qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 0501e1: hw/pci/pcie: Forbid hot-plug if it's


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 0501e1: hw/pci/pcie: Forbid hot-plug if it's disabled on t...
Date: Mon, 04 May 2020 12:45:27 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0501e1aa1d32a6e02dd06a79bba97fbe9d557cb5
      
https://github.com/qemu/qemu/commit/0501e1aa1d32a6e02dd06a79bba97fbe9d557cb5
  Author: Julia Suvorova <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/pci/pcie.c

  Log Message:
  -----------
  hw/pci/pcie: Forbid hot-plug if it's disabled on the slot

Raise an error when trying to hot-plug/unplug a device through QMP to a device
with disabled hot-plug capability. This makes the device behaviour more
consistent and provides an explanation of the failure in the case of
asynchronous unplug.

Signed-off-by: Julia Suvorova <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 6a1e073378353eb6ac0565e0dc649b3db76ed5dc
      
https://github.com/qemu/qemu/commit/6a1e073378353eb6ac0565e0dc649b3db76ed5dc
  Author: Julia Suvorova <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/pci/pcie.c

  Log Message:
  -----------
  hw/pci/pcie: Replace PCI_DEVICE() casts with existing variable

A little cleanup is possible because of hotplug_pdev introduction.

Signed-off-by: Julia Suvorova <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 0f8d656b3b8ef31ebfbd4a24003d9a58d987a605
      
https://github.com/qemu/qemu/commit/0f8d656b3b8ef31ebfbd4a24003d9a58d987a605
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M include/hw/acpi/aml-build.h
    M include/qemu/typedefs.h

  Log Message:
  -----------
  move 'typedef Aml' to qemu/types.h

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


  Commit: 17d08ba4659dc66a51a7eab83aeafcc9765d0a87
      
https://github.com/qemu/qemu/commit/17d08ba4659dc66a51a7eab83aeafcc9765d0a87
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/acpi/Makefile.objs
    A hw/acpi/aml-build-stub.c

  Log Message:
  -----------
  acpi: add aml builder stubs

Needed when moving aml builder code to devices.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9604980303579ac351e1611d1b0ea8a89c3e9e6b
      
https://github.com/qemu/qemu/commit/9604980303579ac351e1611d1b0ea8a89c3e9e6b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  qtest: allow DSDT acpi table changes

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 88b3648f557855f7da85b5d32f1a08c5a66c2a01
      
https://github.com/qemu/qemu/commit/88b3648f557855f7da85b5d32f1a08c5a66c2a01
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  acpi: drop pointless _STA method

When returning a constant there is no point in having a method
in the first place, _STA can be a simple integer instead.

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


  Commit: a53e581ee818d44bea9dcd2c543c2d08a5934fae
      
https://github.com/qemu/qemu/commit/a53e581ee818d44bea9dcd2c543c2d08a5934fae
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/isa/isa-bus.c
    M include/hw/isa/isa.h

  Log Message:
  -----------
  acpi: add ISADeviceClass->build_aml()

Also add isa_aml_build() function which walks all isa devices.
This allows to move aml builder code to isa devices.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ba480fa6264b161697009448c3cbc0730485379e
      
https://github.com/qemu/qemu/commit/ba480fa6264b161697009448c3cbc0730485379e
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/rtc/mc146818rtc.c
    M include/hw/rtc/mc146818rtc.h

  Log Message:
  -----------
  rtc: add RTC_ISA_BASE

Add and use RTC_ISA_BASE define instead of hardcoding 0x70.

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


  Commit: 15138b5e6ff28a8e68a2e1cb6f4ca2fb7e5b057c
      
https://github.com/qemu/qemu/commit/15138b5e6ff28a8e68a2e1cb6f4ca2fb7e5b057c
  Author: Anthoine Bourgeois <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/display/virtio-vga.c

  Log Message:
  -----------
  virtio-vga: fix virtio-vga bar ordering

