From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWd5-0002Rx-DW for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWcs-00067y-TW for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:35 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41669 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcs-00067r-JC for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:22 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:47 +0100 Message-Id: <1392675899-21210-38-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 37/49] qdev: Remove legacy parsers for hex8/32/64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Paolo Bonzini The hexNN property types have not been accepting values not prefixed by "0x" since QEMU 1.2. Parse those values as decimals now. Reviewed-by: Igor Mammedov Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- hw/core/qdev-properties.c | 54 -----------------------------------------= ------ 1 file changed, 54 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index da37710..e223ce1 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -189,23 +189,6 @@ PropertyInfo qdev_prop_uint8 =3D { =20 /* --- 8bit hex value --- */ =20 -static int parse_hex8(DeviceState *dev, Property *prop, const char *str) -{ - uint8_t *ptr =3D qdev_get_prop_ptr(dev, prop); - char *end; - - if (str[0] !=3D '0' || str[1] !=3D 'x') { - return -EINVAL; - } - - *ptr =3D strtoul(str, &end, 16); - if ((*end !=3D '\0') || (end =3D=3D str)) { - return -EINVAL; - } - - return 0; -} - static int print_hex8(DeviceState *dev, Property *prop, char *dest, size= _t len) { uint8_t *ptr =3D qdev_get_prop_ptr(dev, prop); @@ -215,7 +198,6 @@ static int print_hex8(DeviceState *dev, Property *pro= p, char *dest, size_t len) PropertyInfo qdev_prop_hex8 =3D { .name =3D "uint8", .legacy_name =3D "hex8", - .parse =3D parse_hex8, .print =3D print_hex8, .get =3D get_uint8, .set =3D set_uint8, @@ -320,23 +302,6 @@ PropertyInfo qdev_prop_int32 =3D { =20 /* --- 32bit hex value --- */ =20 -static int parse_hex32(DeviceState *dev, Property *prop, const char *str= ) -{ - uint32_t *ptr =3D qdev_get_prop_ptr(dev, prop); - char *end; - - if (str[0] !=3D '0' || str[1] !=3D 'x') { - return -EINVAL; - } - - *ptr =3D strtoul(str, &end, 16); - if ((*end !=3D '\0') || (end =3D=3D str)) { - return -EINVAL; - } - - return 0; -} - static int print_hex32(DeviceState *dev, Property *prop, char *dest, siz= e_t len) { uint32_t *ptr =3D qdev_get_prop_ptr(dev, prop); @@ -346,7 +311,6 @@ static int print_hex32(DeviceState *dev, Property *pr= op, char *dest, size_t len) PropertyInfo qdev_prop_hex32 =3D { .name =3D "uint32", .legacy_name =3D "hex32", - .parse =3D parse_hex32, .print =3D print_hex32, .get =3D get_uint32, .set =3D set_uint32, @@ -387,23 +351,6 @@ PropertyInfo qdev_prop_uint64 =3D { =20 /* --- 64bit hex value --- */ =20 -static int parse_hex64(DeviceState *dev, Property *prop, const char *str= ) -{ - uint64_t *ptr =3D qdev_get_prop_ptr(dev, prop); - char *end; - - if (str[0] !=3D '0' || str[1] !=3D 'x') { - return -EINVAL; - } - - *ptr =3D strtoull(str, &end, 16); - if ((*end !=3D '\0') || (end =3D=3D str)) { - return -EINVAL; - } - - return 0; -} - static int print_hex64(DeviceState *dev, Property *prop, char *dest, siz= e_t len) { uint64_t *ptr =3D qdev_get_prop_ptr(dev, prop); @@ -413,7 +360,6 @@ static int print_hex64(DeviceState *dev, Property *pr= op, char *dest, size_t len) PropertyInfo qdev_prop_hex64 =3D { .name =3D "uint64", .legacy_name =3D "hex64", - .parse =3D parse_hex64, .print =3D print_hex64, .get =3D get_uint64, .set =3D set_uint64, --=20 1.8.4.5