From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56955 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4df7-0007K4-Ls for qemu-devel@nongnu.org; Tue, 29 Mar 2011 14:29:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4df3-0003h4-7h for qemu-devel@nongnu.org; Tue, 29 Mar 2011 14:29:04 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:7014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4df3-0003gw-37 for qemu-devel@nongnu.org; Tue, 29 Mar 2011 14:29:01 -0400 From: anthony.perard@citrix.com Date: Tue, 29 Mar 2011 19:27:58 +0100 Message-Id: <1301423290-12443-6-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1301423290-12443-1-git-send-email-anthony.perard@citrix.com> References: <1301423290-12443-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH V12 05/17] xen: Add xenfv machine List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel , Anthony Liguori , Alexander Graf Cc: Anthony PERARD , Xen Devel , Stefano Stabellini From: Anthony PERARD Introduce the Xen FV (Fully Virtualized) machine to Qemu, some more Xen specific call will be added in further patches. Signed-off-by: Anthony PERARD --- hw/pc.c | 19 +++++++++++++++++-- hw/pc_piix.c | 17 +++++++++++++++++ hw/xen.h | 4 ++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 6939c04..d7732d4 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -41,6 +41,7 @@ #include "sysemu.h" #include "blockdev.h" #include "ui/qemu-spice.h" +#include "xen.h" /* output Bochs bios info messages */ //#define DEBUG_BIOS @@ -918,7 +919,11 @@ static void pc_cpu_reset(void *opaque) CPUState *env = opaque; cpu_reset(env); - env->halted = !cpu_is_bsp(env); + if (!xen_enabled()) { + env->halted = !cpu_is_bsp(env); + } else { + env->halted = 1; + } } static CPUState *pc_new_cpu(const char *cpu_model) @@ -952,7 +957,12 @@ void pc_cpus_init(const char *cpu_model) #endif } - for(i = 0; i < smp_cpus; i++) { + if (!xen_enabled()) { + for(i = 0; i < smp_cpus; i++) { + pc_new_cpu(cpu_model); + } + } else { + /* Xen require only one Qemu VCPU */ pc_new_cpu(cpu_model); } } @@ -980,6 +990,11 @@ void pc_memory_init(ram_addr_t ram_size, *above_4g_mem_size_p = above_4g_mem_size; *below_4g_mem_size_p = below_4g_mem_size; + if (xen_enabled()) { + /* Nothing to do for Xen */ + return; + } + linux_boot = (kernel_filename != NULL); /* allocate RAM */ diff --git a/hw/pc_piix.c b/hw/pc_piix.c index b3ede89..6eff06e 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -37,6 +37,10 @@ #include "sysbus.h" #include "arch_init.h" #include "blockdev.h" +#include "xen.h" +#ifdef CONFIG_XEN +# include +#endif #define MAX_IDE_BUS 2 @@ -391,6 +395,16 @@ static QEMUMachine isapc_machine = { .max_cpus = 1, }; +#ifdef CONFIG_XEN +static QEMUMachine xenfv_machine = { + .name = "xenfv", + .desc = "Xen Fully-virtualized PC", + .init = pc_init_pci, + .max_cpus = HVM_MAX_VCPUS, + .default_machine_opts = "accel=xen", +}; +#endif + static void pc_machine_init(void) { qemu_register_machine(&pc_machine); @@ -399,6 +413,9 @@ static void pc_machine_init(void) qemu_register_machine(&pc_machine_v0_11); qemu_register_machine(&pc_machine_v0_10); qemu_register_machine(&isapc_machine); +#ifdef CONFIG_XEN + qemu_register_machine(&xenfv_machine); +#endif } machine_init(pc_machine_init); diff --git a/hw/xen.h b/hw/xen.h index 1fefe3a..726360a 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -31,4 +31,8 @@ static inline int xen_enabled(void) int xen_init(void); +#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 +# define HVM_MAX_VCPUS 32 +#endif + #endif /* QEMU_HW_XEN_H */ -- 1.7.2.3