From nobody Sat Feb 7 21:11:05 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=HamaK9B6ZetTCKQ8l/X0y16sSnzyJbjl82LkADQi/9tbs741xv8lFq6DVQPYfZ+0ThWNID3gypWDOuANfWgN/8dL44ZS5sX4JpCvzfRpF8hwBUyOHtstl7Sep3p5fsxQAkm+PzKVrvLFdyGnL2a76Sq7SVUmPEpC4RLbQSsA/ks= 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=Ov1XOkeJwZ/gcn0REF7J0gpGI4nBQOXv5cyxEqHbJvQ=; b=ohtX3HFppuSVLxdBmLZvUwlgoR1N7laq0w84aEeJr2lHjYiP6Snik+xqIw3WjpNjgScoBacbncegua9YsimdNEstP2Wawo5WQ3l5FN25GGv2N7FR7g7pFg1+53dYtqsOmHXcbMprq0OBVz+sfqMov93kmIgPhgNGWQmJWKhghbk= 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 1569865711886372.5979481141063; 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 0FADE3004144; Mon, 30 Sep 2019 17:48:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2A1B5D9D5; 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 AC32F4EDA5; Mon, 30 Sep 2019 17:48:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8UHmJ7B029182 for ; Mon, 30 Sep 2019 13:48:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id D740C1001B13; Mon, 30 Sep 2019 17:48:19 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7000C1001281; Mon, 30 Sep 2019 17:48:17 +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 33BEB3082E6E; Mon, 30 Sep 2019 17:48:16 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id l3so18130701qtr.4; Mon, 30 Sep 2019 10:48:16 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:14 -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=X5eTRFI3TOdma19AtEnnNJtC3FjuRYp4qIxWKO92XfM=; b=UqBBYB2wvUKvkPq6HfXTd/O31wuBCt/wRGftU2sC+IsBJ6p7d0ttnJixjHyn/MYNc6 hRUHkTGbMoog2ni5/ev7AdNGMVnnHg4Op9fLKuQNceRSQCWhbKPR62I24fEqDXVzbw03 qQSNb55j4HySGn+0H0rYK2AxLgvyRZcthEbSsbkT/XiiKD3ggXy8p7Rg+ASmB1++mTzE Tc/6phMY42jKltmfwymEwmjpSjspuu6lSzso71u1CwhZ/+tOxCr2be0wHfd6s+4olT/w TYHYEtVlA2V2YLOd4mJtD3SQcyTT4XO0uDw+mKVvPnPQl7EGZqf35KBD0JTDhGPvZw76 upsw== 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=X5eTRFI3TOdma19AtEnnNJtC3FjuRYp4qIxWKO92XfM=; b=C0ToJ+ew6pxlOefsVF8xl6kxFzQMTPyrSW7SB9wuT6s+3zRn4GBIrUHsAXr1AKCTIm S8A7v47ZqAhSHAcBZgXLXHz/x5+zkwOVwAdR1GOu5zxTDo00e39qomotWeAv273mXAsb jyOXfeqXmxNFUisJDtiohetCF6GJoIQtIqroy5TTfa9fDtRChYxiSRNSArrO4cyzEL+C XF1WWkdIm5V6F6PhLVrrJtviyI6fS86P84qX1kOVk6tcsngAbMpAMV+U9t2S077Hpoyq tYDYp6IX8r/Fkj9BlrGrz6rmDREAnRGg0r69cgLrd7ONINQ+e7GcPnkIAz8iWCxgGp8w A4PQ== X-Gm-Message-State: APjAAAXfIXOXgnhbK5UEonp6gNUVSi8x0T12N8B+RWMWcR/8Jyu9d1cj rbC+JIBYC1uMxdGnEMUZ4nL8DDfZe60= X-Google-Smtp-Source: APXvYqy0wG3vXXUEZJ4eCgbJekokM+4wreQoqG+MkhLd8lCjCs1ew6ztHvoD6D/tzeMefurVuW0b2A== X-Received: by 2002:ac8:458e:: with SMTP id l14mr25841804qtn.153.1569865695258; Mon, 30 Sep 2019 10:48:15 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:55 -0300 Message-Id: <20190930174802.22426-3-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.46]); Mon, 30 Sep 2019 17:48:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 30 Sep 2019 17:48:16 +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.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v2 2/9] qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 2/3 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.5.16 (mx1.redhat.com [10.5.110.46]); 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" virQEMUDriverConfigPtr 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 virQEMUDriverConfigPtr declarations to use VIR_AUTOUNREF(). 'cleanup' labels were deleted when applicable. Since there are a lot of references to change, let's do it in 3 steps. This is step 2. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 81 ++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 55 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1e709c1e97..8321fbbe8b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4566,7 +4566,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev; virDomainNetDefPtr def; @@ -4665,7 +4665,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } =20 =20 @@ -4675,7 +4674,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, const char *devAlias, bool connected) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainChrDeviceState newstate; virObjectEventPtr event =3D NULL; virDomainDeviceDef dev; @@ -4708,7 +4707,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, } =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4749,9 +4748,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -5024,21 +5020,20 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, virDomainDefPtr persistentDef, unsigned int nvcpus) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned int topologycpus; - int ret =3D -1; =20 if (def) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("maximum vcpu count of a live domain can't be mod= ified")); - goto cleanup; + return -1; } =20 if (virDomainNumaGetCPUCountTotal(persistentDef->numa) > nvcpus) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Number of CPUs in exceeds the desired " "maximum vcpu count")); - goto cleanup; + return -1; } =20 if (virDomainDefGetVcpusTopology(persistentDef, &topologycpus) =3D=3D = 0 && @@ -5047,23 +5042,19 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, * setting may be corrected via this API */ virReportError(VIR_ERR_INVALID_ARG, "%s", _("CPU topology doesn't match the desired vcpu coun= t")); - goto cleanup; + return -1; } =20 /* ordering information may become invalid, thus clear it */ virDomainDefVcpuOrderClear(persistentDef); =20 if (virDomainDefSetVcpusMax(persistentDef, nvcpus, driver->xmlopt) < 0) - goto cleanup; + return -1; =20 if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) <= 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -5228,7 +5219,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, int ret =3D -1; virBitmapPtr pcpumap =3D NULL; virDomainVcpuDefPtr vcpuinfo =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -5285,7 +5276,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); - virObjectUnref(cfg); return ret; } =20 @@ -5348,7 +5338,7 @@ qemuDomainPinEmulator(virDomainPtr dom, int ret =3D -1; qemuDomainObjPrivatePtr priv; virBitmapPtr pcpumap =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virObjectEventPtr event =3D NULL; char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -5442,7 +5432,6 @@ qemuDomainPinEmulator(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -5813,7 +5802,7 @@ qemuDomainPinIOThread(virDomainPtr dom, { int ret =3D -1; virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainObjPtr vm; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -5937,7 +5926,6 @@ qemuDomainPinIOThread(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -6286,7 +6274,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, virDomainIOThreadAction action, unsigned int flags) { - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -6297,7 +6285,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, priv =3D vm->privateData; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return -1; =20 if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) goto endjob; @@ -6385,8 +6373,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, endjob: qemuDomainObjEndJob(driver, vm); =20 - cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6897,7 +6883,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; char *errbuf =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -7019,7 +7005,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); - virObjectUnref(cfg); return ret; } =20 @@ -7444,13 +7429,11 @@ static char *qemuConnectDomainXMLToNative(virConnec= tPtr conn, virCommandPtr cmd =3D NULL; char *ret =3D NULL; size_t i; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virCapsPtr caps =3D NULL; =20 virCheckFlags(0, NULL); =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (virConnectDomainXMLToNativeEnsureACL(conn) < 0) goto cleanup; =20 @@ -7510,7 +7493,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virCommandFree(cmd); virObjectUnref(vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -7697,7 +7679,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virCapsPtr caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; @@ -7707,8 +7689,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; =20 @@ -7765,7 +7745,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); - virObjectUnref(cfg); return dom; } =20 @@ -7786,7 +7765,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, int ret =3D -1; int nsnapshots; int ncheckpoints; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA | @@ -7906,7 +7885,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -8726,7 +8704,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr vmdef =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; @@ -8811,7 +8789,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(cfg); virObjectUnref(caps); =20 return ret; @@ -8872,7 +8849,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefPtr dev =3D NULL, dev_copy =3D NULL; bool force =3D (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) !=3D 0; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virCapsPtr caps =3D NULL; unsigned int parse_flags =3D 0; =20 @@ -8973,7 +8950,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; } @@ -8986,7 +8962,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =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; virDomainDefPtr vmdef =3D NULL; @@ -9065,7 +9041,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, =20 cleanup: virObjectUnref(caps); - virObjectUnref(cfg); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9082,7 +9057,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainDefPtr vmdef =3D NULL; @@ -9143,7 +9118,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(cfg); virObjectUnref(caps); return ret; } @@ -9252,7 +9226,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, virDomainObjPtr vm; char *configFile =3D NULL, *autostartLink =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -9317,7 +9291,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9564,7 +9537,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; qemuDomainObjPrivatePtr priv; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9764,7 +9737,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9876,7 +9848,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, bool set_swap_hard_limit =3D false; bool set_hard_limit =3D false; bool set_soft_limit =3D false; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; int rc; int ret =3D -1; qemuDomainObjPrivatePtr priv; @@ -10001,7 +9973,6 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list