[Qemu-commits] [qemu/qemu] cbea0c: target-i386: save 64-bit CR3 in 64-bit SMM state s...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: cbea0c26e718191b57783f847ad2c805670439e8
      
https://github.com/qemu/qemu/commit/cbea0c26e718191b57783f847ad2c805670439e8
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M target-i386/smm_helper.c

  Log Message:
  -----------
  target-i386: save 64-bit CR3 in 64-bit SMM state save area

The x86_64 CR3 register is 64 bits wide, save all of them!

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


  Commit: 420957a5982113416c5e442687de5e1ffaffeafc
      
https://github.com/qemu/qemu/commit/420957a5982113416c5e442687de5e1ffaffeafc
  Author: Joseph Hindin <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M qga/vss-win32/Makefile.objs

  Log Message:
  -----------
  qga: fitering out -fstack-protector-strong

configure script may add -fstack-protector-strong option instead
of -fstack-protector-all, depending on availability ( see
commit 63678e17c ). Both options have to by filtered out for
qga-vss.dll, otherwise MinGW cross-compilation fails at linking
stage.

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


  Commit: 9cb11fd7539b5b787d8fb3834004804a58dd16ae
      
https://github.com/qemu/qemu/commit/9cb11fd7539b5b787d8fb3834004804a58dd16ae
  Author: Nadav Amit <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M hw/intc/apic_common.c
    M include/hw/i386/apic.h
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: clear bsp bit when designating bsp

Since the BSP bit is writable on real hardware, during reset all the CPUs which
were not chosen to be the BSP should have their BSP bit cleared. This fix is
required for KVM to work correctly when it changes the BSP bit.

An additional fix is required for QEMU tcg to allow software to change the BSP
bit.

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


  Commit: 0a7cf217d81161e36af2344e911d56d4f9fef9c5
      
https://github.com/qemu/qemu/commit/0a7cf217d81161e36af2344e911d56d4f9fef9c5
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M util/qemu-config.c

  Log Message:
  -----------
  util/qemu-config: fix regression of qmp_query_command_line_options

Commit 49d2e64 (machine: remove qemu_machine_opts global list)
made machine options specific to machine sub-type, leaving
the qemu_machine_opts desc array empty. Sadly this is the place
qmp_query_command_line_options is looking for supported options.

As a fix for for 2.3 the machine_qemu_opts (the generic ones)
are restored only for qemu-config scope.
We need to find a better fix for 2.4.

Reported-by: Tony Krowiak <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 4cc856fabae1447d53890e707c70f257a7691174
      
https://github.com/qemu/qemu/commit/4cc856fabae1447d53890e707c70f257a7691174
  Author: zhanghailiang <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M kvm-all.c

  Log Message:
  -----------
  kvm-all: Sync dirty-bitmap from kvm before kvm destroy the corresponding 
dirty_bitmap

Sometimes, we destroy the dirty_bitmap in kvm_memory_slot before any sync action
occur, this bit in dirty_bitmap will be missed, and which will lead the 
corresponding
dirty pages to be missed in migration.

This usually happens when do migration during VM's Start-up or Reboot.

Signed-off-by: zhanghailiang <address@hidden>
[Use s->migration_log instead of exec.c's in_migration. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: fb8597bb65eff5c868db52668d21888e4fe7c27a
      
https://github.com/qemu/qemu/commit/fb8597bb65eff5c868db52668d21888e4fe7c27a
  Author: Ed Maste <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Use $(MAKE) for recursive make

On BSDs "make" is typically BSD make, while "gmake" is GNU make.

Signed-off-by: Ed Maste <address@hidden>
Message-Id: <address@hidden>
[Fix $(INSTALLER) too as reported by Fam Zheng. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a8a7ef145d6e97853ce4ecc9277475e1726ff757
      
https://github.com/qemu/qemu/commit/a8a7ef145d6e97853ce4ecc9277475e1726ff757
  Author: Peter Maydell <address@hidden>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M Makefile
    M hw/intc/apic_common.c
    M include/hw/i386/apic.h
    M kvm-all.c
    M qga/vss-win32/Makefile.objs
    M target-i386/cpu.c
    M target-i386/smm_helper.c
    M util/qemu-config.c

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

Another round of small fixes.  I am not including the
virtio-blk fix, because Wen only posted a prototype and the changes
I made were pretty large.  It definitely needs another pair of eyes
(but it is a 2.3 regression and a blocker).

# gpg: Signature made Thu Apr  2 14:59:56 2015 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# 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:
  Use $(MAKE) for recursive make
  kvm-all: Sync dirty-bitmap from kvm before kvm destroy the corresponding 
dirty_bitmap
  util/qemu-config: fix regression of qmp_query_command_line_options
  target-i386: clear bsp bit when designating bsp
  qga: fitering out -fstack-protector-strong
  target-i386: save 64-bit CR3 in 64-bit SMM state save area

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/913fbe9a6a05...a8a7ef145d6e