On 6/27/25 11:05 AM, Zhao Liu wrote:
After applying these patches to QEMU mainline at commit 6e1571533fd9:
Ah, I forgot I've rebased these patches...Now you can rebase all the
patches at the latest master branch.
Or, you can try this repo - I just created it to make it easier for you:
https://gitlab.com/zhao.liu/qemu/-/tree/cache-model-v2.6-rebase-06-23-2025
I cloned the repo and then ran:
$ git am 20250620_zhao1_liu_i386_cpu_unify_the_cache_model_in_x86cpustate.mbx
The *.mbx is got from b4 tool.
That applied several patches successfully, but on patch #11 I got this error:
error: patch failed: target/i386/cpu.c:7482
error: target/i386/cpu.c: patch does not apply
Patch failed at 0011 i386/cpu: Select legacy cache model based on vendor in
CPUID 0x2
hint: Use 'git am --show-current-patch=diff' to see the failed patch
This error also occured on qemu master when I do 'git am
20250620_zhao1_liu_i386_cpu_unify_the_cache_model_in_x86cpustate.mbx'.
Have you run into this before, or did I miss any steps?