Message ID | 1295965760-31508-7-git-send-email-anthony.perard@citrix.com |
---|---|
State | New |
Headers | show |
On 01/25/2011 08:29 AM, anthony.perard@citrix.com wrote: > From: Anthony PERARD<anthony.perard@citrix.com> > > Signed-off-by: Anthony PERARD<anthony.perard@citrix.com> > --- > 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 07cc21e..8b5fe36 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..29c8002 > --- /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" > +#include "hw/xen_redirect.h" > + > +/* Initialise Xen */ > + > +int xen_init(int smp_cpus) > +{ > + if (xen_mode == XEN_EMULATE) > + xen_mode = XEN_ATTACH; > Missing braces. Regards, Anthony Liguori > + xen_interfaces_init(); > + xen_xc = 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..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; > +} >
diff --git a/Makefile.target b/Makefile.target index 07cc21e..8b5fe36 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..29c8002 --- /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" +#include "hw/xen_redirect.h" + +/* Initialise Xen */ + +int xen_init(int smp_cpus) +{ + if (xen_mode == XEN_EMULATE) + xen_mode = XEN_ATTACH; + xen_interfaces_init(); + xen_xc = 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..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; +}