[Qemu-commits] [qemu/qemu] f5c052: target-i386: fix typo

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f5c052b973b0b2b3aa15e6cb0b0ac48ab763a9b0
      
https://github.com/qemu/qemu/commit/f5c052b973b0b2b3aa15e6cb0b0ac48ab763a9b0
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M target-i386/kvm.c

  Log Message:
  -----------
  target-i386: fix typo

The impact is small because kvm_get_vcpu_events fixes env->hflags, but
it is wrong and could cause INITs to be delayed arbitrarily with
-machine kernel_irqchip=off.

Reported-by: Achille Fouilleul <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 004c8e0090025b4fde4e99fbc5a81049be8f79d1
      
https://github.com/qemu/qemu/commit/004c8e0090025b4fde4e99fbc5a81049be8f79d1
  Author: Michael Tokarev <address@hidden>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl.c: move pidfile creation up the line

With current code, pid file is open after various
sockets, chardevs, fsdevs and the like.  This causes
interesting effects, for example when monitor is a
unix-socket, and another qemu instance is already
running, new qemu first "damages" the socket and
next complain that it can't acquire the pid file and
exits, making running qemu unreachable.

Move pid file creation earlier, right after the call
to os_daemonize(), where we know our process id (pid).

Signed-off-by: Michael Tokarev <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 5122787580ad7fc8f8540c73cd33612604172607
      
https://github.com/qemu/qemu/commit/5122787580ad7fc8f8540c73cd33612604172607
  Author: ZhuangYanying <address@hidden>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M target-i386/machine.c

  Log Message:
  -----------
  target-i386/machine: fix migrate faile because of Hyper-V 
HV_X64_MSR_VP_RUNTIME

Hyper-V HV_X64_MSR_VP_RUNTIME was introduced in linux-4.4 + qemu-2.5.

As long as the KVM module supports, qemu will save / load the
vmstate_msr_hyperv_runtime register during the migration.

Regardless of whether the hyperv_runtime configuration of x86_cpu_properties is
enabled.

The qemu-2.3 does not support this feature, of course, failed to migrate.

    linux-BGSfqC:/home/qemu # ./x86_64-softmmu/qemu-system-x86_64 --enable-kvm \
  -nodefaults -machine pc-i440fx-2.3,accel=kvm,usb=off -smp 4 -m 4096 -drive \
  
file=/work/suse/sles11sp3.img.bak,format=raw,if=none,id=drive-virtio-disk0,cache=none
 \
  -device 
virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0
 \
  -vnc :99 -device cirrus-vga,id=video0,vgamem_mb=8,bus=pci.0,addr=0x2 -monitor 
vc

    
save_section_header:se->section_id=3,se->idstr:ram,se->instance_id=0,se->version_id=4
    
save_section_header:se->section_id=0,se->idstr:timer,se->instance_id=0,se->version_id=2
    
save_section_header:se->section_id=4,se->idstr:cpu_common,se->instance_id=0,se->version_id=1
    
save_section_header:se->section_id=5,se->idstr:cpu,se->instance_id=0,se->version_id=12
    vmstate_subsection_save:vmsd->name:cpu/async_pf_msr
    hyperv_runtime_enable_needed:env->msr_hv_runtime=128902811
    vmstate_subsection_save:vmsd->name:cpu/msr_hyperv_runtime

Since hyperv_runtime is false, vm will not use hv->runtime_offset, then
vmstate_msr_hyperv_runtime is no need to transfer while migrating.

Signed-off-by: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2209401fa73e176ed093167b8f60aba797f25d49
      
https://github.com/qemu/qemu/commit/2209401fa73e176ed093167b8f60aba797f25d49
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M hw/core/qdev-properties-system.c

  Log Message:
  -----------
  qdev: fix use-after-free regression from becdfa00cfa

Spotted by Coverity, CID 1365383.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 175cad36a599bb24ab2a5cd195c96b1f123e25a9
      
https://github.com/qemu/qemu/commit/175cad36a599bb24ab2a5cd195c96b1f123e25a9
  Author: Doug Evans <address@hidden>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: document how x86 gdb_num_core_regs is computed.

It helps when reading the code to see how the number is arrived at.

Signed-off-by: Doug Evans <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a5068244b4f0c994791303b6186b6f732adab6c2
      
https://github.com/qemu/qemu/commit/a5068244b4f0c994791303b6186b6f732adab6c2
  Author: Eric Blake <address@hidden>
  Date:   2016-11-10 (Thu, 10 Nov 2016)

  Changed paths:
    M nbd/client.c

  Log Message:
  -----------
  nbd: Don't inf-loop on early EOF

Commit 7d3123e converted a single read_sync() into a while loop
that assumed that read_sync() would either make progress or give
an error. But when the server hangs up early, the client sees
EOF (a read_sync() of 0) and never makes progress, which in turn
caused qemu-iotest './check -nbd 83' to go into an infinite loop.

Rework the loop to accomodate reads cut short by EOF.

Reported-by: Max Reitz <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 83c83f9a5266ff113060f887f106a47920fa6974
      
https://github.com/qemu/qemu/commit/83c83f9a5266ff113060f887f106a47920fa6974
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M nbd/client.c
    M target-i386/cpu.c
    M target-i386/kvm.c
    M target-i386/machine.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging

Small fixes for hard freeze.

# gpg: Signature made Thu 10 Nov 2016 03:34:24 PM GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# 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

* bonzini/tags/for-upstream:
  nbd: Don't inf-loop on early EOF
  target-i386: document how x86 gdb_num_core_regs is computed.
  qdev: fix use-after-free regression from becdfa00cfa
  target-i386/machine: fix migrate faile because of Hyper-V 
HV_X64_MSR_VP_RUNTIME
  vl.c: move pidfile creation up the line
  target-i386: fix typo

Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


Compare: https://github.com/qemu/qemu/compare/6bbcb76301a7...83c83f9a5266