|
 |
b85204 |
From 227313ca73d24eaaa0b82aca94de2278bca0f95b Mon Sep 17 00:00:00 2001
|
|
|
b85204 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
b85204 |
Date: Mon, 6 Feb 2023 12:13:25 +0000
|
|
|
b85204 |
Subject: [PATCH] convert: linux: Require host cpu for all RHEL-alike >= 9
|
|
|
b85204 |
|
|
|
b85204 |
RHEL >= 9 and compatible distros like Rocky >= 9 will not boot using
|
|
|
b85204 |
the default qemu CPU. You will see an error at boot:
|
|
|
b85204 |
|
|
|
b85204 |
Fatal glibc error: CPU does not support x86-64-v2
|
|
|
b85204 |
|
|
|
b85204 |
Instead you need to use -cpu host.
|
|
|
b85204 |
|
|
|
b85204 |
In commit f28757c6d1 ("convert_linux: set "gcaps_default_cpu = false"
|
|
|
b85204 |
for x86_64 RHEL-9.0+ guests") we fixed this specifically for RHEL >= 9.
|
|
|
b85204 |
|
|
|
b85204 |
This commit extends the same fix to all RHEL family distros.
|
|
|
b85204 |
|
|
|
b85204 |
Updates: commit f28757c6d100060c65212ea55cfa59d308dcb850
|
|
|
b85204 |
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2166619
|
|
|
b85204 |
Reported-by: Ming Xie
|
|
|
b85204 |
Thanks: Laszlo Ersek
|
|
|
b85204 |
(cherry picked from commit 9f12b95bbe7bc2850ce4ba134c46a3cc5fd1167d)
|
|
|
b85204 |
---
|
|
|
b85204 |
convert/convert_linux.ml | 4 ++--
|
|
|
b85204 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
b85204 |
|
|
|
b85204 |
diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
|
|
|
b85204 |
index 41767e62..27bc4ae4 100644
|
|
|
b85204 |
--- a/convert/convert_linux.ml
|
|
|
b85204 |
+++ b/convert/convert_linux.ml
|
|
|
b85204 |
@@ -202,9 +202,9 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
|
|
|
b85204 |
|
|
|
b85204 |
(* RHEL >= 9.0 on x86_64 requires the processor to support the "x86-64-v2"
|
|
|
b85204 |
* microarchitecture level, which the default QEMU VCPU model does not
|
|
|
b85204 |
- * satisfy. Refer to RHBZ#2076013.
|
|
|
b85204 |
+ * satisfy. Refer to RHBZ#2076013 RHBZ#2166619.
|
|
|
b85204 |
*)
|
|
|
b85204 |
- let default_cpu_suffices = inspect.i_distro <> "rhel" ||
|
|
|
b85204 |
+ let default_cpu_suffices = family <> `RHEL_family ||
|
|
|
b85204 |
inspect.i_arch <> "x86_64" ||
|
|
|
b85204 |
inspect.i_major_version < 9 in
|
|
|
b85204 |
|