From nobody Mon Dec 15 23:27:39 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1495199045913783.9244634798112; Fri, 19 May 2017 06:04:05 -0700 (PDT) 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 1571A793FC; Fri, 19 May 2017 13:04:01 +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 D9F375C7C4; Fri, 19 May 2017 13:04:00 +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 82312180BAFC; Fri, 19 May 2017 13:04:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4JD3g7m003857 for ; Fri, 19 May 2017 09:03:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4DB2A18871; Fri, 19 May 2017 13:03:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-18.phx2.redhat.com [10.3.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CEFB5C6A0 for ; Fri, 19 May 2017 13:03:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1571A793FC Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1571A793FC From: John Ferlan To: libvir-list@redhat.com Date: Fri, 19 May 2017 09:03:22 -0400 Message-Id: <20170519130324.4624-15-jferlan@redhat.com> In-Reply-To: <20170519130324.4624-1-jferlan@redhat.com> References: <20170519130324.4624-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/16] network: Adjust virNetworkObjNew call and return 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: , MIME-Version: 1.0 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.25]); Fri, 19 May 2017 13:04:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Have the call take a virNetworkDefPtr and save it in the object. Have virNetworkObjNew return a locked obj Avoids the need for a virNetworkObjSetDef type API for the one test need. Update the test code and do some other name changes to make it look like other code. Signed-off-by: John Ferlan --- src/conf/virnetworkobj.c | 10 +++++----- src/conf/virnetworkobj.h | 2 +- tests/networkxml2conftest.c | 13 +++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 4f32767..fa1e396 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -69,7 +69,7 @@ virNetworkObjOnceInit(void) VIR_ONCE_GLOBAL_INIT(virNetworkObj) =20 virNetworkObjPtr -virNetworkObjNew(void) +virNetworkObjNew(virNetworkDefPtr def) { virNetworkObjPtr obj; =20 @@ -87,6 +87,9 @@ virNetworkObjNew(void) ignore_value(virBitmapSetBit(obj->classIdMap, 1)); ignore_value(virBitmapSetBit(obj->classIdMap, 2)); =20 + virObjectLock(obj); + obj->def =3D def; + return obj; =20 error: @@ -650,16 +653,13 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr net= s, goto cleanup; } =20 - if (!(obj =3D virNetworkObjNew())) + if (!(obj =3D virNetworkObjNew(def))) goto cleanup; =20 - virObjectLock(obj); - virUUIDFormat(def->uuid, uuidstr); if (virHashAddEntry(nets->objs, uuidstr, obj) < 0) goto cleanup; =20 - obj->def =3D def; obj->persistent =3D !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); virObjectRef(obj); } diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 666c2a5..b81ffa8 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -48,7 +48,7 @@ struct _virNetworkObj { }; =20 virNetworkObjPtr -virNetworkObjNew(void); +virNetworkObjNew(virNetworkDefPtr def); =20 virNetworkDefPtr virNetworkObjGetDef(virNetworkObjPtr obj); diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index ab3c13a..6cbfa55 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -23,20 +23,21 @@ testCompareXMLToConfFiles(const char *inxml, const char= *outconf, dnsmasqCapsPtr { char *actual =3D NULL; int ret =3D -1; - virNetworkDefPtr dev =3D NULL; + virNetworkDefPtr def =3D NULL; virNetworkObjPtr obj =3D NULL; + virNetworkDefPtr objdef; virCommandPtr cmd =3D NULL; char *pidfile =3D NULL; dnsmasqContext *dctx =3D NULL; =20 - if (!(dev =3D virNetworkDefParseFile(inxml))) + if (!(def =3D virNetworkDefParseFile(inxml))) goto fail; =20 - if (!(obj =3D virNetworkObjNew())) + if (!(obj =3D virNetworkObjNew(def))) goto fail; + objdef =3D virNetworkObjGetDef(obj); =20 - obj->def =3D dev; - dctx =3D dnsmasqContextNew(dev->name, "/var/lib/libvirt/dnsmasq"); + dctx =3D dnsmasqContextNew(objdef->name, "/var/lib/libvirt/dnsmasq"); =20 if (dctx =3D=3D NULL) goto fail; @@ -66,7 +67,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *= outconf, dnsmasqCapsPtr VIR_FREE(actual); VIR_FREE(pidfile); virCommandFree(cmd); - virObjectUnref(obj); + virNetworkObjEndAPI(&obj); dnsmasqContextFree(dctx); return ret; } --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list