6291e25165
- sync some bugfix patches from upstream - support vhostuser disk - libvirt: support dirtyrate (calc-dirty-rate, dirtyrate-param.mode) Signed-off-by: yezengruan <yezengruan@huawei.com>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 9549d796fd310e41ec58f1c438328d1bedc0cb93 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 29 Nov 2022 12:12:58 +0000
|
|
Subject: [PATCH 09/24] cpu_ppc64: compare CPU function is ignoring return
|
|
value Function to compare CPU on 64-bits PowerPC is ignoring the flag to
|
|
avoid failure in case of CPUs (host and guest) are incompatible. Basically,
|
|
the function is returning -1 even if it is set to continue.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Julio Faracco jcfaracco@gmail.com
|
|
Reviewed-by: Ján Tomko jtomko@redhat.com
|
|
Signed-off-by: Ján Tomko jtomko@redhat.com
|
|
|
|
Signed-off-by: tangbin tangbin_yewu@cmss.chinamobile.com
|
|
(cherry-pick from b356d81b8960c3a43212f8c0e9eab66465c8c10a)
|
|
---
|
|
src/cpu/cpu_ppc64.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
|
|
index 6b3590ab6a..9cbb28cbc5 100644
|
|
--- a/src/cpu/cpu_ppc64.c
|
|
+++ b/src/cpu/cpu_ppc64.c
|
|
@@ -561,11 +561,11 @@ virCPUppc64Compare(virCPUDefPtr host,
|
|
if (failIncompatible) {
|
|
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
|
|
_("unknown host CPU"));
|
|
- } else {
|
|
- VIR_WARN("unknown host CPU");
|
|
- ret = VIR_CPU_COMPARE_INCOMPATIBLE;
|
|
+ return VIR_CPU_COMPARE_ERROR;
|
|
}
|
|
- return -1;
|
|
+
|
|
+ VIR_WARN("unknown host CPU");
|
|
+ return VIR_CPU_COMPARE_INCOMPATIBLE;
|
|
}
|
|
|
|
ret = ppc64Compute(host, cpu, NULL, &message);
|
|
--
|
|
2.27.0
|
|
|