From 3e90bd67a215adcb997b8c2be5d1d6b83251409f Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Wed, 23 May 2018 15:55:36 +0200 Subject: [PATCH] qemu: address: Handle all the video devices within a single loop Since 133fb140 moved the validation of a video device into a separate function, the code handling PCI slot assignment for video devices has been the same for both the primary device and the secondary devices. Let's merge these and thus handle all the devices within the existing 'for' loop. Signed-off-by: Erik Skultety Reviewed-by: John Ferlan --- src/qemu/qemu_domain_address.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index eb11a660d7..6ea80616af 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2081,15 +2081,9 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, goto error; } - /* Assign a PCI slot to the primary video card if there is not an - * assigned address. */ - if (def->nvideos > 0 && - virDeviceInfoPCIAddressWanted(&def->videos[0]->info)) { - if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[0]->info) < 0) - goto error; - } + /* Video devices */ + for (i = 0; i < def->nvideos; i++) { - for (i = 1; i < def->nvideos; i++) { if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info)) continue; -- 2.47.2