Skip to content

Commit d8807bb

Browse files
committed
Update exposed CPU to x86_64-v3 HW level in Podman machine
1 parent 66594c5 commit d8807bb

3 files changed

Lines changed: 29 additions & 28 deletions

File tree

.github/workflows/prepare-podman-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
git fetch --depth 1 origin $PODMAN_SHA
5252
git checkout FETCH_HEAD
5353
patch --binary -l -p 1 < ../patches/podman/0001-Implement-QEMU-Podman-machine-on-Windows.patch
54-
patch --binary -l -p 1 < ../patches/podman/0002-Update-QEMU-CPU-baseline-to-x86-64v2.5.patch
54+
patch --binary -l -p 1 < ../patches/podman/0002-Update-QEMU-CPU-baseline-to-x86-64-v3.patch
5555
- name: "⚗️ Prepare Test Podman"
5656
working-directory: podman-release
5757
shell: msys2 {0}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From ea209e410003362b5233552343b4edd6f8b9a03d Mon Sep 17 00:00:00 2001
2+
From: Arthur Sengileyev <arthur.sengileyev@gmail.com>
3+
Date: Fri, 17 Jan 2025 19:10:55 +0200
4+
Subject: [PATCH] Update QEMU CPU baseline to x86-64-v3
5+
6+
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
7+
---
8+
pkg/machine/qemu/options_windows_amd64.go | 5 ++---
9+
1 file changed, 2 insertions(+), 3 deletions(-)
10+
11+
diff --git a/pkg/machine/qemu/options_windows_amd64.go b/pkg/machine/qemu/options_windows_amd64.go
12+
index 96ca711ea3..b408494203 100644
13+
--- a/pkg/machine/qemu/options_windows_amd64.go
14+
+++ b/pkg/machine/qemu/options_windows_amd64.go
15+
@@ -5,8 +5,7 @@ package qemu
16+
var QemuCommand = "qemu-system-x86_64w"
17+
18+
func (q *QEMUStubber) addArchOptions(_ *setNewMachineCMDOpts) []string {
19+
- // "qemu64" level is used, because "host" is not supported with "whpx" acceleration.
20+
- // It is a stable choice for running on bare metal and inside Hyper-V machine with nested virtualization.
21+
- opts := []string{"-machine", "q35,accel=whpx:tcg", "-cpu", "qemu64"}
22+
+ // defaults to x86_64-v3 to support RHEL workloads
23+
+ opts := []string{"-machine", "q35,accel=whpx:tcg", "-cpu", "qemu64,+aes,+popcnt,+pni,+sse4.1,+sse4.2,+ssse3,+avx,+avx2,+bmi1,+bmi2,+f16c,+fma,+abm,+movbe"}
24+
return opts
25+
}
26+
--
27+
2.53.0
28+

patches/podman/0002-Update-QEMU-CPU-baseline-to-x86-64v2.5.patch

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)