aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-07-31 12:25:40 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:27 -0500
commit14b41872fd4ccdb750d539f1f317ae0e070f73a4 (patch)
tree53fc8c557be4d1897bd94238a1d731b2cfc1c85f
parentadd -drive if=none (diff)
downloadqemu-kvm-14b41872fd4ccdb750d539f1f317ae0e070f73a4.tar.gz
qemu-kvm-14b41872fd4ccdb750d539f1f317ae0e070f73a4.tar.bz2
qemu-kvm-14b41872fd4ccdb750d539f1f317ae0e070f73a4.zip
qdev/prop: add drive property.
Adds a (host) drive property, intended to be used by virtual disk backend drivers. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--hw/qdev-properties.c32
-rw-r--r--hw/qdev.h4
2 files changed, 36 insertions, 0 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 0e4878ee8..5a3d10d6f 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,3 +1,4 @@
+#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);
diff --git a/hw/qdev.h b/hw/qdev.h
index 0f0acb13a..91d9f5f18 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -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);