Commit 316940b0 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by malc
Browse files

qdev: add property type for 32bit signed integers. 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 679a37af

hw/qdev-properties.c

+28 −0
Original line number Diff line number Diff line
@@ -64,6 +64,29 @@ PropertyInfo qdev_prop_uint32 = { 
    .print = print_uint32,

};



static int parse_int32(DeviceState *dev, Property *prop, const char *str)

{

    int32_t *ptr = qdev_get_prop_ptr(dev, prop);



    if (sscanf(str, "%" PRId32, ptr) != 1)

        return -1;

    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",

    .type  = PROP_TYPE_INT32,

    .size  = sizeof(int32_t),

    .parse = parse_int32,

    .print = print_int32,

};



/* --- 32bit hex value --- */



static int parse_hex32(DeviceState *dev, Property *prop, const char *str)
@@ -367,6 +390,11 @@ void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value) 
    qdev_prop_set(dev, name, &value, PROP_TYPE_UINT32);

}



void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value)

{

    qdev_prop_set(dev, name, &value, PROP_TYPE_INT32);

}



void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value)

{

    qdev_prop_set(dev, name, &value, PROP_TYPE_UINT64);

hw/qdev.h

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ enum PropertyType { 
    PROP_TYPE_UNSPEC = 0,

    PROP_TYPE_UINT16,

    PROP_TYPE_UINT32,

    PROP_TYPE_INT32,

    PROP_TYPE_UINT64,

    PROP_TYPE_TADDR,

    PROP_TYPE_MACADDR,
@@ -156,6 +157,7 @@ void do_info_qdm(Monitor *mon); 


extern PropertyInfo qdev_prop_uint16;

extern PropertyInfo qdev_prop_uint32;

extern PropertyInfo qdev_prop_int32;

extern PropertyInfo qdev_prop_uint64;

extern PropertyInfo qdev_prop_hex32;

extern PropertyInfo qdev_prop_hex64;
@@ -183,6 +185,8 @@ extern PropertyInfo qdev_prop_pci_devfn; 
    DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint16, uint16_t)

#define DEFINE_PROP_UINT32(_n, _s, _f, _d)                      \

    DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint32, uint32_t)

#define DEFINE_PROP_INT32(_n, _s, _f, _d)                      \

    DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_int32, int32_t)

#define DEFINE_PROP_UINT64(_n, _s, _f, _d)                      \

    DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_uint64, uint64_t)

#define DEFINE_PROP_HEX32(_n, _s, _f, _d)                       \
@@ -210,6 +214,7 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value); 
void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type);

void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value);

void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value);

void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value);

void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value);

void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState *value);

void qdev_prop_set_drive(DeviceState *dev, const char *name, DriveInfo *value);