From nobody Sat Feb 7 21:11:58 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=1571259301; cv=none; d=zoho.com; s=zohoarc; b=UjFqKQNJrzavpf8yLTOKSjC1wDM40HDxf7cImH57vYVE+uQJ3/EbvChWsEr1QlX2xBksY5HuY/rXdNrhiaDUyby3koadiwnq3YHEVunfdAhf+wjZRnlYfTWznWVyKIDp+T/i8I4+dSB1HzD4jvBPVXwbOMxNhXEg9sRGJD16SS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571259301; 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; bh=yyelOaAi3BTAJlZaBCcVzfj+0CCc5o9nYGrOUZ6bAwI=; b=JuQgkRIjaUT8BZVLxhTgqPAIx9Z0jPp5IfhuHOwqd/Ps121vecpFqW27SDD63hBr1Y0EjRBCsrlDcCqrxSE0Fdyf6LEtoWdk4n4Li8LQDIrc4j8GveXOHzXbjE+Lp6oajdMIBBGCMXQNurCIYCFoxqlKaX9Rms6riX4K9IjUy5o= 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 1571259301232789.0890649555836; Wed, 16 Oct 2019 13:55:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E7E830821C2; Wed, 16 Oct 2019 20:54:59 +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 0359719C70; Wed, 16 Oct 2019 20:54:59 +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 756A31800535; Wed, 16 Oct 2019 20:54:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9GKst48018424 for ; Wed, 16 Oct 2019 16:54:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id E49A95D71C; Wed, 16 Oct 2019 20:54:55 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 254495D6A9; Wed, 16 Oct 2019 20:54:51 +0000 (UTC) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (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 03FCF8667D; Wed, 16 Oct 2019 20:54:49 +0000 (UTC) Received: by mail-qt1-f178.google.com with SMTP id u40so96161qth.11; Wed, 16 Oct 2019 13:54:48 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id m125sm23965qkd.3.2019.10.16.13.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:54:47 -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=xHLsYdhtV4OoRwY5EDy9izS6DOuK9uAFGrLIwIZnRy4=; b=L3q7Ua9KsemqqMipkGxmT88fEHVylV6LFxO9zBS2REt/g+musvHso8ehM8NhmUIaNG sF+KBy88rkzchEygCkimo8P41zOOKR83YQm7ZvORQBShaX1yJAFUL80iU8wD+RiIoW8U XM/lHZrsxUTp5pFQ+l9HPzRY6s2M+jV8IYYPA5b7MdSUkmCo241T+6eWQ+I0Q6FzECLn Xx16GfDHII2x19DsKl8phScuU86zQsXVlP3FRzJRrxU1Qn598hUK9NvEspsl5og4wWC1 DFxtoOWt13zqsqf4nvQW0Lw7NsJAj/QG181U1xkyAdGOXMbP0tl9M666/K2fCYmShxOh nugA== 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=xHLsYdhtV4OoRwY5EDy9izS6DOuK9uAFGrLIwIZnRy4=; b=RZiDl4++ho83yibnLehW//0w/+JCWixMOGohZKq/adfdT1QC7Y61T6g000T4IZsAKF DypjmjKd3E5OIp5A/IgVTs4yyAxDd8Pd3gXAc/QlK4zF+wt3EMx9nszHaclTAzr/Zy3L SoYne7P3pmm52nRKQjZfTcMcp1XBTK2hxjEuvpkx1MkFzFw8M0X+TZtcn8wYePnNazB7 A47buLh6IlMdZLXrTvoDA8LW9WrgOP3oOTAml+hU+2RL/gpA8nFZ9QfmSimBb7MW+sSo jXMLHy7tlmAEpWAaxm4RHlTXE79k/QjIcTz0hbeoxFUnkMmoT8SkOHvb86ata3DlSSXi P61g== X-Gm-Message-State: APjAAAVHI3KnBx6dXEBPt/23trYUPBmawCdc0wD/zorlJ+TN54M8M6IQ f9p8anijMTGsgD/nYwUL5tqnYPli X-Google-Smtp-Source: APXvYqyGDeib8zYG8DoSXH83nLJJs/0fWSgtL0xPu/8UFkMdRAVGwpzTcMNAZmBGxb0wQ0itaHv05g== X-Received: by 2002:ac8:b46:: with SMTP id m6mr39992qti.262.1571259287394; Wed, 16 Oct 2019 13:54:47 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Wed, 16 Oct 2019 17:54:30 -0300 Message-Id: <20191016205433.18341-3-danielhb413@gmail.com> In-Reply-To: <20191016205433.18341-1-danielhb413@gmail.com> References: <20191016205433.18341-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.26]); Wed, 16 Oct 2019 20:54:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 16 Oct 2019 20:54:49 +0000 (UTC) for IP:'209.85.160.178' DOMAIN:'mail-qt1-f178.google.com' HELO:'mail-qt1-f178.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.178 mail-qt1-f178.google.com 209.85.160.178 mail-qt1-f178.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , jtomko@redhat.com, eskultet@redhat.com Subject: [libvirt] [PATCH v4 2/5] qemu_driver: use g_autoptr() when possible 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 16 Oct 2019 20:54:59 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Several pointer types can be auto-unref for the great majority of the uses made in qemu_driver, sparing us a virObjectUnref() call. This patch uses g_autoptr() in the following pointer types inside qemu_driver.c, whenever possible: - qemuBlockJobDataPtr - virCapsPtr - virConnect - virDomainCapsPtr - virNetworkPtr - virQEMUDriverConfigPtr Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 271 +++++++++++++---------------------------- 1 file changed, 87 insertions(+), 184 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3772c71a51..dc342734b1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -202,7 +202,7 @@ qemuAutostartDomain(virDomainObjPtr vm, { virQEMUDriverPtr driver =3D opaque; int flags =3D 0; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 if (cfg->autoStartBypassCache) @@ -234,7 +234,6 @@ qemuAutostartDomain(virDomainObjPtr vm, ret =3D 0; cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -308,7 +307,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) char **names; virSecurityManagerPtr mgr =3D NULL; virSecurityManagerPtr stack =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int flags =3D 0; =20 if (cfg->securityDefaultConfined) @@ -368,7 +367,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) } =20 driver->securityManager =3D stack; - virObjectUnref(cfg); return 0; =20 error: @@ -376,7 +374,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) _("Failed to initialize security drivers")); virObjectUnref(stack); virObjectUnref(mgr); - virObjectUnref(cfg); return -1; } =20 @@ -1053,8 +1050,8 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, = int newVM, void *opaque) static int qemuStateReload(void) { - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (!qemu_driver) return 0; @@ -1069,8 +1066,6 @@ qemuStateReload(void) caps, qemu_driver->xmlopt, qemuNotifyLoadDomain, qemu_driver); cleanup: - virObjectUnref(cfg); - virObjectUnref(caps); return 0; } =20 @@ -1085,13 +1080,13 @@ static int qemuStateStop(void) { int ret =3D -1; - virConnectPtr conn; + g_autoptr(virConnect) conn =3D NULL; int numDomains =3D 0; size_t i; int state; virDomainPtr *domains =3D NULL; unsigned int *flags =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(qemu_driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(qemu_dri= ver); =20 if (!(conn =3D virConnectOpen(cfg->uri))) goto cleanup; @@ -1129,8 +1124,6 @@ qemuStateStop(void) VIR_FREE(domains); } VIR_FREE(flags); - virObjectUnref(conn); - virObjectUnref(cfg); =20 return ret; } @@ -1188,7 +1181,7 @@ qemuStateCleanup(void) static int qemuConnectURIProbe(char **uri) { - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int ret =3D -1; =20 if (qemu_driver =3D=3D NULL) @@ -1200,7 +1193,6 @@ qemuConnectURIProbe(char **uri) =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -1344,8 +1336,8 @@ qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUS= ED, const char *type) =20 static char *qemuConnectGetCapabilities(virConnectPtr conn) { virQEMUDriverPtr driver =3D conn->privateData; - virCapsPtr caps =3D NULL; char *xml =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; @@ -1354,7 +1346,6 @@ static char *qemuConnectGetCapabilities(virConnectPtr= conn) { goto cleanup; =20 xml =3D virCapabilitiesFormatXML(caps); - virObjectUnref(caps); =20 cleanup: =20 @@ -1706,7 +1697,7 @@ static int qemuConnectGetVersion(virConnectPtr conn, = unsigned long *version) virQEMUDriverPtr driver =3D conn->privateData; int ret =3D -1; unsigned int qemuVersion =3D 0; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (virConnectGetVersionEnsureACL(conn) < 0) return -1; @@ -1723,7 +1714,6 @@ static int qemuConnectGetVersion(virConnectPtr conn, = unsigned long *version) ret =3D 0; =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -1777,7 +1767,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; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -1852,7 +1842,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); return dom; } @@ -1866,7 +1855,7 @@ static int qemuDomainSuspend(virDomainPtr dom) qemuDomainObjPrivatePtr priv; virDomainPausedReason reason; int state; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1909,7 +1898,6 @@ static int qemuDomainSuspend(virDomainPtr dom) cleanup: virDomainObjEndAPI(&vm); =20 - virObjectUnref(cfg); return ret; } =20 @@ -1921,7 +1909,7 @@ static int qemuDomainResume(virDomainPtr dom) int ret =3D -1; int state; int reason; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -1967,7 +1955,6 @@ static int qemuDomainResume(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2348,7 +2335,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -2453,7 +2440,6 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -2476,7 +2462,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1, r; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2539,7 +2525,6 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -3052,14 +3037,12 @@ qemuOpenFile(virQEMUDriverPtr driver, bool *needUnlink) { int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t user =3D cfg->user; gid_t group =3D cfg->group; bool dynamicOwnership =3D cfg->dynamicOwnership; virSecurityLabelDefPtr seclabel; =20 - virObjectUnref(cfg); - /* TODO: Take imagelabel into account? */ if (vm && (seclabel =3D virDomainDefGetSecurityLabelDef(vm->def, "dac")) != =3D NULL && @@ -3236,7 +3219,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; @@ -3299,7 +3282,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) ret =3D -1; virFileWrapperFdFree(wrapperFd); - virObjectUnref(cfg); =20 if (ret < 0 && needUnlink) unlink(path); @@ -3323,7 +3305,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int ret =3D -1; virObjectEventPtr event =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps; + g_autoptr(virCaps) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -3438,7 +3420,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); return ret; } =20 @@ -3527,7 +3508,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, char *compressedpath =3D NULL; int ret =3D -1; virDomainObjPtr vm =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE | VIR_DOMAIN_SAVE_RUNNING | @@ -3554,7 +3535,6 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *pat= h, const char *dxml, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -3568,14 +3548,11 @@ static char * qemuDomainManagedSavePath(virQEMUDriverPtr driver, virDomainObjPtr vm) { char *ret; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 - if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) { - virObjectUnref(cfg); + if (virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name) < 0) return NULL; - } =20 - virObjectUnref(cfg); return ret; } =20 @@ -3583,7 +3560,7 @@ static int qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int compressed; char *compressedpath =3D NULL; virDomainObjPtr vm; @@ -3629,7 +3606,6 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int = flags) virDomainObjEndAPI(&vm); VIR_FREE(name); VIR_FREE(compressedpath); - virObjectUnref(cfg); =20 return ret; } @@ -3827,7 +3803,7 @@ doCoreDump(virQEMUDriverPtr driver, int directFlag =3D 0; unsigned int flags =3D VIR_FILE_WRAPPER_NON_BLOCKING; const char *memory_dump_format =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); char *compressedpath =3D NULL; =20 /* We reuse "save" flag for "dump" here. Then, we can support the same @@ -3909,7 +3885,6 @@ doCoreDump(virQEMUDriverPtr driver, if (ret !=3D 0) unlink(path); VIR_FREE(compressedpath); - virObjectUnref(cfg); return ret; } =20 @@ -4041,7 +4016,7 @@ qemuDomainScreenshot(virDomainPtr dom, const char *videoAlias =3D NULL; char *ret =3D NULL; bool unlink_tmp =3D false; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -4133,7 +4108,6 @@ qemuDomainScreenshot(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -4146,7 +4120,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, char timestr[100]; struct tm time_info; time_t curtime =3D time(NULL); - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!domname) return NULL; @@ -4161,7 +4135,6 @@ getAutoDumpPath(virQEMUDriverPtr driver, domname, timestr)); =20 - virObjectUnref(cfg); VIR_FREE(domname); return dumpfile; } @@ -4172,7 +4145,7 @@ processWatchdogEvent(virQEMUDriverPtr driver, int action) { int ret; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); char *dumpfile =3D getAutoDumpPath(driver, vm); unsigned int flags =3D VIR_DUMP_MEMORY_ONLY; =20 @@ -4213,7 +4186,6 @@ processWatchdogEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); VIR_FREE(dumpfile); } =20 @@ -4223,7 +4195,7 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, unsigned int flags) { int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); char *dumpfile =3D getAutoDumpPath(driver, vm); =20 if (!dumpfile) @@ -4236,7 +4208,6 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, "%s", _("Dump failed")); cleanup: VIR_FREE(dumpfile); - virObjectUnref(cfg); return ret; } =20 @@ -4265,13 +4236,13 @@ processGuestPanicEvent(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool removeInactive =3D false; unsigned long flags =3D VIR_DUMP_MEMORY_ONLY; =20 if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) <= 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Ignoring GUEST_PANICKED event from inactive domain %s", @@ -4338,9 +4309,6 @@ processGuestPanicEvent(virQEMUDriverPtr driver, qemuDomainObjEndAsyncJob(driver, vm); if (removeInactive) qemuDomainRemoveInactiveJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4349,14 +4317,14 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDeviceDef dev; =20 VIR_DEBUG("Removing device %s from domain %p %s", devAlias, vm, vm->def->name); =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; + return; =20 if (!virDomainObjIsActive(vm)) { VIR_DEBUG("Domain is not running"); @@ -4379,9 +4347,6 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -4586,7 +4551,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDeviceDef dev; virDomainNetDefPtr def; @@ -4685,7 +4650,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr drive= r, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } =20 =20 @@ -4695,7 +4659,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, const char *devAlias, bool connected) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainChrDeviceState newstate; virObjectEventPtr event =3D NULL; virDomainDeviceDef dev; @@ -4728,7 +4692,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"); @@ -4769,9 +4733,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, =20 endjob: qemuDomainObjEndJob(driver, vm); - - cleanup: - virObjectUnref(cfg); } =20 =20 @@ -5044,7 +5005,7 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, virDomainDefPtr persistentDef, unsigned int nvcpus) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int topologycpus; int ret =3D -1; =20 @@ -5082,7 +5043,6 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -5248,7 +5208,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, int ret =3D -1; virBitmapPtr pcpumap =3D NULL; virDomainVcpuDefPtr vcpuinfo =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -5305,7 +5265,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); virBitmapFree(pcpumap); - virObjectUnref(cfg); return ret; } =20 @@ -5368,7 +5327,7 @@ qemuDomainPinEmulator(virDomainPtr dom, int ret =3D -1; qemuDomainObjPrivatePtr priv; virBitmapPtr pcpumap =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; char *str =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -5462,7 +5421,6 @@ qemuDomainPinEmulator(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -5833,7 +5791,7 @@ qemuDomainPinIOThread(virDomainPtr dom, { int ret =3D -1; virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainObjPtr vm; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -5957,7 +5915,6 @@ qemuDomainPinIOThread(virDomainPtr dom, VIR_FREE(str); virBitmapFree(pcpumap); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -6306,7 +6263,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, virDomainIOThreadAction action, unsigned int flags) { - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -6406,7 +6363,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -6634,7 +6590,7 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, virQEMUDriverPtr driver =3D conn->privateData; char *p; int ret =3D 0; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 memset(secmodel, 0, sizeof(*secmodel)); =20 @@ -6670,7 +6626,6 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, strcpy(secmodel->doi, p); =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -6692,7 +6647,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virDomainDefPtr ret =3D NULL; virDomainDefPtr newdef_migr =3D NULL; virDomainDefPtr newdef =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -6730,7 +6685,6 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(caps); virDomainDefFree(newdef); virDomainDefFree(newdef_migr); =20 @@ -6770,7 +6724,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virQEMUSaveHeaderPtr header; virDomainDefPtr def =3D NULL; int oflags =3D open_write ? O_RDWR : O_RDONLY; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; size_t xml_len; size_t cookie_len; =20 @@ -6890,7 +6844,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_data =3D data; =20 cleanup: - virObjectUnref(caps); return fd; =20 error: @@ -6917,7 +6870,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, int intermediatefd =3D -1; virCommandPtr cmd =3D NULL; char *errbuf =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virQEMUSaveHeaderPtr header =3D &data->header; qemuDomainSaveCookiePtr cookie =3D NULL; =20 @@ -7039,7 +6992,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 @@ -7464,13 +7416,11 @@ static char *qemuConnectDomainXMLToNative(virConnec= tPtr conn, virCommandPtr cmd =3D NULL; char *ret =3D NULL; size_t i; - virQEMUDriverConfigPtr cfg; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virCaps) caps =3D NULL; =20 virCheckFlags(0, NULL); =20 - cfg =3D virQEMUDriverGetConfig(driver); - if (virConnectDomainXMLToNativeEnsureACL(conn) < 0) goto cleanup; =20 @@ -7529,8 +7479,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, cleanup: virCommandFree(cmd); virObjectUnref(vm); - virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -7717,8 +7665,8 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainObjPtr vm =3D NULL; virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7727,8 +7675,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 @@ -7784,8 +7730,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); - virObjectUnref(cfg); return dom; } =20 @@ -7806,7 +7750,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, int ret =3D -1; int nsnapshots; int ncheckpoints; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; g_autofree char *nvram_path =3D NULL; =20 virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | @@ -7934,7 +7878,6 @@ qemuDomainUndefineFlags(virDomainPtr dom, VIR_FREE(name); virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -8754,11 +8697,11 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr= vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr vmdef =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDeviceDefPtr devConf =3D NULL; virDomainDeviceDefPtr devLive =3D NULL; int ret =3D -1; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -8839,8 +8782,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, virDomainDefFree(vmdef); virDomainDeviceDefFree(devConf); virDomainDeviceDefFree(devLive); - virObjectUnref(cfg); - virObjectUnref(caps); =20 return ret; } @@ -8900,8 +8841,8 @@ 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; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D 0; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9000,8 +8941,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; } @@ -9013,8 +8952,8 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) 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; @@ -9092,8 +9031,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, ret =3D 0; =20 cleanup: - virObjectUnref(caps); - virObjectUnref(cfg); if (dev !=3D dev_copy) virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); @@ -9109,8 +9046,8 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDefPtr def =3D NULL; virDomainDefPtr persistentDef =3D NULL; virDomainDefPtr vmdef =3D NULL; @@ -9171,8 +9108,6 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive= rPtr driver, ret =3D 0; cleanup: virDomainDefFree(vmdef); - virObjectUnref(cfg); - virObjectUnref(caps); return ret; } =20 @@ -9280,7 +9215,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, virDomainObjPtr vm; char *configFile =3D NULL, *autostartLink =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (!(vm =3D qemuDomainObjFromDomain(dom))) return -1; @@ -9345,7 +9280,6 @@ static int qemuDomainSetAutostart(virDomainPtr dom, VIR_FREE(configFile); VIR_FREE(autostartLink); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9592,7 +9526,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virDomainDefPtr def; virDomainDefPtr persistentDef; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -9792,7 +9726,6 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -9904,7 +9837,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; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; int rc; int ret =3D -1; qemuDomainObjPrivatePtr priv; @@ -10029,7 +9962,6 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10194,7 +10126,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, virDomainDefPtr persistentDef; virDomainObjPtr vm =3D NULL; int ret =3D -1; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virBitmapPtr nodeset =3D NULL; virDomainNumatuneMemMode config_mode; @@ -10306,7 +10238,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, cleanup: virBitmapFree(nodeset); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10411,7 +10342,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, virQEMUDriverPtr driver =3D dom->conn->privateData; size_t i; virDomainObjPtr vm =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuDomainObjPrivatePtr priv; virDomainDefPtr def; virDomainDefPtr persistentDef; @@ -10503,7 +10434,6 @@ qemuDomainSetPerfEvents(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -10690,8 +10620,8 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, long long value_l; int ret =3D -1; int rc; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; @@ -10983,8 +10913,6 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(caps); - virObjectUnref(cfg); return ret; } #undef SCHED_RANGE_CHECK @@ -11649,7 +11577,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, int ret =3D -1; virDomainNetDefPtr net =3D NULL, persistentNet =3D NULL; virNetDevBandwidthPtr bandwidth =3D NULL, newBandwidth =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; bool inboundSpecified =3D false, outboundSpecified =3D false; int actualType; bool qosSupported =3D true; @@ -11844,7 +11772,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(newBandwidth); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12106,7 +12033,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, char *tmp =3D NULL; int fd =3D -1, ret =3D -1; qemuDomainObjPrivatePtr priv; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_MEMORY_VIRTUAL | VIR_MEMORY_PHYSICAL, -1); =20 @@ -12177,7 +12104,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, unlink(tmp); VIR_FREE(tmp); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12394,7 +12320,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, virDomainObjPtr vm; int ret =3D -1; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; qemuBlockStatsPtr entry =3D NULL; =20 virCheckFlags(0, -1); @@ -12483,7 +12409,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -12955,7 +12880,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, unsigned int flags) { virQEMUDriverPtr driver =3D dconn->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDefPtr def =3D NULL; const char *dom_xml =3D NULL; const char *dname =3D NULL; @@ -13029,7 +12954,6 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, VIR_FREE(migrate_disks); VIR_FREE(origname); virDomainDefFree(def); - virObjectUnref(cfg); return ret; } =20 @@ -13601,7 +13525,7 @@ qemuConnectCompareCPU(virConnectPtr conn, { virQEMUDriverPtr driver =3D conn->privateData; int ret =3D VIR_CPU_COMPARE_ERROR; - virCapsPtr caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool failIncompatible; =20 virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, @@ -13619,7 +13543,6 @@ qemuConnectCompareCPU(virConnectPtr conn, xmlDesc, failIncompatible); =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -13675,7 +13598,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virCPUDefPtr cpu =3D NULL; @@ -13729,7 +13652,6 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, =20 cleanup: virCPUDefFree(cpu); - virObjectUnref(qemuCaps); return ret; } =20 @@ -13889,7 +13811,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, virQEMUDriverPtr driver =3D conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virCPUDefPtr *cpus =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -13968,7 +13890,6 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, cleanup: virCPUDefListFree(cpus); virCPUDefFree(cpu); - virObjectUnref(qemuCaps); virStringListFree(features); =20 return cpustr; @@ -14753,7 +14674,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, virCommandPtr cmd =3D NULL; const char *qemuImgPath; virBitmapPtr created =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; virBuffer buf =3D VIR_BUFFER_INITIALIZER; virDomainSnapshotDefPtr snapdef =3D virDomainSnapshotObjGetDef(snap); @@ -14841,7 +14762,6 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, } } virBitmapFree(created); - virObjectUnref(cfg); =20 return ret; } @@ -15943,8 +15863,8 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; g_autoptr(virDomainSnapshotDef) def =3D NULL; @@ -16216,8 +16136,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cleanup: virDomainObjEndAPI(&vm); VIR_FREE(xml); - virObjectUnref(caps); - virObjectUnref(cfg); return snapshot; } =20 @@ -16627,8 +16545,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, int rc; virDomainDefPtr config =3D NULL; virDomainDefPtr inactiveConfig =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool was_stopped =3D false; qemuDomainSaveCookiePtr cookie; virCPUDefPtr origCPU =3D NULL; @@ -17045,8 +16963,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); - virObjectUnref(caps); - virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); @@ -17107,7 +17023,7 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, virQEMUMomentReparent rep; bool metadata_only =3D !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_= ONLY); int external =3D 0; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY | @@ -17199,7 +17115,6 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snaps= hot, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -17779,10 +17694,10 @@ qemuDomainBlockJobAbort(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainDiskDefPtr disk =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); - qemuBlockJobDataPtr job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv =3D NULL; bool blockdev =3D false; @@ -17883,8 +17798,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(job); - virObjectUnref(cfg); virDomainObjEndAPI(&vm); return ret; } @@ -19144,7 +19057,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, bool supportMaxOptions =3D true; bool supportGroupNameOption =3D true; bool supportMaxLengthOptions =3D true; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event =3D NULL; virTypedParameterPtr eventParams =3D NULL; int eventNparams =3D 0; @@ -19465,7 +19378,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainObjEndAPI(&vm); if (eventNparams) virTypedParamsFree(eventParams, eventNparams); - virObjectUnref(cfg); return ret; } =20 @@ -19715,8 +19627,8 @@ qemuDomainSetMetadata(virDomainPtr dom, { virQEMUDriverPtr driver =3D dom->conn->privateData; virDomainObjPtr vm; - virQEMUDriverConfigPtr cfg =3D NULL; - virCapsPtr caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int ret =3D -1; =20 virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -19750,8 +19662,6 @@ qemuDomainSetMetadata(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(caps); - virObjectUnref(cfg); return ret; } =20 @@ -20559,10 +20469,10 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, { char *ret =3D NULL; virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; - virDomainCapsPtr domCaps =3D NULL; + g_autoptr(virDomainCaps) domCaps =3D NULL; =20 virCheckFlags(0, ret); =20 @@ -20585,8 +20495,6 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn, =20 ret =3D virDomainCapsFormat(domCaps); cleanup: - virObjectUnref(domCaps); - virObjectUnref(qemuCaps); return ret; } =20 @@ -21338,7 +21246,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashTablePtr nodestats =3D NULL; virJSONValuePtr nodedata =3D NULL; qemuDomainObjPrivatePtr priv =3D dom->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool fetchnodedata =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES)= && !blockdev; @@ -21396,7 +21304,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, virHashFree(stats); virHashFree(nodestats); virJSONValueFree(nodedata); - virObjectUnref(cfg); return ret; } =20 @@ -21831,7 +21738,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, int n_leases =3D 0; size_t i, j; size_t ifaces_count =3D 0; - virNetworkPtr network =3D NULL; + g_autoptr(virNetwork) network =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainInterfacePtr iface =3D NULL; virNetworkDHCPLeasePtr *leases =3D NULL; @@ -21899,7 +21806,6 @@ qemuGetDHCPInterfaces(virDomainPtr dom, rv =3D ifaces_count; =20 cleanup: - virObjectUnref(network); if (leases) { for (i =3D 0; i < n_leases; i++) virNetworkDHCPLeaseFree(leases[i]); @@ -22035,7 +21941,7 @@ qemuDomainRenameCallback(virDomainObjPtr vm, void *opaque) { virQEMUDriverPtr driver =3D opaque; - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virObjectEventPtr event_new =3D NULL; virObjectEventPtr event_old =3D NULL; int ret =3D -1; @@ -22124,7 +22030,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm, VIR_FREE(new_dom_name); virObjectEventStateQueue(driver->domainEventState, event_old); virObjectEventStateQueue(driver->domainEventState, event_new); - virObjectUnref(cfg); return ret; =20 rollback: @@ -22587,7 +22492,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver =3D dom->conn->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv; virDomainObjPtr vm =3D NULL; virDomainDefPtr def =3D NULL; @@ -22644,7 +22549,6 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(cfg); return ret; } =20 @@ -22696,8 +22600,8 @@ qemuNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemucaps =3D NULL; int ret =3D -1; + g_autoptr(virQEMUCaps) qemucaps =3D NULL; =20 if (virNodeGetSevInfoEnsureACL(conn) < 0) return ret; @@ -22719,7 +22623,6 @@ qemuNodeGetSEVInfo(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(qemucaps); =20 return ret; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list