From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55850 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuUQr-0006cA-AF for qemu-devel@nongnu.org; Tue, 01 Mar 2011 13:36:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PuUQq-0002BJ-8W for qemu-devel@nongnu.org; Tue, 01 Mar 2011 13:36:25 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:1859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PuUQq-0002B9-5G for qemu-devel@nongnu.org; Tue, 01 Mar 2011 13:36:24 -0500 From: anthony.perard@citrix.com Date: Tue, 1 Mar 2011 18:35:16 +0000 Message-Id: <1299004529-31290-3-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1299004529-31290-1-git-send-email-anthony.perard@citrix.com> References: <1299004529-31290-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH V11 02/15] xen: Make Xen build once. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel , Anthony Liguori Cc: Anthony PERARD , Xen Devel , Stefano Stabellini From: Anthony PERARD xen_domainbuild is now build in libhw. And xen_machine_pv is build only for i386 targets. Signed-off-by: Anthony PERARD --- Makefile.objs | 3 +++ Makefile.target | 2 +- hw/xen_domainbuild.c | 10 +++++----- hw/xen_domainbuild.h | 5 +++-- hw/xen_machine_pv.c | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 9e98a66..8034115 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -269,6 +269,9 @@ hw-obj-$(CONFIG_DP8393X) += dp8393x.o hw-obj-$(CONFIG_DS1225Y) += ds1225y.o hw-obj-$(CONFIG_MIPSNET) += mipsnet.o +# Xen +hw-obj-$(CONFIG_XEN) += xen_domainbuild.o + # Sound sound-obj-y = sound-obj-$(CONFIG_SB16) += sb16.o diff --git a/Makefile.target b/Makefile.target index 220589e..ab0a570 100644 --- a/Makefile.target +++ b/Makefile.target @@ -206,7 +206,7 @@ QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) QEMU_CFLAGS += $(VNC_PNG_CFLAGS) # xen backend driver support -obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o +obj-i386-$(CONFIG_XEN) += xen_machine_pv.o # Inter-VM PCI shared memory obj-$(CONFIG_KVM) += ivshmem.o diff --git a/hw/xen_domainbuild.c b/hw/xen_domainbuild.c index 7f1fd66..b73d47f 100644 --- a/hw/xen_domainbuild.c +++ b/hw/xen_domainbuild.c @@ -1,9 +1,9 @@ #include -#include "xen_backend.h" -#include "xen_domainbuild.h" #include "sysemu.h" #include "qemu-timer.h" #include "qemu-log.h" +#include "xen_backend.h" +#include "xen_domainbuild.h" #include @@ -49,7 +49,7 @@ static int xenstore_domain_mkdir(char *path) } int xenstore_domain_init1(const char *kernel, const char *ramdisk, - const char *cmdline) + const char *cmdline, ram_addr_t ram_size) { char *dom, uuid_string[42], vm[256], path[256]; int i; @@ -225,7 +225,7 @@ static void xen_domain_cleanup(void) } int xen_domain_build_pv(const char *kernel, const char *ramdisk, - const char *cmdline) + const char *cmdline, ram_addr_t ram_size) { uint32_t ssidref = 0; uint32_t flags = 0; @@ -246,7 +246,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, goto err; } - xenstore_domain_init1(kernel, ramdisk, cmdline); + xenstore_domain_init1(kernel, ramdisk, cmdline, ram_size); rc = xc_domain_max_vcpus(xen_xc, xen_domid, smp_cpus); if (rc < 0) { diff --git a/hw/xen_domainbuild.h b/hw/xen_domainbuild.h index dea0121..49683f8 100644 --- a/hw/xen_domainbuild.h +++ b/hw/xen_domainbuild.h @@ -1,13 +1,14 @@ #ifndef QEMU_HW_XEN_DOMAINBUILD_H #define QEMU_HW_XEN_DOMAINBUILD_H 1 +#include "cpu-common.h" #include "xen_common.h" int xenstore_domain_init1(const char *kernel, const char *ramdisk, - const char *cmdline); + const char *cmdline, ram_addr_t ram_size); int xenstore_domain_init2(int xenstore_port, int xenstore_mfn, int console_port, int console_mfn); int xen_domain_build_pv(const char *kernel, const char *ramdisk, - const char *cmdline); + const char *cmdline, ram_addr_t ram_size); #endif /* QEMU_HW_XEN_DOMAINBUILD_H */ diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 77a34bf..d0e6e8f 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -64,7 +64,7 @@ static void xen_init_pv(ram_addr_t ram_size, break; case XEN_CREATE: if (xen_domain_build_pv(kernel_filename, initrd_filename, - kernel_cmdline) < 0) { + kernel_cmdline, ram_size) < 0) { fprintf(stderr, "xen pv domain creation failed\n"); exit(1); } -- 1.7.2.3