[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V13 04/17] xen: Add initialisation of Xen
From: |
anthony.perard |
Subject: |
[Qemu-devel] [PATCH V13 04/17] xen: Add initialisation of Xen |
Date: |
Mon, 18 Apr 2011 12:37:04 +0100 |
From: Anthony PERARD <address@hidden>
The xenpv machine use the common init function.
Signed-off-by: Anthony PERARD <address@hidden>
Acked-by: Alexander Graf <address@hidden>
---
Makefile.target | 9 +++++++++
hw/xen.h | 13 +++++++++++++
hw/xen_backend.c | 3 +--
hw/xen_machine_pv.c | 1 +
vl.c | 2 ++
xen-all.c | 23 +++++++++++++++++++++++
xen-stub.c | 15 +++++++++++++++
7 files changed, 64 insertions(+), 2 deletions(-)
create mode 100644 xen-all.c
create mode 100644 xen-stub.c
diff --git a/Makefile.target b/Makefile.target
index 6ce6987..6b2a41c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -208,6 +208,15 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
# xen backend driver support
obj-i386-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
+ifeq ($(TARGET_BASE_ARCH), i386)
+ CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
+else
+ CONFIG_NO_XEN = y
+endif
+# xen support
+obj-i386-$(CONFIG_XEN) += xen-all.o
+obj-$(CONFIG_NO_XEN) += xen-stub.o
+
# Inter-VM PCI shared memory
CONFIG_IVSHMEM =
ifeq ($(CONFIG_KVM), y)
diff --git a/hw/xen.h b/hw/xen.h
index 780dcf7..1fefe3a 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(void);
+
#endif /* QEMU_HW_XEN_H */
diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 5f58a3f..d881fa2 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -665,9 +665,8 @@ int xen_be_init(void)
goto err;
}
- xen_xc = xen_xc_interface_open(0, 0, 0);
if (xen_xc == XC_HANDLER_INITIAL_VALUE) {
- xen_be_printf(NULL, 0, "can't open xen interface\n");
+ /* Check if xen_init() have been called */
goto err;
}
return 0;
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 77a34bf..f77be7e 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -114,6 +114,7 @@ static QEMUMachine xenpv_machine = {
.desc = "Xen Para-virtualized PC",
.init = xen_init_pv,
.max_cpus = 1,
+ .default_machine_opts = "accel=xen",
};
static void xenpv_machine_init(void)
diff --git a/vl.c b/vl.c
index d06c1f9..b67068e 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;
@@ -1890,6 +1891,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..e2872f9
--- /dev/null
+++ b/xen-all.c
@@ -0,0 +1,23 @@
+/*
+ * 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 "hw/xen_common.h"
+#include "hw/xen_backend.h"
+
+/* Initialise Xen */
+
+int xen_init(void)
+{
+ xen_xc = xen_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..beb982f
--- /dev/null
+++ b/xen-stub.c
@@ -0,0 +1,15 @@
+/*
+ * 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 "qemu-common.h"
+#include "hw/xen.h"
+
+int xen_init(void)
+{
+ return -ENOSYS;
+}
--
1.7.2.3
- [Qemu-devel] [PATCH V13 00/17] Xen device model support, anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 02/17] xen: Make Xen build once., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 05/17] pc_memory_init: Move memory calculation to the caller., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 06/17] xen: Add xenfv machine, anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 01/17] xen: Replace some tab-indents with spaces (clean-up)., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 03/17] xen: Support new libxc calls from xen unstable., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 04/17] xen: Add initialisation of Xen,
anthony.perard <=
- [Qemu-devel] [PATCH V13 08/17] xen: Introduce Xen Interrupt Controller, anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 07/17] piix_pci: Introduces Xen specific call for irq., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 09/17] xen: Introduce the Xen mapcache, anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 10/17] xen: Adds a cap to the number of map cache entries., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 11/17] Introduce qemu_put_ram_ptr, anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 13/17] pci: Use of qemu_put_ram_ptr in pci_add_option_rom., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 17/17] xen: Add Xen hypercall for sleep state in the cmos_s3 callback., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 15/17] xen: Initialize event channels and io rings, anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 16/17] xen: Set running state in xenstore., anthony.perard, 2011/04/18
- [Qemu-devel] [PATCH V13 12/17] configure: Always use 64bits target physical addresses with xen enabled., anthony.perard, 2011/04/18