Commit 14b41872 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

qdev/prop: add drive property. 



Adds a (host) drive property, intended to be used by virtual disk
backend drivers.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Message-Id:
parent a8659e90

hw/qdev-properties.c

+32 −0
Original line number Diff line number Diff line 
#include "sysemu.h"

#include "qdev.h"



void *qdev_get_prop_ptr(DeviceState *dev, Property *prop)
@@ -141,6 +142,32 @@ PropertyInfo qdev_prop_hex64 = { 
    .print = print_hex64,

};



/* --- drive --- */



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

{

    DriveInfo **ptr = qdev_get_prop_ptr(dev, prop);



    *ptr = drive_get_by_id(str);

    if (*ptr == NULL)

        return -1;

    return 0;

}



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

{

    DriveInfo **ptr = qdev_get_prop_ptr(dev, prop);

    return snprintf(dest, len, "%s", (*ptr)->id);

}



PropertyInfo qdev_prop_drive = {

    .name  = "drive",

    .type  = PROP_TYPE_DRIVE,

    .size  = sizeof(DriveInfo*),

    .parse = parse_drive,

    .print = print_drive,

};



/* --- pointer --- */



static int print_ptr(DeviceState *dev, Property *prop, char *dest, size_t len)
@@ -325,6 +352,11 @@ void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value) 
    qdev_prop_set(dev, name, &value, PROP_TYPE_UINT64);

}



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

{

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

}



void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value)

{

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

hw/qdev.h

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define QDEV_H



#include "hw.h"

#include "sysemu.h"

#include "sys-queue.h"

#include "qemu-option.h"
@@ -63,6 +64,7 @@ enum PropertyType { 
    PROP_TYPE_UINT64,

    PROP_TYPE_TADDR,

    PROP_TYPE_MACADDR,

    PROP_TYPE_DRIVE,

    PROP_TYPE_PTR,

};
@@ -155,6 +157,7 @@ extern PropertyInfo qdev_prop_hex32; 
extern PropertyInfo qdev_prop_hex64;

extern PropertyInfo qdev_prop_ptr;

extern PropertyInfo qdev_prop_macaddr;

extern PropertyInfo qdev_prop_drive;

extern PropertyInfo qdev_prop_pci_devfn;



/* Set properties between creation and init.  */
@@ -164,6 +167,7 @@ void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyT 
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_uint64(DeviceState *dev, const char *name, uint64_t value);

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

/* FIXME: Remove opaque pointer properties.  */

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

void qdev_prop_set_defaults(DeviceState *dev, Property *props);