With virtio-vga, pci bar are reordered. Bar #2 is used for compatibility
with stdvga. By default, bar #2 is used by virtio modern io bar.
This bar is the last one introduce in the virtio pci bar layout and it's
crushed by the virtio-vga reordering. So virtio-vga and
modern-pio-notify are incompatible because virtio-vga failed to
initialize with this option.

This fix sets the modern io bar to the bar #5 to avoid conflict.

Signed-off-by: Anthoine Bourgeois <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: e6779156a44846053f662157a12ed366568c2cff
      
https://github.com/qemu/qemu/commit/e6779156a44846053f662157a12ed366568c2cff
  Author: Anthoine Bourgeois <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

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

  Log Message:
  -----------
  virtio-pci: update virtio pci bar layout documentation

The modern io bar was never documented.

Signed-off-by: Anthoine Bourgeois <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: 0ac2e63575b5af918e333cc687bbd8e1ab7bb6fe
      
https://github.com/qemu/qemu/commit/0ac2e63575b5af918e333cc687bbd8e1ab7bb6fe
  Author: Li Feng <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/block/vhost-user-blk.c
    M hw/virtio/vhost.c

  Log Message:
  -----------
  vhost-user-blk: fix invalid memory access

when s->inflight is freed, vhost_dev_free_inflight may try to access
s->inflight->addr, it will retrigger the following issue.

==7309==ERROR: AddressSanitizer: heap-use-after-free on address 0x604001020d18 
at pc 0x555555ce948a bp 0x7fffffffb170 sp 0x7fffffffb160
READ of size 8 at 0x604001020d18 thread T0
    #0 0x555555ce9489 in vhost_dev_free_inflight 
/root/smartx/qemu-el7/qemu-test/hw/virtio/vhost.c:1473
    #1 0x555555cd86eb in virtio_reset 
/root/smartx/qemu-el7/qemu-test/hw/virtio/virtio.c:1214
    #2 0x5555560d3eff in virtio_pci_reset hw/virtio/virtio-pci.c:1859
    #3 0x555555f2ac53 in device_set_realized hw/core/qdev.c:893
    #4 0x5555561d572c in property_set_bool qom/object.c:1925
    #5 0x5555561de8de in object_property_set_qobject qom/qom-qobject.c:27
    #6 0x5555561d99f4 in object_property_set_bool qom/object.c:1188
    #7 0x555555e50ae7 in qdev_device_add 
/root/smartx/qemu-el7/qemu-test/qdev-monitor.c:626
    #8 0x555555e51213 in qmp_device_add 
/root/smartx/qemu-el7/qemu-test/qdev-monitor.c:806
    #9 0x555555e8ff40 in hmp_device_add 
/root/smartx/qemu-el7/qemu-test/hmp.c:1951
    #10 0x555555be889a in handle_hmp_command 
/root/smartx/qemu-el7/qemu-test/monitor.c:3404
    #11 0x555555beac8b in monitor_command_cb 
/root/smartx/qemu-el7/qemu-test/monitor.c:4296
    #12 0x555556433eb7 in readline_handle_byte util/readline.c:393
    #13 0x555555be89ec in monitor_read 
/root/smartx/qemu-el7/qemu-test/monitor.c:4279
    #14 0x5555563285cc in tcp_chr_read chardev/char-socket.c:470
    #15 0x7ffff670b968 in g_main_context_dispatch 
(/lib64/libglib-2.0.so.0+0x4a968)
    #16 0x55555640727c in glib_pollfds_poll util/main-loop.c:215
    #17 0x55555640727c in os_host_main_loop_wait util/main-loop.c:238
    #18 0x55555640727c in main_loop_wait util/main-loop.c:497
    #19 0x555555b2d0bf in main_loop /root/smartx/qemu-el7/qemu-test/vl.c:2013
    #20 0x555555b2d0bf in main /root/smartx/qemu-el7/qemu-test/vl.c:4776
    #21 0x7fffdd2eb444 in __libc_start_main (/lib64/libc.so.6+0x22444)
    #22 0x555555b3767a  
(/root/smartx/qemu-el7/qemu-test/x86_64-softmmu/qemu-system-x86_64+0x5e367a)

