[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/32] block/qdev: Allow node name for drive properti
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 17/32] block/qdev: Allow node name for drive properties |
Date: |
Fri, 8 Jul 2016 19:21:29 +0200 |
If a node name instead of a BlockBackend name is specified as the driver
for a guest device, an anonymous BlockBackend is created now.
usb-storage uses a hack where it forwards its BlockBackend as a property
to another device that it internally creates. This hack must be updated
so that it doesn't drop its original BB before it can be passed to the
other device. This used to work because we always had the monitor
reference around, but with node-names the device reference is the only
one now.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
hw/core/qdev-properties-system.c | 37 ++++++++++++++++++++++++++++++++-----
hw/usb/dev-storage.c | 5 ++++-
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index df38b8a..53079b8 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -72,12 +72,21 @@ static void parse_drive(DeviceState *dev, const char *str,
void **ptr,
const char *propname, Error **errp)
{
BlockBackend *blk;
+ bool blk_created = false;
blk = blk_by_name(str);
if (!blk) {
+ BlockDriverState *bs = bdrv_lookup_bs(NULL, str, NULL);
+ if (bs) {
+ blk = blk_new();
+ blk_insert_bs(blk, bs);
+ blk_created = true;
+ }
+ }
+ if (!blk) {
error_setg(errp, "Property '%s.%s' can't find value '%s'",
object_get_typename(OBJECT(dev)), propname, str);
- return;
+ goto fail;
}
if (blk_attach_dev(blk, dev) < 0) {
DriveInfo *dinfo = blk_legacy_dinfo(blk);
@@ -91,9 +100,16 @@ static void parse_drive(DeviceState *dev, const char *str,
void **ptr,
error_setg(errp, "Drive '%s' is already in use by another device",
str);
}
- return;
+ goto fail;
}
+
*ptr = blk;
+
+fail:
+ if (blk_created) {
+ /* If we need to keep a reference, blk_attach_dev() took it */
+ blk_unref(blk);
+ }
}
static void release_drive(Object *obj, const char *name, void *opaque)
@@ -127,7 +143,7 @@ static void set_drive(Object *obj, Visitor *v, const char
*name, void *opaque,
PropertyInfo qdev_prop_drive = {
.name = "str",
- .description = "ID of a drive to use as a backend",
+ .description = "Node name or ID of a block device to use as a backend",
.get = get_drive,
.set = set_drive,
.release = release_drive,
@@ -362,8 +378,19 @@ PropertyInfo qdev_prop_vlan = {
void qdev_prop_set_drive(DeviceState *dev, const char *name,
BlockBackend *value, Error **errp)
{
- object_property_set_str(OBJECT(dev), value ? blk_name(value) : "",
- name, errp);
+ const char *ref = "";
+
+ if (value) {
+ ref = blk_name(value);
+ if (!*ref) {
+ BlockDriverState *bs = blk_bs(value);
+ if (bs) {
+ ref = bdrv_get_node_name(bs);
+ }
+ }
+ }
+
+ object_property_set_str(OBJECT(dev), ref, name, errp);
}
void qdev_prop_set_chr(DeviceState *dev, const char *name,
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 4d605b8..78038a2 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -609,10 +609,12 @@ static void usb_msd_realize_storage(USBDevice *dev, Error
**errp)
* a SCSI bus that can serve only a single device, which it
* creates automatically. But first it needs to detach from its
* blockdev, or else scsi_bus_legacy_add_drive() dies when it
- * attaches again.
+ * attaches again. We also need to take another reference so that
+ * blk_detach_dev() doesn't free blk while we still need it.
*
* The hack is probably a bad idea.
*/
+ blk_ref(blk);
blk_detach_dev(blk, &s->dev.qdev);
s->conf.blk = NULL;
@@ -623,6 +625,7 @@ static void usb_msd_realize_storage(USBDevice *dev, Error
**errp)
scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,
s->conf.bootindex, dev->serial,
&err);
+ blk_unref(blk);
if (!scsi_dev) {
error_propagate(errp, err);
return;
--
1.8.3.1
- [Qemu-devel] [PULL 12/32] osdep: Introduce qemu_dup, (continued)
- [Qemu-devel] [PULL 12/32] osdep: Introduce qemu_dup, Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 04/32] block: Use block_job_get() in find_block_job(), Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 03/32] blockjob: Add block_job_get(), Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 14/32] coroutine: use QSIMPLEQ instead of QTAILQ, Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 06/32] mirror: Add 'job-id' parameter to 'blockdev-mirror' and 'drive-mirror', Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 15/32] test-coroutine: prepare for the next patch, Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 02/32] blockjob: Update description of the 'id' field, Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 13/32] raw-posix: Use qemu_dup, Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 05/32] blockjob: Add 'job_id' parameter to block_job_create(), Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 07/32] backup: Add 'job-id' parameter to 'blockdev-backup' and 'drive-backup', Kevin Wolf, 2016/07/08
- [Qemu-devel] [PULL 17/32] block/qdev: Allow node name for drive properties,
Kevin Wolf <=
- [Qemu-devel] [PULL 19/32] commit: Fix use of error handling policy, Kevin Wolf, 2016/07/08
[Qemu-devel] [PULL 18/32] block/qdev: Allow configuring WCE with qdev properties, Kevin Wolf, 2016/07/08
[Qemu-devel] [PULL 08/32] stream: Add 'job-id' parameter to 'block-stream', Kevin Wolf, 2016/07/08
[Qemu-devel] [PULL 10/32] qemu-img: Set the ID of the block job in img_commit(), Kevin Wolf, 2016/07/08
[Qemu-devel] [PULL 20/32] block/qdev: Allow configuring rerror/werror with qdev properties, Kevin Wolf, 2016/07/08