Message ID | CAMo8BfKsLmdjRzmX6+nD3u-+8-6dx5VuU-kNH9gwx04NhQ5fGA@mail.gmail.com |
---|---|
State | New |
Headers | show |
Series | qemu-softmmu -cpu help broken | expand |
On 10/03/2022 12.10, Max Filippov wrote: > Hello, > > I've noticed that the command > qemu-system-xtensa -cpu help > no longer prints anything. Apparently because cpu_list is no longer defined > in list_cpus inside softmmu/cpus.c > > Bisection points to the following commit: > e0220bb5b200 ("softmmu: Build target-agnostic objects once") > > Reverting the change for the cpus.c fixes it for me: > > diff --git a/softmmu/meson.build b/softmmu/meson.build > index 8138248661a2..adede5e604db 100644 > --- a/softmmu/meson.build > +++ b/softmmu/meson.build > @@ -1,5 +1,6 @@ > specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( > 'arch_init.c', > + 'cpus.c', > 'ioport.c', > 'memory.c', > 'physmem.c', > @@ -13,7 +14,6 @@ specific_ss.add(when: ['CONFIG_SOFTMMU', > 'CONFIG_TCG'], if_true: [files( > softmmu_ss.add(files( > 'balloon.c', > 'bootdevice.c', > - 'cpus.c', > 'cpu-throttle.c', > 'cpu-timers.c', > 'datadir.c', > > I can send a proper patch if this is the right fix, please > let me know. Since we're in soft-freeze now already, I think your patch is the best way to go forward, so yes, please post it as a proper patch! Thomas
On 3/10/22 12:10, Max Filippov wrote: > Hello, > > I've noticed that the command > qemu-system-xtensa -cpu help > no longer prints anything. Apparently because cpu_list is no longer defined > in list_cpus inside softmmu/cpus.c I think it'd be better to move list_cpus() to cpu.c in the root directory, and from include/sysemu/cpus.h to include/exec/cpu-common.h. Paolo
diff --git a/softmmu/meson.build b/softmmu/meson.build index 8138248661a2..adede5e604db 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -1,5 +1,6 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( 'arch_init.c', + 'cpus.c', 'ioport.c', 'memory.c', 'physmem.c', @@ -13,7 +14,6 @@ specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( softmmu_ss.add(files( 'balloon.c', 'bootdevice.c', - 'cpus.c', 'cpu-throttle.c', 'cpu-timers.c',