0x604001020d18 is located 8 bytes inside of 40-byte region 
[0x604001020d10,0x604001020d38)
freed by thread T0 here:
    #0 0x7ffff6f00508 in __interceptor_free (/lib64/libasan.so.4+0xde508)
    #1 0x7ffff671107d in g_free (/lib64/libglib-2.0.so.0+0x5007d)

previously allocated by thread T0 here:
    #0 0x7ffff6f00a88 in __interceptor_calloc (/lib64/libasan.so.4+0xdea88)
    #1 0x7ffff6710fc5 in g_malloc0 (/lib64/libglib-2.0.so.0+0x4ffc5)

SUMMARY: AddressSanitizer: heap-use-after-free 
/root/smartx/qemu-el7/qemu-test/hw/virtio/vhost.c:1473 in 
vhost_dev_free_inflight
Shadow bytes around the buggy address:
  0x0c08801fc150: fa fa 00 00 00 00 04 fa fa fa fd fd fd fd fd fa
  0x0c08801fc160: fa fa fd fd fd fd fd fd fa fa 00 00 00 00 04 fa
  0x0c08801fc170: fa fa 00 00 00 00 00 01 fa fa 00 00 00 00 04 fa
  0x0c08801fc180: fa fa 00 00 00 00 00 01 fa fa 00 00 00 00 00 01
  0x0c08801fc190: fa fa 00 00 00 00 00 fa fa fa 00 00 00 00 04 fa
=>0x0c08801fc1a0: fa fa fd[fd]fd fd fd fa fa fa fd fd fd fd fd fa
  0x0c08801fc1b0: fa fa fd fd fd fd fd fa fa fa fd fd fd fd fd fa
  0x0c08801fc1c0: fa fa 00 00 00 00 00 fa fa fa fd fd fd fd fd fd
  0x0c08801fc1d0: fa fa 00 00 00 00 00 01 fa fa fd fd fd fd fd fa
  0x0c08801fc1e0: fa fa fd fd fd fd fd fa fa fa fd fd fd fd fd fd
  0x0c08801fc1f0: fa fa 00 00 00 00 00 01 fa fa fd fd fd fd fd fa
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07
  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb
==7309==ABORTING

Signed-off-by: Li Feng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Raphael Norwitz <address@hidden>


  Commit: e625ba2a413f2bfdbb71c71008b627fede20fcbb
      
https://github.com/qemu/qemu/commit/e625ba2a413f2bfdbb71c71008b627fede20fcbb
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M scripts/checkpatch.pl

  Log Message:
  -----------
  checkpatch: fix acpi check with multiple file name

Using global expected/nonexpected values causes
false positives when testing multiple patches in one
checkpatch run: one patch can change expected,
another one non-expected.

Use local variables within process() to fix that.

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


  Commit: e11b06a880caa1630fcfdca7d2fc3c9e597792a1
      
https://github.com/qemu/qemu/commit/e11b06a880caa1630fcfdca7d2fc3c9e597792a1
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M scripts/checkpatch.pl

  Log Message:
  -----------
  checkpatch: ignore allowed diff list

Allow changing allowed diff list at any point:
- when changing code under test
- when adding expected files

It's just a list of files so easy to review and merge anyway.

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


  Commit: e3a99063af7bc78e51c19cb007acb646d381a9c7
      
https://github.com/qemu/qemu/commit/e3a99063af7bc78e51c19cb007acb646d381a9c7
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M tests/data/acpi/pc/DSDT
    M tests/data/acpi/pc/DSDT.acpihmat
    M tests/data/acpi/pc/DSDT.bridge
    M tests/data/acpi/pc/DSDT.cphp
    M tests/data/acpi/pc/DSDT.dimmpxm
    M tests/data/acpi/pc/DSDT.ipmikcs
    M tests/data/acpi/pc/DSDT.memhp
    M tests/data/acpi/pc/DSDT.numamem
    M tests/data/acpi/q35/DSDT
    M tests/data/acpi/q35/DSDT.acpihmat
    M tests/data/acpi/q35/DSDT.bridge
    M tests/data/acpi/q35/DSDT.cphp
    M tests/data/acpi/q35/DSDT.dimmpxm
    M tests/data/acpi/q35/DSDT.ipmibt
    M tests/data/acpi/q35/DSDT.memhp
    M tests/data/acpi/q35/DSDT.mmio64
    M tests/data/acpi/q35/DSDT.numamem
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  acpi: DSDT without _STA

