diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-20 15:48:34 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-20 15:48:34 +0000 |
commit | ed627b2ad37469eeba9e9ed5fecfe315df9ecc60 (patch) | |
tree | aca1c6bddbaa61ffe2d029b123539fe20e6ecddc /tests/acpi-test-data | |
parent | 4aafb1b192e5d3685e94cefdce63343a86d64647 (diff) | |
parent | 1dc61e7b37d339c42ec9bd7a7eec1ef2c22f351c (diff) | |
download | qemu-ed627b2ad37469eeba9e9ed5fecfe315df9ecc60.zip qemu-ed627b2ad37469eeba9e9ed5fecfe315df9ecc60.tar.gz qemu-ed627b2ad37469eeba9e9ed5fecfe315df9ecc60.tar.bz2 |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,vhost,pci,pc: features, cleanups
SRAT tables for DIMM devices
new virtio net flags for speed/duplex
post-copy migration support in vhost
cleanups in pci
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 20 Mar 2018 14:40:43 GMT
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# 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: (51 commits)
postcopy shared docs
libvhost-user: Claim support for postcopy
postcopy: Allow shared memory
vhost: Huge page align and merge
vhost+postcopy: Wire up POSTCOPY_END notify
vhost-user: Add VHOST_USER_POSTCOPY_END message
libvhost-user: mprotect & madvises for postcopy
vhost+postcopy: Call wakeups
vhost+postcopy: Add vhost waker
postcopy: postcopy_notify_shared_wake
postcopy: helper for waking shared
vhost+postcopy: Resolve client address
postcopy-ram: add a stub for postcopy_request_shared_page
vhost+postcopy: Helper to send requests to source for shared pages
vhost+postcopy: Stash RAMBlock and offset
vhost+postcopy: Send address back to qemu
libvhost-user+postcopy: Register new regions with the ufd
migration/ram: ramblock_recv_bitmap_test_byte_offset
postcopy+vhost-user: Split set_mem_table for postcopy
vhost+postcopy: Transmit 'listen' to slave
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# scripts/update-linux-headers.sh
Diffstat (limited to 'tests/acpi-test-data')
-rw-r--r-- | tests/acpi-test-data/pc/APIC.dimmpxm | bin | 0 -> 144 bytes |
-rw-r--r-- | tests/acpi-test-data/pc/DSDT.dimmpxm | bin | 0 -> 6803 bytes |
-rw-r--r-- | tests/acpi-test-data/pc/NFIT.dimmpxm | bin | 0 -> 224 bytes |
-rw-r--r-- | tests/acpi-test-data/pc/SRAT.dimmpxm | bin | 0 -> 472 bytes |
-rw-r--r-- | tests/acpi-test-data/pc/SSDT.dimmpxm | bin | 0 -> 685 bytes |
-rw-r--r-- | tests/acpi-test-data/q35/APIC.dimmpxm | bin | 0 -> 144 bytes |
-rw-r--r-- | tests/acpi-test-data/q35/DSDT.dimmpxm | bin | 0 -> 9487 bytes |
-rw-r--r-- | tests/acpi-test-data/q35/NFIT.dimmpxm | bin | 0 -> 224 bytes |
-rw-r--r-- | tests/acpi-test-data/q35/SRAT.dimmpxm | bin | 0 -> 472 bytes |
-rw-r--r-- | tests/acpi-test-data/q35/SSDT.dimmpxm | bin | 0 -> 685 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/tests/acpi-test-data/pc/APIC.dimmpxm b/tests/acpi-test-data/pc/APIC.dimmpxm Binary files differnew file mode 100644 index 0000000..427bb08 --- /dev/null +++ b/tests/acpi-test-data/pc/APIC.dimmpxm diff --git a/tests/acpi-test-data/pc/DSDT.dimmpxm b/tests/acpi-test-data/pc/DSDT.dimmpxm Binary files differnew file mode 100644 index 0000000..38661cb --- /dev/null +++ b/tests/acpi-test-data/pc/DSDT.dimmpxm diff --git a/tests/acpi-test-data/pc/NFIT.dimmpxm b/tests/acpi-test-data/pc/NFIT.dimmpxm Binary files differnew file mode 100644 index 0000000..2bfc6c5 --- /dev/null +++ b/tests/acpi-test-data/pc/NFIT.dimmpxm diff --git a/tests/acpi-test-data/pc/SRAT.dimmpxm b/tests/acpi-test-data/pc/SRAT.dimmpxm Binary files differnew file mode 100644 index 0000000..3b10a60 --- /dev/null +++ b/tests/acpi-test-data/pc/SRAT.dimmpxm diff --git a/tests/acpi-test-data/pc/SSDT.dimmpxm b/tests/acpi-test-data/pc/SSDT.dimmpxm Binary files differnew file mode 100644 index 0000000..8ba0e67 --- /dev/null +++ b/tests/acpi-test-data/pc/SSDT.dimmpxm diff --git a/tests/acpi-test-data/q35/APIC.dimmpxm b/tests/acpi-test-data/q35/APIC.dimmpxm Binary files differnew file mode 100644 index 0000000..427bb08 --- /dev/null +++ b/tests/acpi-test-data/q35/APIC.dimmpxm diff --git a/tests/acpi-test-data/q35/DSDT.dimmpxm b/tests/acpi-test-data/q35/DSDT.dimmpxm Binary files differnew file mode 100644 index 0000000..14904e8 --- /dev/null +++ b/tests/acpi-test-data/q35/DSDT.dimmpxm diff --git a/tests/acpi-test-data/q35/NFIT.dimmpxm b/tests/acpi-test-data/q35/NFIT.dimmpxm Binary files differnew file mode 100644 index 0000000..2bfc6c5 --- /dev/null +++ b/tests/acpi-test-data/q35/NFIT.dimmpxm diff --git a/tests/acpi-test-data/q35/SRAT.dimmpxm b/tests/acpi-test-data/q35/SRAT.dimmpxm Binary files differnew file mode 100644 index 0000000..3b10a60 --- /dev/null +++ b/tests/acpi-test-data/q35/SRAT.dimmpxm diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/acpi-test-data/q35/SSDT.dimmpxm Binary files differnew file mode 100644 index 0000000..8ba0e67 --- /dev/null +++ b/tests/acpi-test-data/q35/SSDT.dimmpxm |