#include "sysemu/qtest.h"
#include "kvm_i386.h"
#include "hw/xen/xen.h"
+#include "hw/xen/start_info.h"
#include "ui/qemu-spice.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "hw/usb.h"
#include "hw/i386/intel_iommu.h"
#include "hw/net/ne2000-isa.h"
+#include "standard-headers/asm-x86/bootparam.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
static unsigned e820_entries;
struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
+/* Physical Address of PVH entry point read from kernel ELF NOTE */
+static size_t pvh_start_addr;
+
GlobalProperty pc_compat_3_1[] = {
- {
- .driver = "intel-iommu",
- .property = "dma-drain",
- .value = "off",
- },
+ { "intel-iommu", "dma-drain", "off" },
+ { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
+ { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" },
+ { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" },
+ { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" },
+ { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" },
+ { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" },
+ { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" },
+ { "EPYC" "-" TYPE_X86_CPU, "npt", "off" },
+ { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" },
+ { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" },
+ { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" },
+ { "Skylake-Client" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Skylake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Cascadelake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Icelake-Client" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Icelake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
+ { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" },
+ { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" },
};
const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
GlobalProperty pc_compat_3_0[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "x-hv-synic-kvm-only",
- .value = "on",
- },{
- .driver = "Skylake-Server" "-" TYPE_X86_CPU,
- .property = "pku",
- .value = "off",
- },{
- .driver = "Skylake-Server-IBRS" "-" TYPE_X86_CPU,
- .property = "pku",
- .value = "off",
- },
+ { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" },
+ { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" },
+ { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" },
};
const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
GlobalProperty pc_compat_2_12[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "legacy-cache",
- .value = "on",
- },{
- .driver = TYPE_X86_CPU,
- .property = "topoext",
- .value = "off",
- },{
- .driver = "EPYC-" TYPE_X86_CPU,
- .property = "xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "EPYC-IBPB-" TYPE_X86_CPU,
- .property = "xlevel",
- .value = stringify(0x8000000a),
- },
+ { TYPE_X86_CPU, "legacy-cache", "on" },
+ { TYPE_X86_CPU, "topoext", "off" },
+ { "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
+ { "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
};
const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
GlobalProperty pc_compat_2_11[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "x-migrate-smi-count",
- .value = "off",
- },{
- .driver = "Skylake-Server" "-" TYPE_X86_CPU,
- .property = "clflushopt",
- .value = "off",
- },
+ { TYPE_X86_CPU, "x-migrate-smi-count", "off" },
+ { "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" },
};
const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
GlobalProperty pc_compat_2_10[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "x-hv-max-vps",
- .value = "0x40",
- },{
- .driver = "i440FX-pcihost",
- .property = "x-pci-hole64-fix",
- .value = "off",
- },{
- .driver = "q35-pcihost",
- .property = "x-pci-hole64-fix",
- .value = "off",
- },
+ { TYPE_X86_CPU, "x-hv-max-vps", "0x40" },
+ { "i440FX-pcihost", "x-pci-hole64-fix", "off" },
+ { "q35-pcihost", "x-pci-hole64-fix", "off" },
};
const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10);
GlobalProperty pc_compat_2_9[] = {
- {
- .driver = "mch",
- .property = "extended-tseg-mbytes",
- .value = stringify(0),
- },
+ { "mch", "extended-tseg-mbytes", "0" },
};
const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9);
GlobalProperty pc_compat_2_8[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "tcg-cpuid",
- .value = "off",
- },
- {
- .driver = "kvmclock",
- .property = "x-mach-use-reliable-get-clock",
- .value = "off",
- },
- {
- .driver = "ICH9-LPC",
- .property = "x-smi-broadcast",
- .value = "off",
- },
- {
- .driver = TYPE_X86_CPU,
- .property = "vmware-cpuid-freq",
- .value = "off",
- },
- {
- .driver = "Haswell-" TYPE_X86_CPU,
- .property = "stepping",
- .value = "1",
- },
+ { TYPE_X86_CPU, "tcg-cpuid", "off" },
+ { "kvmclock", "x-mach-use-reliable-get-clock", "off" },
+ { "ICH9-LPC", "x-smi-broadcast", "off" },
+ { TYPE_X86_CPU, "vmware-cpuid-freq", "off" },
+ { "Haswell-" TYPE_X86_CPU, "stepping", "1" },
};
const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8);
GlobalProperty pc_compat_2_7[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "l3-cache",
- .value = "off",
- },
- {
- .driver = TYPE_X86_CPU,
- .property = "full-cpuid-auto-level",
- .value = "off",
- },
- {
- .driver = "Opteron_G3" "-" TYPE_X86_CPU,
- .property = "family",
- .value = "15",
- },
- {
- .driver = "Opteron_G3" "-" TYPE_X86_CPU,
- .property = "model",
- .value = "6",
- },
- {
- .driver = "Opteron_G3" "-" TYPE_X86_CPU,
- .property = "stepping",
- .value = "1",
- },
- {
- .driver = "isa-pcspk",
- .property = "migrate",
- .value = "off",
- },
+ { TYPE_X86_CPU, "l3-cache", "off" },
+ { TYPE_X86_CPU, "full-cpuid-auto-level", "off" },
+ { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" },
+ { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" },
+ { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" },
+ { "isa-pcspk", "migrate", "off" },
};
const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7);
GlobalProperty pc_compat_2_6[] = {
- {
- .driver = TYPE_X86_CPU,
- .property = "cpuid-0xb",
- .value = "off",
- },{
- .driver = "vmxnet3",
- .property = "romfile",
- .value = "",
- },
- {
- .driver = TYPE_X86_CPU,
- .property = "fill-mtrr-mask",
- .value = "off",
- },
- {
- .driver = "apic-common",
- .property = "legacy-instance-id",
- .value = "on",
- }
+ { TYPE_X86_CPU, "cpuid-0xb", "off" },
+ { "vmxnet3", "romfile", "" },
+ { TYPE_X86_CPU, "fill-mtrr-mask", "off" },
+ { "apic-common", "legacy-instance-id", "on", }
};
const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6);
GlobalProperty pc_compat_2_4[] = {
PC_CPU_MODEL_IDS("2.4.0")
- {
- .driver = "Haswell-" TYPE_X86_CPU,
- .property = "abm",
- .value = "off",
- },
- {
- .driver = "Haswell-noTSX-" TYPE_X86_CPU,
- .property = "abm",
- .value = "off",
- },
- {
- .driver = "Broadwell-" TYPE_X86_CPU,
- .property = "abm",
- .value = "off",
- },
- {
- .driver = "Broadwell-noTSX-" TYPE_X86_CPU,
- .property = "abm",
- .value = "off",
- },
- {
- .driver = "host" "-" TYPE_X86_CPU,
- .property = "host-cache-info",
- .value = "on",
- },
- {
- .driver = TYPE_X86_CPU,
- .property = "check",
- .value = "off",
- },
- {
- .driver = "qemu64" "-" TYPE_X86_CPU,
- .property = "sse4a",
- .value = "on",
- },
- {
- .driver = "qemu64" "-" TYPE_X86_CPU,
- .property = "abm",
- .value = "on",
- },
- {
- .driver = "qemu64" "-" TYPE_X86_CPU,
- .property = "popcnt",
- .value = "on",
- },
- {
- .driver = "qemu32" "-" TYPE_X86_CPU,
- .property = "popcnt",
- .value = "on",
- },{
- .driver = "Opteron_G2" "-" TYPE_X86_CPU,
- .property = "rdtscp",
- .value = "on",
- },{
- .driver = "Opteron_G3" "-" TYPE_X86_CPU,
- .property = "rdtscp",
- .value = "on",
- },{
- .driver = "Opteron_G4" "-" TYPE_X86_CPU,
- .property = "rdtscp",
- .value = "on",
- },{
- .driver = "Opteron_G5" "-" TYPE_X86_CPU,
- .property = "rdtscp",
- .value = "on",
- }
+ { "Haswell-" TYPE_X86_CPU, "abm", "off" },
+ { "Haswell-noTSX-" TYPE_X86_CPU, "abm", "off" },
+ { "Broadwell-" TYPE_X86_CPU, "abm", "off" },
+ { "Broadwell-noTSX-" TYPE_X86_CPU, "abm", "off" },
+ { "host" "-" TYPE_X86_CPU, "host-cache-info", "on" },
+ { TYPE_X86_CPU, "check", "off" },
+ { "qemu64" "-" TYPE_X86_CPU, "sse4a", "on" },
+ { "qemu64" "-" TYPE_X86_CPU, "abm", "on" },
+ { "qemu64" "-" TYPE_X86_CPU, "popcnt", "on" },
+ { "qemu32" "-" TYPE_X86_CPU, "popcnt", "on" },
+ { "Opteron_G2" "-" TYPE_X86_CPU, "rdtscp", "on" },
+ { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "on" },
+ { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "on" },
+ { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "on", }
};
const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4);
GlobalProperty pc_compat_2_3[] = {
PC_CPU_MODEL_IDS("2.3.0")
- {
- .driver = TYPE_X86_CPU,
- .property = "arat",
- .value = "off",
- },{
- .driver = "qemu64" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(4),
- },{
- .driver = "kvm64" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(5),
- },{
- .driver = "pentium3" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(2),
- },{
- .driver = "n270" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(5),
- },{
- .driver = "Conroe" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(4),
- },{
- .driver = "Penryn" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(4),
- },{
- .driver = "Nehalem" "-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(4),
- },{
- .driver = "n270" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Penryn" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Conroe" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Nehalem" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Westmere" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "SandyBridge" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "IvyBridge" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Haswell" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Haswell-noTSX" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Broadwell" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = "Broadwell-noTSX" "-" TYPE_X86_CPU,
- .property = "min-xlevel",
- .value = stringify(0x8000000a),
- },{
- .driver = TYPE_X86_CPU,
- .property = "kvm-no-smi-migration",
- .value = "on",
- },
+ { TYPE_X86_CPU, "arat", "off" },
+ { "qemu64" "-" TYPE_X86_CPU, "min-level", "4" },
+ { "kvm64" "-" TYPE_X86_CPU, "min-level", "5" },
+ { "pentium3" "-" TYPE_X86_CPU, "min-level", "2" },
+ { "n270" "-" TYPE_X86_CPU, "min-level", "5" },
+ { "Conroe" "-" TYPE_X86_CPU, "min-level", "4" },
+ { "Penryn" "-" TYPE_X86_CPU, "min-level", "4" },
+ { "Nehalem" "-" TYPE_X86_CPU, "min-level", "4" },
+ { "n270" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Penryn" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Conroe" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Nehalem" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Westmere" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "SandyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "IvyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Haswell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Haswell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Broadwell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { "Broadwell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
+ { TYPE_X86_CPU, "kvm-no-smi-migration", "on" },
};
const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3);
GlobalProperty pc_compat_2_2[] = {
PC_CPU_MODEL_IDS("2.2.0")
- {
- .driver = "kvm64" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "kvm32" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Conroe" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Penryn" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Nehalem" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Westmere" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "SandyBridge" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Haswell" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Broadwell" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Opteron_G1" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Opteron_G2" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Opteron_G3" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Opteron_G4" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Opteron_G5" "-" TYPE_X86_CPU,
- .property = "vme",
- .value = "off",
- },
- {
- .driver = "Haswell" "-" TYPE_X86_CPU,
- .property = "f16c",
- .value = "off",
- },
- {
- .driver = "Haswell" "-" TYPE_X86_CPU,
- .property = "rdrand",
- .value = "off",
- },
- {
- .driver = "Broadwell" "-" TYPE_X86_CPU,
- .property = "f16c",
- .value = "off",
- },
- {
- .driver = "Broadwell" "-" TYPE_X86_CPU,
- .property = "rdrand",
- .value = "off",
- },
+ { "kvm64" "-" TYPE_X86_CPU, "vme", "off" },
+ { "kvm32" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Conroe" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Penryn" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Nehalem" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Westmere" "-" TYPE_X86_CPU, "vme", "off" },
+ { "SandyBridge" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Haswell" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Broadwell" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Opteron_G1" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Opteron_G2" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Opteron_G3" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Opteron_G4" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Opteron_G5" "-" TYPE_X86_CPU, "vme", "off" },
+ { "Haswell" "-" TYPE_X86_CPU, "f16c", "off" },
+ { "Haswell" "-" TYPE_X86_CPU, "rdrand", "off" },
+ { "Broadwell" "-" TYPE_X86_CPU, "f16c", "off" },
+ { "Broadwell" "-" TYPE_X86_CPU, "rdrand", "off" },
};
const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2);
GlobalProperty pc_compat_2_1[] = {
PC_CPU_MODEL_IDS("2.1.0")
- {
- .driver = "coreduo" "-" TYPE_X86_CPU,
- .property = "vmx",
- .value = "on",
- },
- {
- .driver = "core2duo" "-" TYPE_X86_CPU,
- .property = "vmx",
- .value = "on",
- },
+ { "coreduo" "-" TYPE_X86_CPU, "vmx", "on" },
+ { "core2duo" "-" TYPE_X86_CPU, "vmx", "on" },
};
const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1);
GlobalProperty pc_compat_2_0[] = {
PC_CPU_MODEL_IDS("2.0.0")
- {
- .driver = "virtio-scsi-pci",
- .property = "any_layout",
- .value = "off",
- },{
- .driver = "PIIX4_PM",
- .property = "memory-hotplug-support",
- .value = "off",
- },
- {
- .driver = "apic",
- .property = "version",
- .value = stringify(0x11),
- },
- {
- .driver = "nec-usb-xhci",
- .property = "superspeed-ports-first",
- .value = "off",
- },
- {
- .driver = "nec-usb-xhci",
- .property = "force-pcie-endcap",
- .value = "on",
- },
- {
- .driver = "pci-serial",
- .property = "prog_if",
- .value = stringify(0),
- },
- {
- .driver = "pci-serial-2x",
- .property = "prog_if",
- .value = stringify(0),
- },
- {
- .driver = "pci-serial-4x",
- .property = "prog_if",
- .value = stringify(0),
- },
- {
- .driver = "virtio-net-pci",
- .property = "guest_announce",
- .value = "off",
- },
- {
- .driver = "ICH9-LPC",
- .property = "memory-hotplug-support",
- .value = "off",
- },{
- .driver = "xio3130-downstream",
- .property = COMPAT_PROP_PCP,
- .value = "off",
- },{
- .driver = "ioh3420",
- .property = COMPAT_PROP_PCP,
- .value = "off",
- },
+ { "virtio-scsi-pci", "any_layout", "off" },
+ { "PIIX4_PM", "memory-hotplug-support", "off" },
+ { "apic", "version", "0x11" },
+ { "nec-usb-xhci", "superspeed-ports-first", "off" },
+ { "nec-usb-xhci", "force-pcie-endcap", "on" },
+ { "pci-serial", "prog_if", "0" },
+ { "pci-serial-2x", "prog_if", "0" },
+ { "pci-serial-4x", "prog_if", "0" },
+ { "virtio-net-pci", "guest_announce", "off" },
+ { "ICH9-LPC", "memory-hotplug-support", "off" },
+ { "xio3130-downstream", COMPAT_PROP_PCP, "off" },
+ { "ioh3420", COMPAT_PROP_PCP, "off" },
};
const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0);
GlobalProperty pc_compat_1_7[] = {
PC_CPU_MODEL_IDS("1.7.0")
- {
- .driver = TYPE_USB_DEVICE,
- .property = "msos-desc",
- .value = "no",
- },
- {
- .driver = "PIIX4_PM",
- .property = "acpi-pci-hotplug-with-bridge-support",
- .value = "off",
- },
- {
- .driver = "hpet",
- .property = HPET_INTCAP,
- .value = stringify(4),
- },
+ { TYPE_USB_DEVICE, "msos-desc", "no" },
+ { "PIIX4_PM", "acpi-pci-hotplug-with-bridge-support", "off" },
+ { "hpet", HPET_INTCAP, "4" },
};
const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7);
GlobalProperty pc_compat_1_6[] = {
PC_CPU_MODEL_IDS("1.6.0")
- {
- .driver = "e1000",
- .property = "mitigation",
- .value = "off",
- },{
- .driver = "qemu64-" TYPE_X86_CPU,
- .property = "model",
- .value = stringify(2),
- },{
- .driver = "qemu32-" TYPE_X86_CPU,
- .property = "model",
- .value = stringify(3),
- },{
- .driver = "i440FX-pcihost",
- .property = "short_root_bus",
- .value = stringify(1),
- },{
- .driver = "q35-pcihost",
- .property = "short_root_bus",
- .value = stringify(1),
- },
+ { "e1000", "mitigation", "off" },
+ { "qemu64-" TYPE_X86_CPU, "model", "2" },
+ { "qemu32-" TYPE_X86_CPU, "model", "3" },
+ { "i440FX-pcihost", "short_root_bus", "1" },
+ { "q35-pcihost", "short_root_bus", "1" },
};
const size_t pc_compat_1_6_len = G_N_ELEMENTS(pc_compat_1_6);
GlobalProperty pc_compat_1_5[] = {
PC_CPU_MODEL_IDS("1.5.0")
- {
- .driver = "Conroe-" TYPE_X86_CPU,
- .property = "model",
- .value = stringify(2),
- },{
- .driver = "Conroe-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(2),
- },{
- .driver = "Penryn-" TYPE_X86_CPU,
- .property = "model",
- .value = stringify(2),
- },{
- .driver = "Penryn-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(2),
- },{
- .driver = "Nehalem-" TYPE_X86_CPU,
- .property = "model",
- .value = stringify(2),
- },{
- .driver = "Nehalem-" TYPE_X86_CPU,
- .property = "min-level",
- .value = stringify(2),
- },{
- .driver = "virtio-net-pci",
- .property = "any_layout",
- .value = "off",
- },{
- .driver = TYPE_X86_CPU,
- .property = "pmu",
- .value = "on",
- },{
- .driver = "i440FX-pcihost",
- .property = "short_root_bus",
- .value = stringify(0),
- },{
- .driver = "q35-pcihost",
- .property = "short_root_bus",
- .value = stringify(0),
- },
+ { "Conroe-" TYPE_X86_CPU, "model", "2" },
+ { "Conroe-" TYPE_X86_CPU, "min-level", "2" },
+ { "Penryn-" TYPE_X86_CPU, "model", "2" },
+ { "Penryn-" TYPE_X86_CPU, "min-level", "2" },
+ { "Nehalem-" TYPE_X86_CPU, "model", "2" },
+ { "Nehalem-" TYPE_X86_CPU, "min-level", "2" },
+ { "virtio-net-pci", "any_layout", "off" },
+ { TYPE_X86_CPU, "pmu", "on" },
+ { "i440FX-pcihost", "short_root_bus", "0" },
+ { "q35-pcihost", "short_root_bus", "0" },
};
const size_t pc_compat_1_5_len = G_N_ELEMENTS(pc_compat_1_5);
GlobalProperty pc_compat_1_4[] = {
PC_CPU_MODEL_IDS("1.4.0")
- {
- .driver = "scsi-hd",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "scsi-cd",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "scsi-disk",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "ide-hd",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "ide-cd",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "ide-drive",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "virtio-blk-pci",
- .property = "discard_granularity",
- .value = stringify(0),
- },{
- .driver = "virtio-serial-pci",
- .property = "vectors",
- /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */
- .value = stringify(0xFFFFFFFF),
- },{
- .driver = "virtio-net-pci",
- .property = "ctrl_guest_offloads",
- .value = "off",
- },{
- .driver = "e1000",
- .property = "romfile",
- .value = "pxe-e1000.rom",
- },{
- .driver = "ne2k_pci",
- .property = "romfile",
- .value = "pxe-ne2k_pci.rom",
- },{
- .driver = "pcnet",
- .property = "romfile",
- .value = "pxe-pcnet.rom",
- },{
- .driver = "rtl8139",
- .property = "romfile",
- .value = "pxe-rtl8139.rom",
- },{
- .driver = "virtio-net-pci",
- .property = "romfile",
- .value = "pxe-virtio.rom",
- },{
- .driver = "486-" TYPE_X86_CPU,
- .property = "model",
- .value = stringify(0),
- },
- {
- .driver = "n270" "-" TYPE_X86_CPU,
- .property = "movbe",
- .value = "off",
- },
- {
- .driver = "Westmere" "-" TYPE_X86_CPU,
- .property = "pclmulqdq",
- .value = "off",
- },
+ { "scsi-hd", "discard_granularity", "0" },
+ { "scsi-cd", "discard_granularity", "0" },
+ { "scsi-disk", "discard_granularity", "0" },
+ { "ide-hd", "discard_granularity", "0" },
+ { "ide-cd", "discard_granularity", "0" },
+ { "ide-drive", "discard_granularity", "0" },
+ { "virtio-blk-pci", "discard_granularity", "0" },
+ /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string: */
+ { "virtio-serial-pci", "vectors", "0xFFFFFFFF" },
+ { "virtio-net-pci", "ctrl_guest_offloads", "off" },
+ { "e1000", "romfile", "pxe-e1000.rom" },
+ { "ne2k_pci", "romfile", "pxe-ne2k_pci.rom" },
+ { "pcnet", "romfile", "pxe-pcnet.rom" },
+ { "rtl8139", "romfile", "pxe-rtl8139.rom" },
+ { "virtio-net-pci", "romfile", "pxe-virtio.rom" },
+ { "486-" TYPE_X86_CPU, "model", "0" },
+ { "n270" "-" TYPE_X86_CPU, "movbe", "off" },
+ { "Westmere" "-" TYPE_X86_CPU, "pclmulqdq", "off" },
};
const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
return size;
}
-/* setup_data types */
-#define SETUP_NONE 0
-#define SETUP_E820_EXT 1
-#define SETUP_DTB 2
-#define SETUP_PCI 3
-#define SETUP_EFI 4
-
struct setup_data {
uint64_t next;
uint32_t type;
uint8_t data[0];
} __attribute__((packed));
+
+/*
+ * The entry point into the kernel for PVH boot is different from
+ * the native entry point. The PVH entry is defined by the x86/HVM
+ * direct boot ABI and is available in an ELFNOTE in the kernel binary.
+ *
+ * This function is passed to load_elf() when it is called from
+ * load_elfboot() which then additionally checks for an ELF Note of
+ * type XEN_ELFNOTE_PHYS32_ENTRY and passes it to this function to
+ * parse the PVH entry address from the ELF Note.
+ *
+ * Due to trickery in elf_opts.h, load_elf() is actually available as
+ * load_elf32() or load_elf64() and this routine needs to be able
+ * to deal with being called as 32 or 64 bit.
+ *
+ * The address of the PVH entry point is saved to the 'pvh_start_addr'
+ * global variable. (although the entry point is 32-bit, the kernel
+ * binary can be either 32-bit or 64-bit).
+ */
+static uint64_t read_pvh_start_addr(void *arg1, void *arg2, bool is64)
+{
+ size_t *elf_note_data_addr;
+
+ /* Check if ELF Note header passed in is valid */
+ if (arg1 == NULL) {
+ return 0;
+ }
+
+ if (is64) {
+ struct elf64_note *nhdr64 = (struct elf64_note *)arg1;
+ uint64_t nhdr_size64 = sizeof(struct elf64_note);
+ uint64_t phdr_align = *(uint64_t *)arg2;
+ uint64_t nhdr_namesz = nhdr64->n_namesz;
+
+ elf_note_data_addr =
+ ((void *)nhdr64) + nhdr_size64 +
+ QEMU_ALIGN_UP(nhdr_namesz, phdr_align);
+ } else {
+ struct elf32_note *nhdr32 = (struct elf32_note *)arg1;
+ uint32_t nhdr_size32 = sizeof(struct elf32_note);
+ uint32_t phdr_align = *(uint32_t *)arg2;
+ uint32_t nhdr_namesz = nhdr32->n_namesz;
+
+ elf_note_data_addr =
+ ((void *)nhdr32) + nhdr_size32 +
+ QEMU_ALIGN_UP(nhdr_namesz, phdr_align);
+ }
+
+ pvh_start_addr = *elf_note_data_addr;
+
+ return pvh_start_addr;
+}
+
+static bool load_elfboot(const char *kernel_filename,
+ int kernel_file_size,
+ uint8_t *header,
+ size_t pvh_xen_start_addr,
+ FWCfgState *fw_cfg)
+{
+ uint32_t flags = 0;
+ uint32_t mh_load_addr = 0;
+ uint32_t elf_kernel_size = 0;
+ uint64_t elf_entry;
+ uint64_t elf_low, elf_high;
+ int kernel_size;
+
+ if (ldl_p(header) != 0x464c457f) {
+ return false; /* no elfboot */
+ }
+
+ bool elf_is64 = header[EI_CLASS] == ELFCLASS64;
+ flags = elf_is64 ?
+ ((Elf64_Ehdr *)header)->e_flags : ((Elf32_Ehdr *)header)->e_flags;
+
+ if (flags & 0x00010004) { /* LOAD_ELF_HEADER_HAS_ADDR */
+ error_report("elfboot unsupported flags = %x", flags);
+ exit(1);
+ }
+
+ uint64_t elf_note_type = XEN_ELFNOTE_PHYS32_ENTRY;
+ kernel_size = load_elf(kernel_filename, read_pvh_start_addr,
+ NULL, &elf_note_type, &elf_entry,
+ &elf_low, &elf_high, 0, I386_ELF_MACHINE,
+ 0, 0);
+
+ if (kernel_size < 0) {
+ error_report("Error while loading elf kernel");
+ exit(1);
+ }
+ mh_load_addr = elf_low;
+ elf_kernel_size = elf_high - elf_low;
+
+ if (pvh_start_addr == 0) {
+ error_report("Error loading uncompressed kernel without PVH ELF Note");
+ exit(1);
+ }
+ fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, pvh_start_addr);
+ fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, mh_load_addr);
+ fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, elf_kernel_size);
+
+ return true;
+}
+
static void load_linux(PCMachineState *pcms,
FWCfgState *fw_cfg)
{
if (ldl_p(header+0x202) == 0x53726448) {
protocol = lduw_p(header+0x206);
} else {
- /* This looks like a multiboot kernel. If it is, let's stop
- treating it like a Linux kernel. */
+ /*
+ * This could be a multiboot kernel. If it is, let's stop treating it
+ * like a Linux kernel.
+ * Note: some multiboot images could be in the ELF format (the same of
+ * PVH), so we try multiboot first since we check the multiboot magic
+ * header before to load it.
+ */
if (load_multiboot(fw_cfg, f, kernel_filename, initrd_filename,
kernel_cmdline, kernel_size, header)) {
return;
}
+ /*
+ * Check if the file is an uncompressed kernel file (ELF) and load it,
+ * saving the PVH entry point used by the x86/HVM direct boot ABI.
+ * If load_elfboot() is successful, populate the fw_cfg info.
+ */
+ if (pcmc->pvh_enabled &&
+ load_elfboot(kernel_filename, kernel_size,
+ header, pvh_start_addr, fw_cfg)) {
+ fclose(f);
+
+ fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_SIZE,
+ strlen(kernel_cmdline) + 1);
+ fw_cfg_add_string(fw_cfg, FW_CFG_CMDLINE_DATA, kernel_cmdline);
+
+ fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, sizeof(header));
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA,
+ header, sizeof(header));
+
+ /* load initrd */
+ if (initrd_filename) {
+ gsize initrd_size;
+ gchar *initrd_data;
+ GError *gerr = NULL;
+
+ if (!g_file_get_contents(initrd_filename, &initrd_data,
+ &initrd_size, &gerr)) {
+ fprintf(stderr, "qemu: error reading initrd %s: %s\n",
+ initrd_filename, gerr->message);
+ exit(1);
+ }
+
+ initrd_max = pcms->below_4g_mem_size - pcmc->acpi_data_size - 1;
+ if (initrd_size >= initrd_max) {
+ fprintf(stderr, "qemu: initrd is too large, cannot support."
+ "(max: %"PRIu32", need %"PRId64")\n",
+ initrd_max, (uint64_t)initrd_size);
+ exit(1);
+ }
+
+ initrd_addr = (initrd_max - initrd_size) & ~4095;
+
+ fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_addr);
+ fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, initrd_data,
+ initrd_size);
+ }
+
+ option_rom[nb_option_roms].bootindex = 0;
+ option_rom[nb_option_roms].name = "pvh.bin";
+ nb_option_roms++;
+
+ return;
+ }
protocol = 0;
}
#endif
/* highest address for loading the initrd */
- if (protocol >= 0x203) {
+ if (protocol >= 0x20c &&
+ lduw_p(header+0x236) & XLF_CAN_BE_LOADED_ABOVE_4G) {
+ /*
+ * Linux has supported initrd up to 4 GB for a very long time (2007,
+ * long before XLF_CAN_BE_LOADED_ABOVE_4G which was added in 2013),
+ * though it only sets initrd_max to 2 GB to "work around bootloader
+ * bugs". Luckily, QEMU firmware(which does something like bootloader)
+ * has supported this.
+ *
+ * It's believed that if XLF_CAN_BE_LOADED_ABOVE_4G is set, initrd can
+ * be loaded into any address.
+ *
+ * In addition, initrd_max is uint32_t simply because QEMU doesn't
+ * support the 64-bit boot protocol (specifically the ext_ramdisk_image
+ * field).
+ *
+ * Therefore here just limit initrd_max to UINT32_MAX simply as well.
+ */
+ initrd_max = UINT32_MAX;
+ } else if (protocol >= 0x203) {
initrd_max = ldl_p(header+0x22c);
} else {
initrd_max = 0x37ffffff;
pci_address_space, -1);
}
-void pc_acpi_init(const char *default_dsdt)
-{
- char *filename;
-
- if (acpi_tables != NULL) {
- /* manually set via -acpitable, leave it alone */
- return;
- }
-
- filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt);
- if (filename == NULL) {
- warn_report("failed to find %s", default_dsdt);
- } else {
- QemuOpts *opts = qemu_opts_create(qemu_find_opts("acpi"), NULL, 0,
- &error_abort);
- Error *err = NULL;
-
- qemu_opt_set(opts, "file", filename, &error_abort);
-
- acpi_table_add_builtin(opts, &err);
- if (err) {
- warn_reportf_err(err, "failed to load %s: ", filename);
- }
- g_free(filename);
- }
-}
-
void xen_load_linux(PCMachineState *pcms)
{
int i;
for (i = 0; i < nb_option_roms; i++) {
assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
!strcmp(option_rom[i].name, "linuxboot_dma.bin") ||
+ !strcmp(option_rom[i].name, "pvh.bin") ||
!strcmp(option_rom[i].name, "multiboot.bin"));
rom_add_option(option_rom[i].name, option_rom[i].bootindex);
}
}
/* Initialize PC system firmware */
- pc_system_firmware_init(rom_memory, !pcmc->pci_enabled);
+ pc_system_firmware_init(pcms, rom_memory);
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
{
const PCMachineState *pcms = PC_MACHINE(hotplug_dev);
const PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
+ const MachineState *ms = MACHINE(hotplug_dev);
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
const uint64_t legacy_align = TARGET_PAGE_SIZE;
return;
}
- if (is_nvdimm && !pcms->acpi_nvdimm_state.is_enabled) {
+ if (is_nvdimm && !ms->nvdimms_state->is_enabled) {
error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'");
return;
}
static void pc_memory_plug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- HotplugHandlerClass *hhc;
Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
+ MachineState *ms = MACHINE(hotplug_dev);
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err);
}
if (is_nvdimm) {
- nvdimm_plug(&pcms->acpi_nvdimm_state);
+ nvdimm_plug(ms->nvdimms_state);
}
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort);
+ hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort);
out:
error_propagate(errp, local_err);
}
static void pc_memory_unplug_request(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- HotplugHandlerClass *hhc;
Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
goto out;
}
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
-
+ hotplug_handler_unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev,
+ &local_err);
out:
error_propagate(errp, local_err);
}
DeviceState *dev, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
- HotplugHandlerClass *hhc;
Error *local_err = NULL;
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
-
+ hotplug_handler_unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
if (local_err) {
goto out;
}
pc_dimm_unplug(PC_DIMM(dev), MACHINE(pcms));
- object_unparent(OBJECT(dev));
-
+ object_property_set_bool(OBJECT(dev), false, "realized", NULL);
out:
error_propagate(errp, local_err);
}
DeviceState *dev, Error **errp)
{
CPUArchId *found_cpu;
- HotplugHandlerClass *hhc;
Error *local_err = NULL;
X86CPU *cpu = X86_CPU(dev);
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
if (pcms->acpi_dev) {
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
+ hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
if (local_err) {
goto out;
}
DeviceState *dev, Error **errp)
{
int idx = -1;
- HotplugHandlerClass *hhc;
Error *local_err = NULL;
X86CPU *cpu = X86_CPU(dev);
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
goto out;
}
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
-
+ hotplug_handler_unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev,
+ &local_err);
if (local_err) {
goto out;
}
DeviceState *dev, Error **errp)
{
CPUArchId *found_cpu;
- HotplugHandlerClass *hhc;
Error *local_err = NULL;
X86CPU *cpu = X86_CPU(dev);
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
- hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
- hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
-
+ hotplug_handler_unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
if (local_err) {
goto out;
}
found_cpu = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);
found_cpu->cpu = NULL;
- object_unparent(OBJECT(dev));
+ object_property_set_bool(OBJECT(dev), false, "realized", NULL);
/* decrement the number of CPUs */
pcms->boot_cpus--;
}
}
-static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
+static HotplugHandler *pc_get_hotplug_handler(MachineState *machine,
DeviceState *dev)
{
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) ||
visit_type_OnOffAuto(v, name, &pcms->smm, errp);
}
-static bool pc_machine_get_nvdimm(Object *obj, Error **errp)
-{
- PCMachineState *pcms = PC_MACHINE(obj);
-
- return pcms->acpi_nvdimm_state.is_enabled;
-}
-
-static void pc_machine_set_nvdimm(Object *obj, bool value, Error **errp)
-{
- PCMachineState *pcms = PC_MACHINE(obj);
-
- pcms->acpi_nvdimm_state.is_enabled = value;
-}
-
-static char *pc_machine_get_nvdimm_persistence(Object *obj, Error **errp)
-{
- PCMachineState *pcms = PC_MACHINE(obj);
-
- return g_strdup(pcms->acpi_nvdimm_state.persistence_string);
-}
-
-static void pc_machine_set_nvdimm_persistence(Object *obj, const char *value,
- Error **errp)
-{
- PCMachineState *pcms = PC_MACHINE(obj);
- AcpiNVDIMMState *nvdimm_state = &pcms->acpi_nvdimm_state;
-
- if (strcmp(value, "cpu") == 0)
- nvdimm_state->persistence = 3;
- else if (strcmp(value, "mem-ctrl") == 0)
- nvdimm_state->persistence = 2;
- else {
- error_setg(errp, "-machine nvdimm-persistence=%s: unsupported option",
- value);
- return;
- }
-
- g_free(nvdimm_state->persistence_string);
- nvdimm_state->persistence_string = g_strdup(value);
-}
-
static bool pc_machine_get_smbus(Object *obj, Error **errp)
{
PCMachineState *pcms = PC_MACHINE(obj);
pcms->max_ram_below_4g = 0; /* use default */
pcms->smm = ON_OFF_AUTO_AUTO;
pcms->vmport = ON_OFF_AUTO_AUTO;
- /* nvdimm is disabled on default. */
- pcms->acpi_nvdimm_state.is_enabled = false;
/* acpi build is enabled by default if machine supports it */
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
pcms->smbus_enabled = true;
pcms->sata_enabled = true;
pcms->pit_enabled = true;
+
+ pc_system_flash_create(pcms);
}
static void pc_machine_reset(void)
pcmc->acpi_data_size = 0x20000 + 0x8000;
pcmc->save_tsc_khz = true;
pcmc->linuxboot_dma_enabled = true;
+ pcmc->pvh_enabled = true;
assert(!mc->get_hotplug_handler);
- mc->get_hotplug_handler = pc_get_hotpug_handler;
+ mc->get_hotplug_handler = pc_get_hotplug_handler;
mc->cpu_index_to_instance_props = pc_cpu_index_to_props;
mc->get_default_cpu_node_id = pc_get_default_cpu_node_id;
mc->possible_cpu_arch_ids = pc_possible_cpu_arch_ids;
hc->unplug = pc_machine_device_unplug_cb;
nc->nmi_monitor_handler = x86_nmi;
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
+ mc->nvdimm_supported = true;
object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
pc_machine_get_device_memory_region_size, NULL,
object_class_property_set_description(oc, PC_MACHINE_VMPORT,
"Enable vmport (pc & q35)", &error_abort);
- object_class_property_add_bool(oc, PC_MACHINE_NVDIMM,
- pc_machine_get_nvdimm, pc_machine_set_nvdimm, &error_abort);
-
- object_class_property_add_str(oc, PC_MACHINE_NVDIMM_PERSIST,
- pc_machine_get_nvdimm_persistence,
- pc_machine_set_nvdimm_persistence, &error_abort);
-
object_class_property_add_bool(oc, PC_MACHINE_SMBUS,
pc_machine_get_smbus, pc_machine_set_smbus, &error_abort);