commit f6595976e699 ("acpi: drop pointless _STA method") replaced
_STA method with simple name object. Update DSDT accordingly.

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


  Commit: 71b0269ae9a80cfd28c3b5946748b92ac8821334
      
https://github.com/qemu/qemu/commit/71b0269ae9a80cfd28c3b5946748b92ac8821334
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/acpi/nvdimm.c
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length

As per ACPI spec 6.3, Table 19-419 Object Conversion Rules, if
the Buffer Field <= to the size of an Integer (in bits), it will
be treated as an integer. Moreover, the integer size depends on
DSDT tables revision number. If revision number is < 2, integer
size is 32 bits, otherwise it is 64 bits. Current NVDIMM common
DSM aml code (NCAL) uses CreateField() for creating DSM output
buffer. This creates an issue in arm/virt platform where DSDT
revision number is 2 and results in DSM buffer with a wrong
size(8 bytes) gets returned when actual length is < 8 bytes.
This causes guest kernel to report,

"nfit ACPI0012:00: found a zero length table '0' parsing nfit"

In order to fix this, aml code is now modified such that it builds
the DSM output buffer in a byte by byte fashion when length is
smaller than Integer size.

Suggested-by: Igor Mammedov <address@hidden>
Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 5c94b82662a815d8430b81090200178b5377a62e
      
https://github.com/qemu/qemu/commit/5c94b82662a815d8430b81090200178b5377a62e
  Author: Kwangwoo Lee <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/acpi/nvdimm.c
    M hw/i386/acpi-build.c
    M hw/i386/acpi-build.h
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/mem/nvdimm.h

  Log Message:
  -----------
  nvdimm: Use configurable ACPI IO base and size

This patch makes IO base and size configurable to create NPIO AML for
ACPI NFIT. Since a different architecture like AArch64 does not use
port-mapped IO, a configurable IO base is required to create correct
mapping of ACPI IO address and size.

Signed-off-by: Kwangwoo Lee <address@hidden>
Signed-off-by: Eric Auger <address@hidden>
Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b5a60bee7425ec2ce9b1aa0577585e8328c1b768
      
https://github.com/qemu/qemu/commit/b5a60bee7425ec2ce9b1aa0577585e8328c1b768
  Author: Kwangwoo Lee <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/arm/Kconfig
    M hw/arm/virt-acpi-build.c
    M hw/arm/virt.c
    M hw/mem/Kconfig
    M include/hw/arm/virt.h

  Log Message:
  -----------
  hw/arm/virt: Add nvdimm hot-plug infrastructure

This adds support to init nvdimm acpi state and build nvdimm acpi tables.
Please note nvdimm_support is not yet enabled.

Signed-off-by: Kwangwoo Lee <address@hidden>
Signed-off-by: Eric Auger <address@hidden>
Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c2505d1c56fc4959974985f57f100d90bc82f0ee
      
https://github.com/qemu/qemu/commit/c2505d1c56fc4959974985f57f100d90bc82f0ee
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M docs/specs/acpi_hw_reduced_hotplug.rst
    M hw/acpi/generic_event_device.c
    M hw/arm/virt.c
    M include/hw/acpi/generic_event_device.h

  Log Message:
  -----------
  hw/arm/virt: Add nvdimm hotplug support

This adds support for nvdimm hotplug events through GED
and enables nvdimm for the arm/virt. Now Guests with ACPI
can have both cold and hot plug of nvdimms.

Hot removal functionality is not yet supported.

Signed-off-by: Shameer Kolothum <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 122752d267cb43ee29b5f0acac1057198797c45c
      
