Re: [libvirt] [PATCH v4 02/25] [ACKED but has additions] qemu: replace a lot of "def->controllers[i]" with equivalent "cont"

On Fri, 2016-10-14 at 15:53 -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. > --- > > Change: added more instances of the same change. > > src/qemu/qemu_domain_address.c | 208 ++++++++++++++++++++++------------------- > 1 file changed, 111 insertions(+), 97 deletions(-) > > diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c > index dc67d51..e6abadf 100644 > --- a/src/qemu/qemu_domain_address.c > +++ b/src/qemu/qemu_domain_address.c > @@ -220,18 +220,22 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, > } > > for (i = 0; i < def->ncontrollers; i++) { > - model = def->controllers[i]->model; > - if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { > + virDomainControllerDefPtr cont = def->controllers[i]; > + > + model = cont->model; > + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { > if (qemuDomainSetSCSIControllerModel(def, qemuCaps, &model) < 0) Definitely not something that should be touched by this patch, but shouldn't we pass &cont->model here? I mean, if the value stored in model will be different than the one that was already in cont->model, it means that the default controller model was not set properly earlier... On the other hand, the default model should really have been set in PostParse() or something like that.