[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] qdev/compat: compat property infrastructure.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/7] qdev/compat: compat property infrastructure. |
Date: |
Mon, 13 Jul 2009 11:40:44 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/boards.h | 1 +
hw/qdev-properties.c | 19 +++++++++++++++++++
hw/qdev.c | 1 +
hw/qdev.h | 11 +++++++++++
vl.c | 2 ++
5 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/hw/boards.h b/hw/boards.h
index f6733b7..5a07d07 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -17,6 +17,7 @@ typedef struct QEMUMachine {
int use_scsi;
int max_cpus;
int is_default;
+ struct CompatProperty *compat_props;
struct QEMUMachine *next;
} QEMUMachine;
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 3c31e31..7f58d69 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -240,3 +240,22 @@ void qdev_prop_set_defaults(DeviceState *dev, Property
*props)
}
}
+static CompatProperty *compat_props;
+
+void qdev_register_compat_props(CompatProperty *props)
+{
+ compat_props = props;
+}
+
+void qdev_prop_set_compat(DeviceState *dev)
+{
+ CompatProperty *prop;
+
+ if (!compat_props)
+ return;
+ for (prop = compat_props; prop->driver != NULL; prop++) {
+ if (strcmp(dev->info->name, prop->driver) != 0)
+ continue;
+ qdev_prop_parse(dev, prop->property, prop->value);
+ }
+}
diff --git a/hw/qdev.c b/hw/qdev.c
index a075e86..669a642 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -98,6 +98,7 @@ DeviceState *qdev_create(BusState *bus, const char *name)
dev->parent_bus = bus;
qdev_prop_set_defaults(dev, dev->info->props);
qdev_prop_set_defaults(dev, dev->parent_bus->info->props);
+ qdev_prop_set_compat(dev);
LIST_INSERT_HEAD(&bus->children, dev, sibling);
return dev;
}
diff --git a/hw/qdev.h b/hw/qdev.h
index 6b35961..7f70934 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -8,6 +8,8 @@ typedef struct Property Property;
typedef struct PropertyInfo PropertyInfo;
+typedef struct CompatProperty CompatProperty;
+
typedef struct DeviceInfo DeviceInfo;
typedef struct BusState BusState;
@@ -61,6 +63,12 @@ struct PropertyInfo {
int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);
};
+struct CompatProperty {
+ const char *driver;
+ const char *property;
+ const char *value;
+};
+
/*** Board API. This should go away once we have a machine config file. ***/
DeviceState *qdev_create(BusState *bus, const char *name);
@@ -144,4 +152,7 @@ int qdev_prop_set_uint32(DeviceState *dev, const char
*name, uint32_t value);
int qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
void qdev_prop_set_defaults(DeviceState *dev, Property *props);
+void qdev_register_compat_props(CompatProperty *props);
+void qdev_prop_set_compat(DeviceState *dev);
+
#endif
diff --git a/vl.c b/vl.c
index cdc7b8a..5402787 100644
--- a/vl.c
+++ b/vl.c
@@ -5911,6 +5911,8 @@ int main(int argc, char **argv, char **envp)
module_call_init(MODULE_INIT_DEVICE);
+ if (machine->compat_props)
+ qdev_register_compat_props(machine->compat_props);
machine->init(ram_size, boot_devices,
kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
--
1.6.2.5
- [Qemu-devel] [PATCH v2 0/7] qdev: compat properties., Gerd Hoffmann, 2009/07/13
- [Qemu-devel] [PATCH 4/7] qdev/compat: add pc-0.10 machine type., Gerd Hoffmann, 2009/07/13
- [Qemu-devel] [PATCH 3/7] qdev/compat: compat property infrastructure.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/7] qdev/compat: virtio-blk-pci 0.10 compatibility., Gerd Hoffmann, 2009/07/13
- [Qemu-devel] [PATCH 7/7] qdev/compat: virtio-net-pci 0.10 compatibility., Gerd Hoffmann, 2009/07/13
- [Qemu-devel] [PATCH 1/7] cleanup: drop unused struct elements from VirtIOPCIProxy., Gerd Hoffmann, 2009/07/13
- [Qemu-devel] [PATCH 6/7] qdev/compat: virtio-balloon-pci 0.10 compatibility., Gerd Hoffmann, 2009/07/13