| Message ID | 20230914185718.76241-11-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | accel/tcg: Make more files target agnostic (& exec/ housekeeping) | expand |
On 14/09/23, Philippe Mathieu-Daudé wrote: > Remove the unused "exec/exec-all.h" header. There is > no more target specific code in it: make it target > agnostic (rename using the '-common' suffix). Since > it is TCG specific, move it to accel/tcg, updating > MAINTAINERS. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > MAINTAINERS | 1 - > softmmu/icount.c => accel/tcg/icount-common.c | 3 +-- > accel/tcg/meson.build | 1 + > softmmu/meson.build | 4 ---- > 4 files changed, 2 insertions(+), 7 deletions(-) > rename softmmu/icount.c => accel/tcg/icount-common.c (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index ff436dbf21..047d143b9d 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2912,7 +2912,6 @@ F: softmmu/main.c > F: softmmu/cpus.c > F: softmmu/cpu-throttle.c > F: softmmu/cpu-timers.c > -F: softmmu/icount.c Would also be a maintainer switch Otherwise, Reviewed-by: Anton Johansson <anjo@rev.ng>
On 15/9/23 16:31, Anton Johansson wrote: > On 14/09/23, Philippe Mathieu-Daudé wrote: >> Remove the unused "exec/exec-all.h" header. There is >> no more target specific code in it: make it target >> agnostic (rename using the '-common' suffix). Since >> it is TCG specific, move it to accel/tcg, updating >> MAINTAINERS. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> MAINTAINERS | 1 - >> softmmu/icount.c => accel/tcg/icount-common.c | 3 +-- >> accel/tcg/meson.build | 1 + >> softmmu/meson.build | 4 ---- >> 4 files changed, 2 insertions(+), 7 deletions(-) >> rename softmmu/icount.c => accel/tcg/icount-common.c (99%) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index ff436dbf21..047d143b9d 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -2912,7 +2912,6 @@ F: softmmu/main.c >> F: softmmu/cpus.c >> F: softmmu/cpu-throttle.c >> F: softmmu/cpu-timers.c >> -F: softmmu/icount.c > Would also be a maintainer switch OK, now I understood your comment. I should have mentioned it in the commit description. This move from "Main loop" to "Overall TCG". Icount is a TCG feature. (Less work for Paolo, but more for Richard...) > Otherwise, > Reviewed-by: Anton Johansson <anjo@rev.ng>
On 15/09/23, Philippe Mathieu-Daudé wrote: > On 15/9/23 16:31, Anton Johansson wrote: > > On 14/09/23, Philippe Mathieu-Daudé wrote: > > > Remove the unused "exec/exec-all.h" header. There is > > > no more target specific code in it: make it target > > > agnostic (rename using the '-common' suffix). Since > > > it is TCG specific, move it to accel/tcg, updating > > > MAINTAINERS. > > > > > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > > --- > > > MAINTAINERS | 1 - > > > softmmu/icount.c => accel/tcg/icount-common.c | 3 +-- > > > accel/tcg/meson.build | 1 + > > > softmmu/meson.build | 4 ---- > > > 4 files changed, 2 insertions(+), 7 deletions(-) > > > rename softmmu/icount.c => accel/tcg/icount-common.c (99%) > > > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > > index ff436dbf21..047d143b9d 100644 > > > --- a/MAINTAINERS > > > +++ b/MAINTAINERS > > > @@ -2912,7 +2912,6 @@ F: softmmu/main.c > > > F: softmmu/cpus.c > > > F: softmmu/cpu-throttle.c > > > F: softmmu/cpu-timers.c > > > -F: softmmu/icount.c > > Would also be a maintainer switch > > OK, now I understood your comment. I should have mentioned > it in the commit description. This move from "Main loop" > to "Overall TCG". Icount is a TCG feature. > (Less work for Paolo, but more for Richard...) Ah that makes sense, just wanted to make sure:)
diff --git a/MAINTAINERS b/MAINTAINERS index ff436dbf21..047d143b9d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2912,7 +2912,6 @@ F: softmmu/main.c F: softmmu/cpus.c F: softmmu/cpu-throttle.c F: softmmu/cpu-timers.c -F: softmmu/icount.c F: softmmu/runstate* F: qapi/run-state.json diff --git a/softmmu/icount.c b/accel/tcg/icount-common.c similarity index 99% rename from softmmu/icount.c rename to accel/tcg/icount-common.c index 4527bfbd6e..0bf5bb5e21 100644 --- a/softmmu/icount.c +++ b/accel/tcg/icount-common.c @@ -27,7 +27,6 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "exec/exec-all.h" #include "sysemu/cpus.h" #include "sysemu/qtest.h" #include "qemu/main-loop.h" @@ -38,7 +37,7 @@ #include "hw/core/cpu.h" #include "sysemu/cpu-timers.h" #include "sysemu/cpu-throttle.h" -#include "timers-state.h" +#include "softmmu/timers-state.h" /* * ICOUNT: Instruction Counter diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 0fb03bd7d3..4633a34d28 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -23,6 +23,7 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( )) system_ss.add(when: ['CONFIG_TCG'], if_true: files( + 'icount-common.c', 'monitor.c', )) diff --git a/softmmu/meson.build b/softmmu/meson.build index c18b7ad738..3a64dd89de 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -6,10 +6,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'watchpoint.c', )]) -specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files( - 'icount.c', -)]) - system_ss.add(files( 'balloon.c', 'bootdevice.c',
Remove the unused "exec/exec-all.h" header. There is no more target specific code in it: make it target agnostic (rename using the '-common' suffix). Since it is TCG specific, move it to accel/tcg, updating MAINTAINERS. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- MAINTAINERS | 1 - softmmu/icount.c => accel/tcg/icount-common.c | 3 +-- accel/tcg/meson.build | 1 + softmmu/meson.build | 4 ---- 4 files changed, 2 insertions(+), 7 deletions(-) rename softmmu/icount.c => accel/tcg/icount-common.c (99%)