[Qemu-commits] [qemu/qemu] b73f05: scripts: Detect git worktrees for get_maintainer.p...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b73f059cf2dce327f4f5936a1e6d4d7b898c6a71
      
https://github.com/qemu/qemu/commit/b73f059cf2dce327f4f5936a1e6d4d7b898c6a71
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M scripts/get_maintainer.pl

  Log Message:
  -----------
  scripts: Detect git worktrees for get_maintainer.pl --git

Recent git versions support worktrees where .git is not a directory but
a file with a path to the .git repository; however the get_maintainer.pl
script only recognises the .git directory, let's fix it.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Tested-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c3157b74c47f886f99df752500f7cf76e7a287dd
      
https://github.com/qemu/qemu/commit/c3157b74c47f886f99df752500f7cf76e7a287dd
  Author: Sergio Lopez <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm: fix memory leak in microvm_fix_kernel_cmdline

In microvm_fix_kernel_cmdline(), fw_cfg_modify_string() is duplicating
cmdline instead of taking ownership of it. Free it afterwards to avoid
leaking it.

Reported-by: Coverity (CID 1407218)
Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Sergio Lopez <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7f7a585d5bd3c7f1275d28c77d9d67513c1de36c
      
https://github.com/qemu/qemu/commit/7f7a585d5bd3c7f1275d28c77d9d67513c1de36c
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M target/i386/cpu.c

  Log Message:
  -----------
  target/i386: add PSCHANGE_NO bit for the ARCH_CAPABILITIES MSR

This is required to disable ITLB multihit mitigations in nested
hypervisors.

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


  Commit: 7fac38635e1cc5ebae34eb6530da1009bd5808e4
      
https://github.com/qemu/qemu/commit/7fac38635e1cc5ebae34eb6530da1009bd5808e4
  Author: Pawan Gupta <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M target/i386/cpu.c

  Log Message:
  -----------
  target/i386: Export TAA_NO bit to guests

TSX Async Abort (TAA) is a side channel attack on internal buffers in
some Intel processors similar to Microachitectural Data Sampling (MDS).

Some future Intel processors will use the ARCH_CAP_TAA_NO bit in the
IA32_ARCH_CAPABILITIES MSR to report that they are not vulnerable to
TAA. Make this bit available to guests.

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


  Commit: c9d6da3a5e427cd0ff58a06a38c8faa4fa7b21ba
      
https://github.com/qemu/qemu/commit/c9d6da3a5e427cd0ff58a06a38c8faa4fa7b21ba
  Author: Thomas Huth <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  hw/i386: Fix compiler warning when CONFIG_IDE_ISA is disabled

When CONFIG_IDE_ISA is disabled, compilation currently fails:

 hw/i386/pc_piix.c: In function ‘pc_init1’:
 hw/i386/pc_piix.c:81:9: error: unused variable ‘i’ [-Werror=unused-variable]

Move the variable declaration to the right code block to avoid
this problem.

Fixes: 4501d317b50e ("hw/i386/pc: Extract pc_i8259_create()")
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7771e1ae1bedba67e9034f9eab233f823aae5fee
      
https://github.com/qemu/qemu/commit/7771e1ae1bedba67e9034f9eab233f823aae5fee
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/vfio/Kconfig

  Log Message:
  -----------
  vfio: vfio-pci requires EDID

hw/vfio/display.c needs the EDID subsystem, select it.

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


  Commit: ff9d708933c019d963505f65c031ac743ec5de1d
      
https://github.com/qemu/qemu/commit/ff9d708933c019d963505f65c031ac743ec5de1d
  Author: Sergio Lopez <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M docs/microvm.rst

  Log Message:
  -----------
  docs/microvm.rst: fix alignment in "Limitations"

Fix the alignment of the items in the "Limitations" section.

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


  Commit: 62e9dc35824eee7caf6878a6ba89a46afa433289
      
https://github.com/qemu/qemu/commit/62e9dc35824eee7caf6878a6ba89a46afa433289
  Author: Sergio Lopez <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M docs/microvm.rst

  Log Message:
  -----------
  docs/microvm.rst: add instructions for shutting down the guest

Add a new section explaining the particularities of the microvm
machine type for triggering a guest-initiated shut down.

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


  Commit: 2f34ebf222d6a9367665a4bf78b8c861a988c1d0
      
https://github.com/qemu/qemu/commit/2f34ebf222d6a9367665a4bf78b8c861a988c1d0
  Author: Liam Merwick <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/x86.c
    M include/hw/i386/pc.h
    M include/hw/i386/x86.h
    M target/i386/machine.c

  Log Message:
  -----------
  hw/i386: Move save_tsc_khz from PCMachineClass to X86MachineClass

Attempting to migrate a VM using the microvm machine class results in the source
QEMU aborting with the following message/backtrace:

