From nobody Wed May 14 15:26:09 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 1520614308556286.7507859172172; Fri, 9 Mar 2018 08:51:48 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0450346668; Fri, 9 Mar 2018 16:51:47 +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 D1883BABE; Fri, 9 Mar 2018 16:51:46 +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 96D20181BA02; Fri, 9 Mar 2018 16:51:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w29GmhJa000584 for ; Fri, 9 Mar 2018 11:48:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3B77618661; Fri, 9 Mar 2018 16:48:43 +0000 (UTC) Received: from unknown54ee7586bd10.attlocal.net.com (ovpn-116-138.phx2.redhat.com [10.3.116.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED9825DD82 for ; Fri, 9 Mar 2018 16:48:42 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 9 Mar 2018 11:48:12 -0500 Message-Id: <20180309164816.837-17-jferlan@redhat.com> In-Reply-To: <20180309164816.837-1-jferlan@redhat.com> References: <20180309164816.837-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/20] vz: Unify vzDomObjFromDomain{Ref} 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 09 Mar 2018 16:51:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than have two API's doing different things for different callers, let's make one API that will always return a locked and ref counted object. That way, the callers will always know that they must call virDomainObjEndAPI and not have to decide whether they should call virObjectUnlock instead. This will make things consistent with LookupByName which returns the locked and ref counted object. Signed-off-by: John Ferlan --- src/vz/vz_driver.c | 111 ++++++++++++++++++++++++++-----------------------= ---- src/vz/vz_utils.c | 32 +-------------- src/vz/vz_utils.h | 1 - 3 files changed, 56 insertions(+), 88 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6d02ef274..1118ef92f 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -654,7 +654,7 @@ vzDomainGetInfo(virDomainPtr domain, virDomainInfoPtr i= nfo) vzDomObjPtr privdom; int ret =3D -1; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) goto cleanup; =20 if (virDomainGetInfoEnsureACL(domain->conn, dom->def) < 0) @@ -703,7 +703,7 @@ vzDomainGetOSType(virDomainPtr domain) ignore_value(VIR_STRDUP(ret, virDomainOSTypeToString(dom->def->os.type= ))); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -722,7 +722,7 @@ vzDomainIsPersistent(virDomainPtr domain) ret =3D 1; =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -745,7 +745,7 @@ vzDomainGetState(virDomainPtr domain, ret =3D 0; =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -771,7 +771,7 @@ vzDomainGetXMLDesc(virDomainPtr domain, unsigned int fl= ags) ret =3D virDomainDefFormat(def, privconn->driver->caps, flags); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -791,7 +791,7 @@ vzDomainGetAutostart(virDomainPtr domain, int *autostar= t) ret =3D 0; =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -985,7 +985,7 @@ vzDomainGetVcpus(virDomainPtr domain, size_t i; int ret =3D -1; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainGetVcpusEnsureACL(domain->conn, dom->def) < 0) @@ -1087,7 +1087,7 @@ vzDomainSuspend(virDomainPtr domain) int ret =3D -1; bool job =3D false; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainSuspendEnsureACL(domain->conn, dom->def) < 0) @@ -1124,7 +1124,7 @@ vzDomainResume(virDomainPtr domain) int ret =3D -1; bool job =3D false; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainResumeEnsureACL(domain->conn, dom->def) < 0) @@ -1163,7 +1163,7 @@ vzDomainCreateWithFlags(virDomainPtr domain, unsigned= int flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainCreateWithFlagsEnsureACL(domain->conn, dom->def) < 0) @@ -1202,7 +1202,7 @@ vzDomainDestroyFlags(virDomainPtr domain, unsigned in= t flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainDestroyFlagsEnsureACL(domain->conn, dom->def) < 0) @@ -1247,7 +1247,7 @@ vzDomainShutdownFlags(virDomainPtr domain, unsigned i= nt flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainShutdownFlagsEnsureACL(domain->conn, dom->def, flags) < 0) @@ -1291,7 +1291,7 @@ vzDomainReboot(virDomainPtr domain, unsigned int flag= s) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainRebootEnsureACL(domain->conn, dom->def, flags) < 0) @@ -1334,7 +1334,7 @@ static int vzDomainIsActive(virDomainPtr domain) ret =3D virDomainObjIsActive(dom); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); =20 return ret; } @@ -1357,7 +1357,7 @@ vzDomainUndefineFlags(virDomainPtr domain, virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainUndefineFlagsEnsureACL(domain->conn, dom->def) < 0) @@ -1409,7 +1409,7 @@ vzDomainHasManagedSaveImage(virDomainPtr domain, unsi= gned int flags) ret =3D 0; =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); =20 return ret; } @@ -1426,7 +1426,7 @@ vzDomainManagedSave(virDomainPtr domain, unsigned int= flags) virCheckFlags(VIR_DOMAIN_SAVE_RUNNING | VIR_DOMAIN_SAVE_PAUSED, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainManagedSaveEnsureACL(domain->conn, dom->def) < 0) @@ -1469,7 +1469,7 @@ vzDomainManagedSaveRemove(virDomainPtr domain, unsign= ed int flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainManagedSaveRemoveEnsureACL(domain->conn, dom->def) < 0) @@ -1522,7 +1522,7 @@ static int vzDomainAttachDeviceFlags(virDomainPtr dom= ain, const char *xml, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (vzCheckConfigUpdateFlags(dom, &flags) < 0) @@ -1577,7 +1577,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom= ain, const char *xml, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); =20 - dom =3D vzDomObjFromDomainRef(domain); + dom =3D vzDomObjFromDomain(domain); if (dom =3D=3D NULL) return -1; =20 @@ -1634,7 +1634,7 @@ vzDomainSetUserPassword(virDomainPtr domain, bool job =3D false; =20 virCheckFlags(0, -1); - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainSetUserPasswordEnsureACL(domain->conn, dom->def) < 0) @@ -1670,7 +1670,7 @@ static int vzDomainUpdateDeviceFlags(virDomainPtr dom= ain, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainUpdateDeviceFlagsEnsureACL(domain->conn, dom->def, flags)= < 0) @@ -1723,7 +1723,7 @@ vzDomainGetMaxMemory(virDomainPtr domain) ret =3D virDomainDefGetMemoryTotal(dom->def); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -1784,7 +1784,7 @@ vzDomainBlockStats(virDomainPtr domain, virDomainObjPtr dom; int ret =3D -1; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainBlockStatsEnsureACL(domain->conn, dom->def) < 0) @@ -1851,7 +1851,7 @@ vzDomainBlockStatsFlags(virDomainPtr domain, /* We don't return strings, and thus trivially support this flag. */ flags &=3D ~VIR_TYPED_PARAM_STRING_OKAY; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainBlockStatsFlagsEnsureACL(domain->conn, dom->def) < 0) @@ -1880,7 +1880,7 @@ vzDomainInterfaceStats(virDomainPtr domain, vzDomObjPtr privdom; int ret =3D -1; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainInterfaceStatsEnsureACL(domain->conn, dom->def) < 0) @@ -1907,7 +1907,7 @@ vzDomainMemoryStats(virDomainPtr domain, int ret =3D -1; =20 virCheckFlags(0, -1); - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainMemoryStatsEnsureACL(domain->conn, dom->def) < 0) @@ -1946,7 +1946,7 @@ vzDomainGetVcpusFlags(virDomainPtr domain, ret =3D virDomainDefGetVcpus(dom->def); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); =20 return ret; } @@ -1973,7 +1973,7 @@ static int vzDomainIsUpdated(virDomainPtr domain) ret =3D 0; =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -2110,7 +2110,7 @@ static int vzDomainSetMemoryFlags(virDomainPtr domain= , unsigned long memory, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (vzCheckConfigUpdateFlags(dom, &flags) < 0) @@ -2142,7 +2142,7 @@ static int vzDomainSetMemory(virDomainPtr domain, uns= igned long memory) int ret =3D -1; bool job =3D false; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainSetMemoryEnsureACL(domain->conn, dom->def) < 0) @@ -2217,7 +2217,7 @@ vzDomainSnapshotNum(virDomainPtr domain, unsigned int= flags) virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainSnapshotNumEnsureACL(domain->conn, dom->def) < 0) @@ -2248,7 +2248,7 @@ vzDomainSnapshotListNames(virDomainPtr domain, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainSnapshotListNamesEnsureACL(domain->conn, dom->def) < 0) @@ -2278,7 +2278,7 @@ vzDomainListAllSnapshots(virDomainPtr domain, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainListAllSnapshotsEnsureACL(domain->conn, dom->def) < 0) @@ -2308,7 +2308,7 @@ vzDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snaps= hot, unsigned int flags) =20 virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return NULL; =20 if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, dom->= def, flags) < 0) @@ -2345,7 +2345,7 @@ vzDomainSnapshotNumChildren(virDomainSnapshotPtr snap= shot, unsigned int flags) virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainSnapshotNumChildrenEnsureACL(snapshot->domain->conn, dom-= >def) < 0) @@ -2380,7 +2380,7 @@ vzDomainSnapshotListChildrenNames(virDomainSnapshotPt= r snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainSnapshotListChildrenNamesEnsureACL(snapshot->domain->conn= , dom->def) < 0) @@ -2414,7 +2414,7 @@ vzDomainSnapshotListAllChildren(virDomainSnapshotPtr = snapshot, virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainSnapshotListAllChildrenEnsureACL(snapshot->domain->conn, = dom->def) < 0) @@ -2447,7 +2447,7 @@ vzDomainSnapshotLookupByName(virDomainPtr domain, =20 virCheckFlags(0, NULL); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return NULL; =20 if (virDomainSnapshotLookupByNameEnsureACL(domain->conn, dom->def) < 0) @@ -2477,7 +2477,7 @@ vzDomainHasCurrentSnapshot(virDomainPtr domain, unsig= ned int flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainHasCurrentSnapshotEnsureACL(domain->conn, dom->def) < 0) @@ -2505,7 +2505,7 @@ vzDomainSnapshotGetParent(virDomainSnapshotPtr snapsh= ot, unsigned int flags) =20 virCheckFlags(0, NULL); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return NULL; =20 if (virDomainSnapshotGetParentEnsureACL(snapshot->domain->conn, dom->d= ef) < 0) @@ -2543,7 +2543,7 @@ vzDomainSnapshotCurrent(virDomainPtr domain, unsigned= int flags) =20 virCheckFlags(0, NULL); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return NULL; =20 if (virDomainSnapshotCurrentEnsureACL(domain->conn, dom->def) < 0) @@ -2577,7 +2577,7 @@ vzDomainSnapshotIsCurrent(virDomainSnapshotPtr snapsh= ot, unsigned int flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainSnapshotIsCurrentEnsureACL(snapshot->domain->conn, dom->d= ef) < 0) @@ -2607,7 +2607,7 @@ vzDomainSnapshotHasMetadata(virDomainSnapshotPtr snap= shot, =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainSnapshotHasMetadataEnsureACL(snapshot->domain->conn, dom-= >def) < 0) @@ -2645,7 +2645,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, =20 virCheckFlags(0, NULL); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return NULL; =20 if (virDomainSnapshotCreateXMLEnsureACL(domain->conn, dom->def, flags)= < 0) @@ -2708,7 +2708,7 @@ vzDomainSnapshotDelete(virDomainSnapshotPtr snapshot,= unsigned int flags) =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainSnapshotDeleteEnsureACL(snapshot->domain->conn, dom->def)= < 0) @@ -2732,7 +2732,7 @@ vzDomainRevertToSnapshot(virDomainSnapshotPtr snapsho= t, unsigned int flags) =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(snapshot->domain))) + if (!(dom =3D vzDomObjFromDomain(snapshot->domain))) return -1; =20 if (virDomainRevertToSnapshotEnsureACL(snapshot->domain->conn, dom->de= f) < 0) @@ -2978,8 +2978,7 @@ vzDomainMigrateBegin3Params(virDomainPtr domain, =20 cleanup: =20 - if (dom) - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return xml; } =20 @@ -3309,7 +3308,7 @@ vzDomainMigratePerform3Params(virDomainPtr domain, if (virTypedParamsValidate(params, nparams, VZ_MIGRATION_PARAMETERS) <= 0) return -1; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainMigratePerform3ParamsEnsureACL(domain->conn, dom->def) < = 0) @@ -3432,7 +3431,7 @@ vzDomainGetJobInfo(virDomainPtr domain, virDomainJobI= nfoPtr info) ret =3D vzDomainGetJobInfoImpl(dom, info); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); return ret; } =20 @@ -3504,7 +3503,7 @@ vzDomainGetJobStats(virDomainPtr domain, ret =3D vzDomainJobInfoToParams(&info, type, params, nparams); =20 cleanup: - virObjectUnlock(dom); + virDomainObjEndAPI(&dom); =20 return ret; } @@ -3883,7 +3882,7 @@ vzDomainAbortJob(virDomainPtr domain) virDomainObjPtr dom; int ret =3D -1; =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainAbortJobEnsureACL(domain->conn, dom->def) < 0) @@ -3906,7 +3905,7 @@ vzDomainReset(virDomainPtr domain, unsigned int flags) =20 virCheckFlags(0, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) return -1; =20 if (virDomainResetEnsureACL(domain->conn, dom->def) < 0) @@ -3938,7 +3937,7 @@ static int vzDomainSetVcpusFlags(virDomainPtr domain,= unsigned int nvcpus, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) goto cleanup; =20 if (vzCheckConfigUpdateFlags(dom, &flags) < 0) @@ -3981,7 +3980,7 @@ vzDomainBlockResize(virDomainPtr domain, =20 virCheckFlags(VIR_DOMAIN_BLOCK_RESIZE_BYTES, -1); =20 - if (!(dom =3D vzDomObjFromDomainRef(domain))) + if (!(dom =3D vzDomObjFromDomain(domain))) goto cleanup; =20 if (virDomainBlockResizeEnsureACL(domain->conn, dom->def) < 0) diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 6fb27169a..8f4e3e347 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -63,43 +63,13 @@ static virDomainControllerType vz7ControllerTypes[] =3D= {VIR_DOMAIN_CONTROLLER_TYP * @domain: Domain pointer that has to be looked up * * This function looks up @domain and returns the appropriate virDomainObj= Ptr - * that has to be unlocked by virObjectUnlock(). - * - * Returns the domain object without incremented reference counter which i= s locked - * on success, NULL otherwise. - */ -virDomainObjPtr -vzDomObjFromDomain(virDomainPtr domain) -{ - virDomainObjPtr vm; - vzConnPtr privconn =3D domain->conn->privateData; - char uuidstr[VIR_UUID_STRING_BUFLEN]; - vzDriverPtr driver =3D privconn->driver; - - vm =3D virDomainObjListFindByUUID(driver->domains, domain->uuid); - if (!vm) { - virUUIDFormat(domain->uuid, uuidstr); - virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), - uuidstr, domain->name); - return NULL; - } - - return vm; -} - -/** - * vzDomObjFromDomainRef: - * @domain: Domain pointer that has to be looked up - * - * This function looks up @domain and returns the appropriate virDomainObj= Ptr * that has to be released by calling virDomainObjEndAPI(). * * Returns the domain object with incremented reference counter which is l= ocked * on success, NULL otherwise. */ virDomainObjPtr -vzDomObjFromDomainRef(virDomainPtr domain) +vzDomObjFromDomain(virDomainPtr domain) { virDomainObjPtr vm; vzConnPtr privconn =3D domain->conn->privateData; diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index f9e9dee42..40a1ce23d 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -120,7 +120,6 @@ void* vzDomObjAlloc(void *opaque); void vzDomObjFree(void *p); =20 virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); -virDomainObjPtr vzDomObjFromDomainRef(virDomainPtr domain); =20 char * vzGetOutput(const char *binary, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list