[Qemu-commits] [qemu/qemu] 8e2e95: xio3130_downstream: typo fix

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8e2e95ef04a8d40d59d1d735e3ebd48324c27417
      
https://github.com/qemu/qemu/commit/8e2e95ef04a8d40d59d1d735e3ebd48324c27417
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M hw/pci-bridge/xio3130_downstream.c

  Log Message:
  -----------
  xio3130_downstream: typo fix

slt ctl/status are passed in incorrect order.
Fix this up.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reported-by: Peter Maydell <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 4d90b7a0e4aa8051d4a059d49e458e3378aa39ff
      
https://github.com/qemu/qemu/commit/4d90b7a0e4aa8051d4a059d49e458e3378aa39ff
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M include/hw/pci/pcie.h

  Log Message:
  -----------
  pcie: consistent names for function args

The function declarations for pci_cap_slot_get and
pci_cap_slot_write_config call the argument "slot_ctl", but the function
definitions and all the call sites drop the 'o' and call it "slt_ctl".
Let's be consistent.

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 2bbadb08ce272d65e1f78621002008b07d1e0f03
      
https://github.com/qemu/qemu/commit/2bbadb08ce272d65e1f78621002008b07d1e0f03
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M hw/core/machine.c
    M hw/virtio/virtio-balloon.c
    M include/hw/virtio/virtio-balloon.h

  Log Message:
  -----------
  virtio-balloon: fix QEMU 4.0 config size migration incompatibility

The virtio-balloon config size changed in QEMU 4.0 even for existing
machine types.  Migration from QEMU 3.1 to 4.0 can fail in some
circumstances with the following error:

  qemu-system-x86_64: get_pci_config_device: Bad config data: i=0x10 read: a1 
device: 1 cmask: ff wmask: c0 w1cmask:0

This happens because the virtio-balloon config size affects the VIRTIO
Legacy I/O Memory PCI BAR size.

Introduce a qdev property called "qemu-4-0-config-size" and enable it
only for the QEMU 4.0 machine types.  This way <4.0 machine types use
the old size, 4.0 uses the larger size, and >4.0 machine types use the
appropriate size depending on enabled virtio-balloon features.

Live migration to and from old QEMUs to QEMU 4.1 works again as long as
a versioned machine type is specified (do not use just "pc"!).

Originally-by: Wolfgang Bumiller <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Wolfgang Bumiller <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ab31b3373eba7e186282aac9f05c4303c309ac27
      
https://github.com/qemu/qemu/commit/ab31b3373eba7e186282aac9f05c4303c309ac27
  Author: Igor Mammedov <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M tests/bios-tables-test.c

  Log Message:
  -----------
  tests: acpi: do not require IASL for dumping AML blobs

IASL isn't needed when dumping ACPI tables from guest for
rebuild purposes. So move this part out from IASL branch.

Makes rebuild-expected-aml.sh work without IASL installed
on host.

Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7b9829bc6c7d84056c3a1c60737f71db4d2871e4
      
https://github.com/qemu/qemu/commit/7b9829bc6c7d84056c3a1c60737f71db4d2871e4
  Author: Igor Mammedov <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M tests/bios-tables-test.c

  Log Message:
  -----------
  tests: acpi: do not skip tests when IASL is not installed

tests do binary comparision so we can check tables without
IASL. Move IASL condition right before decompilation step
and skip it if IASL is not installed.

Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f37f47126236c8dc710d97da8ca9d43c38bef4ec
      
https://github.com/qemu/qemu/commit/f37f47126236c8dc710d97da8ca9d43c38bef4ec
  Author: Pankaj Gupta <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M hw/virtio/virtio-pmem-pci.c

  Log Message:
  -----------
  virtio pmem: fix wrong mem region condition

Coverity reported memory region returns zero
for non-null value. This is because of wrong
arguments to '?:' , fixing this.

Signed-off-by: Pankaj Gupta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>


  Commit: 7b8a8474249eec97cd6a82f78b91183626fda65b
      
https://github.com/qemu/qemu/commit/7b8a8474249eec97cd6a82f78b91183626fda65b
  Author: Pankaj Gupta <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M hw/virtio/virtio-pmem.c

  Log Message:
  -----------
  virtio pmem: remove memdev null check

Coverity reports that when we're assigning vi->size we handle the
"pmem->memdev is NULL" case; but we then pass it into
object_get_canonical_path(), which unconditionally dereferences it
and will crash if it is NULL. If this pointer can be NULL then we
need to do something else here.

We are removing 'pmem->memdev' null check here as memdev will never
be null in this function.

Signed-off-by: Pankaj Gupta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>


  Commit: 207efa18ac9eb7085a44cad24489d0da54bc5f65
      
https://github.com/qemu/qemu/commit/207efa18ac9eb7085a44cad24489d0da54bc5f65
  Author: Pankaj Gupta <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M hw/virtio/virtio-pmem-pci.c

  Log Message:
  -----------
  virtio pmem: remove transitional names

Remove transitional & non transitional names for virtio pmem.
Only virtio 1.0 and up is supported.

Signed-off-by: Pankaj Gupta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>


  Commit: 46cd24e7ed38191b5ab5c40a836d6c5b6b604f8a
      
https://github.com/qemu/qemu/commit/46cd24e7ed38191b5ab5c40a836d6c5b6b604f8a
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-12 (Fri, 12 Jul 2019)

  Changed paths:
    M hw/core/machine.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/virtio/virtio-balloon.c
    M hw/virtio/virtio-pmem-pci.c
    M hw/virtio/virtio-pmem.c
    M include/hw/pci/pcie.h
    M include/hw/virtio/virtio-balloon.h
    M tests/bios-tables-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, pc, pci: fixes, cleanups, tests

A bunch of fixes all over the place.
ACPI tests will now run on more systems: might
introduce new failure reports but that's for
the best, isn't it?

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Fri 12 Jul 2019 15:57:40 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>" [full]
# gpg:                 aka "Michael S. Tsirkin <address@hidden>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  virtio pmem: remove transitional names
  virtio pmem: remove memdev null check
  virtio pmem: fix wrong mem region condition
  tests: acpi: do not skip tests when IASL is not installed
  tests: acpi: do not require IASL for dumping AML blobs
  virtio-balloon: fix QEMU 4.0 config size migration incompatibility
  pcie: consistent names for function args
  xio3130_downstream: typo fix

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


Compare: https://github.com/qemu/qemu/compare/1316b1ddc8a0...46cd24e7ed38