From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfSSF-0003BY-90 for qemu-devel@nongnu.org; Thu, 23 May 2013 06:09:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UfSSA-0005ni-UX for qemu-devel@nongnu.org; Thu, 23 May 2013 06:09:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfSSA-0005nU-Mp for qemu-devel@nongnu.org; Thu, 23 May 2013 06:08:58 -0400 Message-ID: <519DEAA4.3090209@redhat.com> Date: Thu, 23 May 2013 12:08:36 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1369228150-5428-1-git-send-email-afaerber@suse.de> <1369228150-5428-5-git-send-email-afaerber@suse.de> In-Reply-To: <1369228150-5428-5-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-cpu 4/4] memory_mapping: Move stubs to libqemustub.a List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Vincent Rabin , Qiao Nuohan , qemu-devel@nongnu.org, Jens Freimann Il 22/05/2013 15:09, Andreas F=C3=A4rber ha scritto: > Allows us to drop CONFIG_NO_GET_MEMORY_MAPPING with its indirect > dependency on CONFIG_HAVE_GET_MEMORY_MAPPING in Makefile.target. >=20 > Signed-off-by: Andreas F=C3=A4rber > --- > Makefile.target | 2 -- > stubs/Makefile.objs | 1 + > memory_mapping-stub.c =3D> stubs/memory_mapping.c | 5 +++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > rename memory_mapping-stub.c =3D> stubs/memory_mapping.c (85%) >=20 > diff --git a/Makefile.target b/Makefile.target > index 5b02200..efc0b11 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -63,7 +63,6 @@ all: $(PROGS) stap > CONFIG_NO_PCI =3D $(if $(subst n,,$(CONFIG_PCI)),n,y) > CONFIG_NO_KVM =3D $(if $(subst n,,$(CONFIG_KVM)),n,y) > CONFIG_NO_XEN =3D $(if $(subst n,,$(CONFIG_XEN)),n,y) > -CONFIG_NO_GET_MEMORY_MAPPING =3D $(if $(subst n,,$(CONFIG_HAVE_GET_MEM= ORY_MAPPING)),n,y) > =20 > ######################################################### > # cpu emulator library > @@ -112,7 +111,6 @@ obj-$(CONFIG_KVM) +=3D kvm-all.o > obj-y +=3D memory.o savevm.o cputlb.o > obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) +=3D memory_mapping.o > obj-y +=3D dump.o memory_mapping_common.o > -obj-$(CONFIG_NO_GET_MEMORY_MAPPING) +=3D memory_mapping-stub.o > LIBS+=3D$(libs_softmmu) > =20 > # xen support > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > index 9b701b4..b0bca4d 100644 > --- a/stubs/Makefile.objs > +++ b/stubs/Makefile.objs > @@ -10,6 +10,7 @@ stub-obj-y +=3D fdset-remove-fd.o > stub-obj-y +=3D get-fd.o > stub-obj-y +=3D get-vm-name.o > stub-obj-y +=3D iothread-lock.o > +stub-obj-y +=3D memory_mapping.o > stub-obj-y +=3D migr-blocker.o > stub-obj-y +=3D mon-is-qmp.o > stub-obj-y +=3D mon-printf.o > diff --git a/memory_mapping-stub.c b/stubs/memory_mapping.c > similarity index 85% > rename from memory_mapping-stub.c > rename to stubs/memory_mapping.c > index c48ea44..4db2108 100644 > --- a/memory_mapping-stub.c > +++ b/stubs/memory_mapping.c > @@ -11,8 +11,9 @@ > * > */ > =20 > -#include "cpu.h" > -#include "exec/cpu-all.h" > +#include "qemu-common.h" > +#include "exec/cpu-common.h" > +#include "qom/cpu.h" > #include "sysemu/memory_mapping.h" > =20 > int qemu_get_guest_memory_mapping(MemoryMappingList *list) >=20 Patches 1-3 are fine. But I wonder if a better replacement for stubs is methods in CPU. Paolo