From nobody Sun Feb 8 20:23:21 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=1660136599; cv=none; d=zohomail.com; s=zohoarc; b=fFPt82IT43W3bgxZA3R4MjXJF+G+LqFkFA4vRqPkZvjLtQIMmCJD3Nl9vuIuhMgo7SJK3p9zbFANEPqYq0cyxzAb+d7mAyNlTU/xQIW1+8CU093xj2PwLc73+zIcOZrRoQ7BwthXpN7nmBlbAaccfnDtxhrRJZWr4fqlM+GQhdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660136599; 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=v7SmBh/Q242/BZC8grjuhpI9CoySisUlT0I3msOmowc=; b=Y/uLZXpDjofMQGv7xQOi95GUDk7DwxBvH+GIcwGeua7YxVjdE1+GD+nC3vq6r5modlYsNQnzuVUj4HzWia9+ZDNcnPB7udyZ4+5Gn8CDHTger9+1aW9vgHnEMqavAqczgz6rJeMo0GJq60n4qBpZurHWuQGL9lKhwGe0yCV+5ko= 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 16601365990272.287252616234582; Wed, 10 Aug 2022 06:03:19 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-L3WWmYzqNMitk1j69ibZAg-1; Wed, 10 Aug 2022 09:03:07 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F024D8918A2; Wed, 10 Aug 2022 13:02:38 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2984B492C3B; Wed, 10 Aug 2022 13:02:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D442B1946A55; Wed, 10 Aug 2022 13:02:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EF1041946A4F for ; Wed, 10 Aug 2022 12:57:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C6F2040D282E; Wed, 10 Aug 2022 12:57:12 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72ED840D2827 for ; Wed, 10 Aug 2022 12:57:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660136597; 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=v7SmBh/Q242/BZC8grjuhpI9CoySisUlT0I3msOmowc=; b=L+z6fz8c8YBF+L8bLiHwU/jdxo+Uc4Ia3nKurWhUhCWMJP8of10aNXV8NSvNrPAUulU1jM CkEiCU2OJqgA2DZ84xNKkrl7Q4dG3ozR/bZvZhhDXutAdmjulY9r2xZeaE01rG87gA2od9 I/dBe3h0PofLlY0ou8teznTAZC7sbOk= X-MC-Unique: L3WWmYzqNMitk1j69ibZAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 4/5] qemu: refactor functions with removed driver if possible Date: Wed, 10 Aug 2022 14:57:03 +0200 Message-Id: <93207d4f1907374092afcfa876100a1852c84726.1660136124.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660136599695100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova --- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_driver.c | 52 ++++++++++++++------------------------- src/qemu/qemu_hotplug.c | 12 +++------ src/qemu/qemu_migration.c | 39 ++++++++++------------------- src/qemu/qemu_snapshot.c | 3 +-- 5 files changed, 37 insertions(+), 72 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b1c17bcd03..93fd11a3c9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6081,8 +6081,7 @@ qemuDomainObjExitMonitor(virDomainObj *obj) =20 void qemuDomainObjEnterMonitor(virDomainObj *obj) { - ignore_value(qemuDomainObjEnterMonitorInternal(obj, - VIR_ASYNC_JOB_NONE)); + ignore_value(qemuDomainObjEnterMonitorInternal(obj, VIR_ASYNC_JOB_NONE= )); } =20 /* diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0503a79075..4ff1d65c1e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -184,8 +184,8 @@ qemuAutostartDomain(virDomainObj *vm, virResetLastError(); if (vm->autostart && !virDomainObjIsActive(vm)) { - if (qemuProcessBeginJob(vm, - VIR_DOMAIN_JOB_OPERATION_START, flags) < 0= ) { + if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, + flags) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to start job on VM '%s': %s"), vm->def->name, virGetLastErrorMessage()); @@ -1623,8 +1623,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, NULL))) goto cleanup; =20 - if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, - flags) < 0) { + if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0= ) { qemuDomainRemoveInactive(driver, vm); goto cleanup; } @@ -1784,8 +1783,7 @@ qemuDomainShutdownFlagsAgent(virDomainObj *vm, int agentFlag =3D isReboot ? QEMU_AGENT_SHUTDOWN_REBOOT : QEMU_AGENT_SHUTDOWN_POWERDOWN; =20 - if (qemuDomainObjBeginAgentJob(vm, - VIR_AGENT_JOB_MODIFY) < 0) + if (qemuDomainObjBeginAgentJob(vm, VIR_AGENT_JOB_MODIFY) < 0) return -1; =20 if (virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_RUNNING) { @@ -1913,8 +1911,7 @@ qemuDomainRebootAgent(virDomainObj *vm, if (!isReboot) agentFlag =3D QEMU_AGENT_SHUTDOWN_POWERDOWN; =20 - if (qemuDomainObjBeginAgentJob(vm, - VIR_AGENT_JOB_MODIFY) < 0) + if (qemuDomainObjBeginAgentJob(vm, VIR_AGENT_JOB_MODIFY) < 0) return -1; =20 if (!qemuDomainAgentAvailable(vm, agentForced)) @@ -1941,8 +1938,7 @@ qemuDomainRebootMonitor(virDomainObj *vm, qemuDomainObjPrivate *priv =3D vm->privateData; int ret =3D -1; =20 - if (qemuDomainObjBeginJob(vm, - VIR_JOB_MODIFY) < 0) + if (qemuDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) return -1; =20 if (virDomainObjCheckActive(vm) < 0) @@ -3221,8 +3217,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, if (virDomainCoreDumpWithFormatEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (qemuDomainObjBeginAsyncJob(vm, - VIR_ASYNC_JOB_DUMP, + if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) goto cleanup; @@ -3460,8 +3455,7 @@ processWatchdogEvent(virQEMUDriver *driver, =20 switch (action) { case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: - if (qemuDomainObjBeginAsyncJob(vm, - VIR_ASYNC_JOB_DUMP, + if (qemuDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_DUMP, VIR_DOMAIN_JOB_OPERATION_DUMP, flags) < 0) { return; @@ -4268,8 +4262,7 @@ static void qemuProcessEventHandler(void *data, void = *opaque) processEvent->action); break; case QEMU_PROCESS_EVENT_BLOCK_JOB: - processBlockJobEvent(vm, - processEvent->data, + processBlockJobEvent(vm, processEvent->data, processEvent->action, processEvent->status); break; @@ -6040,8 +6033,7 @@ qemuDomainRestoreInternal(virConnectPtr conn, priv->hookRun =3D true; } =20 - if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_RESTORE, - flags) < 0) + if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_RESTORE, flags) <= 0) goto cleanup; =20 ret =3D qemuSaveImageStartVM(conn, driver, vm, &fd, data, path, @@ -6650,8 +6642,7 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, - flags) < 0) + if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0) goto cleanup; =20 if (virDomainObjIsActive(vm)) { @@ -7001,8 +6992,7 @@ qemuDomainAttachDeviceLive(virDomainObj *vm, break; =20 case VIR_DOMAIN_DEVICE_SHMEM: - ret =3D qemuDomainAttachShmemDevice(vm, - dev->data.shmem); + ret =3D qemuDomainAttachShmemDevice(vm, dev->data.shmem); if (!ret) { alias =3D dev->data.shmem->info.alias; dev->data.shmem =3D NULL; @@ -7010,8 +7000,7 @@ qemuDomainAttachDeviceLive(virDomainObj *vm, break; =20 case VIR_DOMAIN_DEVICE_WATCHDOG: - ret =3D qemuDomainAttachWatchdog(vm, - dev->data.watchdog); + ret =3D qemuDomainAttachWatchdog(vm, dev->data.watchdog); if (!ret) { alias =3D dev->data.watchdog->info.alias; dev->data.watchdog =3D NULL; @@ -7293,8 +7282,7 @@ qemuDomainChangeMemoryLive(virQEMUDriver *driver G_GN= UC_UNUSED, if (!qemuDomainChangeMemoryLiveValidateChange(oldDef, newDef)) return -1; =20 - if (qemuDomainChangeMemoryRequestedSize(vm, - newDef->info.alias, + if (qemuDomainChangeMemoryRequestedSize(vm, newDef->info.alias, newDef->requestedsize) < 0) return -1; =20 @@ -13092,8 +13080,7 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; =20 - if (qemuMigrationParamsFetch(vm, VIR_ASYNC_JOB_NONE, - &migParams) < 0) + if (qemuMigrationParamsFetch(vm, VIR_ASYNC_JOB_NONE, &migParams) < 0) goto endjob; =20 if ((rc =3D qemuMigrationParamsGetULL(migParams, @@ -13316,8 +13303,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virDomainOb= j *vm, if (virDomainObjCheckActive(vm) < 0) goto cleanup; =20 - if (qemuMigrationParamsFetch(vm, VIR_ASYNC_JOB_NONE, - &migParams) < 0) + if (qemuMigrationParamsFetch(vm, VIR_ASYNC_JOB_NONE, &migParams) < 0) goto cleanup; =20 if ((rc =3D qemuMigrationParamsGetULL(migParams, @@ -19065,8 +19051,7 @@ qemuDomainGetFSInfoAgent(virDomainObj *vm, int ret =3D -1; qemuAgent *agent; =20 - if (qemuDomainObjBeginAgentJob(vm, - VIR_AGENT_JOB_QUERY) < 0) + if (qemuDomainObjBeginAgentJob(vm, VIR_AGENT_JOB_QUERY) < 0) return ret; =20 if (virDomainObjCheckActive(vm) < 0) @@ -20616,8 +20601,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, if (virDomainGetGuestInfoEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (qemuDomainObjBeginAgentJob(vm, - VIR_AGENT_JOB_QUERY) < 0) + if (qemuDomainObjBeginAgentJob(vm, VIR_AGENT_JOB_QUERY) < 0) goto cleanup; =20 if (!qemuDomainAgentAvailable(vm, true)) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f5f7d4bdf1..2a782b6e79 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1904,8 +1904,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriver *dri= ver, ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); - qemuDomainDelTLSObjects(vm, VIR_ASYNC_JOB_NONE, - secAlias, tlsAlias); + qemuDomainDelTLSObjects(vm, VIR_ASYNC_JOB_NONE, secAlias, tlsAlias); goto audit; } =20 @@ -2197,8 +2196,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); =20 - qemuDomainDelTLSObjects(vm, VIR_ASYNC_JOB_NONE, - secAlias, tlsAlias); + qemuDomainDelTLSObjects(vm, VIR_ASYNC_JOB_NONE, secAlias, tlsAlias); goto audit; } =20 @@ -2303,8 +2301,7 @@ qemuDomainAttachRNGDevice(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); virErrorRestore(&orig_err); =20 - qemuDomainDelTLSObjects(vm, VIR_ASYNC_JOB_NONE, - secAlias, tlsAlias); + qemuDomainDelTLSObjects(vm, VIR_ASYNC_JOB_NONE, secAlias, tlsAlias); goto audit; } =20 @@ -2405,8 +2402,7 @@ qemuDomainAttachMemory(virQEMUDriver *driver, mem =3D NULL; =20 /* this step is best effort, removing the device would be so much trou= ble */ - ignore_value(qemuDomainUpdateMemoryDeviceInfo(vm, - VIR_ASYNC_JOB_NONE)); + ignore_value(qemuDomainUpdateMemoryDeviceInfo(vm, VIR_ASYNC_JOB_NONE)); =20 ret =3D 0; =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f846932857..7d3cfa6212 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -603,8 +603,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, } } =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_IN) < 0) + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_IN)= < 0) goto cleanup; =20 if (!server_started) { @@ -643,8 +642,7 @@ qemuMigrationDstStopNBDServer(virDomainObj *vm, if (!mig->nbd) return 0; =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_IN) < 0) + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0) return -1; =20 if (qemuMonitorNBDServerStop(priv->mon) < 0) @@ -1049,8 +1047,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *= vm, false))) return -1; =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_OUT) < 0) + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) < = 0) return -1; =20 mon_ret =3D qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm)= , data); @@ -1097,8 +1094,7 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virDomainOb= j *vm, diskAlias); } =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_OUT) < 0) + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) < = 0) return -1; =20 mon_ret =3D qemuMonitorDriveMirror(qemuDomainGetMonitor(vm), @@ -1156,8 +1152,7 @@ qemuMigrationSrcNBDStorageCopyOne(virDomainObj *vm, =20 if (flags & VIR_MIGRATE_TLS || virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(vm, - disk, jobname, + rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(vm, disk, jobname, sourcename, persistjob, host, port, socket, mirror_speed, @@ -2078,8 +2073,7 @@ qemuMigrationSrcWaitForCompletion(virDomainObj *vm, =20 jobData->status =3D VIR_DOMAIN_JOB_STATUS_MIGRATING; =20 - while ((rv =3D qemuMigrationAnyCompleted(vm, asyncJob, - dconn, flags)) !=3D 1) { + while ((rv =3D qemuMigrationAnyCompleted(vm, asyncJob, dconn, flags)) = !=3D 1) { if (rv < 0) return rv; =20 @@ -2119,8 +2113,7 @@ qemuMigrationDstWaitForCompletion(virDomainObj *vm, if (postcopy) flags =3D QEMU_MIGRATION_COMPLETED_POSTCOPY; =20 - while ((rv =3D qemuMigrationAnyCompleted(vm, asyncJob, - NULL, flags)) !=3D 1) { + while ((rv =3D qemuMigrationAnyCompleted(vm, asyncJob, NULL, flags)) != =3D 1) { if (rv < 0 || virDomainObjWait(vm) < 0) return -1; } @@ -2208,8 +2201,7 @@ qemuMigrationSrcGraphicsRelocate(virDomainObj *vm, if (port <=3D 0 && tlsPort <=3D 0) return 0; =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_OUT) =3D=3D= 0) { + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) = =3D=3D 0) { qemuDomainJobPrivate *jobPriv =3D priv->job.privateData; =20 rc =3D qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, @@ -2895,8 +2887,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, } =20 if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) { - if (qemuMigrationJobStart(vm, VIR_ASYNC_JOB_MIGRATION_OUT, - flags) < 0) + if (qemuMigrationJobStart(vm, VIR_ASYNC_JOB_MIGRATION_OUT, flags) = < 0) goto cleanup; asyncJob =3D VIR_ASYNC_JOB_MIGRATION_OUT; } else { @@ -4903,8 +4894,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, goto error; } =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_OUT) < 0) + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT) < = 0) goto error; =20 if (priv->job.abortJob) { @@ -4945,8 +4935,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, if (flags & VIR_MIGRATE_POSTCOPY) waitFlags |=3D QEMU_MIGRATION_COMPLETED_POSTCOPY; =20 - rc =3D qemuMigrationSrcWaitForCompletion(vm, - VIR_ASYNC_JOB_MIGRATION_OUT, + rc =3D qemuMigrationSrcWaitForCompletion(vm, VIR_ASYNC_JOB_MIGRATION_O= UT, dconn, waitFlags); if (rc =3D=3D -2) goto error; @@ -5047,8 +5036,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, =20 if (cancel && priv->job.current->status !=3D VIR_DOMAIN_JOB_STATUS_HYPERVISO= R_COMPLETED && - qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_MIGRATION_OUT) = =3D=3D 0) { + qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT= ) =3D=3D 0) { qemuMonitorMigrateCancel(priv->mon); qemuDomainObjExitMonitor(vm); } @@ -6186,8 +6174,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, =20 /* If we didn't start the job in the begin phase, start it now. */ if (!(flags & VIR_MIGRATE_CHANGE_PROTECTION)) { - if (qemuMigrationJobStart(vm, VIR_ASYNC_JOB_MIGRATION_OUT, - flags) < 0) + if (qemuMigrationJobStart(vm, VIR_ASYNC_JOB_MIGRATION_OUT, flags) = < 0) return ret; } else if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT))= { return ret; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 4a3f4fa5e3..0b4d9b089f 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -311,8 +311,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver, } } =20 - if (qemuDomainObjEnterMonitorAsync(vm, - VIR_ASYNC_JOB_SNAPSHOT) < 0) { + if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_SNAPSHOT) < 0) { resume =3D false; goto cleanup; } --=20 2.37.1