From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zo7eB-0007oo-42 for qemu-devel@nongnu.org; Mon, 19 Oct 2015 06:26:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zo7e6-0001cd-As for qemu-devel@nongnu.org; Mon, 19 Oct 2015 06:26:31 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:46418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zo7e6-0001cP-6t for qemu-devel@nongnu.org; Mon, 19 Oct 2015 06:26:26 -0400 From: Stefano Stabellini Date: Mon, 19 Oct 2015 11:23:43 +0100 Message-ID: <1445250224-5788-1-git-send-email-stefano.stabellini@eu.citrix.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PULL 1/2] pc: Require xen when initializing xenfv machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, Eduardo Habkost , Stefano Stabellini From: Eduardo Habkost Without this check, the xen-platform device will crash on reset if using the accel option with anything other than xen (e.g. "-machine xenfv,accel=kvm"). Signed-off-by: Eduardo Habkost Reviewed-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/i386/pc_piix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ae7bbeb..a91cc3d 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(); -- 1.7.10.4