[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool |
Date: |
Tue, 14 Jun 2011 04:37:42 +0200 |
VMState supports the type bool but qdev instead supports bit, backed by
uint32_t. Therefore let's add DEFINE_PROP_BOOL() and qdev_prop_set_bool().
Since, e.g., enabled=on does not look nice, parse/print "yes" and "no".
Also support on/off as secondary values and vice versa.
Cc: Juan Quintela <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/qdev-properties.c | 43 +++++++++++++++++++++++++++++++++++++++++--
hw/qdev.h | 5 +++++
2 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index eff2d24..3ad6f93 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -40,9 +40,11 @@ static void qdev_prop_cpy(DeviceState *dev, Property *props,
void *src)
/* Bit */
static int parse_bit(DeviceState *dev, Property *prop, const char *str)
{
- if (!strncasecmp(str, "on", 2))
+ if (!strncasecmp(str, "on", 2) ||
+ !strncasecmp(str, "yes", 3))
bit_prop_set(dev, prop, true);
- else if (!strncasecmp(str, "off", 3))
+ else if (!strncasecmp(str, "off", 3) ||
+ !strncasecmp(str, "no", 2))
bit_prop_set(dev, prop, false);
else
return -EINVAL;
@@ -63,6 +65,38 @@ PropertyInfo qdev_prop_bit = {
.print = print_bit,
};
+/* --- bool --- */
+
+static int parse_bool(DeviceState *dev, Property *prop, const char *str)
+{
+ bool *ptr = qdev_get_prop_ptr(dev, prop);
+
+ if (strncasecmp(str, "yes", 3) == 0 ||
+ strncasecmp(str, "on", 2) == 0) {
+ *ptr = true;
+ } else if (strncasecmp(str, "no", 2) == 0 ||
+ strncasecmp(str, "off", 3) == 0) {
+ *ptr = false;
+ } else {
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int print_bool(DeviceState *dev, Property *prop, char *dest, size_t len)
+{
+ bool *ptr = qdev_get_prop_ptr(dev, prop);
+ return snprintf(dest, len, (*ptr) ? "yes" : "no");
+}
+
+PropertyInfo qdev_prop_bool = {
+ .name = "yes/no",
+ .type = PROP_TYPE_BOOL,
+ .size = sizeof(bool),
+ .parse = parse_bool,
+ .print = print_bool,
+};
+
/* --- 8bit integer --- */
static int parse_uint8(DeviceState *dev, Property *prop, const char *str)
@@ -644,6 +678,11 @@ void qdev_prop_set_bit(DeviceState *dev, const char *name,
bool value)
qdev_prop_set(dev, name, &value, PROP_TYPE_BIT);
}
+void qdev_prop_set_bool(DeviceState *dev, const char *name, bool value)
+{
+ qdev_prop_set(dev, name, &value, PROP_TYPE_BOOL);
+}
+
void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value)
{
qdev_prop_set(dev, name, &value, PROP_TYPE_UINT8);
diff --git a/hw/qdev.h b/hw/qdev.h
index 8a13ec9..f05166d 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -101,6 +101,7 @@ enum PropertyType {
PROP_TYPE_VLAN,
PROP_TYPE_PTR,
PROP_TYPE_BIT,
+ PROP_TYPE_BOOL,
};
struct PropertyInfo {
@@ -219,6 +220,7 @@ int do_device_del(Monitor *mon, const QDict *qdict, QObject
**ret_data);
/*** qdev-properties.c ***/
extern PropertyInfo qdev_prop_bit;
+extern PropertyInfo qdev_prop_bool;
extern PropertyInfo qdev_prop_uint8;
extern PropertyInfo qdev_prop_uint16;
extern PropertyInfo qdev_prop_uint32;
@@ -257,6 +259,8 @@ extern PropertyInfo qdev_prop_pci_devfn;
.defval = (bool[]) { (_defval) }, \
}
+#define DEFINE_PROP_BOOL(_n, _s, _f, _d) \
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_bool, bool)
#define DEFINE_PROP_UINT8(_n, _s, _f, _d) \
DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint8, uint8_t)
#define DEFINE_PROP_UINT16(_n, _s, _f, _d) \
@@ -298,6 +302,7 @@ int qdev_prop_exists(DeviceState *dev, const char *name);
int qdev_prop_parse(DeviceState *dev, const char *name, const char *value);
void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum
PropertyType type);
void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value);
+void qdev_prop_set_bool(DeviceState *dev, const char *name, bool value);
void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value);
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);
--
1.7.5.3
- [Qemu-devel] [RFC 00/23] PReP 40P emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH RFC 01/23] prep: Refactor CPU initialization, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 02/23] prep: qdev'ify PCI, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 03/23] prep: Prepare emulation of an IBM RS/6000 6015 / 7020 (40p), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 04/23] 40p: Add PCI host, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 05/23] prep: Add i82374 DMA emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 06/23] prep: Add i82378 PCI-to-ISA bridge emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378), Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool,
Andreas Färber <=
- [Qemu-devel] [PATCH v5 09/23] qdev: Add helpers for reading properties, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 10/23] isa: Provide enable and disable callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 13/23] parallel: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 14/23] serial: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 16/23] fdc: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 17/23] ide: Allow to discard I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 18/23] ide: Implement ISA state callbacks, Andreas Färber, 2011/06/13