53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
|
From bd8b565057cacc69a0c0c4b2463ffab6c0cf395e Mon Sep 17 00:00:00 2001
|
||
|
|
From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Fri, 25 Nov 2022 02:19:55 +0800
|
||
|
|
Subject: [PATCH 23/23] qemuMigrationSrcWaitForSpice: Remove return value
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry-pick from b76c58081c69a8775dd46b014611b28f6ed2a1b2
|
||
|
|
|
||
|
|
The only caller doesn't check the return value and actually doesn't have
|
||
|
|
one either. Remove the return value and adjust return statements.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
|
||
|
|
Reviewed-by: Erik Skultety <eskultet@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_migration.c | 7 +++----
|
||
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
||
|
|
index d86325881e..1c48138ce3 100644
|
||
|
|
--- a/src/qemu/qemu_migration.c
|
||
|
|
+++ b/src/qemu/qemu_migration.c
|
||
|
|
@@ -1426,20 +1426,19 @@ qemuMigrationAnyPostcopyFailed(virQEMUDriverPtr driver,
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
-static int
|
||
|
|
+static void
|
||
|
|
qemuMigrationSrcWaitForSpice(virDomainObjPtr vm)
|
||
|
|
{
|
||
|
|
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||
|
|
|
||
|
|
if (!priv->job.spiceMigration)
|
||
|
|
- return 0;
|
||
|
|
+ return;
|
||
|
|
|
||
|
|
VIR_DEBUG("Waiting for SPICE to finish migration");
|
||
|
|
while (!priv->job.spiceMigrated && !priv->job.abortJob) {
|
||
|
|
if (virDomainObjWait(vm) < 0)
|
||
|
|
- return -1;
|
||
|
|
+ return;
|
||
|
|
}
|
||
|
|
- return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|