From 58a7787987b61098ed45d1cb5e581fe1450d60a0 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 12 May 2026 16:43:51 +0300 Subject: [PATCH 1/4] chore(ci): update qemu build Signed-off-by: Maksim Fedotov --- build/components/versions.yml | 2 +- images/qemu/werf.inc.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/components/versions.yml b/build/components/versions.yml index daf7a6a989..7f1c681099 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -1,5 +1,5 @@ firmware: - qemu: v9.2.0 + qemu: v10.2.2 libvirt: v10.9.0 edk2: stable202411 core: diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 8f8832f339..5720269597 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -215,7 +215,7 @@ shell: --block-drv-ro-whitelist="vdi,vmdk,vhdx,vpc,https" \ --disable-alsa \ --disable-auth-pam \ - --disable-avx2 \ + --enable-avx2 \ --disable-avx512bw \ --disable-block-drv-whitelist-in-tools \ --disable-bochs \ @@ -256,7 +256,7 @@ shell: --disable-linux-user \ --disable-lto \ --disable-lzfse \ - --disable-membarrier \ + --enable-membarrier \ --disable-module-upgrades \ --disable-multiprocess \ --disable-netmap \ @@ -321,7 +321,7 @@ shell: --enable-pie \ --enable-rbd \ --enable-rdma \ - --enable-seccomp \ + --disable-seccomp \ --enable-selinux \ --enable-slirp \ --enable-snappy \ From af95de435e0d6a6fcfaa608c172ae3e60d96991a Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 12 May 2026 18:29:39 +0300 Subject: [PATCH 2/4] remove legacy avx2 options Signed-off-by: Maksim Fedotov --- images/qemu/werf.inc.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/qemu/werf.inc.yaml b/images/qemu/werf.inc.yaml index 5720269597..b8785b6f38 100644 --- a/images/qemu/werf.inc.yaml +++ b/images/qemu/werf.inc.yaml @@ -215,8 +215,6 @@ shell: --block-drv-ro-whitelist="vdi,vmdk,vhdx,vpc,https" \ --disable-alsa \ --disable-auth-pam \ - --enable-avx2 \ - --disable-avx512bw \ --disable-block-drv-whitelist-in-tools \ --disable-bochs \ --disable-bpf \ From adfa37f091e89b9ea1cc9ede93caee9fe214aed5 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Fri, 15 May 2026 11:56:30 +0300 Subject: [PATCH 3/4] remove ht in nehalem Signed-off-by: Maksim Fedotov --- images/qemu/patches/002-remove-nehalem-ht.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 images/qemu/patches/002-remove-nehalem-ht.patch diff --git a/images/qemu/patches/002-remove-nehalem-ht.patch b/images/qemu/patches/002-remove-nehalem-ht.patch new file mode 100644 index 0000000000..b621e3ae28 --- /dev/null +++ b/images/qemu/patches/002-remove-nehalem-ht.patch @@ -0,0 +1,12 @@ +diff --git a/target/i386/cpu.c b/target/i386/cpu.c +index 78308a82a0..b88063f234 100644 +--- a/target/i386/cpu.c ++++ b/target/i386/cpu.c +@@ -3708,6 +3708,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, From 8422faba9635084903eedc63ffbb3868732aad43 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Fri, 15 May 2026 12:18:05 +0300 Subject: [PATCH 4/4] update patch Signed-off-by: Maksim Fedotov --- .../qemu/patches/002-remove-nehalem-ht.patch | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/images/qemu/patches/002-remove-nehalem-ht.patch b/images/qemu/patches/002-remove-nehalem-ht.patch index b621e3ae28..e1b5b492b7 100644 --- a/images/qemu/patches/002-remove-nehalem-ht.patch +++ b/images/qemu/patches/002-remove-nehalem-ht.patch @@ -1,8 +1,16 @@ diff --git a/target/i386/cpu.c b/target/i386/cpu.c -index 78308a82a0..b88063f234 100644 +index 78308a82a0..d5f3f5276e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c -@@ -3708,6 +3708,7 @@ static const X86CPUDefinition builtin_x86_defs[] = { +@@ -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, @@ -10,3 +18,11 @@ index 78308a82a0..b88063f234 100644 .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 */