From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNua-0006Lf-Lr for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUNuW-000680-RT for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:27 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:36043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNuV-00067N-Ll for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:24 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 8 Jun 2011 20:55:08 +0200 Message-Id: <1307559319-16183-2-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307559319-16183-1-git-send-email-andreas.faerber@web.de> References: <4DEF2F25.5070104@redhat.com> <1307559319-16183-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 01/12] qdev: Add support for property type bool List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com, Juan Quintela 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=3Don does not look nice, parse/print "yes" and "no". Cc: Juan Quintela Signed-off-by: Andreas F=C3=A4rber --- hw/qdev-properties.c | 35 +++++++++++++++++++++++++++++++++++ hw/qdev.h | 5 +++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index eff2d24..e262f9a 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -63,6 +63,36 @@ PropertyInfo qdev_prop_bit =3D { .print =3D print_bit, }; =20 +/* --- bool --- */ + +static int parse_bool(DeviceState *dev, Property *prop, const char *str) +{ + bool *ptr =3D qdev_get_prop_ptr(dev, prop); + + if (strncasecmp(str, "yes", 3) =3D=3D 0) { + *ptr =3D true; + } else if (strncasecmp(str, "no", 2) =3D=3D 0) { + *ptr =3D false; + } else { + return -EINVAL; + } + return 0; +} + +static int print_bool(DeviceState *dev, Property *prop, char *dest, size= _t len) +{ + bool *ptr =3D qdev_get_prop_ptr(dev, prop); + return snprintf(dest, len, (*ptr) ? "yes" : "no"); +} + +PropertyInfo qdev_prop_bool =3D { + .name =3D "yes/no", + .type =3D PROP_TYPE_BOOL, + .size =3D sizeof(bool), + .parse =3D parse_bool, + .print =3D print_bool, +}; + /* --- 8bit integer --- */ =20 static int parse_uint8(DeviceState *dev, Property *prop, const char *str= ) @@ -644,6 +674,11 @@ void qdev_prop_set_bit(DeviceState *dev, const char = *name, bool value) qdev_prop_set(dev, name, &value, PROP_TYPE_BIT); } =20 +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 val= ue) { 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, }; =20 struct PropertyInfo { @@ -219,6 +220,7 @@ int do_device_del(Monitor *mon, const QDict *qdict, Q= Object **ret_data); /*** qdev-properties.c ***/ =20 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 =3D (bool[]) { (_defval) }, \ } =20 +#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 *na= me); int qdev_prop_parse(DeviceState *dev, const char *name, const char *valu= e); void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum P= ropertyType 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 val= ue); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t v= alue); void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t v= alue); --=20 1.7.5.3