[libvirt] [PATCH] qemu: command: Ignore QEMU_CAPS_DEVICE when building drive alias

[Peter Krempa]

On Sun, May 15, 2016 at 17:03:55 -0400, Cole Robinson wrote:
> QEMU_CAPS_DEVICE is always set nowadays, so we can drop the
> non-DEVICE code paths
> ---
>  src/qemu/qemu_command.c | 12 ++++--------
>  src/qemu/qemu_command.h |  3 +--
>  src/qemu/qemu_hotplug.c |  4 ++--
>  3 files changed, 7 insertions(+), 12 deletions(-)

[...]

> diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
> index d5ad1b2..c777701 100644
> --- a/src/qemu/qemu_command.h
> +++ b/src/qemu/qemu_command.h
> @@ -96,8 +96,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def,
>                           size_t vhostfdSize,
>                           virQEMUCapsPtr qemuCaps);
>  
> -char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
> -                               virQEMUCapsPtr qemuCaps);
> +char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk);

ACK, although it's weird that this function is only used in the hotplug
code. This has probably to do with the very weird command line generator
code for drives which actually clears QEMU_CAPS_DEVICE in certain cases
and then sets it back once finished.

I have to finish the patches getting rid of that oddity.

Peter
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20160516/f87cc0e4/attachment-0001.sig>