Re: [libvirt] [PATCH v3 02/18] qemu: replace a lot of "def->controllers[i]" with equivalent "cont"
On Tue, 2016-09-20 at 15:14 -0400, Laine Stump wrote:
> There's no functional change here. This pointer was just used so many
> times that the extra long lines became annoying.
> ---
> src/qemu/qemu_domain_address.c | 100
>+
> 1 file changed, 51 insertions(+), 49 deletions(-)
[...]
> @@ -798,21 +800,21 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
> if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr,
> flags, false, true) <
>0)
> goto cleanup;
> -def->controllers[i]->info.type
> +cont->info.type
> = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
You can now join this line with the one above it :)
> -def->controllers[i]->info.addr.pci.domain = 0;
> -def->controllers[i]->info.addr.pci.bus = 0;
> -def->controllers[i]->info.addr.pci.slot = tmp_addr.slot;
> -def->controllers[i]->info.addr.pci.function = 0;
> -def->controllers[i]->info.addr.pci.multi
> +cont->info.addr.pci.domain = 0;
> +cont->info.addr.pci.bus = 0;
> +cont->info.addr.pci.slot = tmp_addr.slot;
> +cont->info.addr.pci.function = 0;
> +cont->info.addr.pci.multi
> = VIR_TRISTATE_SWITCH_ON;
Same here.
[...]
> @@ -1014,9 +1018,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
> * controller/bus to connect it to on the upstream side.
> */
> flags = virDomainPCIControllerModelToConnectType(model);
> -if (virDomainPCIAddressReserveNextSlot(addrs,
> -
> &def->controllers[i]->info,
> - flags) < 0)
> +if (virDomainPCIAddressReserveNextSlot(addrs, &cont->info,
> flags) < 0)
This is >80 columns, so "flags) < 0)" will have to remain
on its own line.
[...]
> @@ -1147,12 +1151,10 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
> false, foundAddr) < 0)
> goto error;
>
> -def->controllers[i]->info.type =
> VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
> -def->controllers[i]->info.addr.pci = addr;
> +cont->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
> +cont->info.addr.pci = addr;
> } else {
> -if (virDomainPCIAddressReserveNextSlot(addrs,
> -
> &def->controllers[i]->info,
> - flags) < 0)
> +if (virDomainPCIAddressReserveNextSlot(addrs, &cont->info,
> flags) < 0)
Same here.
ACK once you address the comments above.
--
Andrea Bolognani / Red Hat / Virtualization
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH v3 02/18] qemu: replace a lot of "def->controllers[i]" with equivalent "cont"
There's no functional change here. This pointer was just used so many
times that the extra long lines became annoying.
---
src/qemu/qemu_domain_address.c | 100 +
1 file changed, 51 insertions(+), 49 deletions(-)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index bb16738..dc4e4ee 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -743,36 +743,38 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE;
for (i = 0; i < def->ncontrollers; i++) {
-switch (def->controllers[i]->type) {
+virDomainControllerDefPtr cont = def->controllers[i];
+
+switch (cont->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SATA:
/* Verify that the first SATA controller is at 00:1F.2 the
* q35 machine type *always* has a SATA controller at this
* address.
*/
-if (def->controllers[i]->idx == 0) {
-if
(virDeviceInfoPCIAddressPresent(&def->controllers[i]->info)) {
-if (def->controllers[i]->info.addr.pci.domain != 0 ||
-def->controllers[i]->info.addr.pci.bus != 0 ||
-def->controllers[i]->info.addr.pci.slot != 0x1F ||
-def->controllers[i]->info.addr.pci.function != 2) {
+if (cont->idx == 0) {
+if (virDeviceInfoPCIAddressPresent(&cont->info)) {
+if (cont->info.addr.pci.domain != 0 ||
+cont->info.addr.pci.bus != 0 ||
+cont->info.addr.pci.slot != 0x1F ||
+cont->info.addr.pci.function != 2) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Primary SATA controller must have
PCI address 0:0:1f.2"));
goto cleanup;
}
} else {
-def->controllers[i]->info.type =
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
-def->controllers[i]->info.addr.pci.domain = 0;
-def->controllers[i]->info.addr.pci.bus = 0;
-def->controllers[i]->info.addr.pci.slot = 0x1F;
-def->controllers[i]->info.addr.pci.function = 2;
+cont->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
+cont->info.addr.pci.domain = 0;
+cont->info.addr.pci.bus = 0;
+cont->info.addr.pci.slot = 0x1F;
+cont->info.addr.pci.function = 2;
}
}
break;
case VIR_DOMAIN_CONTROLLER_TYPE_USB:
-if ((def->controllers[i]->model
+if ((cont->model
== VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1) &&
-(def->controllers[i]->info.type
+(cont->info.type
== VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)) {
/* Try to assign the first found USB2 controller to
* 00:1D.0 and 2nd to 00:1A.0 (because that is their
@@ -798,21 +800,21 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr,
flags, false, true) < 0)
goto cleanup;
-def->controllers[i]->info.type
+cont->info.type
= VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
-def->controllers[i]->info.addr.pci.domain = 0;
-def->controllers[i]->info.addr.pci.bus = 0;
-def->controllers[i]->info.addr.pci.slot = tmp_addr.slot;
-def->controllers[i]->info.addr.pci.function = 0;
-def->controllers[i]->info.addr.pci.multi
+cont->info.addr.pci.domain = 0;
+cont->info.addr.pci.bus = 0;
+cont->info.addr.pci.slot = tmp_addr.slot;
+cont->info.addr.pci.function = 0;
+cont->info.addr.pci.multi
= VIR_TRISTATE_SWITCH_ON;
}
}
break;
case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
-if (def->controllers[i]->model ==
VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE &&
-def->controllers[i]->info.type ==
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE &&
+cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
/* Try to assign this bridge to 00:1E.0 (because that
* is its standard location on real hardware) unless
* it's already taken, but don't insist on it.
@@ -823,11 +825,11 @@ qemuDomainValid
