Received: from eggs.gnu.org ([2001:4830:134:3::10]:52644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zgeca-00052E-82 for qemu-devel@nongnu.org; Mon, 28 Sep 2015 16:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgecE-00011L-5a for qemu-devel@nongnu.org; Mon, 28 Sep 2015 16:01:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgecE-00011H-0V for qemu-devel@nongnu.org; Mon, 28 Sep 2015 16:01:38 -0400 From: Eduardo Habkost Date: Mon, 28 Sep 2015 17:01:23 -0300 Message-Id: <1443470484-5389-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1443470484-5389-1-git-send-email-ehabkost@redhat.com> References: <1443470484-5389-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] pc: Require xen when initializing xenfv machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org, Stefano Stabellini 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 --- 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 3ffb05f..8fab2f9 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(); -- 2.1.0