From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37447 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0bhv-0000RD-Km for qemu-devel@nongnu.org; Tue, 28 Sep 2010 11:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P0bhj-0005yT-0B for qemu-devel@nongnu.org; Tue, 28 Sep 2010 11:02:53 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:39101) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P0bhi-0005xm-SC for qemu-devel@nongnu.org; Tue, 28 Sep 2010 11:02:50 -0400 From: anthony.perard@citrix.com Date: Tue, 28 Sep 2010 16:01:28 +0100 Message-Id: <1285686097-13036-6-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1285686097-13036-1-git-send-email-anthony.perard@citrix.com> References: <1285686097-13036-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH RFC V4 05/14] xen: Add xen in -accel option. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony PERARD , xen-devel@lists.xensource.com, Stefano.Stabellini@eu.citrix.com From: Anthony PERARD This come with the initialisation of Xen. Signed-off-by: Anthony PERARD --- Makefile.target | 5 +++++ hw/xen.h | 10 ++++++++++ vl.c | 2 ++ xen-all.c | 25 +++++++++++++++++++++++++ xen-stub.c | 17 +++++++++++++++++ 5 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 xen-all.c create mode 100644 xen-stub.c diff --git a/Makefile.target b/Makefile.target index 7adbc20..7a5eb71 100644 --- a/Makefile.target +++ b/Makefile.target @@ -2,6 +2,7 @@ GENERATED_HEADERS = config-target.h 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 @@ -183,6 +184,10 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS) # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o +# xen support +obj-$(CONFIG_XEN) += xen-all.o +obj-$(CONFIG_NO_XEN) += xen-stub.o + # xen full virtualized machine obj-i386-$(CONFIG_XEN) += xen_machine_fv.o diff --git a/hw/xen.h b/hw/xen.h index 780dcf7..14bbb6e 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -18,4 +18,14 @@ enum xen_mode { extern uint32_t xen_domid; extern enum xen_mode xen_mode; +extern int xen_allowed; + +#if defined CONFIG_XEN +#define xen_enabled() (xen_allowed) +#else +#define xen_enabled() (0) +#endif + +int xen_init(int smp_cpus); + #endif /* QEMU_HW_XEN_H */ diff --git a/vl.c b/vl.c index 797f04d..c0c9d32 100644 --- a/vl.c +++ b/vl.c @@ -243,6 +243,7 @@ static NotifierList exit_notifiers = NOTIFIER_LIST_INITIALIZER(exit_notifiers); int kvm_allowed = 0; +int xen_allowed = 0; uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; @@ -1755,6 +1756,7 @@ static struct { int *allowed; } accel_list[] = { { "tcg", "tcg", NULL, NULL, NULL }, + { "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..42c93ba --- /dev/null +++ b/xen-all.c @@ -0,0 +1,25 @@ +/* + * 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" + +/* Initialise Xen */ + +int xen_init(int smp_cpus) +{ + xen_xc = xc_interface_open(NULL, NULL, 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; +} -- 1.6.5