From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4ju-0007aP-JJ for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WC4jm-0004H8-7Z for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:22 -0500 Received: from mail-ea0-x229.google.com ([2a00:1450:4013:c01::229]:37338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4jm-0004Gv-1U for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:14 -0500 Received: by mail-ea0-f169.google.com with SMTP id h10so2025409eak.14 for ; Sat, 08 Feb 2014 02:02:13 -0800 (PST) Received: from yakj.usersys.redhat.com.cz (auth47-172.fi.muni.cz. [147.251.47.172]) by mx.google.com with ESMTPSA id k41sm27156087een.19.2014.02.08.02.02.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Feb 2014 02:02:12 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 8 Feb 2014 11:01:46 +0100 Message-Id: <1391853717-3837-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1391853717-3837-1-git-send-email-pbonzini@redhat.com> References: <1391853717-3837-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 03/14] 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 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 --- 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 = { /* --- 8bit hex value --- */ -static int parse_hex8(DeviceState *dev, Property *prop, const char *str) -{ - uint8_t *ptr = qdev_get_prop_ptr(dev, prop); - char *end; - - if (str[0] != '0' || str[1] != 'x') { - return -EINVAL; - } - - *ptr = strtoul(str, &end, 16); - if ((*end != '\0') || (end == str)) { - return -EINVAL; - } - - return 0; -} - static int print_hex8(DeviceState *dev, Property *prop, char *dest, size_t len) { uint8_t *ptr = qdev_get_prop_ptr(dev, prop); @@ -215,7 +198,6 @@ static int print_hex8(DeviceState *dev, Property *prop, char *dest, size_t len) PropertyInfo qdev_prop_hex8 = { .name = "uint8", .legacy_name = "hex8", - .parse = parse_hex8, .print = print_hex8, .get = get_uint8, .set = set_uint8, @@ -320,23 +302,6 @@ PropertyInfo qdev_prop_int32 = { /* --- 32bit hex value --- */ -static int parse_hex32(DeviceState *dev, Property *prop, const char *str) -{ - uint32_t *ptr = qdev_get_prop_ptr(dev, prop); - char *end; - - if (str[0] != '0' || str[1] != 'x') { - return -EINVAL; - } - - *ptr = strtoul(str, &end, 16); - if ((*end != '\0') || (end == str)) { - return -EINVAL; - } - - return 0; -} - static int print_hex32(DeviceState *dev, Property *prop, char *dest, size_t len) { uint32_t *ptr = qdev_get_prop_ptr(dev, prop); @@ -346,7 +311,6 @@ static int print_hex32(DeviceState *dev, Property *prop, char *dest, size_t len) PropertyInfo qdev_prop_hex32 = { .name = "uint32", .legacy_name = "hex32", - .parse = parse_hex32, .print = print_hex32, .get = get_uint32, .set = set_uint32, @@ -387,23 +351,6 @@ PropertyInfo qdev_prop_uint64 = { /* --- 64bit hex value --- */ -static int parse_hex64(DeviceState *dev, Property *prop, const char *str) -{ - uint64_t *ptr = qdev_get_prop_ptr(dev, prop); - char *end; - - if (str[0] != '0' || str[1] != 'x') { - return -EINVAL; - } - - *ptr = strtoull(str, &end, 16); - if ((*end != '\0') || (end == str)) { - return -EINVAL; - } - - return 0; -} - static int print_hex64(DeviceState *dev, Property *prop, char *dest, size_t len) { uint64_t *ptr = qdev_get_prop_ptr(dev, prop); @@ -413,7 +360,6 @@ static int print_hex64(DeviceState *dev, Property *prop, char *dest, size_t len) PropertyInfo qdev_prop_hex64 = { .name = "uint64", .legacy_name = "hex64", - .parse = parse_hex64, .print = print_hex64, .get = get_uint64, .set = set_uint64, -- 1.8.5.3