From patchwork Mon Mar 22 10:00:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 48287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9DC29B7CFC for ; Mon, 22 Mar 2010 21:59:46 +1100 (EST) Received: from localhost ([127.0.0.1]:60488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ntf9g-0004MP-VL for incoming@patchwork.ozlabs.org; Mon, 22 Mar 2010 06:46:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NteRc-0004FV-Ld for qemu-devel@nongnu.org; Mon, 22 Mar 2010 06:01:12 -0400 Received: from [199.232.76.173] (port=52955 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NteRb-0004EK-It for qemu-devel@nongnu.org; Mon, 22 Mar 2010 06:01:11 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NteRY-00088H-QF for qemu-devel@nongnu.org; Mon, 22 Mar 2010 06:01:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24532) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NteRX-000885-TY for qemu-devel@nongnu.org; Mon, 22 Mar 2010 06:01:08 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2MA16ax001609 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Mar 2010 06:01:07 -0400 Received: from localhost.localdomain (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2MA0xHr006105; Mon, 22 Mar 2010 06:01:06 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Mon, 22 Mar 2010 11:00:22 +0100 Message-Id: <1269252024-5271-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1269252024-5271-1-git-send-email-kwolf@redhat.com> References: <1269252024-5271-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 5/7] Make qemu-config available for tools X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To be able to use config files for blkdebug, we need to make these functions available in the tools. This involves moving two functions that can only be built in the context of the emulator. Signed-off-by: Kevin Wolf --- Makefile.objs | 4 ++-- hw/qdev-properties.c | 19 ++++++++++++++++++- hw/qdev.h | 1 - qemu-config.c | 17 ----------------- qemu-tool.c | 4 ++++ 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index ece02d5..930408b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -8,7 +8,7 @@ qobject-obj-y += qerror.o # block-obj-y is code used by both qemu system emulation and qemu-img block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o -block-obj-y += nbd.o block.o aio.o aes.o osdep.o +block-obj-y += nbd.o block.o aio.o aes.o osdep.o qemu-config.o block-obj-$(CONFIG_POSIX) += posix-aio-compat.o block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o @@ -76,7 +76,7 @@ common-obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o common-obj-y += qemu-char.o savevm.o #aio.o common-obj-y += msmouse.o ps2.o common-obj-y += qdev.o qdev-properties.o -common-obj-y += qemu-config.o block-migration.o +common-obj-y += block-migration.o common-obj-$(CONFIG_BRLAPI) += baum.o common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 92d6793..d344b80 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -660,7 +660,7 @@ void qdev_prop_set_defaults(DeviceState *dev, Property *props) static QTAILQ_HEAD(, GlobalProperty) global_props = QTAILQ_HEAD_INITIALIZER(global_props); -void qdev_prop_register_global(GlobalProperty *prop) +static void qdev_prop_register_global(GlobalProperty *prop) { QTAILQ_INSERT_TAIL(&global_props, prop, next); } @@ -688,3 +688,20 @@ void qdev_prop_set_globals(DeviceState *dev) } } } + +static int qdev_add_one_global(QemuOpts *opts, void *opaque) +{ + GlobalProperty *g; + + g = qemu_mallocz(sizeof(*g)); + g->driver = qemu_opt_get(opts, "driver"); + g->property = qemu_opt_get(opts, "property"); + g->value = qemu_opt_get(opts, "value"); + qdev_prop_register_global(g); + return 0; +} + +void qemu_add_globals(void) +{ + qemu_opts_foreach(&qemu_global_opts, qdev_add_one_global, NULL, 0); +} diff --git a/hw/qdev.h b/hw/qdev.h index 9475705..3a8e801 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -273,7 +273,6 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value); void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value); void qdev_prop_set_defaults(DeviceState *dev, Property *props); -void qdev_prop_register_global(GlobalProperty *prop); void qdev_prop_register_global_list(GlobalProperty *props); void qdev_prop_set_globals(DeviceState *dev); diff --git a/qemu-config.c b/qemu-config.c index dedf177..ad91133 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -378,23 +378,6 @@ int qemu_global_option(const char *str) return 0; } -static int qemu_add_one_global(QemuOpts *opts, void *opaque) -{ - GlobalProperty *g; - - g = qemu_mallocz(sizeof(*g)); - g->driver = qemu_opt_get(opts, "driver"); - g->property = qemu_opt_get(opts, "property"); - g->value = qemu_opt_get(opts, "value"); - qdev_prop_register_global(g); - return 0; -} - -void qemu_add_globals(void) -{ - qemu_opts_foreach(&qemu_global_opts, qemu_add_one_global, NULL, 0); -} - struct ConfigWriteData { QemuOptsList *list; FILE *fp; diff --git a/qemu-tool.c b/qemu-tool.c index 97ca949..619b7b1 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -128,6 +128,10 @@ void loc_restore(Location *loc) { } +void loc_set_file(const char *fname, int lno) +{ +} + void error_report(const char *fmt, ...) { va_list args;