diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-04 09:26:24 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-04 09:26:24 +0000 |
| commit | 9226682a401f34b10fd79dfe17ba334da0800747 (patch) | |
| tree | af3b43298cde18ae33b0ae2c90bc764a2ba7f191 /include | |
| parent | 199a5bde46b0eab898ab1ec591f423000302569f (diff) | |
| parent | 021746c131cdfeab9d82ff918795a9f18d20d7ae (diff) | |
| download | qemu-9226682a401f34b10fd79dfe17ba334da0800747.tar.gz qemu-9226682a401f34b10fd79dfe17ba334da0800747.tar.bz2 qemu-9226682a401f34b10fd79dfe17ba334da0800747.zip | |
Merge remote-tracking branch 'sstabellini/tags/xen-20161102-tag' into staging
Xen 2016/11/02
# gpg: Signature made Wed 02 Nov 2016 07:28:40 PM GMT
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg: aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* sstabellini/tags/xen-20161102-tag:
PCMachineState: introduce acpi_build_enabled field
hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()
Message-id: alpine.DEB.2.10.1611021227530.19454@sstabellini-ThinkPad-X260
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 98dc7722c3..8eb517f914 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -62,6 +62,8 @@ struct PCMachineState { AcpiNVDIMMState acpi_nvdimm_state; + bool acpi_build_enabled; + /* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size; |