[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [RFC PATCH 1/7] block/qdev: Allow node name for drive p
From: |
Eric Blake |
Subject: |
Re: [Qemu-block] [RFC PATCH 1/7] block/qdev: Allow node name for drive properties |
Date: |
Fri, 24 Jun 2016 11:35:59 -0600 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 |
On 06/23/2016 08:36 AM, Kevin Wolf wrote:
> If a node name instead of a BlockBackend name is specified as the driver
> for a guest device, an anonymous BlockBackend is created now.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> hw/core/qdev-properties-system.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/qdev-properties-system.c
> b/hw/core/qdev-properties-system.c
> index df38b8a..c5cc9cf 100644
> --- a/hw/core/qdev-properties-system.c
> +++ b/hw/core/qdev-properties-system.c
> @@ -72,9 +72,18 @@ 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);
So BB name takes priority, but if one is not found, you try a BDS lookup
(node name) and create an anonymous BB to match. Seems okay.
> + 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;
This return is safe, but looks a bit odd...
> @@ -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;
...given that you had to convert this return to a goto.
> }
> +
> *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)
>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-block] [RFC PATCH 0/7] BlockBackends, nodes and guest devices, Kevin Wolf, 2016/06/23
- [Qemu-block] [RFC PATCH 1/7] block/qdev: Allow node name for drive properties, Kevin Wolf, 2016/06/23
- Re: [Qemu-block] [RFC PATCH 1/7] block/qdev: Allow node name for drive properties,
Eric Blake <=
- [Qemu-block] [RFC PATCH 7/7] block/qdev: Allow configuring WCE with qdev properties, Kevin Wolf, 2016/06/23
- [Qemu-block] [RFC PATCH 2/7] block: Add blk_by_dev(), Kevin Wolf, 2016/06/23
- [Qemu-block] [RFC PATCH 4/7] qdev-monitor: Add blk_by_qdev_id(), Kevin Wolf, 2016/06/23
- [Qemu-block] [RFC PATCH 3/7] qdev-monitor: Factor out find_device_state(), Kevin Wolf, 2016/06/23
- [Qemu-block] [RFC PATCH 5/7] block: Accept device model name for blockdev-open/close-tray, Kevin Wolf, 2016/06/23