diff options
| author | Peter Maydell | 2019-03-12 16:25:46 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-12 16:25:46 +0100 |
| commit | 2cb73afa6a2408b397a5af1427d120b8aa04997a (patch) | |
| tree | cb22349ed4a8c37708dc5e5077dee9e86906849d /include/hw/i386 | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20190311.0' ... (diff) | |
| parent | memfd: improve error messages (diff) | |
| download | qemu-2cb73afa6a2408b397a5af1427d120b8aa04997a.tar.gz qemu-2cb73afa6a2408b397a5af1427d120b8aa04997a.tar.xz qemu-2cb73afa6a2408b397a5af1427d120b8aa04997a.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue, 2019-03-11
* memfd fixes (Ilya Maximets)
* Move nvdimms state into struct MachineState (Eric Auger)
* hostmem-file: reject invalid pmem file sizes (Stefan Hajnoczi)
# gpg: Signature made Tue 12 Mar 2019 00:57:41 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
memfd: improve error messages
memfd: set up correct errno if not supported
memfd: always check for MFD_CLOEXEC
hostmem-memfd: disable for systems without sealing support
machine: Move nvdimms state into struct MachineState
nvdimm: Rename AcpiNVDIMMState into NVDIMMState
hostmem-file: reject invalid pmem file sizes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/i386')
| -rw-r--r-- | include/hw/i386/pc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 276ff15d4d..ca65ef18af 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -47,8 +47,6 @@ struct PCMachineState { OnOffAuto vmport; OnOffAuto smm; - AcpiNVDIMMState acpi_nvdimm_state; - bool acpi_build_enabled; bool smbus_enabled; bool sata_enabled; @@ -76,8 +74,6 @@ struct PCMachineState { #define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g" #define PC_MACHINE_VMPORT "vmport" #define PC_MACHINE_SMM "smm" -#define PC_MACHINE_NVDIMM "nvdimm" -#define PC_MACHINE_NVDIMM_PERSIST "nvdimm-persistence" #define PC_MACHINE_SMBUS "smbus" #define PC_MACHINE_SATA "sata" #define PC_MACHINE_PIT "pit" |