From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rt9Pv-0007uM-2P for qemu-devel@nongnu.org; Thu, 02 Feb 2012 22:02:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rt9Pt-00061C-AX for qemu-devel@nongnu.org; Thu, 02 Feb 2012 22:02:27 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55611 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rt9Pt-00060t-1f for qemu-devel@nongnu.org; Thu, 02 Feb 2012 22:02:25 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 3 Feb 2012 03:59:33 +0100 Message-Id: <1328237992-14953-3-git-send-email-afaerber@suse.de> In-Reply-To: <1328237992-14953-1-git-send-email-afaerber@suse.de> References: <1328237992-14953-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 v3 02/21] 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.objs | 6 ++++++ Makefile.user | 1 + bsd-user/main.c | 2 ++ configure | 2 ++ darwin-user/main.c | 3 +++ linux-user/main.c | 2 ++ qemu-user.c | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 qemu-user.c diff --git a/Makefile.objs b/Makefile.objs index ec35320..1155cc0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -182,7 +182,11 @@ user-obj-y =3D user-obj-y +=3D envlist.o path.o user-obj-y +=3D tcg-runtime.o host-utils.o user-obj-y +=3D cutils.o cache-utils.o +user-obj-y +=3D module.o +user-obj-y +=3D qemu-user.o user-obj-y +=3D $(trace-obj-y) +user-obj-y +=3D $(qobject-obj-y) +user-obj-y +=3D $(addprefix qom/, $(qom-y)) =20 ###################################################################### # libhw @@ -421,6 +425,8 @@ qapi-obj-y =3D $(addprefix qapi/, $(qapi-nested-y)) common-obj-y +=3D qmp-marshal.o qapi-visit.o qapi-types.o $(qapi-obj-y) common-obj-y +=3D qmp.o hmp.o =20 +user-obj-y +=3D $(qapi-obj-y) + ###################################################################### # guest agent =20 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/configure b/configure index 3b0b300..ee1140e 100755 --- a/configure +++ b/configure @@ -3849,6 +3849,8 @@ fi d=3Dlibuser mkdir -p $d mkdir -p $d/trace +mkdir -p $d/qapi +mkdir -p $d/qom symlink $source_path/Makefile.user $d/Makefile =20 if test "$docs" =3D "yes" ; then 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) { diff --git a/qemu-user.c b/qemu-user.c new file mode 100644 index 0000000..51b2649 --- /dev/null +++ b/qemu-user.c @@ -0,0 +1,37 @@ +/* + * Stubs for QEMU user emulation + * + * Copyright (c) 2012 SUSE LINUX Products GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see + * + */ + +#include "qemu-common.h" +#include "monitor.h" + +Monitor *cur_mon; + +int monitor_cur_is_qmp(void) +{ + return 0; +} + +void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) +{ +} + +void monitor_set_error(Monitor *mon, QError *qerror) +{ +} --=20 1.7.7