From nobody Mon Feb 9 05:00:44 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=1637760635; cv=none; d=zohomail.com; s=zohoarc; b=HVkKy9MJuA/iZRW0xz9dQiNQEr55DoZAKDLPSZlsXNsWFpE/WrlbE7m+GfMFs4hxMW7J/jqCWZsnRpxyuJF/67srrBegeZ3iBr0VHph7HmDrFWCfxR1DHGDBD76HCXngefbLfQo4KLVjO5rK8AdQeS7YFVvRpIbIpJW19JurEZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637760635; 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=rnyxoVnZtnjQVlHp7jeNhnqk06PGfmybctnEFzTsr6A=; b=gVIZzvy6vz2qTdHwo4TC9Riz63a3Y++QIG3QDXFmKOZHKSrRjdARfw3PLTDflHTo2evvGDsT3YDBmhT7IhLWeqxlWF8aeFQHj0UvSz5bHcPeBTObgdSEVO/KmBVnQyywazADuAEwPHal9YBYwyOvPq0Sfc92ipIntX0F2XnH7jU= 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 1637760635722413.4228598293795; Wed, 24 Nov 2021 05:30:35 -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-428-R8trclF9MBW2gY3-aYO7EA-1; Wed, 24 Nov 2021 08:30:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6A69481EE71; Wed, 24 Nov 2021 13:30:25 +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 1A0992B0B2; Wed, 24 Nov 2021 13:30:25 +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 DF5F61802E23; Wed, 24 Nov 2021 13:30:24 +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 1AODTWJx012639 for ; Wed, 24 Nov 2021 08:29:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1A528ADDC; Wed, 24 Nov 2021 13:29:32 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96AF15DF37 for ; Wed, 24 Nov 2021 13:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637760634; 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=rnyxoVnZtnjQVlHp7jeNhnqk06PGfmybctnEFzTsr6A=; b=TL/IexPyWuFeoRLRGkenGv+iOZrLhRoSSuWnFXBBTOVUdtxQ0cTtC8eeToaSL3dQWGXN38 PO8b/w6D7nJSt4SzWWqbPTJXkQcelHfC1RBwMFSrMJ8a/DS4DwDL3i7UUie+u/rLL6877l MnR5mMutptS/cIbi8N97LaE1O6ZlJqo= X-MC-Unique: R8trclF9MBW2gY3-aYO7EA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/7] qemu: remove ignore_value for qemuDomainObjExitMonitor Date: Wed, 24 Nov 2021 14:28:53 +0100 Message-Id: <825b22adb7aa1720c815ca5274a4b7a376be3842.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.13 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: 1637760636019100001 Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_backup.c | 4 ++-- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 18 +++++++++--------- src/qemu/qemu_hotplug.c | 26 +++++++++++++------------- src/qemu/qemu_migration.c | 14 +++++++------- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_snapshot.c | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 8e191d344e..304a0d5a4f 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -132,7 +132,7 @@ qemuBackupDiskDataCleanupOne(virDomainObj *vm, if (dd->added) { qemuDomainObjEnterMonitor(priv->driver, vm); qemuBlockStorageSourceAttachRollback(priv->mon, dd->crdata->sr= cdata[0]); - ignore_value(qemuDomainObjExitMonitor(priv->driver, vm)); + qemuDomainObjExitMonitor(priv->driver, vm); } =20 if (dd->created) { @@ -935,7 +935,7 @@ qemuBackupBegin(virDomainObj *vm, ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias, false)); if (tlsSecretAlias) ignore_value(qemuMonitorDelObject(priv->mon, tlsSecretAlias, f= alse)); - ignore_value(qemuDomainObjExitMonitor(priv->driver, vm)); + qemuDomainObjExitMonitor(priv->driver, vm); } =20 if (ret < 0 && !job_started && priv->backup) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 04f5e383bc..8a10d2aa0c 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2906,7 +2906,7 @@ qemuBlockStorageSourceCreate(virDomainObj *vm, qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) =3D=3D = 0) { =20 qemuBlockStorageSourceAttachRollback(priv->mon, data); - ignore_value(qemuDomainObjExitMonitor(priv->driver, vm)); + qemuDomainObjExitMonitor(priv->driver, vm); } =20 return ret; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b0b2dd0258..94b4081da6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6968,7 +6968,7 @@ qemuDomainSnapshotDiscard(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); /* we continue on even in the face of error */ qemuMonitorDeleteSnapshot(priv->mon, snap->def->name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } } =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4a48354df1..28a9ae09e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3120,7 +3120,7 @@ qemuDumpToFd(virQEMUDriver *driver, _("unsupported dumpformat '%s' " "for this QEMU binary"), dumpformat); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); return -1; } } @@ -3419,7 +3419,7 @@ qemuDomainScreenshot(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorScreendump(priv->mon, videoAlias, screen, tmp) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto endjob; } qemuDomainObjExitMonitor(driver, vm); @@ -5302,7 +5302,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, if (qemuMonitorDelObject(priv->mon, alias, true) < 0) VIR_WARN("deletion of iothread object %d of domain %s fail= ed when cleanup", iothread_id, vm->def->name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } } =20 @@ -5317,7 +5317,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriver *driver, return ret; =20 exit_monitor: - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } =20 @@ -5405,7 +5405,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriver *driver, return ret; =20 exit_monitor: - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } =20 @@ -9907,7 +9907,7 @@ qemuDomainBlockResize(virDomainPtr dom, =20 qemuDomainObjEnterMonitor(driver, vm); if (qemuMonitorBlockResize(priv->mon, device, nodename, size) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto endjob; } qemuDomainObjExitMonitor(driver, vm); @@ -10796,12 +10796,12 @@ qemuDomainMemoryPeek(virDomainPtr dom, qemuDomainObjEnterMonitor(driver, vm); if (flags =3D=3D VIR_MEMORY_VIRTUAL) { if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0= ) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto endjob; } } else { if (qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp) < = 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto endjob; } } @@ -15184,7 +15184,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, qemuBlockStorageSourceChainDetach(priv->mon, data); if (crdata) qemuBlockStorageSourceAttachRollback(priv->mon, crdata->sr= cdata[0]); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } if (need_revoke) qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e886fbc35d..43d86dbb65 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1442,7 +1442,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (qemuMonitorAddFileHandleToSet(priv->mon, vdpafd, -1, net->data.vdpa.devicepath, &fdinfo) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } vdpafdName =3D g_strdup_printf("/dev/fdset/%d", fdinfo.fdset); @@ -1452,13 +1452,13 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, tapfdName, tapfdSize, vhostfdName, vhostfdSize, slirpfdName, vdpafdName))) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (qemuHotplugChardevAttach(priv->mon, charDevAlias, net->data.vh= ostuser) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto cleanup; } @@ -1469,7 +1469,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, tapfd, tapfdName, tapfdSize, vhostfd, vhostfdName, vhostfdSize, slirpfd, slirpfdName) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } @@ -1488,14 +1488,14 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); =20 if (qemuDomainAttachExtensionDevice(priv->mon, &net->info) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } =20 if (qemuMonitorAddDeviceProps(priv->mon, &nicprops) < 0) { ignore_value(qemuDomainDetachExtensionDevice(priv->mon, &net->info= )); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } @@ -1510,7 +1510,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuDomainObjEnterMonitor(driver, vm); =20 if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOMAIN_= NET_INTERFACE_LINK_STATE_DOWN) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virDomainAuditNet(vm, NULL, net, "attach", false); goto try_remove; } @@ -1609,7 +1609,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) VIR_WARN("Failed to remove network backend for netdev %s", netdev_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&originalError); goto cleanup; } @@ -1769,7 +1769,7 @@ qemuDomainDelTLSObjects(virQEMUDriver *driver, if (secAlias) ignore_value(qemuMonitorDelObject(priv->mon, secAlias, false)); =20 - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); =20 cleanup: virErrorRestore(&orig_err); @@ -1806,7 +1806,7 @@ qemuDomainAddTLSObjects(virQEMUDriver *driver, =20 error: virErrorPreserveLast(&orig_err); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, asyncJob, secAlias, NULL); =20 @@ -1989,7 +1989,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, /* detach associated chardev on error */ if (chardevAdded) ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&orig_err); qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, secAlias, tlsAlias); @@ -2264,7 +2264,7 @@ int qemuDomainAttachChrDevice(virQEMUDriver *driver, /* detach associated chardev on error */ if (chardevAttached) qemuMonitorDetachCharDev(priv->mon, charAlias); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&orig_err); =20 qemuDomainDelTLSObjects(driver, vm, QEMU_ASYNC_JOB_NONE, @@ -2690,7 +2690,7 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriver *driver, exit_monitor: virErrorPreserveLast(&orig_err); qemuBlockStorageSourceAttachRollback(priv->mon, data); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); virErrorRestore(&orig_err); =20 virDomainAuditHostdev(vm, hostdev, "attach", false); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a544e9e2fd..3cb39264e3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -529,7 +529,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, return ret; =20 exit_monitor: - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } =20 @@ -4368,7 +4368,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) = =3D=3D 0) { qemuMonitorMigrateCancel(priv->mon); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } =20 /* cancel any outstanding NBD jobs */ @@ -4389,7 +4389,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto cleanup; =20 exit_monitor: - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto error; } =20 @@ -5970,11 +5970,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDo= mainObj *vm, if (virSetCloseExec(pipeFD[1]) < 0) { virReportSystemError(errno, "%s", _("Unable to set cloexec flag")); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } if (virCommandRunAsync(compressor, NULL) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); goto cleanup; } rc =3D qemuMonitorMigrateToFd(priv->mon, @@ -5997,7 +5997,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, if (virDomainObjIsActive(vm) && qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D= =3D 0) { qemuMonitorMigrateCancel(priv->mon); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } } goto cleanup; @@ -6024,7 +6024,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, } else { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D= =3D 0) { qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } } priv->migMaxBandwidth =3D saveMigBandwidth; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dcd547b279..34302b404a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3195,7 +3195,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, return ret; =20 error: - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); return -1; } =20 diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index d0b2d40e94..394956a14d 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -883,7 +883,7 @@ qemuSnapshotDiskCleanup(qemuSnapshotDiskData *data, =20 qemuBlockStorageSourceAttachRollback(qemuDomainGetMoni= tor(vm), data[i].crdata->s= rcdata[0]); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); + qemuDomainObjExitMonitor(driver, vm); } } =20 --=20 2.31.1