[libvirt] [PATCH] qemu: use enum when setting PCI "multi" value, not 0 or 1

John Ferlan jferlan at redhat.com
Mon Jan 11 18:56:39 UTC 2016



On 01/11/2016 01:31 PM, Laine Stump wrote:
> From: root <root at vhost2.laine.org>
> 

^^^
If you fix this to something "Use the VIR_TRISTATE_SWITCH_* enums
appropriately.", then

ACK

John
> No functional change.
> ---
> This was suggested by jferlan in an earlier review.
> 
>  src/qemu/qemu_command.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 936a43e..3c9caea 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -1,7 +1,7 @@
>  /*
>   * qemu_command.c: QEMU command generation
>   *
> - * Copyright (C) 2006-2015 Red Hat, Inc.
> + * Copyright (C) 2006-2016 Red Hat, Inc.
>   * Copyright (C) 2006 Daniel P. Berrange
>   *
>   * This library is free software; you can redistribute it and/or
> @@ -2142,12 +2142,12 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
>          memset(&tmp_addr, 0, sizeof(tmp_addr));
>          tmp_addr.slot = 0x1F;
>          tmp_addr.function = 0;
> -        tmp_addr.multi = 1;
> +        tmp_addr.multi = VIR_TRISTATE_SWITCH_ON;
>          if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags,
>                                             false, false) < 0)
>             goto cleanup;
>          tmp_addr.function = 3;
> -        tmp_addr.multi = 0;
> +        tmp_addr.multi = VIR_TRISTATE_SWITCH_ABSENT;
>          if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags,
>                                             false, false) < 0)
>             goto cleanup;
> @@ -2623,7 +2623,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
>  
>                  addrs->lastaddr = addr;
>                  addrs->lastaddr.function = 0;
> -                addrs->lastaddr.multi = 0;
> +                addrs->lastaddr.multi = VIR_TRISTATE_SWITCH_ABSENT;
>              }
>              /* Finally we can reserve the slot+function */
>              if (virDomainPCIAddressReserveAddr(addrs, &addr, flags,
> 




More information about the libvir-list mailing list