1. 25 1月, 2017 32 次提交
  2. 24 1月, 2017 8 次提交
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging · a678502e
      Peter Maydell 提交于
      x86, machine, numa queue (2017-01-23)
      
      # gpg: Signature made Mon 23 Jan 2017 23:26:59 GMT
      # gpg:                using RSA key 0x2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/x86-and-machine-pull-request:
        kvm: Allow invtsc migration if tsc-khz is set explicitly
        kvm: Simplify invtsc check
        hw/core/null-machine: Add the possibility to instantiate a CPU and RAM
        qemu-options: Rename variables on the -numa "cpus" option
        MAINTAINERS: Add an entry for hw/core/null-machine.c
        machine: Make possible_cpu_arch_ids() return const pointer
        pc: don't return cpu pointer from pc_new_cpu() as it's not needed anymore
        pc: cleanup: move smbios_set_cpuid() into pc_build_smbios()
        arch_init: Remove unnecessary default_config_files table
        vl: Ensure the numa_post_machine_init func in the appropriate location
        i386: Return migration-safe field on query-cpu-definitions
        i386: Remove AMD feature flag aliases from Opteron models
        x86: add AVX512_VPOPCNTDQ features
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a678502e
    • C
      s390x/kvm: fix cmma reset for KVM · 0cf4d747
      Christian Borntraeger 提交于
      We must reset the CMMA states for normal memory (when not on mem path),
      but the current code does the opposite. This was unnoticed for some time
      as the kernel since 4.6 also had a bug which mostly disabled the paging
      optimizations.
      
      Fixes: 07059eff ("s390x/kvm: let the CPU model control CMM(A)")
      Cc: qemu-stable@nongnu.org # v2.8
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NCornelia Huck <cornelia.huck@de.ibm.com>
      0cf4d747
    • C
      s390x/kvm: include hw_accel.h instead of kvm.h · 8195d899
      Cornelia Huck 提交于
      Commit b3946626 ("kvm: move cpu synchronization code") switched
      to hw_accel.h instead of kvm.h, but missed s390x, resulting in
      
        CC      s390x-softmmu/target/s390x/kvm.o
      /home/cohuck/git/qemu/target/s390x/kvm.c: In function ‘kvm_sclp_service_call’:
      /home/cohuck/git/qemu/target/s390x/kvm.c:1034:5: error: implicit declaration of function ‘cpu_synchronize_state’ [-Werror=implicit-function-declaration]
           cpu_synchronize_state(CPU(cpu));
           ^
      /home/cohuck/git/qemu/target/s390x/kvm.c:1034:5: error: nested extern declaration of ‘cpu_synchronize_state’ [-Werror=nested-externs]
      /home/cohuck/git/qemu/target/s390x/kvm.c: In function ‘sigp_initial_cpu_reset’:
      /home/cohuck/git/qemu/target/s390x/kvm.c:1628:5: error: implicit declaration of function ‘cpu_synchronize_post_reset’ [-Werror=implicit-function-declaration]
           cpu_synchronize_post_reset(cs);
           ^
      /home/cohuck/git/qemu/target/s390x/kvm.c:1628:5: error: nested extern declaration of ‘cpu_synchronize_post_reset’ [-Werror=nested-externs]
      /home/cohuck/git/qemu/target/s390x/kvm.c: In function ‘sigp_set_prefix’:
      /home/cohuck/git/qemu/target/s390x/kvm.c:1665:5: error: implicit declaration of function ‘cpu_synchronize_post_init’ [-Werror=implicit-function-declaration]
           cpu_synchronize_post_init(cs);
           ^
      /home/cohuck/git/qemu/target/s390x/kvm.c:1665:5: error: nested extern declaration of ‘cpu_synchronize_post_init’ [-Werror=nested-externs]
      cc1: all warnings being treated as errors
      /home/cohuck/git/qemu/rules.mak:64: recipe for target 'target/s390x/kvm.o' failed
      
      Fix this.
      
      Fixes: b3946626 ("kvm: move cpu synchronization code")
      Signed-off-by: NCornelia Huck <cornelia.huck@de.ibm.com>
      Acked-by: NVincent Palatin <vpalatin@chromium.org>
      8195d899
    • P
      Makefile: Add qemu-doc.txt to distclean and dependencies · d5e85105
      Peter Maydell 提交于
      When qemu-doc.txt was added as a new output format in
      commit f8bab10b, it was not added to either the
      list of files to remove in distclean or to the dependency
      line that forces qemu-options.texi to be built before
      attempting to build qemu-doc.*.
      
      In particular, the missing dependency meant that on
      some platforms (notably OSX hosts) we would try to
      build qemu-doc.txt before qemu-options.texi had been
      fully written out, and then makeinfo would complain
      about missing cross-reference targets.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 1485266538-10119-1-git-send-email-peter.maydell@linaro.org
      Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      d5e85105
    • P
      Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20170123' into staging · 48cef39b
      Peter Maydell 提交于
      hppa-linux target support
      
      # gpg: Signature made Mon 23 Jan 2017 17:54:09 GMT
      # gpg:                using RSA key 0xAD1270CC4DD0279B
      # gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
      # gpg:                 aka "Richard Henderson <rth@redhat.com>"
      # gpg:                 aka "Richard Henderson <rth@twiddle.net>"
      # Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B
      
      * remotes/rth/tags/pull-hppa-20170123: (25 commits)
        target-hppa: Implement floating-point insns
        target-hppa: Implement system and memory-management insns
        target-hppa: Implement loads and stores
        target-hppa: Implement shifts and deposits
        target-hppa: Implement linux-user gateway page
        target-hppa: Implement branches
        target-hppa: Implement basic arithmetic
        target-hppa: Add nullification framework
        target-hppa: Add framework and enable compilation
        target-hppa: Add softfloat specializations
        linux-user: Add HPPA startup and main loop
        linux-user: Add HPPA signal handling
        linux-user: Add HPPA target_signal.h and target_cpu.h
        linux-user: Add HPPA target_structs.h
        linux-user: Add HPPA definitions to syscall_defs.h
        linux-user: Add HPPA target_syscall.h
        linux-user: Add HPPA termbits.h
        linux-user: Add HPPA syscall numbers
        linux-user: Add HPPA socket.h definitions
        linux-user: Add some hppa ioctls
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      48cef39b
    • E
      kvm: Allow invtsc migration if tsc-khz is set explicitly · d99569d9
      Eduardo Habkost 提交于
      We can safely allow a VM to be migrated with invtsc enabled if
      tsc-khz is set explicitly, because:
      * QEMU already refuses to start if it can't set the TSC frequency
        to the configured value.
      * Management software is already required to keep device
        configuration (including CPU configuration) the same on
        migration source and destination.
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Message-Id: <20170108173234.25721-3-ehabkost@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      d99569d9
    • E
      kvm: Simplify invtsc check · d74460ec
      Eduardo Habkost 提交于
      Instead of searching the table we have just built, we can check
      the env->features field directly.
      Reviewed-by: NMarcelo Tosatti <mtosatti@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Message-Id: <20170108173234.25721-2-ehabkost@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      d74460ec
    • T
      hw/core/null-machine: Add the possibility to instantiate a CPU and RAM · 3964ec6c
      Thomas Huth 提交于
      Sometimes it is useful to have just a machine with CPU and RAM, without
      any further hardware in it, e.g. if you just want to do some instruction
      debugging for TCG with a remote GDB attached to QEMU, or run some embedded
      code with the "-semihosting" QEMU parameter. qemu-system-m68k already
      features a "dummy" machine, and xtensa a "sim" machine for exactly this
      purpose.
      All target architectures have nowadays also a "none" machine, which would
      be a perfect match for this, too - but it currently does not allow to add
      CPU and RAM yet. Thus let's add these possibilities in a generic way to the
      "none" machine, too, so that we hopefully do not need additional "dummy"
      machines in the future anymore (and maybe can also get rid of the already
      existing "dummy"/"sim" machines one day).
      Note that the default behaviour of the "none" machine is not changed, i.e.
      no CPU and no RAM is instantiated by default. You have explicitely got to
      specify the CPU model with "-cpu" and the amount of RAM with "-m" to get
      these new features.
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Message-Id: <1484743490-24721-1-git-send-email-thuth@redhat.com>
      Reviewed-by: NEduardo Habkost <ehabkost@redhat.com>
      Reviewed-by: NAlistair Francis <alistair.francis@xilinx.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      3964ec6c