https://github.com/qemu/qemu/commit/122752d267cb43ee29b5f0acac1057198797c45c
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    A tests/data/acpi/virt/NFIT.memhp
    A tests/data/acpi/virt/SSDT.memhp
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  tests: Update ACPI tables list for upcoming arm/virt test changes

This is in preparation to update test_acpi_virt_tcg_memhp()
with pc-dimm and nvdimm. Update the bios-tables-test-allowed-diff.h
with the affected ACPI tables so that "make check" doesn't fail.

Also add empty files for new tables required for new test.

Signed-off-by: Shameer Kolothum <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 62293b4f58276d9f0a25ec35f4bc2e97540ba98f
      
https://github.com/qemu/qemu/commit/62293b4f58276d9f0a25ec35f4bc2e97540ba98f
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

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

  Log Message:
  -----------
  bios-tables-test: test pc-dimm and nvdimm coldplug for arm/virt

Since we now have both pc-dimm and nvdimm support, update
test_acpi_virt_tcg_memhp() to include those.

Signed-off-by: Shameer Kolothum <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: e302bb3da6b59ad22c2157bbaac299a301780ba1
      
https://github.com/qemu/qemu/commit/e302bb3da6b59ad22c2157bbaac299a301780ba1
  Author: Shameer Kolothum <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M tests/data/acpi/pc/SSDT.dimmpxm
    M tests/data/acpi/q35/SSDT.dimmpxm
    M tests/data/acpi/virt/DSDT.memhp
    M tests/data/acpi/virt/NFIT.memhp
    M tests/data/acpi/virt/SSDT.memhp
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  tests/acpi: add expected tables for bios-tables-test

Because of the following changes, the expeacted tables for bios-tables-test
needs to be updated.

1. Changed NVDIM DSM output buffer AML code.
2. Updated arm/virt test_acpi_virt_tcg_memhp() to add pc-dimm/nvdimm

Signed-off-by: Shameer Kolothum <address@hidden>
Message-Id: <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 2d9da9dff35765fc3c0f5a67da04a38066897650
      
https://github.com/qemu/qemu/commit/2d9da9dff35765fc3c0f5a67da04a38066897650
  Author: Raphael Norwitz <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/virtio/vhost-user.c

  Log Message:
  -----------
  Refactor vhost_user_set_mem_table functions

vhost_user_set_mem_table() and vhost_user_set_mem_table_postcopy() have
gotten convoluted, and have some identical code.

This change moves the logic populating the VhostUserMemory struct and
fds array from vhost_user_set_mem_table() and
vhost_user_set_mem_table_postcopy() to a new function,
vhost_user_fill_set_mem_table_msg().

No functionality is impacted.

Signed-off-by: Raphael Norwitz <address@hidden>
Signed-off-by: Peter Turschmid <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4b773fc2f7e56cddc9c192e0c95b3097dbbcf1e9
      
https://github.com/qemu/qemu/commit/4b773fc2f7e56cddc9c192e0c95b3097dbbcf1e9
  Author: Liran Alon <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    A tests/data/acpi/pc/WAET
    A tests/data/acpi/q35/WAET
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  acpi: unit-test: Ignore diff in WAET ACPI table

This is done as a preparation for the following patch to expose WAET
ACPI table to guest.

This patch performs steps 1-3 as describes in
tests/qtest/bios-tables-test.c.

Signed-off-by: Liran Alon <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 14cda3503dc00754bab9ce6c688ea21f791c4a33
      
https://github.com/qemu/qemu/commit/14cda3503dc00754bab9ce6c688ea21f791c4a33
  Author: Liran Alon <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  acpi: Add Windows ACPI Emulated Device Table (WAET)

Microsoft introduced this ACPI table to avoid Windows guests performing
various workarounds for device erratas. As the virtual device emulated
by VMM may not have the errata.

Currently, WAET allows hypervisor to inform guest about two
specific behaviors: One for RTC and the other for ACPI PM timer.

Support for WAET have been introduced since Windows Vista. This ACPI
table is also exposed by other common hypervisors by default, including:
VMware, GCP and AWS.

