OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qdev: drop unnecessary parse/print methods 

More qdev printers could have been removed in the previous series, and
object_property_parse also made several parsers unnecessary.  In fact,
the new code is even more robust with respect to overflows, so clean
them up!

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-02-09 10:12:21 +01:00
parent 0c96e2856e
commit 5cb9b56acf
1 changed files with 0 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
hw/qdev-properties.c
View File

@ -27,16 +27,6 @@ static void bit_prop_set(DeviceState *dev, Property *props, bool val)
}
/* Bit */
static int parse_bit(DeviceState *dev, Property *prop, const char *str)
{
if (!strcasecmp(str, "on"))
bit_prop_set(dev, prop, true);
else if (!strcasecmp(str, "off"))
bit_prop_set(dev, prop, false);
else
return -EINVAL;
return 0;
}
static int print_bit(DeviceState *dev, Property *prop, char *dest, size_t len)
{
@ -79,7 +69,6 @@ static void set_bit(Object *obj, Visitor *v, void *opaque,
PropertyInfo qdev_prop_bit = {
.name = "boolean",
.legacy_name = "on/off",
.parse = parse_bit,
.print = print_bit,
.get = get_bit,
.set = set_bit,
@ -87,26 +76,6 @@ PropertyInfo qdev_prop_bit = {
/* --- 8bit integer --- */
static int parse_uint8(DeviceState *dev, Property *prop, const char *str)
{
uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
char *end;
/* accept both hex and decimal */
*ptr = strtoul(str, &end, 0);
if ((*end != '\0') || (end == str)) {
return -EINVAL;
}
return 0;
}
static int print_uint8(DeviceState *dev, Property *prop, char *dest, size_t len)
{
uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%" PRIu8, *ptr);
}
static void get_int8(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
@ -149,8 +118,6 @@ static void set_int8(Object *obj, Visitor *v, void *opaque,
PropertyInfo qdev_prop_uint8 = {
.name = "uint8",
.parse = parse_uint8,
.print = print_uint8,
.get = get_int8,
.set = set_int8,
.min = 0,
@ -195,26 +162,6 @@ PropertyInfo qdev_prop_hex8 = {
/* --- 16bit integer --- */
static int parse_uint16(DeviceState *dev, Property *prop, const char *str)
{
uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
char *end;
/* accept both hex and decimal */
*ptr = strtoul(str, &end, 0);
if ((*end != '\0') || (end == str)) {
return -EINVAL;
}
return 0;
}
static int print_uint16(DeviceState *dev, Property *prop, char *dest, size_t len)
{
uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%" PRIu16, *ptr);
}
static void get_int16(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
@ -257,8 +204,6 @@ static void set_int16(Object *obj, Visitor *v, void *opaque,
PropertyInfo qdev_prop_uint16 = {
.name = "uint16",
.parse = parse_uint16,
.print = print_uint16,
.get = get_int16,
.set = set_int16,
.min = 0,
@ -267,26 +212,6 @@ PropertyInfo qdev_prop_uint16 = {
/* --- 32bit integer --- */
static int parse_uint32(DeviceState *dev, Property *prop, const char *str)
{
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
char *end;
/* accept both hex and decimal */
*ptr = strtoul(str, &end, 0);
if ((*end != '\0') || (end == str)) {
return -EINVAL;
}
return 0;
}
static int print_uint32(DeviceState *dev, Property *prop, char *dest, size_t len)
{
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%" PRIu32, *ptr);
}
static void get_int32(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
@ -329,37 +254,14 @@ static void set_int32(Object *obj, Visitor *v, void *opaque,
PropertyInfo qdev_prop_uint32 = {
.name = "uint32",
.parse = parse_uint32,
.print = print_uint32,
.get = get_int32,
.set = set_int32,
.min = 0,
.max = 0xFFFFFFFFULL,
};
static int parse_int32(DeviceState *dev, Property *prop, const char *str)
{
int32_t *ptr = qdev_get_prop_ptr(dev, prop);
char *end;
*ptr = strtol(str, &end, 10);
if ((*end != '\0') || (end == str)) {
return -EINVAL;
}
return 0;
}
static int print_int32(DeviceState *dev, Property *prop, char *dest, size_t len)
{
int32_t *ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%" PRId32, *ptr);
}
PropertyInfo qdev_prop_int32 = {
.name = "int32",
.parse = parse_int32,
.print = print_int32,
.get = get_int32,
.set = set_int32,
.min = -0x80000000LL,
@ -404,26 +306,6 @@ PropertyInfo qdev_prop_hex32 = {
/* --- 64bit integer --- */
static int parse_uint64(DeviceState *dev, Property *prop, const char *str)
{
uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
char *end;
/* accept both hex and decimal */
*ptr = strtoull(str, &end, 0);
if ((*end != '\0') || (end == str)) {
return -EINVAL;
}
return 0;
}
static int print_uint64(DeviceState *dev, Property *prop, char *dest, size_t len)
{
uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%" PRIu64, *ptr);
}
static void get_int64(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
@ -451,8 +333,6 @@ static void set_int64(Object *obj, Visitor *v, void *opaque,
PropertyInfo qdev_prop_uint64 = {
.name = "uint64",
.parse = parse_uint64,
.print = print_uint64,
.get = get_int64,
.set = set_int64,
};
@ -749,19 +629,6 @@ PropertyInfo qdev_prop_netdev = {
/* --- vlan --- */
static int parse_vlan(DeviceState *dev, Property *prop, const char *str)
{
VLANState **ptr = qdev_get_prop_ptr(dev, prop);
int id;
if (sscanf(str, "%d", &id) != 1)
return -EINVAL;
*ptr = qemu_find_vlan(id, 1);
if (*ptr == NULL)
return -ENOENT;
return 0;
}
static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)
{
VLANState **ptr = qdev_get_prop_ptr(dev, prop);
@ -820,7 +687,6 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
PropertyInfo qdev_prop_vlan = {
.name = "vlan",
.parse = parse_vlan,
.print = print_vlan,
.get = get_vlan,
.set = set_vlan,