From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsZnO-0004Hg-7H for qemu-devel@nongnu.org; Wed, 01 Feb 2012 08:00:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RsZn9-0005Lu-5p for qemu-devel@nongnu.org; Wed, 01 Feb 2012 08:00:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:37165 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsZn8-0005Kw-Kk for qemu-devel@nongnu.org; Wed, 01 Feb 2012 08:00:02 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 1 Feb 2012 13:57:20 +0100 Message-Id: <1328101045-10717-4-git-send-email-afaerber@suse.de> In-Reply-To: <1328101045-10717-1-git-send-email-afaerber@suse.de> References: <1328101045-10717-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RFC v2 3/8] qom: Add QOM support to user emulators List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Link the Object base class and the module infrastructure for class registration. Call QOM module init. Signed-off-by: Andreas F=C3=A4rber Cc: Anthony Liguori --- Makefile.target | 6 ++++++ Makefile.user | 1 + bsd-user/main.c | 2 ++ darwin-user/main.c | 3 +++ linux-user/main.c | 2 ++ 5 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Makefile.target b/Makefile.target index 68481a3..d1b7867 100644 --- a/Makefile.target +++ b/Makefile.target @@ -129,6 +129,8 @@ obj-m68k-y +=3D m68k-sim.o m68k-semi.o =20 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) =20 +obj-y +=3D module.o +obj-y +=3D $(addprefix ../qom/, $(qom-y)) obj-y +=3D $(addprefix ../libuser/, $(user-obj-y)) obj-y +=3D $(addprefix ../libdis-user/, $(libdis-y)) obj-y +=3D $(libobj-y) @@ -156,6 +158,8 @@ obj-i386-y +=3D ioport-user.o =20 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) =20 +obj-y +=3D module.o +obj-y +=3D $(addprefix ../qom/, $(qom-y)) obj-y +=3D $(addprefix ../libuser/, $(user-obj-y)) obj-y +=3D $(addprefix ../libdis-user/, $(libdis-y)) obj-y +=3D $(libobj-y) @@ -178,6 +182,8 @@ obj-i386-y +=3D ioport-user.o =20 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) =20 +obj-y +=3D module.o +obj-y +=3D $(addprefix ../qom/, $(qom-y)) obj-y +=3D $(addprefix ../libuser/, $(user-obj-y)) obj-y +=3D $(addprefix ../libdis-user/, $(libdis-y)) obj-y +=3D $(libobj-y) diff --git a/Makefile.user b/Makefile.user index 2b1e4d1..72d01c1 100644 --- a/Makefile.user +++ b/Makefile.user @@ -9,6 +9,7 @@ include $(SRC_PATH)/rules.mak $(call set-vpath, $(SRC_PATH)) =20 QEMU_CFLAGS+=3D-I.. +QEMU_CFLAGS+=3D-I$(SRC_PATH)/include =20 include $(SRC_PATH)/Makefile.objs =20 diff --git a/bsd-user/main.c b/bsd-user/main.c index cc7d4a3..cdb0d0a 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -748,6 +748,8 @@ int main(int argc, char **argv) if (argc <=3D 1) usage(); =20 + module_call_init(MODULE_INIT_QOM); + if ((envlist =3D envlist_create()) =3D=3D NULL) { (void) fprintf(stderr, "Unable to allocate envlist\n"); exit(1); diff --git a/darwin-user/main.c b/darwin-user/main.c index 9b57c20..e1519c7 100644 --- a/darwin-user/main.c +++ b/darwin-user/main.c @@ -28,6 +28,7 @@ #include =20 #include "qemu.h" +#include "qemu-common.h" =20 #define DEBUG_LOGFILE "/tmp/qemu.log" =20 @@ -749,6 +750,8 @@ int main(int argc, char **argv) if (argc <=3D 1) usage(); =20 + module_call_init(MODULE_INIT_QOM); + optind =3D 1; for(;;) { if (optind >=3D argc) diff --git a/linux-user/main.c b/linux-user/main.c index 64d2208..f55109c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3278,6 +3278,8 @@ int main(int argc, char **argv, char **envp) int i; int ret; =20 + module_call_init(MODULE_INIT_QOM); + qemu_cache_utils_init(envp); =20 if ((envlist =3D envlist_create()) =3D=3D NULL) { --=20 1.7.7