From nobody Sat Feb 7 15:12:25 2026 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1569865711; cv=none; d=zoho.com; s=zohoarc; b=jjKrLDBfGXsJ4wVejnNgc0hXdIWqX3Leuu2cjzm8oBk8LmghMe3N4cpVfvh26ugOgFxCHZ5eJmQf3lDV9eslj4OznYrEUh+hRQ/UmDsdsDhN54gRlpbcUcmVd9oZf5xCSO+IbppEcwWQ4hJuVIZmq4oZ6FLrfOCI5JB5eMEcv98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865711; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jPlwXzHqnHdaxSl1lKZGZ600QoKVAkWO/7+/Qrop0Pk=; b=OhG89GZEUAr0SeDxRcAmsAR38olVqRXCPGnxrkjdqaUWQLLwrEonAlWxjqX6fuXQd33bKWb0aTgvQYpvlWAa4z+901bZrfjvd5Kzl2dlN06rNK247IqSMxFc76pLiZmyayQefOlwAOBCDRFhos7m9NOpfiMKkX/B0UQ5Vbk0SZ8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156986571164156.93367770071484; Mon, 30 Sep 2019 10:48:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 23C1BA44AE9; Mon, 30 Sep 2019 17:48:30 +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 F35C75D9E1; Mon, 30 Sep 2019 17:48:29 +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 B8FFD18037CD; Mon, 30 Sep 2019 17:48:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8UHmLSk029194 for ; Mon, 30 Sep 2019 13:48:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B5486012C; Mon, 30 Sep 2019 17:48:21 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6205C60126; Mon, 30 Sep 2019 17:48:21 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35C03882EA; Mon, 30 Sep 2019 17:48:20 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id u40so18108554qth.11; Mon, 30 Sep 2019 10:48:20 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FZMmuTpRlhM62AdXnogj5lrQVXZxzZadut0jB2ilp/Q=; b=C4c/BtjzLszGZgS2PPoQFOkzfHEswqWX4stfOINksX6Y826N4usD9nI9xViJmpWsNw pFcxPJEQzIeqIgaqE6qmFbbxp4v6sdjSDV53EmJMD15ftaEfgV2J1+7NpAq0n0ovs5BF L2E/vhvnracKH5LXa0RDwlAsz1k1PUAkblkji9MHmoXgabsoRuWRn4NesVICMp0Nbe7r zZWx875hMOhBB1Q5XJHr1NtMHA6JioosV3IU6LVOVi1uqtnOF/eahdvjubuES+MzeBFI pbiKAAPAMuAC/w2Kpvr/WwLXpd/YJydRvrMG8PXqFo0yeIB1qYMrltXuubPud9ysjX9D Y2MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FZMmuTpRlhM62AdXnogj5lrQVXZxzZadut0jB2ilp/Q=; b=hGIC0OhMRV+au6Csr1T2zNUq1DWYTf7MSIULXz7aLkPYKJg9fAswXjJNvIL20hA945 DOoJ9zrN3YVGPcArsL2fO3vyCJRUsoZ+DNtVQacfUP0MvpI/F7VrL64ajJg0dpKZ8c4A gqgInT6iohlRLCzRtGO2wsr9SJLHgNjZNzQHu2CRf30oVJfXjj/qeGPw3DNZq92fNC3x nCerM4Gnfedogt9qL88+nGxFkWT2ppSzQOK4vo4yvNAJAKrlval0PBxeKe69aAPflPe2 H1620PhkxInibn/RHcZBqkGkD3e+GRBEvuTzGRxNH6mkkgqdlq8tRk7S4LBrlBM6e9fI pueA== X-Gm-Message-State: APjAAAUBeneEKzOiD5/h6JwHV+IzP+Xnmqsm6HNcexBUANlLEBUfX+Cz +sD7UxcgbvLDjOaEL25bsqGf5jiKSL8= X-Google-Smtp-Source: APXvYqxmht0cvR4FDohQ48vT6lK+K1qd2e80gJlXAzALlFOpdl3hznChOaaKODfTz/ok4egyMz4z7A== X-Received: by 2002:ac8:3b52:: with SMTP id r18mr26669252qtf.62.1569865699140; Mon, 30 Sep 2019 10:48:19 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:57 -0300 Message-Id: <20190930174802.22426-5-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 30 Sep 2019 17:48:20 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 30 Sep 2019 17:48:20 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v2 4/9] qemu_driver: use VIR_AUTOUNREF() with virCapsPtr 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-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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Mon, 30 Sep 2019 17:48:30 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" virCapsPtr can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call and sometimes a whole 'cleanup' label. This patch changes virCapsPtr declarations to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when possible. Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 113 ++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 76 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2204b2bf5d..9958164788 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -396,7 +396,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); int ret =3D -1; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -495,7 +495,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, cleanup: VIR_DIR_CLOSE(dir); VIR_FREE(snapDir); - virObjectUnref(caps); virObjectUnlock(vm); return ret; } @@ -516,7 +515,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virDomainMomentObjPtr current =3D NULL; unsigned int flags =3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; int ret =3D -1; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -606,7 +605,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, cleanup: VIR_DIR_CLOSE(dir); VIR_FREE(chkDir); - virObjectUnref(caps); virObjectUnlock(vm); return ret; } @@ -1067,13 +1065,13 @@ static int qemuStateReload(void) { VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (!qemu_driver) return 0; =20 if (!(caps =3D virQEMUDriverGetCapabilities(qemu_driver, false))) - goto cleanup; + return 0; =20 cfg =3D virQEMUDriverGetConfig(qemu_driver); virDomainObjListLoadAllConfigs(qemu_driver->domains, @@ -1081,8 +1079,6 @@ qemuStateReload(void) cfg->autostartDir, false, caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); - cleanup: - virObjectUnref(caps); return 0; } =20 @@ -1351,21 +1347,15 @@ qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE= _UNUSED, const char *type) =20 static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - virCapsPtr caps =3D NULL; - char *xml =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, true))) - goto cleanup; - - xml =3D virCapabilitiesFormatXML(caps); - virObjectUnref(caps); - - cleanup: + return NULL; =20 - return xml; + return virCapabilitiesFormatXML(caps); } =20 =20 @@ -1711,27 +1701,22 @@ static int qemuDomainIsUpdated(virDomainPtr dom) static int qemuConnectGetVersion(virConnectPtr conn, unsigned long *versio= n) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D -1; unsigned int qemuVersion =3D 0; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (virConnectGetVersionEnsureACL(conn) < 0) return -1; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return -1; =20 if (virQEMUCapsGetDefaultVersion(caps, driver->qemuCapsCache, &qemuVersion) < 0) - goto cleanup; + return -1; =20 *version =3D qemuVersion; - ret =3D 0; - - cleanup: - virObjectUnref(caps); - return ret; + return 0; } =20 =20 @@ -1784,7 +1769,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virObjectEventPtr event =3D NULL; virObjectEventPtr event2 =3D NULL; unsigned int start_flags =3D VIR_QEMU_PROCESS_START_COLD; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -1859,7 +1844,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return dom; } @@ -3319,7 +3303,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int ret =3D -1; virObjectEventPtr event =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -3434,7 +3418,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return ret; } =20 @@ -6599,29 +6582,27 @@ static int qemuNodeGetSecurityModel(virConnectPtr c= onn, { virQEMUDriverPtr driver =3D conn->privateData; char *p; - int ret =3D 0; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 memset(secmodel, 0, sizeof(*secmodel)); =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return 0; =20 if (virNodeGetSecurityModelEnsureACL(conn) < 0) - goto cleanup; + return 0; =20 /* We treat no driver as success, but simply return no data in *secmod= el */ if (caps->host.nsecModels =3D=3D 0 || caps->host.secModels[0].model =3D=3D NULL) - goto cleanup; + return 0; =20 p =3D caps->host.secModels[0].model; if (strlen(p) >=3D VIR_SECURITY_MODEL_BUFLEN-1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("security model string exceeds max %d bytes"), VIR_SECURITY_MODEL_BUFLEN-1); - ret =3D -1; - goto cleanup; + return -1; } strcpy(secmodel->model, p); =20 @@ -6630,14 +6611,11 @@ static int qemuNodeGetSecurityModel(virConnectPtr c= onn, virReportError(VIR_ERR_INTERNAL_ERROR, _("security DOI string exceeds max %d bytes"), VIR_SECURITY_DOI_BUFLEN-1); - ret =3D -1; - goto cleanup; + return -1; } strcpy(secmodel->doi, p); =20 - cleanup: - virObjectUnref(caps); - return ret; + return 0; } =20 =20 @@ -6658,7 +6636,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virDomainDefPtr ret =3D NULL; virDomainDefPtr newdef_migr =3D NULL; virDomainDefPtr newdef =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -6696,7 +6674,6 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(caps); virDomainDefFree(newdef); virDomainDefFree(newdef_migr); =20 @@ -6736,7 +6713,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virQEMUSaveHeaderPtr header; virDomainDefPtr def =3D NULL; int oflags =3D open_write ? O_RDWR : O_RDONLY; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; size_t xml_len; size_t cookie_len; =20 @@ -6856,7 +6833,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_data =3D data; =20 cleanup: - virObjectUnref(caps); return fd; =20 error: @@ -7430,7 +7406,7 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, char *ret =3D NULL; size_t i; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -7492,7 +7468,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, cleanup: virCommandFree(cmd); virObjectUnref(vm); - virObjectUnref(caps); return ret; } =20 @@ -7680,7 +7655,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7744,7 +7719,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return dom; } =20 @@ -8708,7 +8682,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -8789,7 +8763,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(caps); =20 return ret; } @@ -8850,7 +8823,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; unsigned int parse_flags =3D 0; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -8949,7 +8922,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return ret; } @@ -8961,7 +8933,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; @@ -9040,7 +9012,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, ret =3D 0; =20 cleanup: - virObjectUnref(caps); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9056,7 +9027,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; @@ -9118,7 +9089,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(caps); return ret; } =20 @@ -10632,7 +10602,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, int ret =3D -1; int rc; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -10924,7 +10894,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(caps); return ret; } #undef SCHED_RANGE_CHECK @@ -13536,27 +13505,22 @@ qemuConnectCompareCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - int ret =3D VIR_CPU_COMPARE_ERROR; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; bool failIncompatible; =20 virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, VIR_CPU_COMPARE_ERROR); =20 if (virConnectCompareCPUEnsureACL(conn) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 failIncompatible =3D !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATI= BLE); =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - - ret =3D virCPUCompareXML(caps->host.arch, caps->host.cpu, - xmlDesc, failIncompatible); + return VIR_CPU_COMPARE_ERROR; =20 - cleanup: - virObjectUnref(caps); - return ret; + return virCPUCompareXML(caps->host.arch, caps->host.cpu, + xmlDesc, failIncompatible); } =20 =20 @@ -15725,7 +15689,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; @@ -16004,7 +15968,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(xml); - virObjectUnref(caps); return snapshot; } =20 @@ -16416,7 +16379,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virDomainDefPtr config =3D NULL; virDomainDefPtr inactiveConfig =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; bool was_stopped =3D false; qemuDomainSaveCookiePtr cookie; virCPUDefPtr origCPU =3D NULL; @@ -16844,7 +16807,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -19511,7 +19473,7 @@ qemuDomainSetMetadata(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -19545,7 +19507,6 @@ qemuDomainSetMetadata(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(caps); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list