External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Fix initialization value of 'multi' in PCI address

Browse Source 
The 'multi' element in PCI address struct used as 'virTristateSwitch',
and its default value is 'VIR_TRISTATE_SWITCH_ABSENT'. Current PCI
process use 'false' to initialization 'multi', which is ambiguously
for assignment or comparison. This patch use '{0}' to initialize
the whole PCI address struct, which fix the 'multi' initialization
and makes code more simplify and explicitly.

Signed-off-by: Xian Han Yu <xhyubj@linux.vnet.ibm.com>
This commit is contained in:
Xian Han Yu 2016-08-15 06:22:25 +02:00 committed by Martin Kletzander
parent 4c3b3ea399
commit f7658da6b3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_addr.c
View File

@ -590,7 +590,7 @@ virDomainPCIAddressGetNextSlot(virDomainPCIAddressSetPtr addrs,
/* default to starting the search for a free slot from /* default to starting the search for a free slot from
* the first slot of domain 0 bus 0... * the first slot of domain 0 bus 0...
*/ */
virPCIDeviceAddress a = { 0, 0, 0, 0, false }; virPCIDeviceAddress a = {0};
char *addrStr = NULL; char *addrStr = NULL;
if (addrs->nbuses == 0) { if (addrs->nbuses == 0) {

2
src/conf/node_device_conf.c
View File

@ -1164,7 +1164,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt,
goto cleanup; goto cleanup;
for (i = 0; i < nAddrNodes; i++) { for (i = 0; i < nAddrNodes; i++) {
virPCIDeviceAddress addr = { 0, 0, 0, 0, 0 }; virPCIDeviceAddress addr = {0};
if (virPCIDeviceAddressParseXML(addrNodes[i], &addr) < 0) if (virPCIDeviceAddressParseXML(addrNodes[i], &addr) < 0)
goto cleanup; goto cleanup;
if (VIR_ALLOC(pciAddr) < 0) if (VIR_ALLOC(pciAddr) < 0)

2
src/qemu/qemu_domain_address.c
View File

@ -1096,7 +1096,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
/* USB2 needs special handling to put all companions in the same slot */ /* USB2 needs special handling to put all companions in the same slot */
if (IS_USB2_CONTROLLER(def->controllers[i])) { if (IS_USB2_CONTROLLER(def->controllers[i])) {
virPCIDeviceAddress addr = { 0, 0, 0, 0, false }; virPCIDeviceAddress addr = {0};
bool foundAddr = false; bool foundAddr = false;
memset(&tmp_addr, 0, sizeof(tmp_addr)); memset(&tmp_addr, 0, sizeof(tmp_addr));