diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-19 12:13:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-19 12:13:27 +0100 |
| commit | 26c7be842637ee65a79cd77f96a99c23ddcd90ad (patch) | |
| tree | 8820d011cadf9ed24abf3472ccd9ddcb6805fd3a | |
| parent | 526d5809a0714edc7f19196f14ec2e607dbd9753 (diff) | |
| parent | dbb7405d8caad0814ceddd568cb49f163a847561 (diff) | |
Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging
Xen 2015-10-19
# gpg: Signature made Mon 19 Oct 2015 11:24:05 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/2015-10-19-tag:
xen-platform: Ensure xen is enabled when initializing
pc: Require xen when initializing xenfv machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/i386/pc_piix.c | 5 | ||||
| -rw-r--r-- | hw/i386/xen/xen_platform.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ae7bbebd0f..a91cc3dada 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -434,6 +434,11 @@ static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; + if (!xen_enabled()) { + error_report("xenfv machine requires the xen accelerator"); + exit(1); + } + pc_xen_hvm_init_pci(machine); bus = pci_find_primary_bus(); diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index ee45f038b8..8682c42e46 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -387,6 +387,9 @@ static int xen_platform_initfn(PCIDevice *dev) PCIXenPlatformState *d = XEN_PLATFORM(dev); uint8_t *pci_conf; + /* Device will crash on reset if xen is not initialized */ + assert(xen_enabled()); + pci_conf = dev->config; pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY); |