This patch adds WAET ACPI Table to QEMU.

We set "ACPI PM timer good" bit in "Emualted Device Flags" field to
indicate that the ACPI PM timer has been enhanced to not require
multiple reads to obtain a reliable value.
This results in improving the performance of Windows guests that use
ACPI PM timer by avoiding unnecessary VMExits caused by these multiple
reads.

Co-developed-by: Elad Gabay <address@hidden>
Signed-off-by: Liran Alon <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>


  Commit: 1aaef7d809280388e4e0b73cd21f5aa0a6443b75
      
https://github.com/qemu/qemu/commit/1aaef7d809280388e4e0b73cd21f5aa0a6443b75
  Author: Liran Alon <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M tests/data/acpi/pc/WAET
    M tests/data/acpi/q35/WAET
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  acpi: unit-test: Update WAET ACPI Table expected binaries

This is done according to step (6) in the process described at
tests/qtest/bios-tables-test.c.

Expected WAET.dsl:

[000h 0000   4]                    Signature : "WAET"    [Windows ACPI Emulated 
Devices Table]
[004h 0004   4]                 Table Length : 00000028
[008h 0008   1]                     Revision : 01
[009h 0009   1]                     Checksum : 88
[00Ah 0010   6]                       Oem ID : "BOCHS "
[010h 0016   8]                 Oem Table ID : "BXPCWAET"
[018h 0024   4]                 Oem Revision : 00000001
[01Ch 0028   4]              Asl Compiler ID : "BXPC"
[020h 0032   4]        Asl Compiler Revision : 00000001

[024h 0036   4]        Flags (decoded below) : 00000002
                        RTC needs no INT ack : 0
                     PM timer, one read only : 1

Raw Table Data: Length 40 (0x28)

  0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20  // WAET(.....BOCHS
  0010: 42 58 50 43 57 41 45 54 01 00 00 00 42 58 50 43  // BXPCWAET....BXPC
  0020: 01 00 00 00 02 00 00 00                          // ........

Signed-off-by: Liran Alon <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b4fa79eab5eeaaa6fbebeb03723b9b70dd4563c4
      
https://github.com/qemu/qemu/commit/b4fa79eab5eeaaa6fbebeb03723b9b70dd4563c4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/pc.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw/i386/pc: Create 'vmport' device in place

Signed-off-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: c7358f4ee13de0e546ff457da95a9026098e37a9
      
https://github.com/qemu/qemu/commit/c7358f4ee13de0e546ff457da95a9026098e37a9
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/vmport.c

  Log Message:
  -----------
  hw/i386/vmport: Remove unused 'hw/input/i8042.h' include

Remove unused "hw/input/i8042.h" include.

Signed-off-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: e5951129851798620c4f5179dca503a4d6077f50
      
https://github.com/qemu/qemu/commit/e5951129851798620c4f5179dca503a4d6077f50
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/vmmouse.c
    M hw/i386/vmport.c
    A hw/i386/vmport.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw/i386: Add 'vmport.h' local header

Move 'vmport' related declarations in a target-specific header.

Signed-off-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: d8a05995bd64117bf5219d3ba7956277e608e3ca
      
https://github.com/qemu/qemu/commit/d8a05995bd64117bf5219d3ba7956277e608e3ca
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/i386/vmmouse.c
    M hw/i386/vmport.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw/i386: Make vmmouse helpers static

The vmmouse helpers are only used in hw/i386/vmmouse.c,
make them static.

Signed-off-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: 5375af3cd7b8adcc10c18d8083b7be63976c9645
      