target/i386/machine.c:955:tsc_khz_needed: Object 0x555556608fa0 is not an
instance of type generic-pc-machine

abort()
object_class_dynamic_cast_assert()
vmstate_save_state_v()
vmstate_save_state()
vmstate_save()
qemu_savevm_state_complete_precopy()
migration_thread()
migration_thread()
migration_thread()
qemu_thread_start()
start_thread()
clone()

The access to the machine class returned by MACHINE_GET_CLASS() in
tsc_khz_needed() is crashing as it is trying to dereference a different
type of machine class object (TYPE_PC_MACHINE) to that of this microVM.

This can be resolved by extending the changes in the following commit
f0bb276bf8d5 ("hw/i386: split PCMachineState deriving X86MachineState from it")
and moving the save_tsc_khz field in PCMachineClass to X86MachineClass.

Fixes: f0bb276bf8d5 ("hw/i386: split PCMachineState deriving X86MachineState 
from it")
Signed-off-by: Liam Merwick <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Sergio Lopez <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0d074bf8e74d16920d9c9a132a41d5200333c7bb
      
https://github.com/qemu/qemu/commit/0d074bf8e74d16920d9c9a132a41d5200333c7bb
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M qemu-deprecated.texi
    M tests/qemu-iotests/051.pc.out

  Log Message:
  -----------
  scsi: deprecate scsi-disk

It's an old compatibility shim that just delegates to scsi-cd or scsi-hd.
Just like ide-drive, we don't need this.

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


  Commit: 3ae32adff17226bc6a5f3fd7bb9804e6779e0660
      
https://github.com/qemu/qemu/commit/3ae32adff17226bc6a5f3fd7bb9804e6779e0660
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/rtc/mc146818rtc.c

  Log Message:
  -----------
  Revert "mc146818rtc: fix timer interrupt reinjection"

This reverts commit b429de730174b388ea5760e3debb0d542ea3c261, except
that the reversal of the outer "if (period)" is left in.

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


  Commit: 7a3e29b12f5afe0106a5713bb4db6e23dc66ef91
      
https://github.com/qemu/qemu/commit/7a3e29b12f5afe0106a5713bb4db6e23dc66ef91
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M hw/rtc/mc146818rtc.c

  Log Message:
  -----------
  mc146818rtc: fix timer interrupt reinjection again

Commit 369b41359af46bded5799c9ef8be2b641d92e043 broke timer interrupt
reinjection when there is no period change by the guest.  In that
case, old_period is 0, which ends up zeroing irq_coalesced (counter of
reinjected interrupts).

The consequence is Windows 7 is unable to synchronize time via NTP.
Easily reproducible by playing a fullscreen video with cirrus and VNC.

Fix by passing s->period when periodic_timer_update is called due to
expiration of the timer.  With this change, old_period == 0 only
means that the periodic timer was off.

Reported-by: Marcelo Tosatti <address@hidden>
Co-developed-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 06b43e082c6bdbd5b261b57d5c8e1fe5db6807a9
      
https://github.com/qemu/qemu/commit/06b43e082c6bdbd5b261b57d5c8e1fe5db6807a9
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-19 (Tue, 19 Nov 2019)

  Changed paths:
    M docs/microvm.rst
    M hw/i386/microvm.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/x86.c
    M hw/rtc/mc146818rtc.c
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M include/hw/i386/pc.h
    M include/hw/i386/x86.h
    M qemu-deprecated.texi
    M scripts/get_maintainer.pl
    M target/i386/cpu.c
    M target/i386/machine.c
    M tests/qemu-iotests/051.pc.out

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

* microvm docs and fixes (Sergio, Liam)
* New processor features for Intel errata (myself, Pawan)
* Kconfig fixes (myself, Thomas)
* Revert mc146818rtc change (myself)
* Deprecate scsi-disk (myself)
* RTC fix (myself, Marcelo)

# gpg: Signature made Tue 19 Nov 2019 09:03:49 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>" [full]
# gpg:                 aka "Paolo Bonzini <address@hidden>" [full]
# 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:
  mc146818rtc: fix timer interrupt reinjection again
  Revert "mc146818rtc: fix timer interrupt reinjection"
  scsi: deprecate scsi-disk
  hw/i386: Move save_tsc_khz from PCMachineClass to X86MachineClass
  docs/microvm.rst: add instructions for shutting down the guest
  docs/microvm.rst: fix alignment in "Limitations"
  vfio: vfio-pci requires EDID
  hw/i386: Fix compiler warning when CONFIG_IDE_ISA is disabled
  target/i386: Export TAA_NO bit to guests
  target/i386: add PSCHANGE_NO bit for the ARCH_CAPABILITIES MSR
  microvm: fix memory leak in microvm_fix_kernel_cmdline
  scripts: Detect git worktrees for get_maintainer.pl --git

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


Compare: https://github.com/qemu/qemu/compare/4b8be65ec5b4...06b43e082c6b