[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/26] Make qemu-config available for tools
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 05/26] Make qemu-config available for tools |
Date: |
Fri, 23 Apr 2010 17:30:37 +0200 |
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 <address@hidden>
---
Makefile.objs | 4 ++--
hw/qdev-properties.c | 19 ++++++++++++++++++-
hw/qdev.h | 1 -
qemu-config.c | 17 -----------------
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index ed7bbda..69d6879 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 157a111..9ffdba7 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -661,7 +661,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);
}
@@ -689,3 +689,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 40373c8..d8fbc73 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 9b5fe78..9f0f143 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;
--
1.6.6.1
- [Qemu-devel] [PULL 00/26] Block patches, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 01/26] qemu-config: qemu_read_config_file() reads the normal config file, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 02/26] qemu-config: Make qemu_config_parse more generic, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 04/26] blkdebug: Inject errors, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 03/26] blkdebug: Basic request passthrough, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 05/26] Make qemu-config available for tools,
Kevin Wolf <=
- [Qemu-devel] [PATCH 06/26] blkdebug: Add events and rules, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 08/26] qcow2: Fix creation of large images, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 09/26] Replace calls of old bdrv_open, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 13/26] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 10/26] block: get rid of the BDRV_O_FILE flag, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 12/26] qcow2: Return 0/-errno in write_l2_entries, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 07/26] qcow2: Trigger blkdebug events, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 11/26] block: split raw_getlength, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 15/26] qcow2: Return 0/-errno in l2_allocate, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 14/26] qcow2: Return 0/-errno in write_l1_entry, Kevin Wolf, 2010/04/23