diff options
| author | Peter Maydell | 2019-06-17 12:55:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-06-17 12:55:14 +0200 |
| commit | 5d0e5694470d2952b4f257bc985cac8c89b4fd92 (patch) | |
| tree | a045f8e047841645d1422ba1e2649199980414ab /include | |
| parent | Merge remote-tracking branch 'remotes/lersek/tags/edk2-pull-2019-06-14' into ... (diff) | |
| parent | tests/rebuild-expected-aml.sh: blow out difflist (diff) | |
| download | qemu-5d0e5694470d2952b4f257bc985cac8c89b4fd92.tar.gz qemu-5d0e5694470d2952b4f257bc985cac8c89b4fd92.tar.xz qemu-5d0e5694470d2952b4f257bc985cac8c89b4fd92.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, acpi: fixes, cleanups
A bunch of minor fixes all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Sun 16 Jun 2019 21:46:31 BST
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [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:
tests/rebuild-expected-aml.sh: blow out difflist
q35: update DSDT
q35: fix mmconfig and PCI0._CRS
hw/acpi: extract acpi_add_rom_blob()
vhost: fix vhost_log size overflow during migration
docs/vhost-user.json: some firmware.json copy leftovers
vhost-user-gpu: initialize msghdr & iov at declaration
vhost-user-input: check ioctl(EVIOCGNAME) return value
vhost-user: improve error report
vhost-user: check unix_listen() return value
vhost-user-gpu: do not send scanout update if no GPU socket
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/acpi/utils.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/hw/acpi/utils.h b/include/hw/acpi/utils.h new file mode 100644 index 0000000000..140b4de603 --- /dev/null +++ b/include/hw/acpi/utils.h @@ -0,0 +1,9 @@ +#ifndef HW_ACPI_UTILS_H +#define HW_ACPI_UTILS_H + +#include "hw/nvram/fw_cfg.h" + +MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque, + GArray *blob, const char *name, + uint64_t max_size); +#endif |