https://github.com/qemu/qemu/commit/5375af3cd7b8adcc10c18d8083b7be63976c9645
  Author: Peter Maydell <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M docs/specs/acpi_hw_reduced_hotplug.rst
    M hw/acpi/Makefile.objs
    A hw/acpi/aml-build-stub.c
    M hw/acpi/generic_event_device.c
    M hw/acpi/nvdimm.c
    M hw/arm/Kconfig
    M hw/arm/virt-acpi-build.c
    M hw/arm/virt.c
    M hw/block/vhost-user-blk.c
    M hw/display/virtio-vga.c
    M hw/i386/acpi-build.c
    M hw/i386/acpi-build.h
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/i386/vmmouse.c
    M hw/i386/vmport.c
    A hw/i386/vmport.h
    M hw/isa/isa-bus.c
    M hw/mem/Kconfig
    M hw/pci/pcie.c
    M hw/rtc/mc146818rtc.c
    M hw/virtio/vhost-user.c
    M hw/virtio/vhost.c
    M hw/virtio/virtio-pci.c
    M include/hw/acpi/aml-build.h
    M include/hw/acpi/generic_event_device.h
    M include/hw/arm/virt.h
    M include/hw/i386/pc.h
    M include/hw/isa/isa.h
    M include/hw/mem/nvdimm.h
    M include/hw/rtc/mc146818rtc.h
    M include/qemu/typedefs.h
    M scripts/checkpatch.pl
    M tests/data/acpi/pc/DSDT
    M tests/data/acpi/pc/DSDT.acpihmat
    M tests/data/acpi/pc/DSDT.bridge
    M tests/data/acpi/pc/DSDT.cphp
    M tests/data/acpi/pc/DSDT.dimmpxm
    M tests/data/acpi/pc/DSDT.ipmikcs
    M tests/data/acpi/pc/DSDT.memhp
    M tests/data/acpi/pc/DSDT.numamem
    M tests/data/acpi/pc/SSDT.dimmpxm
    A tests/data/acpi/pc/WAET
    M tests/data/acpi/q35/DSDT
    M tests/data/acpi/q35/DSDT.acpihmat
    M tests/data/acpi/q35/DSDT.bridge
    M tests/data/acpi/q35/DSDT.cphp
    M tests/data/acpi/q35/DSDT.dimmpxm
    M tests/data/acpi/q35/DSDT.ipmibt
    M tests/data/acpi/q35/DSDT.memhp
    M tests/data/acpi/q35/DSDT.mmio64
    M tests/data/acpi/q35/DSDT.numamem
    M tests/data/acpi/q35/SSDT.dimmpxm
    A tests/data/acpi/q35/WAET
    M tests/data/acpi/virt/DSDT.memhp
    A tests/data/acpi/virt/NFIT.memhp
    A tests/data/acpi/virt/SSDT.memhp
    M tests/qtest/bios-tables-test.c

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

virtio,acpi,pci,pc: backlog from pre-5.0

Mostly fixes, cleanups, but also new features for arm/virt and pc acpi.

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

# gpg: Signature made Mon 04 May 2020 15:27:06 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "address@hidden"
# 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: (29 commits)
  hw/i386: Make vmmouse helpers static
  hw/i386: Add 'vmport.h' local header
  hw/i386/vmport: Remove unused 'hw/input/i8042.h' include
  hw/i386/pc: Create 'vmport' device in place
  acpi: unit-test: Update WAET ACPI Table expected binaries
  acpi: Add Windows ACPI Emulated Device Table (WAET)
  acpi: unit-test: Ignore diff in WAET ACPI table
  Refactor vhost_user_set_mem_table functions
  tests/acpi: add expected tables for bios-tables-test
  bios-tables-test: test pc-dimm and nvdimm coldplug for arm/virt
  tests: Update ACPI tables list for upcoming arm/virt test changes
  hw/arm/virt: Add nvdimm hotplug support
  hw/arm/virt: Add nvdimm hot-plug infrastructure
  nvdimm: Use configurable ACPI IO base and size
  hw/acpi/nvdimm: Fix for NVDIMM incorrect DSM output buffer length
  acpi: DSDT without _STA
  checkpatch: ignore allowed diff list
  checkpatch: fix acpi check with multiple file name
  vhost-user-blk: fix invalid memory access
  virtio-pci: update virtio pci bar layout documentation
  ...

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


Compare: https://github.com/qemu/qemu/compare/9af638cc1f66...5375af3cd7b8



reply via email to

[Prev in Thread] Current Thread [Next in Thread]