Skip to content

chore(ci): update qemu build #2339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nevermarine wants to merge 4 commits into
base: main
Choose a base branch
from
+31 −5
Draft

chore(ci): update qemu build #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58a7787
chore(ci): update qemu build
nevermarine May 12, 2026
af95de4
remove legacy avx2 options
nevermarine May 12, 2026
adfa37f
remove ht in nehalem
nevermarine May 15, 2026
8422fab
update patch
nevermarine May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/components/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
firmware:
qemu: v9.2.0
qemu: v10.2.2
libvirt: v10.9.0
edk2: stable202411
core:
Expand Down
28 changes: 28 additions & 0 deletions images/qemu/patches/002-remove-nehalem-ht.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 78308a82a0..d5f3f5276e 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2213,6 +2213,7 @@ typedef struct X86CPUDefinition {
int stepping;
uint8_t avx10_version;
FeatureWordArray features;
+ FeatureWordArray filtered_features;
const char *model_id;
const CPUCaches *const cache_info;
/*
@@ -3708,6 +3709,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
CPUID_DE | CPUID_FP87,
+ .filtered_features[FEAT_1_EDX] = CPUID_HT,
.features[FEAT_1_ECX] =
CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_SSE3,
@@ -7735,6 +7737,7 @@ static void x86_cpu_load_model(X86CPU *cpu, const X86CPUModel *model)
&error_abort);
for (w = 0; w < FEATURE_WORDS; w++) {
env->features[w] = def->features[w];
+ cpu->filtered_features[w] |= def->filtered_features[w];
}

/* legacy-cache defaults to 'off' if CPU model provides cache info */
6 changes: 2 additions & 4 deletions images/qemu/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@ shell:
--block-drv-ro-whitelist="vdi,vmdk,vhdx,vpc,https" \
--disable-alsa \
--disable-auth-pam \
--disable-avx2 \
--disable-avx512bw \
--disable-block-drv-whitelist-in-tools \
--disable-bochs \
--disable-bpf \
Expand Down Expand Up @@ -256,7 +254,7 @@ shell:
--disable-linux-user \
--disable-lto \
--disable-lzfse \
--disable-membarrier \
--enable-membarrier \
--disable-module-upgrades \
--disable-multiprocess \
--disable-netmap \
Expand Down Expand Up @@ -321,7 +319,7 @@ shell:
--enable-pie \
--enable-rbd \
--enable-rdma \
--enable-seccomp \
--disable-seccomp \
--enable-selinux \
--enable-slirp \
--enable-snappy \
Expand Down
Loading