From nobody Sat Feb 7 22:06:48 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=1571179879; cv=none; d=zoho.com; s=zohoarc; b=OJoomsvl6h+pc3/ib+i6CQqW9jt/1ebHCxcke2UR0gmwxwNRPEB0JCF6bR8kS6Xo2xv/O3T4BQcj6Ezg8zjHkzDcoGk2gZH7EPRC7u7BiZndqtEa6NgWHwcrhtkjh0E0n7KfO6vz1EDqGW9wgPKwLGX0fUVXMJkOfxOLzgNPbRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571179879; 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=0RzUVpvWFobX0hrt/ahyw7NVjcZ79ZC0f0Nh0XjeG6w=; b=JmhEim1pHC9kFV7S9QN6xbJg+wPeMX5forcPOuBxfONDDViL6071HflFqz65Rmq+GyPaehtY2s+CHNKS0OhXxof2hkjqdY1NVEDMikTDrcX5pegM26PsiXpHV8qNGcm4MtHrVBOLLNLZZsgbGbLXakogyJys2uQ3p5SXFJJBYKU= 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 1571179879956201.77839313245295; Tue, 15 Oct 2019 15:51:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C05B73086218; Tue, 15 Oct 2019 22:51:17 +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 973FB60127; Tue, 15 Oct 2019 22:51:17 +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 55DC14A486; Tue, 15 Oct 2019 22:51:17 +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 x9FMmK5U016858 for ; Tue, 15 Oct 2019 18:48:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A0F85D9E2; Tue, 15 Oct 2019 22:48:20 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 939745D9CD for ; Tue, 15 Oct 2019 22:48:18 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (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 443E6300C727 for ; Tue, 15 Oct 2019 22:48:16 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id t20so27816555qtr.10 for ; Tue, 15 Oct 2019 15:48:16 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id 54sm14201363qts.75.2019.10.15.15.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 15: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=SKodZTT62x3q5O/kUGD7Tkn07l8lVELZINbg59fKSJg=; b=G7nb7eRiSy2oOD0VMg5RNk2muGB2iRPiEQGUgNLYGx0kI7fqvEelHmIINPbyix+cLX 2lU7kfzolhmzsNaQaDxzwJW0Zzxvw4iBXX1Lkl8+43QZS7soM25BXmAShGofyUqnuGKA qfVrOOQDoXYSE0Vl4VEhjwkABgpsbFjr2BfsYt783VxWjoL6Fw4SX3MrTISLg+LPQXUO S5uATw7S+h4dmpAOF7nm6qQHZaMa0h8OMLiHfSrL/JdcUh58TTATWZvnWDUbLFIQRc1O SzimaqO1WcC6OnFEPOPvOMbs4ROYnIqBb2zXpNcAQ78njE3penj8aEicAXufUjJC+k1b xjug== 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=SKodZTT62x3q5O/kUGD7Tkn07l8lVELZINbg59fKSJg=; b=eQTuaZiEH+69X55AciI8pj8OYCpmxjEH4X1QiHzysMVXrW3tAYcMOaB2gADybmfuZo MpRyNYiIrF4XvrSTyj0ZdpYkgB31h8AC3r1xfU2pOcC9YqTW+LC2Kkt/2Lc2HulMEEfB bGjicx7Dw00asz26Z7UQiFAP5HX3I3lOUc0joy1yu39Wn0KqunR+TGe6FbZtsg/RQ+nB q5rkYFqGqcpYqhZp5ktSyOePrK9Q1eOH9E7avMkC5yel/qR49dVsqoFiGNadQ/lisyJm KV1sW4Y4Q8UDYVGvAlhRBE8HwEuqSdQZfsIQsv/C8uxDZHcLtxiiivBBSqK6km3ERh+U dy9w== X-Gm-Message-State: APjAAAXC9JAOz9UMcHx9K57D2FWtE2eYePkQST368wLrJFh3HRZVi1xt OGG2yjQAcyGBpmAYgezAa3gXea85 X-Google-Smtp-Source: APXvYqx+ycC41mZObLLNSTe/X0r4KaDg4WDHsaCHESgW+tplt+vfHIjcvo4+XE4Q53I5JhZYXqd3JA== X-Received: by 2002:ac8:701e:: with SMTP id x30mr4606571qtm.203.1571179694652; Tue, 15 Oct 2019 15:48:14 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 19:47:59 -0300 Message-Id: <20191015224800.28545-3-danielhb413@gmail.com> In-Reply-To: <20191015224800.28545-1-danielhb413@gmail.com> References: <20191015224800.28545-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.45]); Tue, 15 Oct 2019 22:48:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 15 Oct 2019 22:48:16 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.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.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v2 2/3] qemu_process: use VIR_AUTOUNREF() 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 15 Oct 2019 22:51:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Change all feasible vir*Ptr pointers to be AUTOUNREF(), clearing up the 'cleanup' labels when possible. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_process.c | 316 +++++++++++++++------------------------- 1 file changed, 116 insertions(+), 200 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f4b3144154..72919c370d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -108,11 +108,10 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, char ebuf[1024]; VIR_AUTOFREE(char *) file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) - goto cleanup; + return -1; =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -124,10 +123,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); =20 - ret =3D 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -407,7 +403,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event; qemuDomainObjPrivatePtr priv; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int ret =3D -1; =20 virObjectLock(vm); @@ -444,7 +440,6 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return ret; } =20 @@ -463,7 +458,7 @@ qemuProcessFakeReboot(void *opaque) virDomainObjPtr vm =3D opaque; qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_BOOTED; int ret =3D -1, rc; =20 @@ -513,7 +508,6 @@ qemuProcessFakeReboot(void *opaque) if (ret =3D=3D -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); virDomainObjEndAPI(&vm); - virObjectUnref(cfg); } =20 =20 @@ -576,7 +570,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int detail =3D 0; =20 VIR_DEBUG("vm=3D%p", vm); @@ -633,7 +627,6 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNU= SED, unlock: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); =20 return 0; } @@ -648,7 +641,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, virObjectEventPtr event =3D NULL; virDomainPausedReason reason; virDomainEventSuspendedDetailType detail; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 virObjectLock(vm); @@ -694,7 +687,6 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); =20 return 0; } @@ -707,7 +699,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); qemuDomainObjPrivatePtr priv; virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_UNPAUSED; virDomainEventResumedDetailType eventDetail; @@ -740,7 +732,6 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSE= D, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -752,7 +743,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); =20 @@ -784,7 +775,6 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UN= USED, virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -798,7 +788,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr watchdogEvent =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); watchdogEvent =3D virDomainEventWatchdogNewFromObj(vm, action); @@ -846,7 +836,6 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNU= SED, virObjectEventStateQueue(driver->domainEventState, watchdogEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); =20 - virObjectUnref(cfg); return 0; } =20 @@ -867,7 +856,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUS= ED, const char *srcPath; const char *devAlias; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); =20 @@ -918,7 +907,6 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUS= ED, virObjectEventStateQueue(driver->domainEventState, ioErrorEvent); virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1147,7 +1135,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virDomainDiskDefPtr disk; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, devid); @@ -1170,7 +1158,6 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC= _UNUSED, =20 virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -1182,7 +1169,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_U= NUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventPMWakeupNewFromObj(vm); @@ -1209,7 +1196,6 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_U= NUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1221,7 +1207,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendNewFromObj(vm); @@ -1251,7 +1237,6 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_= UNUSED, =20 virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); return 0; } =20 @@ -1263,7 +1248,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, { virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventBalloonChangeNewFromObj(vm, actual); @@ -1278,7 +1263,6 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_G= NUC_UNUSED, virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -1290,7 +1274,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_G= NUC_UNUSED, virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; virObjectEventPtr lifecycleEvent =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendDiskNewFromObj(vm); @@ -1320,7 +1304,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_G= NUC_UNUSED, =20 virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - virObjectUnref(cfg); =20 return 0; } @@ -1651,7 +1634,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, qemuDomainObjPrivatePtr priv; virQEMUDriverPtr driver =3D opaque; virObjectEventPtr event =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); int reason; =20 virObjectLock(vm); @@ -1690,7 +1673,6 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G= _GNUC_UNUSED, cleanup: virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(cfg); return 0; } =20 @@ -2735,9 +2717,8 @@ static int qemuProcessResctrlCreate(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret =3D -1; size_t i =3D 0; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; =20 if (!vm->def->nresctrls) @@ -2754,7 +2735,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, if (virResctrlAllocCreate(caps->host.resctrl, vm->def->resctrls[i]->alloc, priv->machineName) < 0) - goto cleanup; + return -1; =20 for (j =3D 0; j < vm->def->resctrls[i]->nmonitors; j++) { virDomainResctrlMonDefPtr mon =3D NULL; @@ -2762,14 +2743,11 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver, mon =3D vm->def->resctrls[i]->monitors[j]; if (virResctrlMonitorCreate(mon->instance, priv->machineName) < 0) - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - virObjectUnref(caps); - return ret; + return 0; } =20 =20 @@ -2842,7 +2820,7 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; int errfd =3D -1; VIR_AUTOFREE(char *) pidfile =3D NULL; int pidfd =3D -1; @@ -2954,7 +2932,6 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm) virCommandFree(cmd); VIR_FORCE_CLOSE(pidfd); VIR_FORCE_CLOSE(errfd); - virObjectUnref(cfg); return ret; } =20 @@ -2965,7 +2942,7 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, int asyncJob) { int ret =3D 0; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); size_t i; =20 for (i =3D 0; i < vm->def->ngraphics; ++i) { @@ -2985,11 +2962,9 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, } =20 if (ret < 0) - goto cleanup; + return ret; } =20 - cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3050,7 +3025,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, ssize_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainVideoDefPtr video =3D NULL; - virQEMUDriverConfigPtr cfg =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; @@ -3109,7 +3084,6 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, =20 cfg =3D virQEMUDriverGetConfig(driver); ret =3D virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver-= >caps); - virObjectUnref(cfg); =20 return ret; =20 @@ -3216,11 +3190,11 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDo= mainObjPtr vm, { int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Using lock state '%s'", NULLSTR(priv->lockState)); if (virDomainLockProcessResume(driver->lockManager, cfg->uri, @@ -3229,7 +3203,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, * to make sure we have state still present if the user * tries to resume again */ - goto cleanup; + return -1; } VIR_FREE(priv->lockState); =20 @@ -3250,8 +3224,6 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, * lifecycle event. */ =20 - cleanup: - virObjectUnref(cfg); return ret; =20 release: @@ -3259,7 +3231,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDoma= inObjPtr vm, if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockStat= e) < 0) VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - goto cleanup; + return ret; } =20 =20 @@ -3313,7 +3285,7 @@ static void qemuProcessNotifyNets(virDomainDefPtr def) { size_t i; - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -3331,8 +3303,6 @@ qemuProcessNotifyNets(virDomainDefPtr def) virDomainNetNotifyActualDevice(conn, def, net); } } - - virObjectUnref(conn); } =20 /* Attempt to instantiate the filters. Ignore failures because it's @@ -3857,12 +3827,11 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, virDomainMemoryDefPtr mem, bool build) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_AUTOFREE(char *) path =3D NULL; size_t i; bool shouldBuildHP =3D false; bool shouldBuildMB =3D false; - int ret =3D -1; =20 if (build) { shouldBuildHP =3D qemuProcessNeedHugepagesPath(vm->def, mem); @@ -3874,11 +3843,11 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, path =3D qemuGetDomainHugepagePath(vm->def, &cfg->hugetlbfs[i]= ); =20 if (!path) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) - goto cleanup; + return -1; =20 VIR_FREE(path); } @@ -3886,17 +3855,14 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr= driver, =20 if (!build || shouldBuildMB) { if (qemuGetMemoryBackingDomainPath(vm->def, cfg, &path) < 0) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPathsImpl(driver, vm, path, build) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -3905,23 +3871,19 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPt= r driver, virDomainObjPtr vm, virDomainMemoryDefPtr mem) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_AUTOFREE(char *) path =3D NULL; - int ret =3D -1; =20 if (qemuGetMemoryBackingPath(vm->def, cfg, mem->info.alias, &path) < 0) - goto cleanup; + return -1; =20 if (unlink(path) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, _("Unable to remove %s"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -3960,12 +3922,11 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driv= er, virDomainGraphicsDefPtr graphics, bool allocate) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned short port =3D 0; unsigned short tlsPort; size_t i; int defaultMode =3D graphics->data.spice.defaultMode; - int ret =3D -1; =20 bool needTLSPort =3D false; bool needPort =3D false; @@ -4011,13 +3972,12 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driv= er, if (needTLSPort || graphics->data.spice.tlsPort =3D=3D -1) graphics->data.spice.tlsPort =3D 5902; =20 - ret =3D 0; - goto cleanup; + return 0; } =20 if (needPort || graphics->data.spice.port =3D=3D -1) { if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0) - goto cleanup; + return -1; =20 graphics->data.spice.port =3D port; =20 @@ -4030,11 +3990,11 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driv= er, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Auto allocation of spice TLS port requested " "but spice TLS is disabled in qemu.conf")); - goto cleanup; + return -1; } =20 if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) - goto cleanup; + return -1; =20 graphics->data.spice.tlsPort =3D tlsPort; =20 @@ -4042,11 +4002,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr drive= r, graphics->data.spice.tlsPortReserved =3D true; } =20 - ret =3D 0; - - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -4361,7 +4317,7 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, { virCPUDataPtr cpu =3D NULL; virCPUDataPtr disabled =3D NULL; - virDomainCapsCPUModelsPtr models =3D NULL; + VIR_AUTOUNREF(virDomainCapsCPUModelsPtr) models =3D NULL; int ret =3D -1; =20 /* The host CPU model comes from host caps rather than QEMU caps so @@ -4384,7 +4340,6 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver, cleanup: virCPUDataFree(cpu); virCPUDataFree(disabled); - virObjectUnref(models); return ret; } =20 @@ -4733,9 +4688,9 @@ static int qemuProcessGetNetworkAddress(const char *netname, char **netaddr) { - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; int ret =3D -1; - virNetworkPtr net; + VIR_AUTOUNREF(virNetworkPtr) net =3D NULL; virNetworkDefPtr netdef =3D NULL; virNetworkIPDefPtr ipdef; virSocketAddr addr; @@ -4821,8 +4776,6 @@ qemuProcessGetNetworkAddress(const char *netname, ret =3D 0; cleanup: virNetworkDefFree(netdef); - virObjectUnref(net); - virObjectUnref(conn); return ret; } =20 @@ -4860,12 +4813,11 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr dri= ver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); const char *type =3D virDomainGraphicsTypeToString(graphics->type); char *listenAddr =3D NULL; bool useSocket =3D false; size_t i; - int ret =3D -1; =20 switch (graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -4899,12 +4851,12 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr dri= ver, memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); if (virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, type) < 0) - goto cleanup; + return -1; glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; } else if (listenAddr) { if (VIR_STRDUP(glisten->address, listenAddr) < 0) - goto cleanup; + return -1; glisten->fromConfig =3D true; } } @@ -4916,14 +4868,14 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr dri= ver, =20 if (qemuProcessGraphicsSetupNetworkAddress(glisten, listenAddr) < 0) - goto cleanup; + return -1; break; =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { if (virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, type) < 0) - goto cleanup; + return -1; glisten->autoGenerated =3D true; } break; @@ -4934,11 +4886,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driv= er, } } =20 - ret =3D 0; - - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -5574,7 +5522,7 @@ qemuProcessInit(virQEMUDriverPtr driver, bool migration, unsigned int flags) { - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; int stopFlags; virCPUDefPtr origCPU =3D NULL; @@ -5657,7 +5605,6 @@ qemuProcessInit(virQEMUDriverPtr driver, =20 cleanup: virCPUDefFree(origCPU); - virObjectUnref(caps); return ret; =20 stop: @@ -5678,9 +5625,8 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, { virDomainDefPtr def =3D vm->def; qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; size_t i; - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -5692,9 +5638,9 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dri= ver, */ if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { if (!conn && !(conn =3D virGetConnectNetwork())) - goto cleanup; + return -1; if (virDomainNetAllocateActualDevice(conn, def, net) < 0) - goto cleanup; + return -1; } =20 actualType =3D virDomainNetGetActualType(net); @@ -5718,10 +5664,10 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr d= river, pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function, net->data.network.name, def->name); - goto cleanup; + return -1; } if (virDomainHostdevInsert(def, hostdev) < 0) - goto cleanup; + return -1; } else if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_USER && !priv->disableSlirp && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE))= { @@ -5731,10 +5677,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr dr= iver, } =20 } - ret =3D 0; - cleanup: - virObjectUnref(conn); - return ret; + return 0; } =20 =20 @@ -6238,18 +6181,17 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; size_t i; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virCapsPtr caps; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; + return -1; =20 priv->machineName =3D qemuDomainGetMachineName(vm); if (!priv->machineName) - goto cleanup; + return -1; =20 if (!(flags & VIR_QEMU_PROCESS_START_PRETEND)) { /* If you are using a SecurityDriver with dynamic labelling, @@ -6257,12 +6199,12 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, VIR_DEBUG("Generating domain security label (if required)"); if (qemuSecurityGenLabel(driver->securityManager, vm->def) < 0) { virDomainAuditSecurityLabel(vm, false); - goto cleanup; + return -1; } virDomainAuditSecurityLabel(vm, true); =20 if (qemuProcessPrepareDomainNUMAPlacement(vm, caps) < 0) - goto cleanup; + return -1; } =20 /* Whether we should use virtlogd as stdio handler for character @@ -6296,51 +6238,51 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, VIR_DEBUG("Assigning domain PCI addresses"); if ((qemuDomainAssignAddresses(vm->def, priv->qemuCaps, driver, vm, !!(flags & VIR_QEMU_PROCESS_START_NEW))= ) < 0) { - goto cleanup; + return -1; } =20 if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Setting graphics devices"); if (qemuProcessSetupGraphics(driver, vm, priv->qemuCaps, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Create domain masterKey"); if (qemuDomainMasterKeyCreate(vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Setting up storage"); if (qemuProcessPrepareDomainStorage(driver, vm, priv, cfg, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Prepare chardev source backends for TLS"); qemuDomainPrepareChardevSource(vm->def, cfg); =20 VIR_DEBUG("Prepare device secrets"); if (qemuDomainSecretPrepare(driver, vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Prepare bios/uefi paths"); if (qemuFirmwareFillDomain(driver, vm, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing external devices"); if (qemuExtDevicesPrepareDomain(driver, vm) < 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nchannels; i++) { if (qemuDomainPrepareChannel(vm->def->channels[i], priv->channelTargetDir) < 0) - goto cleanup; + return -1; } =20 if (!(priv->monConfig =3D virDomainChrSourceDefNew(driver->xmlopt))) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing monitor state"); if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0) - goto cleanup; + return -1; =20 priv->monError =3D false; priv->monStart =3D 0; @@ -6349,18 +6291,14 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, =20 VIR_DEBUG("Updating guest CPU definition"); if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < = 0) - goto cleanup; + return -1; =20 for (i =3D 0; i < vm->def->nshmems; i++) { if (qemuDomainPrepareShmemChardev(vm->def->shmems[i]) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - virObjectUnref(caps); - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -6512,17 +6450,16 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virDomainObjPtr vm, unsigned int flags) { - int ret =3D -1; unsigned int hostdev_flags =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 if (qemuPrepareNVRAM(cfg, vm) < 0) - goto cleanup; + return -1; =20 if (vm->def->vsock) { if (qemuProcessOpenVhostVsock(vm->def->vsock) < 0) - goto cleanup; + return -1; } /* network devices must be "prepared" before hostdevs, because * setting up a network device might create a new hostdev that @@ -6530,7 +6467,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, */ VIR_DEBUG("Preparing network devices"); if (qemuProcessNetworkPrepareDevices(driver, vm) < 0) - goto cleanup; + return -1; =20 /* Must be run before security labelling */ VIR_DEBUG("Preparing host devices"); @@ -6540,17 +6477,17 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, hostdev_flags |=3D VIR_HOSTDEV_COLD_BOOT; if (qemuHostdevPrepareDomainDevices(driver, vm->def, priv->qemuCaps, hostdev_flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing chr devices"); if (virDomainChrDefForeach(vm->def, true, qemuProcessPrepareChardevDevice, NULL) < 0) - goto cleanup; + return -1; =20 if (qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, true) < 0) - goto cleanup; + return -1; =20 /* Ensure no historical cgroup for this VM is lying around bogus * settings */ @@ -6561,14 +6498,14 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virReportSystemError(errno, _("cannot create log directory %s"), cfg->logDir); - goto cleanup; + return -1; } =20 VIR_FREE(priv->pidfile); if (!(priv->pidfile =3D virPidFileBuildPath(cfg->stateDir, vm->def->na= me))) { virReportSystemError(errno, "%s", _("Failed to build pidfile path.")); - goto cleanup; + return -1; } =20 if (unlink(priv->pidfile) < 0 && @@ -6576,7 +6513,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, virReportSystemError(errno, _("Cannot remove stale PID file %s"), priv->pidfile); - goto cleanup; + return -1; } =20 /* @@ -6585,27 +6522,24 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, */ if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Write domain masterKey"); if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing disks (host)"); if (qemuProcessPrepareHostStorage(driver, vm, flags) < 0) - goto cleanup; + return -1; =20 VIR_DEBUG("Preparing external devices"); if (qemuExtDevicesPrepareHost(driver, vm) < 0) - goto cleanup; + return -1; =20 if (qemuProcessPrepareSEVGuestInput(vm) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -6715,12 +6649,12 @@ qemuProcessLaunch(virConnectPtr conn, int ret =3D -1; int rv; int logfile =3D -1; - qemuDomainLogContextPtr logCtxt =3D NULL; + VIR_AUTOUNREF(qemuDomainLogContextPtr) logCtxt =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; virCommandPtr cmd =3D NULL; struct qemuProcessHookData hookData; - virQEMUDriverConfigPtr cfg; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; size_t nnicindexes =3D 0; VIR_AUTOFREE(int *) nicindexes =3D NULL; size_t i; @@ -7035,9 +6969,6 @@ qemuProcessLaunch(virConnectPtr conn, qemuExtDevicesStop(driver, vm); qemuDomainSecretDestroy(vm); virCommandFree(cmd); - virObjectUnref(logCtxt); - virObjectUnref(cfg); - virObjectUnref(caps); return ret; } =20 @@ -7094,8 +7025,7 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, bool startCPUs, virDomainPausedReason pausedReason) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); =20 if (startCPUs) { VIR_DEBUG("Starting domain CPUs"); @@ -7105,7 +7035,7 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, if (virGetLastErrorCode() =3D=3D VIR_ERR_OK) virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("resume operation failed")); - goto cleanup; + return -1; } } else { virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, pausedReason); @@ -7113,18 +7043,14 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver, =20 VIR_DEBUG("Writing domain status to disk"); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap= s) < 0) - goto cleanup; + return -1; =20 if (qemuProcessStartHook(driver, vm, VIR_HOOK_QEMU_OP_STARTED, VIR_HOOK_SUBOP_BEGIN) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } =20 =20 @@ -7363,8 +7289,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, virNetDevVPortProfilePtr vport =3D NULL; size_t i; VIR_AUTOFREE(char *) timestamp =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virConnectPtr conn =3D NULL; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; =20 VIR_DEBUG("Shutting down vm=3D%p name=3D%s id=3D%d pid=3D%lld, " "reason=3D%s, asyncJob=3D%s, flags=3D0x%x", @@ -7670,8 +7596,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virSetError(orig_err); virFreeError(orig_err); } - virObjectUnref(conn); - virObjectUnref(cfg); } =20 =20 @@ -7806,7 +7730,7 @@ static int qemuProcessRefreshCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virCapsPtr caps =3D virQEMUDriverGetCapabilities(driver, false); + VIR_AUTOUNREF(virCapsPtr) caps =3D virQEMUDriverGetCapabilities(driver= , false); qemuDomainObjPrivatePtr priv =3D vm->privateData; virCPUDefPtr host =3D NULL; virCPUDefPtr cpu =3D NULL; @@ -7857,7 +7781,6 @@ qemuProcessRefreshCPU(virQEMUDriverPtr driver, cleanup: virCPUDefFree(cpu); virCPUDefFree(host); - virObjectUnref(caps); return ret; } =20 @@ -7993,11 +7916,11 @@ qemuProcessReconnect(void *opaque) qemuDomainJobObj oldjob; int state; int reason; - virQEMUDriverConfigPtr cfg; + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; size_t i; unsigned int stopFlags =3D 0; bool jobStarted =3D false; - virCapsPtr caps =3D NULL; + VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; bool retry =3D true; bool tryMonReconn =3D false; =20 @@ -8241,8 +8164,6 @@ qemuProcessReconnect(void *opaque) qemuDomainRemoveInactiveJob(driver, obj); } virDomainObjEndAPI(&obj); - virObjectUnref(cfg); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); virIdentitySetCurrent(NULL); return; @@ -8605,9 +8526,8 @@ qemuProcessQMPInitMonitor(qemuMonitorPtr mon) static int qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) { - virDomainXMLOptionPtr xmlopt =3D NULL; + VIR_AUTOUNREF(virDomainXMLOptionPtr) xmlopt =3D NULL; virDomainChrSourceDef monConfig; - int ret =3D -1; =20 VIR_DEBUG("proc=3D%p, emulator=3D%s, proc->pid=3D%lld", proc, proc->binary, (long long)proc->pid); @@ -8619,24 +8539,20 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) if (!(xmlopt =3D virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL)) = || !(proc->vm =3D virDomainObjNew(xmlopt)) || !(proc->vm->def =3D virDomainDefNew())) - goto cleanup; + return -1; =20 proc->vm->pid =3D proc->pid; =20 if (!(proc->mon =3D qemuMonitorOpen(proc->vm, &monConfig, true, 0, &callbacks, NULL))) - goto cleanup; + return -1; =20 virObjectLock(proc->mon); =20 if (qemuProcessQMPInitMonitor(proc->mon) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virObjectUnref(xmlopt); - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list