mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-28 09:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/sstabellini/tags/2015-10-19-tag' into staging

Browse Source 
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>
This commit is contained in:
Peter Maydell
2015-10-19 12:13:27 +01:00
parent 526d5809a0 dbb7405d8c
commit 26c7be8426
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hw/i386/pc_piix.c
View File

@ -434,6 +434,11 @@ static void pc_xen_hvm_init(MachineState *machine)
{ {
PCIBus *bus; PCIBus *bus;
if (!xen_enabled()) {
error_report("xenfv machine requires the xen accelerator");
exit(1);
}
pc_xen_hvm_init_pci(machine); pc_xen_hvm_init_pci(machine);
bus = pci_find_primary_bus(); bus = pci_find_primary_bus();

3
hw/i386/xen/xen_platform.c
View File

@ -387,6 +387,9 @@ static int xen_platform_initfn(PCIDevice *dev)
PCIXenPlatformState *d = XEN_PLATFORM(dev); PCIXenPlatformState *d = XEN_PLATFORM(dev);
uint8_t *pci_conf; uint8_t *pci_conf;
/* Device will crash on reset if xen is not initialized */
assert(xen_enabled());
pci_conf = dev->config; pci_conf = dev->config;
pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY); pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY);