From: Anthony PERARD <anthony.perard@xxxxxxxxxx>
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/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);
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
--
1.7.0.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home