[Qemu-devel] [PATCH 1/2] Introduce CharDriverState qdev property type

[Anthony Liguori]

Signed-off-by: Anthony Liguori <address@hidden>
---
 hw/qdev-properties.c |   23 +++++++++++++++++++++++
 hw/qdev.h            |    4 ++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 06c25af..bfe77d1 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -145,6 +145,24 @@ PropertyInfo qdev_prop_macaddr = {
     .print = print_mac,
 };
 
+/* -- character device --- */
+
+static int print_chrdev(DeviceState *dev, Property *prop, char *dest, size_t 
len)
+{
+    void **ptr = qdev_get_prop_ptr(dev, prop);
+    CharDriverState *chr = *ptr;
+
+    return snprintf(dest, len, "chr: %s", chr->label);
+}
+
+PropertyInfo qdev_prop_chrdev = {
+    .name  = "chrdev",
+    .type  = PROP_TYPE_CHRDEV,
+    .size  = sizeof(CharDriverState*),
+    .print = print_chrdev,
+};
+
+
 /* --- public helpers --- */
 
 static Property *qdev_prop_walk(Property *props, const char *name)
@@ -229,6 +247,11 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, 
void *value)
     qdev_prop_set(dev, name, &value, PROP_TYPE_PTR);
 }
 
+void qdev_prop_set_chrdev(DeviceState *dev, const char *name, CharDriverState 
*value)
+{
+    qdev_prop_set(dev, name, &value, PROP_TYPE_CHRDEV);
+}
+
 void qdev_prop_set_defaults(DeviceState *dev, Property *props)
 {
     char *dst;
diff --git a/hw/qdev.h b/hw/qdev.h
index 11744fa..97722b1 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -3,6 +3,7 @@
 
 #include "hw.h"
 #include "sys-queue.h"
+#include "qemu-char.h"
 
 typedef struct Property Property;
 
@@ -61,6 +62,7 @@ enum PropertyType {
     PROP_TYPE_TADDR,
     PROP_TYPE_MACADDR,
     PROP_TYPE_PTR,
+    PROP_TYPE_CHRDEV,
 };
 
 struct PropertyInfo {
@@ -148,6 +150,7 @@ extern PropertyInfo qdev_prop_uint32;
 extern PropertyInfo qdev_prop_hex32;
 extern PropertyInfo qdev_prop_ptr;
 extern PropertyInfo qdev_prop_macaddr;
+extern PropertyInfo qdev_prop_chrdev;
 
 /* Set properties between creation and init.  */
 void *qdev_get_prop_ptr(DeviceState *dev, Property *prop);
@@ -157,6 +160,7 @@ void qdev_prop_set_uint16(DeviceState *dev, const char 
*name, uint16_t value);
 void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value);
 /* FIXME: Remove opaque pointer properties.  */
 void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
+void qdev_prop_set_chrdev(DeviceState *dev, const char *name, CharDriverState 
*chr);
 void qdev_prop_set_defaults(DeviceState *dev, Property *props);
 
 void qdev_prop_register_compat(CompatProperty *props);
-- 
1.6.2.5