From nobody Sun Feb 8 11:40:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1637760623; cv=none; d=zohomail.com; s=zohoarc; b=VIG4Qo0ffqkYuFRARwljg3f3OCSHpmnHe4Dzb2hnzpzHoH90h5ss8GvLoqtTERnGrVM2sUoNddQIRaqllraomVBUaU66mD46cAzsg7+3LYjSvE54dbeZBLH5hlzzO+E74csqPO3w/Kp6ii1m54awnWQPJDiiC6YHLPAnj4ynBlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637760623; h=Content-Type:Content-Transfer-Encoding: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=3UaXLJ3RwgYqtEwtydo26EV+BohpSiY/FMrCWX8SOvY=; b=MEbav2SaCxBWnA4BsLGL+hhtasMX6ZnKb+YB0CZx9ls3G51+lAwauO86qbWHAy7YyK5U4Lve8hHWBgjw813a2C1WTuxkyf66RvjdikwutNT+9goqCQJ//AANeo+6qNP2uxY9yWTWuX5rU6hnZEgIe8KyHKbfJ2cnpPxAZyZ+Rn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1637760623834678.89838726533; Wed, 24 Nov 2021 05:30:23 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-476-b_webplpNyecM5kk6hwyDQ-1; Wed, 24 Nov 2021 08:30:20 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CE26193F566; Wed, 24 Nov 2021 13:30:13 +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 2D47B60C17; Wed, 24 Nov 2021 13:30:13 +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 EDD061809CB9; Wed, 24 Nov 2021 13:30:12 +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 1AODTQ1T012616 for ; Wed, 24 Nov 2021 08:29:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id B832DADDC; Wed, 24 Nov 2021 13:29:26 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F2485DF21 for ; Wed, 24 Nov 2021 13:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637760622; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3UaXLJ3RwgYqtEwtydo26EV+BohpSiY/FMrCWX8SOvY=; b=aZRjcPNklALGM8fOGsYfZt3Wpw6RA2ggBg636AEN+3tC/b80dJfTAnD4pbe97et2cHPFaB z/UAw6RmL8hoib40bl0UPAjO/hBvaSYm25g9kyqN/1PjN5e381B3fb3aQH518lL6p4LKDT qLe3FLGalZWnuWnzkTCWSiiukxiln20= X-MC-Unique: b_webplpNyecM5kk6hwyDQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] qemu: do not check return value of qemuDomainObjExitMonitor Date: Wed, 24 Nov 2021 14:28:52 +0100 Message-Id: <569bc9bfcf820ef0028355c88f0361becf3d4543.1637760513.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637760625713100001 Remove the check from conditions where it's coupled with some other checks. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_backup.c | 9 ++++--- src/qemu/qemu_block.c | 23 +++++++++++----- src/qemu/qemu_blockjob.c | 3 ++- src/qemu/qemu_checkpoint.c | 9 ++++--- src/qemu/qemu_domain.c | 4 ++- src/qemu/qemu_driver.c | 45 ++++++++++++++++++++------------ src/qemu/qemu_hotplug.c | 15 +++++++---- src/qemu/qemu_migration.c | 24 +++++++++++------ src/qemu/qemu_migration_cookie.c | 3 ++- src/qemu/qemu_migration_params.c | 6 +++-- src/qemu/qemu_process.c | 19 +++++++++----- src/qemu/qemu_snapshot.c | 3 ++- 12 files changed, 109 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 193d4ccd29..8e191d344e 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -474,7 +474,8 @@ qemuBackupDiskPrepareOneStorage(virDomainObj *vm, =20 rc =3D qemuBlockStorageSourceAttachApply(priv->mon, dd->crdata->sr= cdata[0]); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) return -1; } =20 @@ -888,7 +889,8 @@ qemuBackupBegin(virDomainObj *vm, if (rc =3D=3D 0) rc =3D qemuMonitorTransaction(priv->mon, &actions); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) goto endjob; =20 job_started =3D true; @@ -1158,7 +1160,8 @@ qemuBackupGetJobInfoStats(virQEMUDriver *driver, =20 rc =3D qemuMonitorGetJobInfo(priv->mon, &blockjobs, &nblockjobs); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto cleanup; =20 /* count in completed jobs */ diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 44579a83ea..04f5e383bc 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -326,7 +326,9 @@ qemuBlockNodeNamesDetect(virQEMUDriver *driver, data =3D qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm)); blockstats =3D qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm)); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !data || !blockstats) + qemuDomainObjExitMonitor(driver, vm); + + if (!data || !blockstats) return -1; =20 if (!(disktable =3D qemuBlockNodeNameGetBackingChain(data, blockstats)= )) @@ -2711,7 +2713,8 @@ qemuBlockStorageSourceCreateGeneric(virDomainObj *vm, rc =3D qemuMonitorBlockdevCreate(priv->mon, job->name, props); props =3D NULL; =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) goto cleanup; =20 qemuBlockJobStarted(job, vm); @@ -2857,7 +2860,8 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, =20 rc =3D qemuBlockStorageSourceAttachApplyStorageDeps(priv->mon, data); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) goto cleanup; =20 if (qemuBlockStorageSourceCreateStorage(vm, src, chain, asyncJob) < 0) @@ -2871,7 +2875,8 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, if (rc =3D=3D 0) rc =3D qemuBlockStorageSourceAttachApplyFormatDeps(priv->mon, data= ); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) goto cleanup; =20 if (qemuBlockStorageSourceCreateFormat(vm, src, backingStore, chain, @@ -2889,7 +2894,8 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, =20 rc =3D qemuBlockStorageSourceAttachApplyFormat(priv->mon, data); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) goto cleanup; =20 ret =3D 0; @@ -3021,7 +3027,9 @@ qemuBlockGetNamedNodeData(virDomainObj *vm, =20 blockNamedNodeData =3D qemuMonitorBlockGetNamedNodeData(priv->mon, sup= ports_flat); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockNamedNodeData) + qemuDomainObjExitMonitor(driver, vm); + + if (!blockNamedNodeData) return NULL; =20 return g_steal_pointer(&blockNamedNodeData); @@ -3377,7 +3385,8 @@ qemuBlockReopenFormat(virDomainObj *vm, =20 rc =3D qemuBlockReopenFormatMon(priv->mon, src); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 return 0; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e7c3fea946..e57902df8c 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -507,7 +507,8 @@ qemuBlockJobRefreshJobs(virQEMUDriver *driver, =20 rc =3D qemuMonitorGetJobInfo(priv->mon, &jobinfo, &njobinfo); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto cleanup; =20 for (i =3D 0; i < njobinfo; i++) { diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 38ea57dea7..3ac5912def 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -524,7 +524,8 @@ qemuCheckpointCreate(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorTransaction(qemuDomainGetMonitor(vm), &actions); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) { + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) { qemuCheckpointRollbackMetadata(vm, chk); return NULL; } @@ -734,7 +735,8 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, if (rc =3D=3D 0) rc =3D qemuMonitorTransaction(priv->mon, &mergeactions); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; =20 /* now do a final refresh */ @@ -746,7 +748,8 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, =20 rc =3D qemuMonitorTransaction(priv->mon, &cleanupactions); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; =20 /* update disks */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d0d9a31f37..b0b2dd0258 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9628,7 +9628,9 @@ qemuDomainRefreshVcpuHalted(virQEMUDriver *driver, QEMU_CAPS_QUERY_CPUS_FAST); haltedmap =3D qemuMonitorGetCpuHalted(qemuDomainGetMonitor(vm), maxvcp= us, fast); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !haltedmap) + qemuDomainObjExitMonitor(driver, vm); + + if (!haltedmap) return -1; =20 for (i =3D 0; i < maxvcpus; i++) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 33686f4f23..4a48354df1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2388,7 +2388,8 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, priv =3D vm->privateData; qemuDomainObjEnterMonitor(driver, vm); r =3D qemuMonitorSetBalloon(priv->mon, newmem); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || r < 0) + qemuDomainObjExitMonitor(driver, vm); + if (r < 0) goto endjob; =20 /* Lack of balloon support is a fatal error */ @@ -3126,7 +3127,8 @@ qemuDumpToFd(virQEMUDriver *driver, =20 ret =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); =20 - if ((qemuDomainObjExitMonitor(driver, vm) < 0) || ret < 0) + qemuDomainObjExitMonitor(driver, vm); + if (ret < 0) return -1; =20 if (detach) @@ -10001,7 +10003,9 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver, rc =3D qemuMonitorBlockStatsUpdateCapacity(priv->mon, blocksta= ts); } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || nstats < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + + if (nstats < 0 || rc < 0) goto cleanup; =20 *retstats =3D g_new0(qemuBlockStats, 1); @@ -12573,7 +12577,8 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriver *driver, =20 rc =3D qemuMonitorQueryDump(priv->mon, &stats); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 jobInfo->stats.dump =3D stats; @@ -12909,7 +12914,8 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, } else { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorSetMigrationDowntime(priv->mon, downtime); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; } =20 @@ -13024,7 +13030,8 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr d= om, } else { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; } =20 @@ -13089,7 +13096,8 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr d= om, } else { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; } =20 @@ -13177,7 +13185,8 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorSetMigrationSpeed(priv->mon, bandwidth); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; } =20 @@ -14663,7 +14672,9 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); blockjobstats =3D qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(v= m), true); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockjobstats) + qemuDomainObjExitMonitor(driver, vm); + + if (!blockjobstats) goto endjob; =20 rawInfo =3D g_hash_table_lookup(blockjobstats, job->name); @@ -15587,10 +15598,10 @@ qemuDomainBlockCommit(virDomainPtr dom, topPath, nodetop, basePath, nodebase, backingPath, speed); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) { - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); + + if (ret < 0) goto endjob; - } =20 if (mirror) { disk->mirror =3D g_steal_pointer(&mirror); @@ -16607,8 +16618,8 @@ qemuDomainProbeQMPCurrentMachine(virQEMUDriver *dri= ver, =20 qemuDomainObjEnterMonitor(driver, vm); rv =3D qemuMonitorGetCurrentMachineInfo(priv->mon, &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || - rv < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) return -1; =20 *wakeupSupported =3D info.wakeupSuspendSupport; @@ -19681,7 +19692,8 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorSetBlockThreshold(priv->mon, nodename, threshold); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto endjob; =20 /* we need to remember whether the threshold was registered with an ex= plicit @@ -19796,7 +19808,8 @@ qemuDomainModifyLifecycleActionLive(virDomainObj *v= m, QEMU_MONITOR_ACTION_WATCHDOG_KEEP, QEMU_MONITOR_ACTION_PANIC_KEEP); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 return 0; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 59b3e57fd3..e886fbc35d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -280,7 +280,8 @@ qemuDomainChangeMediaLegacy(virQEMUDriver *driver, /* re-issue ejection command to pop out the media */ qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, false); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 } else { @@ -432,7 +433,8 @@ qemuHotplugAttachManagedPR(virQEMUDriver *driver, =20 rc =3D qemuMonitorAddObject(priv->mon, &props, NULL); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto cleanup; =20 ret =3D 0; @@ -529,7 +531,8 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver, if (diskPriv->tray && disk->tray_status !=3D VIR_DOMAIN_DISK_TRAY_OPEN= ) { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorBlockdevTrayOpen(priv->mon, diskPriv->qomName, f= orce); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 if (!force && qemuHotplugWaitForTrayEject(vm, disk) < 0) @@ -567,7 +570,8 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver, if (rc < 0 && newbackend) qemuBlockStorageSourceChainDetach(priv->mon, newbackend); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 return 0; @@ -2786,7 +2790,8 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver, ignore_value(qemuMonitorCloseFileHandle(priv->mon, vhostfdName)); if (removeextension) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->i= nfo)); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0) + qemuDomainObjExitMonitor(driver, vm); + if (ret < 0) goto audit; =20 vm->def->hostdevs[vm->def->nhostdevs++] =3D hostdev; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3fd0db15bb..a544e9e2fd 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -750,7 +750,8 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriver *driver, * consistency on the destination so that we can force cancel the mirr= or */ rv =3D qemuMonitorBlockJobCancel(priv->mon, job->name, abortMigration); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) return -1; =20 return 0; @@ -963,7 +964,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *d= river, if (mon_ret !=3D 0) qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), dat= a); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) + qemuDomainObjExitMonitor(driver, vm); + if (mon_ret < 0) return -1; =20 diskPriv->migrSource =3D g_steal_pointer(©src); @@ -1004,7 +1006,8 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriv= er *driver, diskAlias, nbd_dest, "raw", mirror_speed, 0, 0, mirror_shallow, t= rue); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) + qemuDomainObjExitMonitor(driver, vm); + if (mon_ret < 0) return -1; =20 return 0; @@ -1673,7 +1676,8 @@ qemuMigrationAnyFetchStats(virQEMUDriver *driver, =20 rv =3D qemuMonitorGetMigrationStats(priv->mon, &stats, error); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) return -1; =20 jobInfo->stats.mig =3D stats; @@ -2140,7 +2144,8 @@ qemuMigrationDstRun(virQEMUDriver *driver, rv =3D qemuMonitorMigrateIncoming(priv->mon, uri); =20 exit_monitor: - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) return -1; =20 if (asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_IN) { @@ -3930,7 +3935,8 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(virD= omainObj *vm, =20 rc =3D qemuMonitorTransaction(priv->mon, &actions); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 jobPriv->migTempBitmaps =3D g_steal_pointer(&tmpbitmaps); @@ -4240,7 +4246,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver, break; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) goto error; =20 /* From this point onwards we *must* call cancel to abort the @@ -6247,7 +6254,8 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriver *drive= r, =20 blockinfo =3D qemuMonitorGetAllBlockJobInfo(priv->mon, false); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockinfo) + qemuDomainObjExitMonitor(driver, vm); + if (!blockinfo) return -1; =20 memset(stats, 0, sizeof(*stats)); diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index eaf360932d..bffab7c13d 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -496,7 +496,8 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stat= s); else rc =3D qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 for (i =3D 0; i < vm->def->ndisks; i++) { diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 7bfae29de4..837ee6d635 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -1079,7 +1079,8 @@ qemuMigrationParamsFetch(virQEMUDriver *driver, =20 rc =3D qemuMonitorGetMigrationParams(priv->mon, &jsonParams); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 if (!(*migParams =3D qemuMigrationParamsFromJSON(jsonParams))) @@ -1379,7 +1380,8 @@ qemuMigrationCapsCheck(virQEMUDriver *driver, =20 rc =3D qemuMonitorGetMigrationCapabilities(priv->mon, &caps); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 if (!caps) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1148e6072f..dcd547b279 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2372,7 +2372,8 @@ qemuProcessRefreshBalloonState(virQEMUDriver *driver, return -1; =20 rc =3D qemuMonitorGetBalloonInfo(qemuDomainGetMonitor(vm), &balloon); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 /* We want the balloon size stored in domain definition to @@ -4457,7 +4458,8 @@ qemuProcessFetchCPUDefinitions(virQEMUDriver *driver, =20 rc =3D virQEMUCapsFetchCPUModels(priv->mon, vm->def->os.arch, &models); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 *cpuModels =3D g_steal_pointer(&models); @@ -7127,7 +7129,8 @@ qemuProcessSetupDisksTransientHotplug(virDomainObj *v= m, =20 rc =3D qemuMonitorSystemReset(priv->mon); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) return -1; } =20 @@ -7178,7 +7181,8 @@ qemuProcessSetupLifecycleActions(virDomainObj *vm, QEMU_MONITOR_ACTION_WATCHDOG_KEEP, QEMU_MONITOR_ACTION_PANIC_KEEP); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(priv->driver, vm); + if (rc < 0) return -1; =20 return 0; @@ -8390,7 +8394,8 @@ qemuProcessRefreshCPUMigratability(virQEMUDriver *dri= ver, =20 rc =3D qemuMonitorGetCPUMigratable(priv->mon, &migratable); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; =20 if (rc =3D=3D 1) @@ -8547,7 +8552,9 @@ qemuProcessRefreshLegacyBlockjobs(virQEMUDriver *driv= er, =20 qemuDomainObjEnterMonitor(driver, vm); blockJobs =3D qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(vm), = true); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !blockJobs) + qemuDomainObjExitMonitor(driver, vm); + + if (!blockJobs) goto cleanup; =20 if (virHashForEach(blockJobs, qemuProcessRefreshLegacyBlockjob, vm) < = 0) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index ff827d5313..d0b2d40e94 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1032,7 +1032,8 @@ qemuSnapshotDiskPrepareOneBlockdev(virQEMUDriver *dri= ver, rc =3D qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), dd->crdata->srcdata[0]); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + qemuDomainObjExitMonitor(driver, vm); + if (rc < 0) return -1; } else { if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, --=20 2.31.1