1. 15 3月, 2017 2 次提交
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 64c358a3
      Peter Maydell 提交于
      * "x" monitor command fix for KVM (Christian)
      * MemoryRegion name documentation (David)
      * mem-prealloc optimization (Jitendra)
      * -icount/MTTCG fixes (me)
      * "info mtree" niceness (Peter)
      * NBD drop_sync buffer overflow (Vladimir/Eric)
      * small cleanups and bugfixes (Li, Lin, Suramya, Thomas)
      * fix for "-device kvmclock" w/TCG (Eduardo)
      * debug output before crashing on KVM_{GET,SET}_MSRS (Eduardo)
      
      # gpg: Signature made Tue 14 Mar 2017 13:42:05 GMT
      # gpg:                using RSA key 0xBFFBD25F78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * remotes/bonzini/tags/for-upstream:
        nbd/client: fix drop_sync [CVE-2017-2630]
        memory: info mtree check mr range overflow
        icount: process QEMU_CLOCK_VIRTUAL timers in vCPU thread
        main-loop: remove now unnecessary optimization
        cpus: define QEMUTimerListNotifyCB for QEMU system emulation
        qemu-timer: do not include sysemu/cpus.h from util/qemu-timer.h
        qemu-timer: fix off-by-one
        target/nios2: take BQL around interrupt check
        scsi: mptsas: fix the wrong reading size in fetch request
        util: Removed unneeded header from path.c
        configure: add the missing help output for optional features
        scripts/dump-guest-memory.py: fix int128_get64 on recent gcc
        kvmclock: Don't crash QEMU if KVM is disabled
        kvm: Print MSR information if KVM_{GET,SET}_MSRS failed
        exec: add cpu_synchronize_state to cpu_memory_rw_debug
        mem-prealloc: reduce large guest start-up and migration time.
        docs: Add a note about mixing bootindex with "-boot order"
        memory_region: Fix name comments
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      64c358a3
    • P
      hw/misc/imx6_src: Don't crash trying to reset missing CPUs · 5e2fb7c5
      Peter Maydell 提交于
      Commit 4881658a introduced a call to arm_get_cpu_by_id(),
      and Coverity noticed that we weren't checking that it didn't
      return NULL (CID 1371652).
      
      Normally this won't happen (because all 4 CPUs are expected
      to exist), but it's possible the user requested fewer CPUs
      on the command line. Handle this possibility by silently
      doing nothing, which is the same behaviour as before commit
      4881658a and also how we handle the other CPU operations
      (since we ignore the INVALID_PARAM returns from arm_set_cpu_on()
      and friends).
      
      There is a slight behavioural difference to the pre-4881658a
      situation: the "reset this core" bit will remain set rather
      than not being permitted to be set. The imx6 datasheet is
      unclear about the behaviour in this odd corner case, so we
      opt for the simpler code rather than complicated logic to
      maintain identical behaviour.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      Message-id: 1488542374-1256-1-git-send-email-peter.maydell@linaro.org
      Reviewed-by: NAlex Bennée <alex.bennee@linaro.org>
      5e2fb7c5
  2. 14 3月, 2017 32 次提交
  3. 13 3月, 2017 6 次提交