Commit e8cd45c7 authored by Vasilis Liaskovitis's avatar Vasilis Liaskovitis Committed by Anthony Liguori
Browse files

qdev: Add SIZE type to qdev properties 



This patch adds a 'SIZE' type property to qdev.

Signed-off-by: default avatarIan Molton <ian.molton@collabora.co.uk>
Signed-off-by: default avatarVasilis Liaskovitis <vasilis.liaskovitis@profitbricks.com>
Signed-off-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Message-id: 1375109277-25561-7-git-send-email-imammedo@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent b8877962

hw/core/qdev-properties.c

+55 −0
Original line number Diff line number Diff line
@@ -1135,3 +1135,58 @@ void qdev_prop_set_globals(DeviceState *dev, Error **errp) 
        class = object_class_get_parent(class);

    } while (class);

}



/* --- 64bit unsigned int 'size' type --- */



static void get_size(Object *obj, Visitor *v, void *opaque,

                     const char *name, Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;

    uint64_t *ptr = qdev_get_prop_ptr(dev, prop);



    visit_type_size(v, ptr, name, errp);

}



static void set_size(Object *obj, Visitor *v, void *opaque,

                     const char *name, Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;

    uint64_t *ptr = qdev_get_prop_ptr(dev, prop);



    visit_type_size(v, ptr, name, errp);

}



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

{

    uint64_t *ptr = qdev_get_prop_ptr(dev, prop);

    Error *errp = NULL;



    if (str != NULL) {

        parse_option_size(prop->name, str, ptr, &errp);

    }

    assert_no_error(errp);

    return 0;

}



static int print_size(DeviceState *dev, Property *prop, char *dest, size_t len)

{

    uint64_t *ptr = qdev_get_prop_ptr(dev, prop);

    char suffixes[] = {'T', 'G', 'M', 'K', 'B'};

    int i = 0;

    uint64_t div;



    for (div = (long int)1 << 40; !(*ptr / div) ; div >>= 10) {

        i++;

    }

    return snprintf(dest, len, "%0.03f%c", (double)*ptr/div, suffixes[i]);

}



PropertyInfo qdev_prop_size = {

    .name  = "size",

    .parse = parse_size,

    .print = print_size,

    .get = get_size,

    .set = set_size,

};

include/hw/qdev-properties.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ extern PropertyInfo qdev_prop_uint64; 
extern PropertyInfo qdev_prop_hex8;

extern PropertyInfo qdev_prop_hex32;

extern PropertyInfo qdev_prop_hex64;

extern PropertyInfo qdev_prop_size;

extern PropertyInfo qdev_prop_string;

extern PropertyInfo qdev_prop_chr;

extern PropertyInfo qdev_prop_ptr;
@@ -116,6 +117,8 @@ extern PropertyInfo qdev_prop_arraylen; 
    DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex32, uint32_t)

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

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

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

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

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

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

include/qemu/option.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest, 
    QEMUOptionParameter *list);

QEMUOptionParameter *parse_option_parameters(const char *param,

    QEMUOptionParameter *list, QEMUOptionParameter *dest);

void parse_option_size(const char *name, const char *value,

                       uint64_t *ret, Error **errp);

void free_option_parameters(QEMUOptionParameter *list);

void print_option_parameters(QEMUOptionParameter *list);

void print_option_help(QEMUOptionParameter *list);

util/qemu-option.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void parse_option_number(const char *name, const char *value, 
    }

}



static void parse_option_size(const char *name, const char *value,

void parse_option_size(const char *name, const char *value,

                       uint64_t *ret, Error **errp)

{

    char *postfix;