From patchwork Mon Aug 23 09:50:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 62466 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 B4624B70B8 for ; Mon, 23 Aug 2010 20:02:32 +1000 (EST) Received: from localhost ([127.0.0.1]:33438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnTr9-0002I9-Go for incoming@patchwork.ozlabs.org; Mon, 23 Aug 2010 06:02:19 -0400 Received: from [140.186.70.92] (port=36630 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnTg9-0007EU-Si for qemu-devel@nongnu.org; Mon, 23 Aug 2010 05:51:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnTg8-00008y-8i for qemu-devel@nongnu.org; Mon, 23 Aug 2010 05:50:57 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:59698) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnTg8-0008VE-4f for qemu-devel@nongnu.org; Mon, 23 Aug 2010 05:50:56 -0400 X-IronPort-AV: E=Sophos;i="4.56,256,1280721600"; d="scan'208";a="110803854" Received: from ftlpexchmx01.citrite.net ([10.9.154.126]) by FTLPIPO02.CITRIX.COM with ESMTP; 23 Aug 2010 05:50:55 -0400 Received: from smtp01.ad.xensource.com ([10.219.128.104]) by FTLPEXCHMX01.citrite.net with Microsoft SMTPSVC(6.0.3790.4675); Mon, 23 Aug 2010 05:50:54 -0400 Received: from localhost.localdomain (kaball.uk.xensource.com [10.80.2.59]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id o7N9oTHr011158; Mon, 23 Aug 2010 02:50:53 -0700 From: stefano.stabellini@eu.citrix.com To: qemu-devel@nongnu.org Date: Mon, 23 Aug 2010 10:50:48 +0100 Message-Id: <1282557052-14285-11-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: X-OriginalArrivalTime: 23 Aug 2010 09:50:54.0897 (UTC) FILETIME=[ADDB7210:01CB42A8] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Anthony.Perard@citrix.com, Anthony PERARD , xen-devel@lists.xensource.com, stefano.stabellini@eu.citrix.com Subject: [Qemu-devel] [PATCH 11/15] xen: Introduce --enable-xen command options. 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 This options will check if the target is build with Xen support. --- Makefile.target | 3 +++ hw/xen.h | 8 ++++++++ qemu-options.hx | 9 +++++++++ vl.c | 11 +++++++++++ 4 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 xen-all.c create mode 100644 xen-stub.c diff --git a/xen-all.c b/xen-all.c new file mode 100644 index 0000000..e69de29 diff --git a/xen-stub.c b/xen-stub.c new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.target b/Makefile.target index 1984cdd..840b87b 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 @@ -182,6 +183,8 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS) # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o +obj-$(CONFIG_XEN) += xen-all.o +obj-$(CONFIG_NO_XEN) += xen-stub.o # USB layer obj-$(CONFIG_USB_OHCI) += usb-ohci.o diff --git a/hw/xen.h b/hw/xen.h index 780dcf7..f1d01d3 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -18,4 +18,12 @@ 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 + #endif /* QEMU_HW_XEN_H */ diff --git a/qemu-options.hx b/qemu-options.hx index db86feb..0abdfc4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1908,6 +1908,15 @@ Enable KVM full virtualization support. This option is only available if KVM support is enabled when compiling. ETEXI +DEF("enable-xen", 0, QEMU_OPTION_enable_xen, \ + "-enable-xen enable Xen full virtualization support\n", QEMU_ARCH_ALL) +STEXI +@item -enable-xen +@findex -enable-xen +Enable Xen full virtualization support. This option is only available +if Xen support is enabled when compiling. +ETEXI + DEF("xen-domid", HAS_ARG, QEMU_OPTION_xen_domid, "-xen-domid id specify xen guest domain id\n", QEMU_ARCH_ALL) DEF("xen-create", 0, QEMU_OPTION_xen_create, diff --git a/vl.c b/vl.c index b3e3676..dd88806 100644 --- a/vl.c +++ b/vl.c @@ -239,6 +239,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; @@ -2436,6 +2437,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_enable_kvm: kvm_allowed = 1; break; + case QEMU_OPTION_enable_xen: + xen_allowed = 1; + break; case QEMU_OPTION_usb: usb_enabled = 1; break; @@ -2730,6 +2734,13 @@ int main(int argc, char **argv, char **envp) } } + if (xen_allowed) { + if (!xen_available()) { + printf("Xen not supported for this target\n"); + exit(1); + } + } + if (qemu_init_main_loop()) { fprintf(stderr, "qemu_init_main_loop failed\n"); exit(1);