Commit 26c7be84 authored Oct 19, 2015 by Peter Maydell

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>

parents 526d5809 dbb7405d

hw/i386/pc_piix.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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();

hw/i386/xen/xen_platform.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);