From patchwork Tue Jan 25 14:29:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 80381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0B1621007D1 for ; Wed, 26 Jan 2011 02:48:05 +1100 (EST) Received: from localhost ([127.0.0.1]:56631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Phk6j-0007rg-C5 for incoming@patchwork.ozlabs.org; Tue, 25 Jan 2011 09:42:57 -0500 Received: from [140.186.70.92] (port=34106 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Phjty-0001kT-DZ for qemu-devel@nongnu.org; Tue, 25 Jan 2011 09:29:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Phjtu-0007os-1a for qemu-devel@nongnu.org; Tue, 25 Jan 2011 09:29:43 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:32416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Phjtt-0007ng-Pl for qemu-devel@nongnu.org; Tue, 25 Jan 2011 09:29:41 -0500 X-IronPort-AV: E=Sophos;i="4.60,374,1291611600"; d="scan'208";a="132654137" Received: from ftlpexchmx01.citrite.net ([10.9.154.126]) by FTLPIPO02.CITRIX.COM with ESMTP; 25 Jan 2011 09:29:41 -0500 Received: from smtp01.ad.xensource.com ([10.219.128.104]) by FTLPEXCHMX01.citrite.net with Microsoft SMTPSVC(6.0.3790.4675); Tue, 25 Jan 2011 09:29:41 -0500 Received: from perard.cam.xci-test.com (perard.cam.xci-test.com [10.80.248.106]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id p0PETU39005931; Tue, 25 Jan 2011 06:29:39 -0800 From: anthony.perard@citrix.com To: QEMU-devel Date: Tue, 25 Jan 2011 14:29:10 +0000 Message-Id: <1295965760-31508-7-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1295965760-31508-1-git-send-email-anthony.perard@citrix.com> References: <1295965760-31508-1-git-send-email-anthony.perard@citrix.com> X-OriginalArrivalTime: 25 Jan 2011 14:29:41.0223 (UTC) FILETIME=[4D8D7F70:01CBBC9C] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Anthony PERARD , Xen Devel , Stefano Stabellini Subject: [Qemu-devel] [PATCH V9 06/16] xen: Add initialisation of Xen X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Anthony PERARD Signed-off-by: Anthony PERARD --- Makefile.target | 3 +++ hw/xen.h | 13 +++++++++++++ vl.c | 2 ++ xen-all.c | 29 +++++++++++++++++++++++++++++ xen-stub.c | 17 +++++++++++++++++ 5 files changed, 64 insertions(+), 0 deletions(-) create mode 100644 xen-all.c create mode 100644 xen-stub.c diff --git a/Makefile.target b/Makefile.target index 07cc21e..8b5fe36 100644 --- a/Makefile.target +++ b/Makefile.target @@ -3,6 +3,7 @@ GENERATED_HEADERS = config-target.h CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) +CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) include ../config-host.mak include config-devices.mak @@ -207,6 +208,8 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS) # xen support obj-$(CONFIG_XEN) += xen_interfaces.o +obj-$(CONFIG_XEN) += xen-all.o +obj-$(CONFIG_NO_XEN) += xen-stub.o # xen backend driver support obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o diff --git a/hw/xen.h b/hw/xen.h index 780dcf7..183cbb5 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -18,4 +18,17 @@ enum xen_mode { extern uint32_t xen_domid; extern enum xen_mode xen_mode; +extern int xen_allowed; + +static inline int xen_enabled(void) +{ +#ifdef CONFIG_XEN + return xen_allowed; +#else + return 0; +#endif +} + +int xen_init(int smp_cpus); + #endif /* QEMU_HW_XEN_H */ diff --git a/vl.c b/vl.c index 626f4e1..38fa281 100644 --- a/vl.c +++ b/vl.c @@ -259,6 +259,7 @@ static NotifierList machine_init_done_notifiers = static int tcg_allowed = 1; int kvm_allowed = 0; +int xen_allowed = 0; uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; @@ -1836,6 +1837,7 @@ static struct { int *allowed; } accel_list[] = { { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed }, + { "xen", "Xen", xen_available, xen_init, &xen_allowed }, { "kvm", "KVM", kvm_available, kvm_init, &kvm_allowed }, }; diff --git a/xen-all.c b/xen-all.c new file mode 100644 index 0000000..29c8002 --- /dev/null +++ b/xen-all.c @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2010 Citrix Ltd. + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "config.h" + +#include "hw/xen_common.h" +#include "hw/xen_backend.h" +#include "hw/xen_redirect.h" + +/* Initialise Xen */ + +int xen_init(int smp_cpus) +{ + if (xen_mode == XEN_EMULATE) + xen_mode = XEN_ATTACH; + xen_interfaces_init(); + xen_xc = xc_interface_open(0, 0, 0); + if (xen_xc == XC_HANDLER_INITIAL_VALUE) { + xen_be_printf(NULL, 0, "can't open xen interface\n"); + return -1; + } + + return 0; +} diff --git a/xen-stub.c b/xen-stub.c new file mode 100644 index 0000000..0fa9c51 --- /dev/null +++ b/xen-stub.c @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2010 Citrix Ltd. + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "config.h" + +#include "qemu-common.h" +#include "hw/xen.h" + +int xen_init(int smp_cpus) +{ + return -ENOSYS; +}