[libvirt] [PATCH 2/7] qemu: process: Drop !QEMU_CAPS_DEVICE code

John Ferlan jferlan at redhat.com
Thu May 19 21:23:49 UTC 2016



On 05/19/2016 02:59 PM, Ján Tomko wrote:
> From: Cole Robinson <crobinso at redhat.com>
> 
> Nowadays we only support qemu 0.12.0+ which provides QEMU_CAPS_DEVICE,
> so this is all dead code.
> ---
>  src/qemu/qemu_process.c | 53 ++++++++++++++++++++++---------------------------
>  1 file changed, 24 insertions(+), 29 deletions(-)
> 
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 40c238b..b7c8f25 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c

[...]

> @@ -5981,11 +5978,9 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
>       * we also need to populate the PCI address set cache for later
>       * use in hotplug
>       */
> -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
> -        VIR_DEBUG("Assigning domain PCI addresses");
> -        if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm)) < 0)
> +    VIR_DEBUG("Assigning domain PCI addresses");
> +    if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm)) < 0)
>              goto error;

There's 4 extra spaces on indention for goto error.

John




More information about the libvir-list mailing list