qemu: use enum when setting PCI "multi" value, not 0 or 1

Use the VIR_TRISTATE_SWITCH_* enums appropriately.

No functional change.
This commit is contained in:
Laine Stump 2016-01-11 15:12:08 -05:00
parent bd04ad42e7
commit 47b830370a

View File

@ -1,7 +1,7 @@
/* /*
* qemu_command.c: QEMU command generation * 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 * Copyright (C) 2006 Daniel P. Berrange
* *
* This library is free software; you can redistribute it and/or * 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)); memset(&tmp_addr, 0, sizeof(tmp_addr));
tmp_addr.slot = 0x1F; tmp_addr.slot = 0x1F;
tmp_addr.function = 0; tmp_addr.function = 0;
tmp_addr.multi = 1; tmp_addr.multi = VIR_TRISTATE_SWITCH_ON;
if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags,
false, false) < 0) false, false) < 0)
goto cleanup; goto cleanup;
tmp_addr.function = 3; tmp_addr.function = 3;
tmp_addr.multi = 0; tmp_addr.multi = VIR_TRISTATE_SWITCH_ABSENT;
if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags,
false, false) < 0) false, false) < 0)
goto cleanup; goto cleanup;
@ -2623,7 +2623,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
addrs->lastaddr = addr; addrs->lastaddr = addr;
addrs->lastaddr.function = 0; addrs->lastaddr.function = 0;
addrs->lastaddr.multi = 0; addrs->lastaddr.multi = VIR_TRISTATE_SWITCH_ABSENT;
} }
/* Finally we can reserve the slot+function */ /* Finally we can reserve the slot+function */
if (virDomainPCIAddressReserveAddr(addrs, &addr, flags, if (virDomainPCIAddressReserveAddr(addrs, &addr, flags,