[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V10 04/15] xen: Add initialisation of Xen
From: |
anthony . perard |
Subject: |
[Qemu-devel] [PATCH V10 04/15] xen: Add initialisation of Xen |
Date: |
Wed, 2 Feb 2011 14:49:21 +0000 |
From: Anthony PERARD <address@hidden>
Signed-off-by: Anthony PERARD <address@hidden>
Acked-by: Alexander Graf <address@hidden>
---
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 d09719f..00bb690 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..8d77d42
--- /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"
+
+/* Initialise Xen */
+
+int xen_init(int smp_cpus)
+{
+ if (xen_mode == XEN_EMULATE) {
+ xen_mode = XEN_ATTACH;
+ }
+ xen_interfaces_init();
+ xen_xc = xc_ops.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;
+}
--
1.7.1
- Re: [Qemu-devel] [PATCH V10 02/15] xen: Make xen build only on x86 target., (continued)
[Qemu-devel] [PATCH V10 05/15] xen: Add xenfv machine, anthony . perard, 2011/02/02
[Qemu-devel] [PATCH V10 04/15] xen: Add initialisation of Xen,
anthony . perard <=
[Qemu-devel] [PATCH V10 07/15] piix_pci: Introduces Xen specific call for irq., anthony . perard, 2011/02/02
[Qemu-devel] [PATCH V10 08/15] xen: Introduce Xen Interrupt Controller, anthony . perard, 2011/02/02
[Qemu-devel] [PATCH V10 12/15] vl.c: Introduce getter for shutdown_requested and reset_requested., anthony . perard, 2011/02/02
[Qemu-devel] [PATCH V10 11/15] Introduce qemu_put_ram_ptr, anthony . perard, 2011/02/02
[Qemu-devel] [PATCH V10 15/15] xen: Add Xen hypercall for sleep state in the cmos_s3 callback., anthony . perard, 2011/02/02
[Qemu-devel] [PATCH V10 03/15] xen: Support new libxc calls from xen unstable., anthony . perard, 2011/02/02