Give an automatically generated ID to a device that wasn't given one
by the user.
Signed-off-by: John Arbuckle <programmingk...@gmail.com>
---
Replaced my original ID generation code with Jeff Cody's id_generate()
function.
qdev-monitor.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index f9e2d62..a9c54bd 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -574,18 +574,12 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
id = qemu_opts_id(opts);
if (id) {
dev->id = id;
+ } else {
+ dev->id = id_generate(ID_QDEV);
}
- if (dev->id) {
- object_property_add_child(qdev_get_peripheral(), dev->id,
- OBJECT(dev), NULL);
- } else {
- static int anon_count;
- gchar *name = g_strdup_printf("device[%d]", anon_count++);
- object_property_add_child(qdev_get_peripheral_anon(), name,
+ object_property_add_child(qdev_get_peripheral(), dev->id,
OBJECT(dev), NULL);
- g_free(name);
- }
/* set properties */
if (qemu_opt_foreach(opts, set_property, dev, &err)) {
--
1.7.5.4
