[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/48] qdev: Remove legacy parsers for hex8/32/64
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 37/48] qdev: Remove legacy parsers for hex8/32/64 |
Date: |
Mon, 10 Feb 2014 19:36:54 +0100 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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.4.5
- [Qemu-devel] [PULL 23/48] tests: Add pcnet qtest, (continued)
- [Qemu-devel] [PULL 23/48] tests: Add pcnet qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 24/48] tests: Add eepro100 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 26/48] tests: Add virtio-net qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 32/48] ipoctal232: QOM parent field cleanup, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 31/48] ipack: QOM parent field cleanup for IPackDevice, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 34/48] qtest: Don't segfault with invalid -qtest option, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 35/48] qapi: Add size parser to StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 39/48] qdev: Legacy properties are just strings, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 36/48] qdev: Sizes are now parsed by StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 37/48] qdev: Remove legacy parsers for hex8/32/64,
Andreas Färber <=
- [Qemu-devel] [PULL 46/48] qdev: Add enum property types to QAPI schema, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 43/48] qdev: Remove most legacy printers, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 42/48] qdev: Use human mode in "info qtree", Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 48/48] qapi: Refine human printing of sizes, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 41/48] qapi: Add human mode to StringOutputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 45/48] block: Handle "rechs" and "large" translation options, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 38/48] qdev: Legacy properties are now read-only, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 47/48] qdev: Use QAPI type names for properties, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 40/48] qdev: Inline qdev_prop_parse(), Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 44/48] qdev: Remove hex8/32/64 property types, Andreas Färber, 2014/02/10