david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: add string property.

Browse Source 
Patchworks-ID: 35755
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-10-12 17:15:47 +05:30 committed by Anthony Liguori
parent 6cfa64de90
commit 59419663a1
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/qdev-properties.c
View File

@ -193,6 +193,34 @@ PropertyInfo qdev_prop_hex64 = {
.print = print_hex64, .print = print_hex64,
}; };
/* --- string --- */
static int parse_string(DeviceState *dev, Property *prop, const char *str)
{
char **ptr = qdev_get_prop_ptr(dev, prop);
if (*ptr)
qemu_free(*ptr);
*ptr = qemu_strdup(str);
return 0;
}
static int print_string(DeviceState *dev, Property *prop, char *dest, size_t len)
{
char **ptr = qdev_get_prop_ptr(dev, prop);
if (!*ptr)
return snprintf(dest, len, "<null>");
return snprintf(dest, len, "\"%s\"", *ptr);
}
PropertyInfo qdev_prop_string = {
.name = "string",
.type = PROP_TYPE_STRING,
.size = sizeof(char*),
.parse = parse_string,
.print = print_string,
};
/* --- drive --- */ /* --- drive --- */
static int parse_drive(DeviceState *dev, Property *prop, const char *str) static int parse_drive(DeviceState *dev, Property *prop, const char *str)

4
hw/qdev.h
View File

@ -79,6 +79,7 @@ enum PropertyType {
PROP_TYPE_MACADDR, PROP_TYPE_MACADDR,
PROP_TYPE_DRIVE, PROP_TYPE_DRIVE,
PROP_TYPE_CHR, PROP_TYPE_CHR,
PROP_TYPE_STRING,
PROP_TYPE_PTR, PROP_TYPE_PTR,
}; };
@ -186,6 +187,7 @@ extern PropertyInfo qdev_prop_int32;
extern PropertyInfo qdev_prop_uint64; extern PropertyInfo qdev_prop_uint64;
extern PropertyInfo qdev_prop_hex32; extern PropertyInfo qdev_prop_hex32;
extern PropertyInfo qdev_prop_hex64; extern PropertyInfo qdev_prop_hex64;
extern PropertyInfo qdev_prop_string;
extern PropertyInfo qdev_prop_chr; extern PropertyInfo qdev_prop_chr;
extern PropertyInfo qdev_prop_ptr; extern PropertyInfo qdev_prop_ptr;
extern PropertyInfo qdev_prop_macaddr; extern PropertyInfo qdev_prop_macaddr;
@ -227,6 +229,8 @@ extern PropertyInfo qdev_prop_pci_devfn;
DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*) DEFINE_PROP(_n, _s, _f, qdev_prop_ptr, void*)
#define DEFINE_PROP_CHR(_n, _s, _f) \ #define DEFINE_PROP_CHR(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*) DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharDriverState*)
#define DEFINE_PROP_STRING(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*)
#define DEFINE_PROP_DRIVE(_n, _s, _f) \ #define DEFINE_PROP_DRIVE(_n, _s, _f) \
DEFINE_PROP(_n, _s, _f, qdev_prop_drive, DriveInfo*) DEFINE_PROP(_n, _s, _f, qdev_prop_drive, DriveInfo*)
#define DEFINE_PROP_MACADDR(_n, _s, _f) \ #define DEFINE_PROP_MACADDR(_n, _s, _f) \