| Message ID | 20200610042613.1459309-1-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
Patchew URL: https://patchew.org/QEMU/20200610042613.1459309-1-mst@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 20200610042613.1459309-1-mst@redhat.com
Subject: [PULL 00/56] virtio,acpi,pci: features, fixes, cleanups, tests
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
d576bce Fix parameter type in vhost migration log path
407b8ba acpi: ged: rename event memory region
16bfa7d acpi: fadt: add hw-reduced sleep register support
ae67c27 acpi: madt: skip pci override on pci-less systems.
11a424a acpi: create acpi-common.c and move madt code
a73a951 acpi: make build_madt() more generic.
099738a virtio: add vhost-user-vsock-pci device
bdcc4e1 virtio: add vhost-user-vsock base device
f93b9d9 vhost-vsock: add vhost-vsock-common abstraction
1d0d2b0 hw/pci: Fix crash when running QEMU with "-nic model=rocker"
e97f21b libvhost-user: advertise vring features
c9cbf24 Lift max ram slots limit in libvhost-user
c078553 Support individual region unmap in libvhost-user
6147673 Support adding individual regions in libvhost-user
c8397c5 Support ram slot configuration in libvhost-user
9822d5e Refactor out libvhost-user fault generation logic
e921ab7 Lift max memory slots limit imposed by vhost-user
09ca335 Transmit vhost-user memory regions individually
13a3dc9 Add VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS
c91a41b Add vhost-user helper to get MemoryRegion data
2f6982f Add helper to populate vhost-user message regions
19f8b13 vhost-user-blk: delay vhost_user_blk_disconnect
c6557a5 char-socket: return -1 in case of disconnect during tcp_chr_write
a79e12d hw/pci-host: Use the IEC binary prefix definitions
8ba0569 hw/pci/pci_bridge: Use the IEC binary prefix definitions
7e178f0 hw/pci/pci_bridge: Correct pci_bridge_io memory region size
41172e1 hw/pci-host/prep: Correct RAVEN bus bridge memory region size
8e9a7fc pci: assert configuration access is within bounds
aee5e22 hw/pci/pcie: Move hot plug capability check to pre_plug callback
e3d6bcd MAINTAINERS: Fix the classification of bios-tables-test-allowed-diff.h
addb2d8 virtio-balloon: Provide an interface for free page reporting
58e79c3 virtio-balloon: Implement support for page poison reporting feature
9b8c6ad virtio-balloon: unref the iothread when unrealizing
3d3f806 virtio-balloon: fix free page hinting check on unrealize
45da3a2 virtio-balloon: fix free page hinting without an iothread
857aac0 bios-tables-test: Generate reference tables for Q35/TPM-TIS
54c3b28 bios-tables-test: Add Q35/TPM-TIS test
1d2aa0b tests: tpm-emu: Remove assert on TPM2_ST_NO_SESSIONS
643f2af tests/acpi: Add void tables for Q35/TPM-TIS bios-tables-test
8c175a8 test/tpm-emu: include sockets and channel headers in tpm-emu header
dbe41ee arm/acpi: TPM2 ACPI table support
6c25384 acpi: Move build_tpm2() in the generic part
e86af8b acpi: Convert build_tpm2() to build_append* API
573d4d1 acpi: tpm: Do not build TCPA table for TPM 2
ed6dea0 tests/acpi: update DSDT expected files
43e78e3 acpi: move aml builder code for parallel device
8b99639 acpi: parallel: don't use _STA method
e988e2c acpi: move aml builder code for serial device
b4fd47f acpi: serial: don't use _STA method
9a41faa acpi: rtc: use a single crs range
db9b47b acpi: move aml builder code for rtc device
8196b48 qtest: allow DSDT acpi table changes
5eb90f3 tests/acpi: update expected SRAT files
2574d08 hw/acpi/nvdimm: add a helper to augment SRAT generation
d8bb076 diffs-allowed: add the SRAT AML to diffs-allowed
7f549aa msix: allow qword MSI-X table accesses
=== OUTPUT BEGIN ===
1/56 Checking commit 7f549aaaca77 (msix: allow qword MSI-X table accesses)
2/56 Checking commit d8bb0767f522 (diffs-allowed: add the SRAT AML to diffs-allowed)
3/56 Checking commit 2574d08106f4 (hw/acpi/nvdimm: add a helper to augment SRAT generation)
4/56 Checking commit 5eb90f3537a2 (tests/acpi: update expected SRAT files)
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/virt/SRAT.memhp and tests/qtest/bios-tables-test-allowed-diff.h found
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/virt/SRAT.memhp and tests/qtest/bios-tables-test-allowed-diff.h found
total: 2 errors, 0 warnings, 1 lines checked
Patch 4/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/56 Checking commit 8196b48faf56 (qtest: allow DSDT acpi table changes)
6/56 Checking commit db9b47b1f65f (acpi: move aml builder code for rtc device)
7/56 Checking commit 9a41faa54f0b (acpi: rtc: use a single crs range)
8/56 Checking commit b4fd47f96aa3 (acpi: serial: don't use _STA method)
9/56 Checking commit e988e2c791df (acpi: move aml builder code for serial device)
10/56 Checking commit 8b99639ecac8 (acpi: parallel: don't use _STA method)
11/56 Checking commit 43e78e3585b1 (acpi: move aml builder code for parallel device)
12/56 Checking commit ed6dea02d93c (tests/acpi: update DSDT expected files)
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.numamem and tests/qtest/bios-tables-test-allowed-diff.h found
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.numamem and tests/qtest/bios-tables-test-allowed-diff.h found
total: 2 errors, 0 warnings, 1 lines checked
Patch 12/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
13/56 Checking commit 573d4d189a62 (acpi: tpm: Do not build TCPA table for TPM 2)
14/56 Checking commit e86af8b32744 (acpi: Convert build_tpm2() to build_append* API)
15/56 Checking commit 6c253844e61a (acpi: Move build_tpm2() in the generic part)
16/56 Checking commit dbe41eea9950 (arm/acpi: TPM2 ACPI table support)
17/56 Checking commit 8c175a85392c (test/tpm-emu: include sockets and channel headers in tpm-emu header)
18/56 Checking commit 643f2af46a3c (tests/acpi: Add void tables for Q35/TPM-TIS bios-tables-test)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#20:
new file mode 100644
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/TPM2.tis and tests/qtest/bios-tables-test-allowed-diff.h found
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/TPM2.tis and tests/qtest/bios-tables-test-allowed-diff.h found
total: 2 errors, 1 warnings, 3 lines checked
Patch 18/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/56 Checking commit 1d2aa0bd98d4 (tests: tpm-emu: Remove assert on TPM2_ST_NO_SESSIONS)
20/56 Checking commit 54c3b280c4b5 (bios-tables-test: Add Q35/TPM-TIS test)
21/56 Checking commit 857aac054da3 (bios-tables-test: Generate reference tables for Q35/TPM-TIS)
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/TPM2.tis and tests/qtest/bios-tables-test-allowed-diff.h found
ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/TPM2.tis and tests/qtest/bios-tables-test-allowed-diff.h found
total: 2 errors, 0 warnings, 1 lines checked
Patch 21/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
22/56 Checking commit 45da3a28e701 (virtio-balloon: fix free page hinting without an iothread)
23/56 Checking commit 3d3f80629b86 (virtio-balloon: fix free page hinting check on unrealize)
24/56 Checking commit 9b8c6ad22004 (virtio-balloon: unref the iothread when unrealizing)
25/56 Checking commit 58e79c360bd0 (virtio-balloon: Implement support for page poison reporting feature)
26/56 Checking commit addb2d8b4b40 (virtio-balloon: Provide an interface for free page reporting)
27/56 Checking commit e3d6bcd4da5d (MAINTAINERS: Fix the classification of bios-tables-test-allowed-diff.h)
28/56 Checking commit aee5e22a9e1d (hw/pci/pcie: Move hot plug capability check to pre_plug callback)
29/56 Checking commit 8e9a7fc2ae4d (pci: assert configuration access is within bounds)
30/56 Checking commit 41172e1f19b2 (hw/pci-host/prep: Correct RAVEN bus bridge memory region size)
31/56 Checking commit 7e178f0f9fe6 (hw/pci/pci_bridge: Correct pci_bridge_io memory region size)
32/56 Checking commit 8ba05693bab8 (hw/pci/pci_bridge: Use the IEC binary prefix definitions)
33/56 Checking commit a79e12da3528 (hw/pci-host: Use the IEC binary prefix definitions)
34/56 Checking commit c6557a547f41 (char-socket: return -1 in case of disconnect during tcp_chr_write)
35/56 Checking commit 19f8b130db5b (vhost-user-blk: delay vhost_user_blk_disconnect)
36/56 Checking commit 2f6982f6a91f (Add helper to populate vhost-user message regions)
37/56 Checking commit c91a41b691ea (Add vhost-user helper to get MemoryRegion data)
38/56 Checking commit 13a3dc93e86d (Add VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS)
39/56 Checking commit 09ca3357119e (Transmit vhost-user memory regions individually)
40/56 Checking commit e921ab798d3c (Lift max memory slots limit imposed by vhost-user)
41/56 Checking commit 9822d5e6ce72 (Refactor out libvhost-user fault generation logic)
42/56 Checking commit c8397c5b40b0 (Support ram slot configuration in libvhost-user)
43/56 Checking commit 614767379269 (Support adding individual regions in libvhost-user)
44/56 Checking commit c078553f983c (Support individual region unmap in libvhost-user)
45/56 Checking commit c9cbf242b002 (Lift max ram slots limit in libvhost-user)
46/56 Checking commit e97f21bca095 (libvhost-user: advertise vring features)
47/56 Checking commit 1d0d2b05c136 (hw/pci: Fix crash when running QEMU with "-nic model=rocker")
48/56 Checking commit f93b9d9b5e5c (vhost-vsock: add vhost-vsock-common abstraction)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#33:
new file mode 100644
total: 0 errors, 1 warnings, 746 lines checked
Patch 48/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
49/56 Checking commit bdcc4e100c04 (virtio: add vhost-user-vsock base device)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#46:
new file mode 100644
total: 0 errors, 1 warnings, 233 lines checked
Patch 49/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
50/56 Checking commit 099738ae667f (virtio: add vhost-user-vsock-pci device)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#33:
new file mode 100644
total: 0 errors, 1 warnings, 91 lines checked
Patch 50/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
51/56 Checking commit a73a951a0609 (acpi: make build_madt() more generic.)
52/56 Checking commit 11a424ae7ffa (acpi: create acpi-common.c and move madt code)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#186:
new file mode 100644
WARNING: Block comments use a leading /* on a separate line
#191: FILE: hw/i386/acpi-common.c:1:
+/* Support for generating ACPI tables and passing them to Guests
WARNING: Block comments use a leading /* on a separate line
#231: FILE: hw/i386/acpi-common.c:41:
+ /* ACPI spec says that LAPIC entry for non present
ERROR: spaces required around that '<<' (ctx:VxV)
#305: FILE: hw/i386/acpi-common.c:115:
+#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
^
ERROR: spaces required around that '<<' (ctx:VxV)
#305: FILE: hw/i386/acpi-common.c:115:
+#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
^
ERROR: spaces required around that '<<' (ctx:VxV)
#305: FILE: hw/i386/acpi-common.c:115:
+#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
^
ERROR: spaces required around that '<<' (ctx:VxV)
#305: FILE: hw/i386/acpi-common.c:115:
+#define ACPI_BUILD_PCI_IRQS ((1<<5) | (1<<9) | (1<<10) | (1<<11))
^
total: 4 errors, 3 warnings, 321 lines checked
Patch 52/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
53/56 Checking commit ae67c27c1c0e (acpi: madt: skip pci override on pci-less systems.)
WARNING: line over 80 characters
#65: FILE: hw/i386/acpi-common.c:128:
+ intsrcovr->flags = cpu_to_le16(0xd); /* active high, level triggered */
total: 0 errors, 1 warnings, 56 lines checked
Patch 53/56 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
54/56 Checking commit 16bfa7d84717 (acpi: fadt: add hw-reduced sleep register support)
55/56 Checking commit 407b8ba018f4 (acpi: ged: rename event memory region)
56/56 Checking commit d576bcee3ba3 (Fix parameter type in vhost migration log path)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200610042613.1459309-1-mst@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
On Wed, 10 Jun 2020 at 05:26, Michael S. Tsirkin <mst@redhat.com> wrote: > > The following changes since commit 49ee11555262a256afec592dfed7c5902d5eefd2: >/tmp/par8snSu.par > Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request' into staging (2020-06-08 11:04:57 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to 23fe04b63b412276c7c2f67c550961af9d0b4e1e: > > Fix parameter type in vhost migration log path (2020-06-09 14:18:04 -0400) > > ---------------------------------------------------------------- > virtio,acpi,pci: features, fixes, cleanups, tests > > Max slots negotiation for vhost-user. > Free page reporting for balloon. > Partial TPM2 ACPI support for ARM. > Support for NVDIMMs having their own proximity domains. > New vhost-user-vsock device. > > Fixes, cleanups in ACPI, PCI, virtio. > New tests for TPM ACPI. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Hi; I'm afraid this has format string issues: /Users/pm215/src/qemu-for-merges/hw/virtio/vhost-user.c:759:51: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] "%lX", __func__, reply_gpa, ^~~~~~~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/vhost-user.c:760:34: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] dev->mem->regions[reg_idx].guest_phys_addr); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /Users/pm215/src/qemu-for-merges/hw/virtio/vhost-user.c:1876:67: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] "This limit should never decrease.", ram_slots, ^~~~~~~~~ (repros on OSX, OpenBSD, and 32-bit hosts) thanks -- PMM
On Thu, Jun 11, 2020 at 07:13:35PM +0100, Peter Maydell wrote: > On Wed, 10 Jun 2020 at 05:26, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > The following changes since commit 49ee11555262a256afec592dfed7c5902d5eefd2: > >/tmp/par8snSu.par > > > Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request' into staging (2020-06-08 11:04:57 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > for you to fetch changes up to 23fe04b63b412276c7c2f67c550961af9d0b4e1e: > > > > Fix parameter type in vhost migration log path (2020-06-09 14:18:04 -0400) > > > > ---------------------------------------------------------------- > > virtio,acpi,pci: features, fixes, cleanups, tests > > > > Max slots negotiation for vhost-user. > > Free page reporting for balloon. > > Partial TPM2 ACPI support for ARM. > > Support for NVDIMMs having their own proximity domains. > > New vhost-user-vsock device. > > > > Fixes, cleanups in ACPI, PCI, virtio. > > New tests for TPM ACPI. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Hi; I'm afraid this has format string issues: > > /Users/pm215/src/qemu-for-merges/hw/virtio/vhost-user.c:759:51: error: > format specifies type 'unsigned long' but the argument has type > 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] > "%lX", __func__, reply_gpa, > ^~~~~~~~~ > /Users/pm215/src/qemu-for-merges/hw/virtio/vhost-user.c:760:34: error: > format specifies type 'unsigned long' but the argument has type > 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] > dev->mem->regions[reg_idx].guest_phys_addr); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /Users/pm215/src/qemu-for-merges/hw/virtio/vhost-user.c:1876:67: > error: format specifies type 'unsigned long' but the argument has type > 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] > "This limit should never decrease.", ram_slots, > ^~~~~~~~~ > > (repros on OSX, OpenBSD, and 32-bit hosts) > > thanks > -- PMM Fixed and sent v2, thanks!
The following changes since commit 49ee11555262a256afec592dfed7c5902d5eefd2: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request' into staging (2020-06-08 11:04:57 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to 23fe04b63b412276c7c2f67c550961af9d0b4e1e: Fix parameter type in vhost migration log path (2020-06-09 14:18:04 -0400) ---------------------------------------------------------------- virtio,acpi,pci: features, fixes, cleanups, tests Max slots negotiation for vhost-user. Free page reporting for balloon. Partial TPM2 ACPI support for ARM. Support for NVDIMMs having their own proximity domains. New vhost-user-vsock device. Fixes, cleanups in ACPI, PCI, virtio. New tests for TPM ACPI. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Alexander Duyck (2): virtio-balloon: Implement support for page poison reporting feature virtio-balloon: Provide an interface for free page reporting David Hildenbrand (3): virtio-balloon: fix free page hinting without an iothread virtio-balloon: fix free page hinting check on unrealize virtio-balloon: unref the iothread when unrealizing Dima Stepanov (2): char-socket: return -1 in case of disconnect during tcp_chr_write vhost-user-blk: delay vhost_user_blk_disconnect Eric Auger (8): acpi: Convert build_tpm2() to build_append* API acpi: Move build_tpm2() in the generic part arm/acpi: TPM2 ACPI table support test/tpm-emu: include sockets and channel headers in tpm-emu header tests/acpi: Add void tables for Q35/TPM-TIS bios-tables-test tests: tpm-emu: Remove assert on TPM2_ST_NO_SESSIONS bios-tables-test: Add Q35/TPM-TIS test bios-tables-test: Generate reference tables for Q35/TPM-TIS Gerd Hoffmann (12): qtest: allow DSDT acpi table changes acpi: move aml builder code for rtc device acpi: rtc: use a single crs range acpi: serial: don't use _STA method acpi: move aml builder code for serial device acpi: parallel: don't use _STA method acpi: move aml builder code for parallel device acpi: make build_madt() more generic. acpi: create acpi-common.c and move madt code acpi: madt: skip pci override on pci-less systems. acpi: fadt: add hw-reduced sleep register support acpi: ged: rename event memory region Julia Suvorova (1): hw/pci/pcie: Move hot plug capability check to pre_plug callback Michael S. Tsirkin (2): msix: allow qword MSI-X table accesses tests/acpi: update DSDT expected files Philippe Mathieu-Daudé (4): hw/pci-host/prep: Correct RAVEN bus bridge memory region size hw/pci/pci_bridge: Correct pci_bridge_io memory region size hw/pci/pci_bridge: Use the IEC binary prefix definitions hw/pci-host: Use the IEC binary prefix definitions Prasad J Pandit (1): pci: assert configuration access is within bounds Raphael Norwitz (11): Add helper to populate vhost-user message regions Add vhost-user helper to get MemoryRegion data Add VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS Transmit vhost-user memory regions individually Lift max memory slots limit imposed by vhost-user Refactor out libvhost-user fault generation logic Support ram slot configuration in libvhost-user Support adding individual regions in libvhost-user Support individual region unmap in libvhost-user Lift max ram slots limit in libvhost-user Fix parameter type in vhost migration log path Stefan Berger (1): acpi: tpm: Do not build TCPA table for TPM 2 Stefan Hajnoczi (1): libvhost-user: advertise vring features Stefano Garzarella (3): vhost-vsock: add vhost-vsock-common abstraction virtio: add vhost-user-vsock base device virtio: add vhost-user-vsock-pci device Thomas Huth (2): MAINTAINERS: Fix the classification of bios-tables-test-allowed-diff.h hw/pci: Fix crash when running QEMU with "-nic model=rocker" Vishal Verma (3): diffs-allowed: add the SRAT AML to diffs-allowed hw/acpi/nvdimm: add a helper to augment SRAT generation tests/acpi: update expected SRAT files configure | 3 + contrib/libvhost-user/libvhost-user.h | 24 +- hw/i386/acpi-common.h | 15 + include/hw/acpi/acpi-defs.h | 2 + include/hw/acpi/aml-build.h | 2 + include/hw/acpi/generic_event_device.h | 2 +- include/hw/mem/nvdimm.h | 1 + include/hw/virtio/vhost-user-vsock.h | 36 ++ include/hw/virtio/vhost-user.h | 1 + include/hw/virtio/vhost-vsock-common.h | 47 +++ include/hw/virtio/vhost-vsock.h | 11 +- include/hw/virtio/virtio-balloon.h | 3 +- include/sysemu/tpm.h | 2 + tests/qtest/tpm-emu.h | 3 + chardev/char-socket.c | 7 +- contrib/libvhost-user/libvhost-user.c | 351 +++++++++++++---- contrib/vhost-user-blk/vhost-user-blk.c | 4 +- hw/acpi/aml-build.c | 49 ++- hw/acpi/generic_event_device.c | 16 +- hw/acpi/nvdimm.c | 23 ++ hw/arm/virt-acpi-build.c | 11 + hw/block/vhost-user-blk.c | 38 +- hw/char/parallel.c | 22 ++ hw/char/serial-isa.c | 22 ++ hw/core/machine.c | 4 +- hw/i386/acpi-build.c | 270 +------------ hw/i386/acpi-common.c | 156 ++++++++ hw/pci-host/i440fx.c | 3 +- hw/pci-host/prep.c | 2 +- hw/pci-host/q35.c | 2 +- hw/pci-host/versatile.c | 5 +- hw/pci/msix.c | 6 + hw/pci/pci.c | 17 +- hw/pci/pci_bridge.c | 7 +- hw/pci/pcie.c | 19 +- hw/rtc/mc146818rtc.c | 24 ++ hw/virtio/vhost-user-vsock-pci.c | 84 +++++ hw/virtio/vhost-user-vsock.c | 181 +++++++++ hw/virtio/vhost-user.c | 646 +++++++++++++++++++++++++++----- hw/virtio/vhost-vsock-common.c | 258 +++++++++++++ hw/virtio/vhost-vsock.c | 283 +++----------- hw/virtio/vhost.c | 4 +- hw/virtio/virtio-balloon.c | 137 ++++++- tests/qtest/bios-tables-test.c | 58 +++ tests/qtest/tpm-emu.c | 1 - MAINTAINERS | 3 +- docs/interop/vhost-user.rst | 44 +++ hw/i386/Makefile.objs | 1 + hw/virtio/Makefile.objs | 4 +- tests/data/acpi/pc/DSDT | Bin 5125 -> 5014 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 6449 -> 6338 bytes tests/data/acpi/pc/DSDT.bridge | Bin 6984 -> 6873 bytes tests/data/acpi/pc/DSDT.cphp | Bin 5588 -> 5477 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 6778 -> 6667 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 5197 -> 5086 bytes tests/data/acpi/pc/DSDT.memhp | Bin 6484 -> 6373 bytes tests/data/acpi/pc/DSDT.numamem | Bin 5131 -> 5020 bytes tests/data/acpi/pc/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/q35/DSDT | Bin 7863 -> 7752 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9187 -> 9076 bytes tests/data/acpi/q35/DSDT.bridge | Bin 7880 -> 7769 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8326 -> 8215 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9516 -> 9405 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 7938 -> 7827 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9222 -> 9111 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 8993 -> 8882 bytes tests/data/acpi/q35/DSDT.numamem | Bin 7869 -> 7758 bytes tests/data/acpi/q35/DSDT.tis | Bin 0 -> 8357 bytes tests/data/acpi/q35/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/q35/TPM2.tis | Bin 0 -> 76 bytes tests/data/acpi/virt/SRAT.memhp | Bin 186 -> 226 bytes tests/qtest/Makefile.include | 1 + 72 files changed, 2168 insertions(+), 747 deletions(-) create mode 100644 hw/i386/acpi-common.h create mode 100644 include/hw/virtio/vhost-user-vsock.h create mode 100644 include/hw/virtio/vhost-vsock-common.h create mode 100644 hw/i386/acpi-common.c create mode 100644 hw/virtio/vhost-user-vsock-pci.c create mode 100644 hw/virtio/vhost-user-vsock.c create mode 100644 hw/virtio/vhost-vsock-common.c create mode 100644 tests/data/acpi/q35/DSDT.tis create mode 100644 tests/data/acpi/q35/TPM2.tis