From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: Re: Re: [Qemu-devel] [PATCH V11 02/15] xen: Make Xen build once. Date: Mon, 28 Mar 2011 15:50:13 +0100 Message-ID: References: <1299004529-31290-1-git-send-email-anthony.perard@citrix.com> <1299004529-31290-3-git-send-email-anthony.perard@citrix.com> <315066AB-DAF8-4665-A987-CBB0DD553F47@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <315066AB-DAF8-4665-A987-CBB0DD553F47@suse.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Alexander Graf Cc: Xen Devel , QEMU-devel , Anthony Liguori , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org On Wed, Mar 23, 2011 at 10:57, Alexander Graf wrote: > > On 01.03.2011, at 19:35, Anthony.Perard@citrix.com wrote: > >> 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 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2=A03 +++ >> Makefile.target =C2=A0 =C2=A0 =C2=A0| =C2=A0 =C2=A02 +- >> hw/xen_domainbuild.c | =C2=A0 10 +++++----- >> hw/xen_domainbuild.h | =C2=A0 =C2=A05 +++-- >> hw/xen_machine_pv.c =C2=A0| =C2=A0 =C2=A02 +- >> 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) +=3D dp8393x.o >> hw-obj-$(CONFIG_DS1225Y) +=3D ds1225y.o >> hw-obj-$(CONFIG_MIPSNET) +=3D mipsnet.o >> >> +# Xen >> +hw-obj-$(CONFIG_XEN) +=3D xen_domainbuild.o > > Why is this in generic code? Xen is x86 only and really should stay that = way IMHO. I just try to build more object globally to avoid unnecessary i386-isms. >> + >> # Sound >> sound-obj-y =3D >> sound-obj-$(CONFIG_SB16) +=3D 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 +=3D $(VNC_JPEG_CFLAGS) >> QEMU_CFLAGS +=3D $(VNC_PNG_CFLAGS) >> >> # xen backend driver support >> -obj-$(CONFIG_XEN) +=3D xen_machine_pv.o xen_domainbuild.o >> +obj-i386-$(CONFIG_XEN) +=3D xen_machine_pv.o >> >> # Inter-VM PCI shared memory >> obj-$(CONFIG_KVM) +=3D 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, >> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0const char *cmdline) >> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0const char *cmdline, ram_addr_t ram_size) > > Isn't ram_size a global anyways? What's the rationale behind moving it to= a parameter? Not saying I'm against it, just missed the reasoning here :) I put ram_size in a parameter because I don't found a way to access to is global variable, and also because in these function, ram_size is read only. So, I can just remove this patch and just put both xen_machine_pv xen_domainbuild in obj-i386-y. Regards, --=20 Anthony PERARD