From nobody Tue Dec 16 08:53:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519396091740929.193620301578; Fri, 23 Feb 2018 06:28:11 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D12F0C06A814; Fri, 23 Feb 2018 14:28:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84D356047A; Fri, 23 Feb 2018 14:28:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4C8F918033F1; Fri, 23 Feb 2018 14:28:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1NERmF4032693 for ; Fri, 23 Feb 2018 09:27:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 54FA69C04F; Fri, 23 Feb 2018 14:27:48 +0000 (UTC) Received: from dnr.brq.redhat.com (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF6739C04C for ; Fri, 23 Feb 2018 14:27:47 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 23 Feb 2018 15:27:30 +0100 Message-Id: <6638c832dd2e812ebefa3f85539ff047ef47108c.1519395939.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/16] vboxDumpNetwork: add temp variable for current network X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 23 Feb 2018 14:28:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Instead of using def->nets every time, use a temporary pointer. This will allow splitting out the per-adapter code. Signed-off-by: J=C3=A1n Tomko --- src/vbox/vbox_common.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index cc7772f25..052655ca7 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3726,6 +3726,7 @@ vboxDumpNetwork(virDomainDefPtr def, vboxDriverPtr da= ta, IMachine *machine, PRUi /* Now get the details about the network cards here */ for (i =3D 0; netAdpIncCnt < def->nnets && i < networkAdapterCount; i+= +) { INetworkAdapter *adapter =3D NULL; + virDomainNetDefPtr net =3D def->nets[netAdpIncCnt]; =20 gVBoxAPI.UIMachine.GetNetworkAdapter(machine, i, &adapter); if (adapter) { @@ -3742,18 +3743,18 @@ vboxDumpNetwork(virDomainDefPtr def, vboxDriverPtr = data, IMachine *machine, PRUi gVBoxAPI.UINetworkAdapter.GetAttachmentType(adapter, &atta= chmentType); if (attachmentType =3D=3D NetworkAttachmentType_NAT) { =20 - def->nets[netAdpIncCnt]->type =3D VIR_DOMAIN_NET_TYPE_= USER; + net->type =3D VIR_DOMAIN_NET_TYPE_USER; =20 } else if (attachmentType =3D=3D NetworkAttachmentType_Bri= dged) { PRUnichar *hostIntUtf16 =3D NULL; char *hostInt =3D NULL; =20 - def->nets[netAdpIncCnt]->type =3D VIR_DOMAIN_NET_TYPE_= BRIDGE; + net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; =20 gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter,= &hostIntUtf16); =20 VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt); - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->data.= bridge.brname, hostInt)); + ignore_value(VIR_STRDUP(net->data.bridge.brname, hostI= nt)); =20 VBOX_UTF8_FREE(hostInt); VBOX_UTF16_FREE(hostIntUtf16); @@ -3762,12 +3763,12 @@ vboxDumpNetwork(virDomainDefPtr def, vboxDriverPtr = data, IMachine *machine, PRUi PRUnichar *intNetUtf16 =3D NULL; char *intNet =3D NULL; =20 - def->nets[netAdpIncCnt]->type =3D VIR_DOMAIN_NET_TYPE_= INTERNAL; + net->type =3D VIR_DOMAIN_NET_TYPE_INTERNAL; =20 gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, = &intNetUtf16); =20 VBOX_UTF16_TO_UTF8(intNetUtf16, &intNet); - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->data.= internal.name, intNet)); + ignore_value(VIR_STRDUP(net->data.internal.name, intNe= t)); =20 VBOX_UTF8_FREE(intNet); VBOX_UTF16_FREE(intNetUtf16); @@ -3776,12 +3777,12 @@ vboxDumpNetwork(virDomainDefPtr def, vboxDriverPtr = data, IMachine *machine, PRUi PRUnichar *hostIntUtf16 =3D NULL; char *hostInt =3D NULL; =20 - def->nets[netAdpIncCnt]->type =3D VIR_DOMAIN_NET_TYPE_= NETWORK; + net->type =3D VIR_DOMAIN_NET_TYPE_NETWORK; =20 gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter= , &hostIntUtf16); =20 VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt); - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->data.= network.name, hostInt)); + ignore_value(VIR_STRDUP(net->data.network.name, hostIn= t)); =20 VBOX_UTF8_FREE(hostInt); VBOX_UTF16_FREE(hostIntUtf16); @@ -3790,24 +3791,24 @@ vboxDumpNetwork(virDomainDefPtr def, vboxDriverPtr = data, IMachine *machine, PRUi /* default to user type i.e. NAT in VirtualBox if this * dump is ever used to create a machine. */ - def->nets[netAdpIncCnt]->type =3D VIR_DOMAIN_NET_TYPE_= USER; + net->type =3D VIR_DOMAIN_NET_TYPE_USER; } =20 gVBoxAPI.UINetworkAdapter.GetAdapterType(adapter, &adapter= Type); if (adapterType =3D=3D NetworkAdapterType_Am79C970A) { - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->model= , "Am79C970A")); + ignore_value(VIR_STRDUP(net->model, "Am79C970A")); } else if (adapterType =3D=3D NetworkAdapterType_Am79C973)= { - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->model= , "Am79C973")); + ignore_value(VIR_STRDUP(net->model, "Am79C973")); } else if (adapterType =3D=3D NetworkAdapterType_I82540EM)= { - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->model= , "82540EM")); + ignore_value(VIR_STRDUP(net->model, "82540EM")); } else if (adapterType =3D=3D NetworkAdapterType_I82545EM)= { - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->model= , "82545EM")); + ignore_value(VIR_STRDUP(net->model, "82545EM")); } else if (adapterType =3D=3D NetworkAdapterType_I82543GC)= { - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->model= , "82543GC")); + ignore_value(VIR_STRDUP(net->model, "82543GC")); } else if (gVBoxAPI.APIVersion >=3D 3000051 && adapterType =3D=3D NetworkAdapterType_Virtio) { /* Only vbox 3.1 and later support NetworkAdapterType_= Virto */ - ignore_value(VIR_STRDUP(def->nets[netAdpIncCnt]->model= , "virtio")); + ignore_value(VIR_STRDUP(net->model, "virtio")); } =20 gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &MACAddre= ssUtf16); @@ -3819,8 +3820,7 @@ vboxDumpNetwork(virDomainDefPtr def, vboxDriverPtr da= ta, IMachine *machine, PRUi MACAddress[8], MACAddress[9], MACAddress[10], MAC= Address[11]); =20 /* XXX some real error handling here some day ... */ - ignore_value(virMacAddrParse(macaddr, - &def->nets[netAdpIncCnt]->mac= )); + ignore_value(virMacAddrParse(macaddr, &net->mac)); =20 netAdpIncCnt++; =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list