qemu-7.0.0-13
linux-user: default to -cpu max (rhbz#2121700) Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Christophe Fergeau
parent
a75c8ea61f
commit
ce7904b88e
|
|
@ -0,0 +1,81 @@
|
|||
From ea3de64a58f5f157a75280bcddf884c5bda391be Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Fri, 23 Sep 2022 12:04:13 +0100
|
||||
Subject: [PATCH 21/21] linux-user: use 'max' instead of 'qemu32' / 'qemu64' by
|
||||
default
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The 'qemu64' CPU model implements the least featureful x86_64 CPU that's
|
||||
possible. Historically this hasn't been an issue since it was rare for
|
||||
OS distros to build with a higher mandatory CPU baseline.
|
||||
|
||||
With RHEL-9, however, the entire distro is built for the x86_64-v2 ABI
|
||||
baseline:
|
||||
|
||||
https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level
|
||||
|
||||
It is likely that other distros may take similar steps in the not too
|
||||
distant future. For example, it has been suggested for Fedora on a
|
||||
number of occasions.
|
||||
|
||||
This new baseline is not compatible with the qemu64 CPU model though.
|
||||
While it is possible to pass a '-cpu xxx' flag to qemu-x86_64, the
|
||||
usage of QEMU doesn't always allow for this. For example, the args
|
||||
are typically controlled via binfmt rules that the user has no ability
|
||||
to change. This impacts users who are trying to use podman on aarch64
|
||||
platforms, to run containers with x86_64 content. There's no arg to
|
||||
podman that can be used to change the qemu-x86_64 args, and a non-root
|
||||
user of podman can not change binfmt rules without elevating privileges:
|
||||
|
||||
https://github.com/containers/podman/issues/15456#issuecomment-1228210973
|
||||
|
||||
Changing to the 'max' CPU model gives 'qemu-x86_64' maximum
|
||||
compatibility with binaries it is likely to encounter in the wild,
|
||||
and not likely to have a significant downside for existing usage.
|
||||
|
||||
Most other architectures already use an 'any' CPU model, which is
|
||||
often mapped to 'max' (or similar) already, rather than the oldest
|
||||
possible CPU model.
|
||||
|
||||
For the sake of consistency the 'i386' architecture is also changed
|
||||
from using 'qemu32' to 'max'.
|
||||
|
||||
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||||
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
Message-Id: <20220923110413.70593-1-berrange@redhat.com>
|
||||
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
||||
---
|
||||
linux-user/i386/target_elf.h | 2 +-
|
||||
linux-user/x86_64/target_elf.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/linux-user/i386/target_elf.h b/linux-user/i386/target_elf.h
|
||||
index 1c6142e..238a9ab 100644
|
||||
--- a/linux-user/i386/target_elf.h
|
||||
+++ b/linux-user/i386/target_elf.h
|
||||
@@ -9,6 +9,6 @@
|
||||
#define I386_TARGET_ELF_H
|
||||
static inline const char *cpu_get_model(uint32_t eflags)
|
||||
{
|
||||
- return "qemu32";
|
||||
+ return "max";
|
||||
}
|
||||
#endif
|
||||
diff --git a/linux-user/x86_64/target_elf.h b/linux-user/x86_64/target_elf.h
|
||||
index 7b76a90..3f628f8 100644
|
||||
--- a/linux-user/x86_64/target_elf.h
|
||||
+++ b/linux-user/x86_64/target_elf.h
|
||||
@@ -9,6 +9,6 @@
|
||||
#define X86_64_TARGET_ELF_H
|
||||
static inline const char *cpu_get_model(uint32_t eflags)
|
||||
{
|
||||
- return "qemu64";
|
||||
+ return "max";
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.39.0
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
|
|||
%endif
|
||||
|
||||
# To prevent rpmdev-bumpspec breakage
|
||||
%global baserelease 12
|
||||
%global baserelease 13
|
||||
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
|
|
@ -372,6 +372,8 @@ Patch: 0018-hw-display-ati_2d-Fix-buffer-overflow-in-ati_2d_blt.patch
|
|||
Patch: 0019-hw-acpi-erst.c-Fix-memory-handling-issues.patch
|
||||
# qxl: qxl_phys2virt unsafe address translation (CVE-2022-4144)
|
||||
Patch: 0020-hw-display-qxl-Avoid-buffer-overrun-qxl_phys2virt.patch
|
||||
# linux-user: default to -cpu max (rhbz#2121700)
|
||||
Patch: 0021-linux-user-use-max-instead-of-qemu32-qemu64-by-default.patch
|
||||
|
||||
BuildRequires: meson >= %{meson_version}
|
||||
BuildRequires: zlib-devel
|
||||
|
|
@ -2736,6 +2738,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 19 2023 Christophe Fergeau <cfergeau@redhat.com> - 2:7.0.0-13
|
||||
- linux-user: default to -cpu max (rhbz#2121700)
|
||||
|
||||
* Tue Dec 06 2022 Mauro Matteo Cascella <mcascell@redhat.com> - 2:7.0.0-12
|
||||
- hcd-xhci: infinite loop in xhci_ring_chain_length (CVE-2020-14394) (rhbz#1908050)
|
||||
- ati-vga: out-of-bounds write in ati_2d_blt (CVE-2021-3638) (rhbz#1979882)
|
||||
|
|
|
|||
Loading…
Reference in New Issue