[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/32] qdev/prop: add CharDriverState property.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 02/32] qdev/prop: add CharDriverState property. |
Date: |
Mon, 3 Aug 2009 17:35:18 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qdev-properties.c | 20 ++++++++++++++++++++
hw/qdev.h | 6 ++++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 0e4878e..7edb6b7 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -141,6 +141,21 @@ PropertyInfo qdev_prop_hex64 = {
.print = print_hex64,
};
+/* --- character device --- */
+
+static int print_chr(DeviceState *dev, Property *prop, char *dest, size_t len)
+{
+ CharDriverState **ptr = qdev_get_prop_ptr(dev, prop);
+ return snprintf(dest, len, "%s", (*ptr)->label);
+}
+
+PropertyInfo qdev_prop_chr = {
+ .name = "chr",
+ .type = PROP_TYPE_CHR,
+ .size = sizeof(CharDriverState*),
+ .print = print_chr,
+};
+
/* --- pointer --- */
static int print_ptr(DeviceState *dev, Property *prop, char *dest, size_t len)
@@ -325,6 +340,11 @@ void qdev_prop_set_uint64(DeviceState *dev, const char
*name, uint64_t value)
qdev_prop_set(dev, name, &value, PROP_TYPE_UINT64);
}
+void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState
*value)
+{
+ qdev_prop_set(dev, name, &value, PROP_TYPE_CHR);
+}
+
void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value)
{
qdev_prop_set(dev, name, &value, PROP_TYPE_PTR);
diff --git a/hw/qdev.h b/hw/qdev.h
index e2703f4..bff13fa 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;
@@ -62,6 +63,7 @@ enum PropertyType {
PROP_TYPE_UINT64,
PROP_TYPE_TADDR,
PROP_TYPE_MACADDR,
+ PROP_TYPE_CHR,
PROP_TYPE_PTR,
};
@@ -152,6 +154,7 @@ extern PropertyInfo qdev_prop_uint32;
extern PropertyInfo qdev_prop_uint64;
extern PropertyInfo qdev_prop_hex32;
extern PropertyInfo qdev_prop_hex64;
+extern PropertyInfo qdev_prop_chr;
extern PropertyInfo qdev_prop_ptr;
extern PropertyInfo qdev_prop_macaddr;
extern PropertyInfo qdev_prop_pci_devfn;
@@ -188,6 +191,8 @@ extern PropertyInfo qdev_prop_pci_devfn;
#define DEFINE_PROP_PTR(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*)
+#define DEFINE_PROP_CHR(_n, _s, _f) \
+ DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*)
#define DEFINE_PROP_MACADDR(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, uint8_t[6])
@@ -201,6 +206,7 @@ void qdev_prop_set(DeviceState *dev, const char *name, void
*src, enum PropertyT
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);
void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value);
+void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState
*value);
/* FIXME: Remove opaque pointer properties. */
void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
void qdev_prop_set_defaults(DeviceState *dev, Property *props);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/32] qdev: macros for creating typechecked properties., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 03/32] qdev/prop: convert pci.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 05/32] qdev/prop: convert armv7m.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 02/32] qdev/prop: add CharDriverState property.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 14/32] qdev/prop: convert qdev.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 01/32] qdev/prop: macros for creating typechecked properties., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 06/32] qdev/prop: convert eccmemctl.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 10/32] qdev/prop: convert integratorcp.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 24/32] qdev/prop: convert syborg_pointer.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 08/32] qdev/prop: convert etraxfs_pic.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 11/32] qdev/prop: convert iommu.c to helper macros., Gerd Hoffmann, 2009/08/03
- [Qemu-devel] [PATCH 09/32] qdev/prop: convert i2c.c to helper macros., Gerd Hoffmann, 2009/08/03