From nobody Sun Feb 8 07:47:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1637760586; cv=none; d=zohomail.com; s=zohoarc; b=M+cmtyWgyWyB4P6jruasKpyUcLnAPoGV7yS83QNP5tZ1+ZFshhDA1cx5Tdjmc0kIL5dO/fkBuCTj2GD1TABNaf98kot5GYz1jjufKHy1shKe+4srewpAVr2KfBwtd0MyQgEaE5uTKukIDvSK+MLItSXz4rXZJ+l3o+ySSE5ZVjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637760586; 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=dnV6Yfglbqgrv1UwDbS2yESEdLCiaVOJGQzstC3gZRw=; b=E5HimTREBPLh/gXkGvhhwOEWy2G+17bC7SAhQ+0yOLJCTVLqeqArg5ryruOIZceUJjG7cP1Ck2k0Q4mnpMjcxvEHlv3CwmMEMemaIzPIt1egTQEExxhvV3TQV/FXWGm8eyYfNqbfzWDxZ7NNCC0spfIp6e343flcLx4l2nSWzyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1637760586593628.000722187618; Wed, 24 Nov 2021 05:29:46 -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-521-VTY182LTNUGEs2VT5eqfQA-1; Wed, 24 Nov 2021 08:29:43 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E2424193F561; Wed, 24 Nov 2021 13:29:37 +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 C4F4D10246E8; Wed, 24 Nov 2021 13:29:37 +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 99C8F1809CB9; Wed, 24 Nov 2021 13:29:37 +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 1AODTNY6012592 for ; Wed, 24 Nov 2021 08:29:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4F864ADDC; Wed, 24 Nov 2021 13:29:23 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EE9218171 for ; Wed, 24 Nov 2021 13:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637760585; 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=dnV6Yfglbqgrv1UwDbS2yESEdLCiaVOJGQzstC3gZRw=; b=hagHNPsaK4aXTsZp1qyR2nRHZY1yv2IZGc5vxRAT5uWxCS30qrZsh9g5/LaM6s9U2ruvVX sj6MVqKQaMyjxRXMgNyFbizSYQODg53NGPJr4XuJlQRoMSGHW8SOE/OrIO34vuDBznyjlD PkqYkdKu4jL1/RNNG1TPED+LTkgow1o= X-MC-Unique: VTY182LTNUGEs2VT5eqfQA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] qemu: do not check return value of qemuDomainObjExitMonitor Date: Wed, 24 Nov 2021 14:28:51 +0100 Message-Id: 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.84 on 10.5.11.22 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: 1637760587215100004 Remove the unreachable code. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_backup.c | 9 +- src/qemu/qemu_block.c | 3 +- src/qemu/qemu_blockjob.c | 28 ++--- src/qemu/qemu_checkpoint.c | 3 +- src/qemu/qemu_domain.c | 14 +-- src/qemu/qemu_driver.c | 110 +++++++------------- src/qemu/qemu_hotplug.c | 170 +++++++++---------------------- src/qemu/qemu_migration.c | 27 ++--- src/qemu/qemu_migration_params.c | 6 +- src/qemu/qemu_process.c | 54 ++++------ src/qemu/qemu_snapshot.c | 6 +- 11 files changed, 134 insertions(+), 296 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 9fa8d2f02e..193d4ccd29 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -677,8 +677,7 @@ qemuBackupJobCancelBlockjobs(virDomainObj *vm, =20 rc =3D qemuMonitorBlockJobCancel(priv->mon, job->name, true); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - return; + qemuDomainObjExitMonitor(priv->driver, vm); =20 if (rc =3D=3D 0) { backupdisk->state =3D VIR_DOMAIN_BACKUP_DISK_STATE_CANCELLING; @@ -910,8 +909,7 @@ qemuBackupBegin(virDomainObj *vm, /* note that if the export fails we've already created the checkpo= int * and we will not delete it */ rc =3D qemuBackupBeginPullExportDisks(vm, dd, ndd); - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(priv->driver, vm); =20 if (rc < 0) { qemuBackupJobCancelBlockjobs(vm, priv->backup, false, QEMU_ASY= NC_JOB_BACKUP); @@ -1003,8 +1001,7 @@ qemuBackupNotifyBlockjobEnd(virDomainObj *vm, ignore_value(qemuMonitorDelObject(priv->mon, backup->tlsAlias,= false)); if (backup->tlsSecretAlias) ignore_value(qemuMonitorDelObject(priv->mon, backup->tlsSecret= Alias, false)); - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - return; + qemuDomainObjExitMonitor(priv->driver, vm); =20 /* update the final statistics with the current job's data */ backup->pull_tmp_used +=3D cur; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 53a0b919f9..44579a83ea 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2136,8 +2136,7 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriver= *driver, if (ret =3D=3D 0) ret =3D qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->node= storage); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index faf9a9fb7d..e7c3fea946 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -530,8 +530,7 @@ qemuBlockJobRefreshJobs(virQEMUDriver *driver, if (rc =3D=3D -1 && jobinfo[i]->status =3D=3D QEMU_MONITOR_JOB= _STATUS_CONCLUDED) VIR_WARN("can't cancel job '%s' with invalid data", job->n= ame); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) qemuBlockJobUnregister(job, vm); @@ -847,8 +846,8 @@ qemuBlockJobEventProcessConcludedRemoveChain(virQEMUDri= ver *driver, return; =20 qemuBlockStorageSourceChainDetach(qemuDomainGetMonitor(vm), data); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return; + + qemuDomainObjExitMonitor(driver, vm); =20 qemuDomainStorageSourceChainAccessRevoke(driver, vm, chain); } @@ -964,8 +963,7 @@ qemuBlockJobProcessEventCompletedPullBitmaps(virDomainO= bj *vm, =20 qemuMonitorTransaction(priv->mon, &actions); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(priv->driver, vm); =20 return 0; } @@ -1138,8 +1136,7 @@ qemuBlockJobProcessEventCompletedCommitBitmaps(virDom= ainObj *vm, =20 qemuMonitorTransaction(priv->mon, &actions); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(priv->driver, vm); =20 if (!active) { if (qemuBlockReopenReadOnly(vm, job->data.commit.base, asyncJob) <= 0) @@ -1359,8 +1356,7 @@ qemuBlockJobProcessEventCompletedCopyBitmaps(virDomai= nObj *vm, =20 qemuMonitorTransaction(priv->mon, &actions); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(priv->driver, vm); =20 return 0; } @@ -1442,8 +1438,7 @@ qemuBlockJobProcessEventFailedActiveCommit(virQEMUDri= ver *driver, disk->mirror->nodeformat, "libvirt-tmp-activewrite"); =20 - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - return; + qemuDomainObjExitMonitor(priv->driver, vm); =20 /* Ideally, we would make the backing chain read only again (yes, SELi= nux * can do that using different labels). But that is not implemented ye= t and @@ -1491,8 +1486,7 @@ qemuBlockJobProcessEventConcludedCreate(virQEMUDriver= *driver, =20 qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), backend= ); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return; + qemuDomainObjExitMonitor(driver, vm); =20 qemuDomainStorageSourceAccessRevoke(driver, vm, job->data.create.src); } @@ -1527,8 +1521,7 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriver= *driver, job->disk->src->nodeformat, job->data.backup.bitmap); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return; + qemuDomainObjExitMonitor(driver, vm); =20 if (job->data.backup.store) qemuDomainStorageSourceAccessRevoke(driver, vm, job->data.backup.s= tore); @@ -1641,8 +1634,7 @@ qemuBlockJobEventProcessConcluded(qemuBlockJobData *j= ob, /* dismiss job in qemu */ ignore_value(qemuMonitorJobDismiss(qemuDomainGetMonitor(vm), job->name= )); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 if ((job->newstate =3D=3D QEMU_BLOCKJOB_STATE_COMPLETED || job->newstate =3D=3D QEMU_BLOCKJOB_STATE_FAILED) && diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4902585e5d..38ea57dea7 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -237,8 +237,7 @@ qemuCheckpointDiscardBitmaps(virDomainObj *vm, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorTransaction(priv->mon, &actions); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 relabel: for (next =3D relabelimages; next; next =3D next->next) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1f45b30975..d0d9a31f37 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8181,8 +8181,7 @@ qemuDomainUpdateDeviceList(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; rc =3D qemuMonitorGetDeviceAliases(priv->mon, &aliases); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); if (rc < 0) return -1; =20 @@ -8210,10 +8209,7 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driv= er, =20 rc =3D qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - virHashFree(meminfo); - return -1; - } + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) return -1; @@ -9480,8 +9476,7 @@ qemuDomainRefreshVcpuInfo(virQEMUDriver *driver, rc =3D qemuMonitorGetCPUInfo(qemuDomainGetMonitor(vm), &info, maxvcpus, hotplug, fast); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto cleanup; @@ -10054,8 +10049,7 @@ qemuDomainCheckMonitor(virQEMUDriver *driver, =20 ret =3D qemuMonitorCheck(priv->mon); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa48480043..33686f4f23 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1939,8 +1939,7 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriver *driver, qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemPowerdown(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -2065,8 +2064,7 @@ qemuDomainRebootMonitor(virQEMUDriver *driver, qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemPowerdown(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -2155,8 +2153,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) priv =3D vm->privateData; qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemReset(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 priv->fakeReboot =3D false; =20 @@ -2471,8 +2468,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 qemuDomainObjEnterMonitor(driver, vm); r =3D qemuMonitorSetMemoryStatsPeriod(priv->mon, def->memballoon, = period); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); if (r < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("unable to set balloon driver collection peri= od")); @@ -2529,8 +2525,7 @@ static int qemuDomainInjectNMI(virDomainPtr domain, u= nsigned int flags) =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorInjectNMI(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -2589,8 +2584,7 @@ static int qemuDomainSendKey(virDomainPtr domain, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSendKey(priv->mon, holdtime, keycodes, nkeycodes); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -3309,8 +3303,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, if ((ret =3D=3D 0) && (flags & VIR_DUMP_RESET)) { qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemReset(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); } =20 if (resume && virDomainObjIsActive(vm)) { @@ -3427,8 +3420,7 @@ qemuDomainScreenshot(virDomainPtr dom, ignore_value(qemuDomainObjExitMonitor(driver, vm)); goto endjob; } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 if (VIR_CLOSE(tmp_fd) < 0) { virReportSystemError(errno, _("unable to close %s"), tmp); @@ -3928,8 +3920,7 @@ processNicRxFilterChangedEvent(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorQueryRxFilter(priv->mon, devAlias, &guestFilter); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto endjob; =20 @@ -4975,8 +4966,7 @@ qemuDomainGetIOThreadsMon(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetIOThreads(priv->mon, iothreads, niothreads); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -5263,8 +5253,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, if (qemuMonitorGetIOThreads(priv->mon, &new_iothreads, &new_niothreads= ) < 0) goto exit_monitor; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 if (new_niothreads !=3D exp_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5349,8 +5338,7 @@ qemuDomainHotplugModIOThread(virQEMUDriver *driver, =20 rc =3D qemuMonitorSetIOThread(priv->mon, &iothread); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) return -1; @@ -5386,8 +5374,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver, if (qemuMonitorGetIOThreads(priv->mon, &new_iothreads, &new_niothreads= ) < 0) goto exit_monitor; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 if (new_niothreads !=3D exp_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -9921,8 +9908,7 @@ qemuDomainBlockResize(virDomainPtr dom, ignore_value(qemuDomainObjExitMonitor(driver, vm)); goto endjob; } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 ret =3D 0; =20 @@ -10638,8 +10624,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetMemoryStats(qemuDomainGetMonitor(vm), vm->def->memballoon, stats, nr_sta= ts); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0 || ret >=3D nr_stats) return ret; @@ -10816,8 +10801,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, goto endjob; } } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 /* Read the memory file into buffer. */ if (saferead(fd, buffer, size) =3D=3D (ssize_t)-1) { @@ -12784,8 +12768,7 @@ qemuDomainAbortJobMigration(virDomainObj *vm) qemuDomainObjAbortAsyncJob(vm); qemuDomainObjEnterMonitor(priv->driver, vm); ret =3D qemuMonitorMigrateCancel(priv->mon); - if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(priv->driver, vm); =20 return ret; } @@ -13342,8 +13325,7 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, VIR_DEBUG("Starting post-copy"); qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorMigrateStartPostCopy(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -14057,8 +14039,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPt= r domain, const char *cmd, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorArbitraryCommand(priv->mon, cmd, result, hmp); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -14333,8 +14314,7 @@ qemuDomainBlockPivot(virQEMUDriver *driver, } else { ret =3D qemuMonitorDrivePivot(priv->mon, job->name); } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 /* The pivot failed. The block job in QEMU remains in the synchronised= state */ if (ret < 0) @@ -14465,8 +14445,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, (!baseSource || basePath)) ret =3D qemuMonitorBlockStream(priv->mon, device, jobname, persist= job, basePath, nodebase, backingPath, speed); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) goto endjob; @@ -14540,10 +14519,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, } else { qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorBlockJobCancel(priv->mon, job->name, false); - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - ret =3D -1; - goto endjob; - } + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) goto endjob; @@ -14758,8 +14734,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, ret =3D qemuMonitorBlockJobSetSpeed(qemuDomainGetMonitor(vm), job->name, speed); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -15142,8 +15117,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (data) { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuBlockStorageSourceChainAttach(priv->mon, data); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto endjob; @@ -15177,8 +15151,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, } =20 virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >=3D 0); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); if (ret < 0) { qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror); goto endjob; @@ -15707,8 +15680,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAU= TH) !=3D 0); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -15784,8 +15756,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphic= sfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAU= TH)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); qemuDomainObjEndJob(driver, vm); if (ret < 0) goto cleanup; @@ -16221,8 +16192,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSetBlockIoThrottle(priv->mon, drivealias, q= devid, &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto endjob; ret =3D -1; @@ -16352,8 +16322,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, } qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevi= d, &reply); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto endjob; } @@ -16472,8 +16441,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); table =3D qemuMonitorGetBlockInfo(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); if (!table) goto endjob; =20 @@ -16804,8 +16772,7 @@ qemuDomainPMWakeup(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemWakeup(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); @@ -17365,8 +17332,7 @@ qemuDomainSetTime(virDomainPtr dom, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { qemuDomainObjEnterMonitor(driver, vm); rv =3D qemuMonitorRTCResetReinjection(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 if (rv < 0) goto endjob; @@ -18498,8 +18464,7 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver, if (fetchnodedata) nodedata =3D qemuMonitorQueryNamedBlockNodes(priv->mon); =20 - if (qemuDomainObjExitMonitor(driver, dom) < 0) - return -1; + qemuDomainObjExitMonitor(driver, dom); =20 /* failure to retrieve stats is fine at this point */ if (rc < 0 || (fetchnodedata && !nodedata)) @@ -18637,8 +18602,7 @@ qemuDomainGetStatsDirtyRateMon(virQEMUDriver *drive= r, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorQueryDirtyRate(priv->mon, info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -20008,8 +19972,7 @@ qemuDomainGetSEVMeasurement(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); tmp =3D qemuMonitorGetSEVMeasurement(QEMU_DOMAIN_PRIVATE(vm)->mon); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 if (!tmp) goto endjob; @@ -20678,8 +20641,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorStartDirtyRateCalc(priv->mon, seconds); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 endjob: qemuDomainObjEndJob(driver, vm); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7ae0088c6a..59b3e57fd3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -109,10 +109,7 @@ qemuDomainDeleteDevice(virDomainObj *vm, =20 rc =3D qemuMonitorDelDevice(priv->mon, alias); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - /* Domain is no longer running. No cleanup needed. */ - return -1; - } + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) { /* Deleting device failed. Let's check if DEVICE_DELETED @@ -272,8 +269,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorEjectMedia(priv->mon, driveAlias, force); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 /* If the tray is present wait for it to open. */ if (!force && diskPriv->tray) { @@ -305,8 +301,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriver *driver, driveAlias, sourcestr, format); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); } =20 if (rc < 0) @@ -354,8 +349,7 @@ qemuHotplugAttachDBusVMState(virQEMUDriver *driver, if (ret =3D=3D 0) priv->dbusVMState =3D true; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -391,8 +385,7 @@ qemuHotplugRemoveDBusVMState(virQEMUDriver *driver, if (ret =3D=3D 0) priv->dbusVMState =3D false; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -479,8 +472,7 @@ qemuHotplugRemoveManagedPR(virQEMUDriver *driver, goto cleanup; ignore_value(qemuMonitorDelObject(priv->mon, qemuDomainGetManagedPRAli= as(), false)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 qemuProcessKillManagedPRDaemon(vm); =20 @@ -757,8 +749,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, =20 rc =3D qemuBlockStorageSourceChainAttach(priv->mon, data); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -2; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto rollback; @@ -808,8 +799,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, VIR_WARN("failed to set blkdeviotune for '%s' of '%s'", disk->= dst, vm->def->name); } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -2; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto rollback; @@ -825,8 +815,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver, =20 qemuBlockStorageSourceChainDetach(priv->mon, data); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -2; + qemuDomainObjExitMonitor(driver, vm); =20 return -1; } @@ -891,11 +880,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *dr= iver, ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &controlle= r->info)); =20 exit_monitor: - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; - ret =3D -1; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 if (ret =3D=3D 0) virDomainControllerInsertPreAlloced(vm->def, controller); @@ -1486,8 +1471,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } netdevPlugged =3D true; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 for (i =3D 0; i < tapfdSize; i++) VIR_FORCE_CLOSE(tapfd[i]); @@ -1511,8 +1495,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 /* set link state */ if (net->linkstate =3D=3D VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) { @@ -1528,8 +1511,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, goto try_remove; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); } /* link set to down */ } @@ -1728,8 +1710,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, ignore_value(qemuDomainDetachExtensionDevice(priv->mon, hostdev->i= nfo)); =20 exit_monitor: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto error; + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditHostdev(vm, hostdev, "attach", ret =3D=3D 0); if (ret < 0) @@ -1940,8 +1921,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriver *driver, if (secAlias) ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false)); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return 0; } @@ -1989,8 +1969,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto audit; + qemuDomainObjExitMonitor(driver, vm); =20 def->redirdevs[def->nredirdevs++] =3D redirdev; ret =3D 0; @@ -2255,8 +2234,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver, goto exit_monitor; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto audit; + qemuDomainObjExitMonitor(driver, vm); =20 qemuDomainChrInsertPreAlloced(vmdef, chr); ret =3D 0; @@ -2363,10 +2341,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, goto exit_monitor; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 VIR_APPEND_ELEMENT_INPLACE(vm->def->rngs, vm->def->nrngs, rng); =20 @@ -2393,8 +2368,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, ignore_value(qemuMonitorDelObject(priv->mon, objAlias, false)); if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && chardevAdded) ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - releaseaddr =3D false; + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&orig_err); =20 qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, @@ -2487,11 +2461,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver, if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - /* we shouldn't touch mem now, as the def might be freed */ - mem =3D NULL; - goto audit; - } + qemuDomainObjExitMonitor(driver, vm); =20 event =3D virDomainEventDeviceAddedNewFromObj(vm, objalias); virObjectEventStateQueue(driver->domainEventState, event); @@ -2531,8 +2501,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver, virErrorPreserveLast(&orig_err); if (objAdded) ignore_value(qemuMonitorDelObject(priv->mon, objalias, false)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - mem =3D NULL; + qemuDomainObjExitMonitor(driver, vm); =20 if (objAdded && mem) ignore_value(qemuProcessDestroyMemoryBackingPath(driver, vm, mem)); @@ -2597,10 +2566,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorAddDeviceProps(priv->mon, &devprops); - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - ret =3D -1; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); virDomainAuditHostdev(vm, hostdev, "attach", ret =3D=3D 0); if (ret < 0) goto cleanup; @@ -2694,8 +2660,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver, if (qemuMonitorAddDeviceProps(priv->mon, &devprops) < 0) goto exit_monitor; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditHostdev(vm, hostdev, "attach", true); =20 @@ -2914,10 +2879,7 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorAddDeviceProps(priv->mon, &devprops); - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - ret =3D -1; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditHostdev(vm, hostdev, "attach", ret =3D=3D 0); if (ret < 0) @@ -3072,10 +3034,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver, goto exit_monitor; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - release_address =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 /* Doing a copy here just so the pointer doesn't get nullified * because we need it in the audit function */ @@ -3104,8 +3063,7 @@ qemuDomainAttachShmemDevice(virQEMUDriver *driver, ignore_value(qemuMonitorDelObject(priv->mon, memAlias, false)); } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - release_address =3D false; + qemuDomainObjExitMonitor(driver, vm); =20 virErrorRestore(&orig_err); =20 @@ -3205,10 +3163,7 @@ qemuDomainAttachWatchdog(virQEMUDriver *driver, if (rv >=3D 0) rv =3D qemuMonitorAddDeviceProps(priv->mon, &props); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseAddress =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 if (rv < 0) goto cleanup; @@ -3296,10 +3251,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, goto exit_monitor; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 VIR_APPEND_ELEMENT_COPY_INPLACE(vm->def->inputs, vm->def->ninputs, inp= ut); =20 @@ -3325,10 +3277,7 @@ qemuDomainAttachInputDevice(virQEMUDriver *driver, return ret; =20 exit_monitor: - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); goto audit; } =20 @@ -3386,10 +3335,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver, if ((ret =3D qemuMonitorAddDeviceProps(priv->mon, &devprops)) < 0) goto exit_monitor; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 vm->def->vsock =3D g_steal_pointer(&vsock); =20 @@ -3410,8 +3356,7 @@ qemuDomainAttachVsockDevice(virQEMUDriver *driver, ignore_value(qemuMonitorCloseFileHandle(priv->mon, fdname)); if (removeextension) ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &vsock->in= fo)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - releaseaddr =3D false; + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } =20 @@ -3480,10 +3425,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, goto exit_monitor; } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; - goto cleanup; - } + qemuDomainObjExitMonitor(driver, vm); =20 VIR_APPEND_ELEMENT_COPY(vm->def->fss, vm->def->nfss, fs); =20 @@ -3507,8 +3449,7 @@ qemuDomainAttachFSDevice(virQEMUDriver *driver, virErrorPreserveLast(&origErr); if (chardevAdded) ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - releaseaddr =3D false; + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&origErr); goto audit; } @@ -3677,8 +3618,7 @@ int qemuDomainChangeNetLinkState(virQEMUDriver *drive= r, dev->linkstate =3D linkstate; =20 cleanup: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -4272,8 +4212,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriver *driv= er, ret =3D qemuMonitorExpirePassword(priv->mon, type, expire); =20 end_job: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -4552,8 +4491,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver, if (diskBackend) qemuBlockStorageSourceChainDetach(priv->mon, diskBackend); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditDisk(vm, disk->src, NULL, "detach", true); =20 @@ -4629,8 +4567,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorDelObject(priv->mon, backendAlias, true); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - rc =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditMemory(vm, oldmem, newmem, "update", rc =3D=3D 0); if (rc < 0) @@ -4729,8 +4666,7 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); qemuBlockStorageSourceAttachRollback(priv->mon, detachscsi); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); } =20 if (hostdev->parentnet) { @@ -4847,8 +4783,7 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, net, NULL, "detach", false); return -1; } @@ -4894,8 +4829,7 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver, } =20 =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver,= net); @@ -4969,8 +4903,7 @@ qemuDomainRemoveChrDevice(virQEMUDriver *driver, if (monitor) { qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorDetachCharDev(priv->mon, charAlias); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); } =20 if (rc =3D=3D 0 && @@ -5036,8 +4969,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriver *driver, qemuMonitorDetachCharDev(priv->mon, charAlias) < 0) rc =3D -1; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && rc =3D=3D 0 && @@ -5091,8 +5023,7 @@ qemuDomainRemoveShmemDevice(virQEMUDriver *driver, else rc =3D qemuMonitorDelObject(priv->mon, memAlias, true); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditShmem(vm, shmem, "detach", rc =3D=3D 0); =20 @@ -5186,8 +5117,7 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriver *driver, */ ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (qemuDomainDelChardevTLSObjects(driver, vm, dev->source, charAlias)= < 0) return -1; @@ -5224,8 +5154,7 @@ qemuDomainRemoveFSDevice(virQEMUDriver *driver, if (qemuMonitorDetachCharDev(priv->mon, charAlias) < 0) rc =3D -1; =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); } =20 virDomainAuditFS(vm, fs, NULL, "detach", rc =3D=3D 0); @@ -5966,8 +5895,7 @@ qemuDomainDetachDeviceChr(virQEMUDriver *driver, int rc; qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorRemoveNetdev(priv->mon, tmpChr->info.alias); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - rc =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto cleanup; @@ -6503,8 +6431,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriver *driver, =20 rc =3D qemuMonitorAddDeviceProps(qemuDomainGetMonitor(vm), &vcpuprops); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 virDomainAuditVcpu(vm, oldvcpus, oldvcpus + nvcpus, "update", rc =3D= =3D 0); =20 @@ -7000,8 +6927,7 @@ qemuDomainChangeMemoryRequestedSize(virQEMUDriver *dr= iver, =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorChangeMemoryRequestedSize(priv->mon, alias, requeste= dsize); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 return rc; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8001792f5a..3fd0db15bb 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -515,8 +515,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, =20 if (qemuBlockExportAddNBD(vm, diskAlias, disk->src, diskAlias, tru= e, NULL) < 0) goto exit_monitor; - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); } =20 if (server.transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) @@ -551,8 +550,7 @@ qemuMigrationDstStopNBDServer(virQEMUDriver *driver, =20 if (qemuMonitorNBDServerStop(priv->mon) < 0) VIR_WARN("Unable to stop NBD server"); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 virPortAllocatorRelease(priv->nbdPort); priv->nbdPort =3D 0; @@ -873,8 +871,7 @@ qemuMigrationSrcCancelRemoveTempBitmaps(virDomainObj *v= m, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; qemuMonitorBitmapRemove(priv->mon, t->nodename, t->bitmapname); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); } =20 return 0; @@ -2039,8 +2036,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriver *drive= r, ret =3D qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); jobPriv->spiceMigration =3D !ret; - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); } =20 cleanup: @@ -3811,8 +3807,7 @@ qemuMigrationSrcContinue(virQEMUDriver *driver, =20 ret =3D qemuMonitorMigrateContinue(priv->mon, status); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -3835,8 +3830,7 @@ qemuMigrationSetDBusVMState(virQEMUDriver *driver, =20 rv =3D qemuMonitorSetDBusVMStateIdList(priv->mon, priv->dbusVMStat= eIds); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - rv =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 return rv; } else { @@ -5932,8 +5926,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, qemuMonitorSetMigrationSpeed(priv->mon, QEMU_DOMAIN_MIG_BANDWIDTH_MAX); priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX; - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); } } =20 @@ -5984,8 +5977,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, VIR_CLOSE(pipeFD[1]) < 0) VIR_WARN("failed to close intermediate pipe"); } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); if (rc < 0) goto cleanup; =20 @@ -6057,8 +6049,7 @@ qemuMigrationSrcCancel(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk =3D vm->def->disks[i]; diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 8df7aac93a..7bfae29de4 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -870,8 +870,7 @@ qemuMigrationParamsApply(virQEMUDriver *driver, ret =3D 0; =20 cleanup: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (xbzrleCacheSize_old) migParams->params[xbzrle].set =3D true; @@ -1412,8 +1411,7 @@ qemuMigrationCapsCheck(virQEMUDriver *driver, =20 rc =3D qemuMonitorSetMigrationCapabilities(priv->mon, &json); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) { virResetLastError(); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c355a39e15..1148e6072f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -473,8 +473,7 @@ qemuProcessFakeReboot(void *opaque) qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorSystemReset(priv->mon); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto endjob; @@ -1956,8 +1955,7 @@ qemuProcessInitMonitor(virQEMUDriver *driver, =20 ret =3D qemuMonitorSetCapabilities(QEMU_DOMAIN_PRIVATE(vm)->mon); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 return ret; } @@ -2252,8 +2250,7 @@ qemuRefreshVirtioChannelState(virQEMUDriver *driver, goto cleanup; =20 ret =3D qemuMonitorGetChardevInfo(priv->mon, &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) goto cleanup; @@ -2306,8 +2303,7 @@ qemuRefreshPRManagerState(virQEMUDriver *driver, =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetPRManagerInfo(priv->mon, &info); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) goto cleanup; @@ -2337,8 +2333,7 @@ qemuRefreshRTC(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); now =3D time(NULL); rv =3D qemuMonitorGetRTCTime(priv->mon, &thenbits); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - rv =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (rv < 0) return; @@ -2427,8 +2422,7 @@ qemuProcessWaitForMonitor(virQEMUDriver *driver, goto cleanup; ret =3D qemuMonitorGetChardevInfo(priv->mon, &info); VIR_DEBUG("qemuMonitorGetChardevInfo returned %i", ret); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret =3D=3D 0) { if ((ret =3D qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0) @@ -2470,8 +2464,7 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriver *driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; ret =3D qemuMonitorGetIOThreads(priv->mon, &iothreads, &niothreads); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto cleanup; =20 @@ -2646,8 +2639,7 @@ qemuProcessSetLinkStates(virQEMUDriver *driver, ret =3D 0; =20 cleanup: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); return ret; } =20 @@ -3194,8 +3186,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, =20 } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 cfg =3D virQEMUDriverGetConfig(driver); ret =3D virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); @@ -3326,8 +3317,7 @@ qemuProcessStartCPUs(virQEMUDriver *driver, virDomain= Obj *vm, goto release; =20 ret =3D qemuMonitorStartCPUs(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) goto release; @@ -3364,8 +3354,7 @@ int qemuProcessStopCPUs(virQEMUDriver *driver, goto cleanup; =20 ret =3D qemuMonitorStopCPUs(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) goto cleanup; @@ -3476,8 +3465,7 @@ qemuProcessUpdateState(virQEMUDriver *driver, virDoma= inObj *vm) =20 qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorGetStatus(priv->mon, &running, &reason); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (ret < 0) return -1; @@ -3713,8 +3701,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver, case QEMU_ASYNC_JOB_SNAPSHOT: qemuDomainObjEnterMonitor(driver, vm); ignore_value(qemuMonitorMigrateCancel(priv->mon)); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); /* resume the domain but only if it was paused as a result of * running a migration-to-file operation. Although we are * recovering an async job, this function is run at startup @@ -4355,8 +4342,7 @@ qemuProcessFetchGuestCPU(virQEMUDriver *driver, rc =3D qemuMonitorGetGuestCPUx86(priv->mon, &dataEnabled, &dataDis= abled); } =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc =3D=3D -1) return -1; @@ -5206,8 +5192,7 @@ qemuProcessSetupBalloon(virQEMUDriver *driver, ret =3D 0; =20 cleanup: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); return ret; } =20 @@ -6115,8 +6100,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriver *driv= er, =20 rc =3D qemuMonitorAddDeviceProps(qemuDomainGetMonitor(vm), &vcpupr= ops); =20 - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); =20 if (rc < 0) goto cleanup; @@ -7023,8 +7007,7 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriver = *driver, ret =3D 0; =20 cleanup: - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); return ret; } =20 @@ -8337,8 +8320,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver, =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D=3D 0) { table =3D qemuMonitorGetBlockInfo(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; + qemuDomainObjExitMonitor(driver, vm); } =20 if (!table) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 661aeeb8aa..ff827d5313 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -330,8 +330,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver, } =20 ret =3D qemuMonitorCreateSnapshot(priv->mon, snap->def->name); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - ret =3D -1; + qemuDomainObjExitMonitor(driver, vm); if (ret < 0) goto cleanup; =20 @@ -1289,8 +1288,7 @@ qemuSnapshotDiskCreate(qemuSnapshotDiskContext *snapc= txt) =20 rc =3D qemuMonitorTransaction(priv->mon, &snapctxt->actions); =20 - if (qemuDomainObjExitMonitor(driver, snapctxt->vm) < 0) - rc =3D -1; + qemuDomainObjExitMonitor(driver, snapctxt->vm); =20 for (i =3D 0; i < snapctxt->ndd; i++) { qemuSnapshotDiskData *dd =3D snapctxt->dd + i; --=20 2.31.1