On 29/06/20 11:35, Claudio Fontana wrote: > move arch_init, balloon, cpus, ioport, memory, memory_mapping, qtest. > > They are all specific to CONFIG_SOFTMMU. > > Signed-off-by: Claudio Fontana <cfont...@suse.de> > Reviewed-by: Alex Bennée <alex.ben...@linaro.org> > Reviewed-by: Laurent Vivier <lviv...@redhat.com> > Reviewed-by: Thomas Huth <th...@redhat.com> > --- > MAINTAINERS | 12 ++++++------ > Makefile.target | 7 ++----- > softmmu/Makefile.objs | 10 ++++++++++ > arch_init.c => softmmu/arch_init.c | 0 > balloon.c => softmmu/balloon.c | 0 > cpus.c => softmmu/cpus.c | 0 > ioport.c => softmmu/ioport.c | 0 > memory.c => softmmu/memory.c | 0 > memory_mapping.c => softmmu/memory_mapping.c | 0 > qtest.c => softmmu/qtest.c | 0 > 10 files changed, 18 insertions(+), 11 deletions(-) > rename arch_init.c => softmmu/arch_init.c (100%) > rename balloon.c => softmmu/balloon.c (100%) > rename cpus.c => softmmu/cpus.c (100%) > rename ioport.c => softmmu/ioport.c (100%) > rename memory.c => softmmu/memory.c (100%) > rename memory_mapping.c => softmmu/memory_mapping.c (100%) > rename qtest.c => softmmu/qtest.c (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index dec252f38b..7214f59383 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -115,7 +115,7 @@ Overall TCG CPUs > M: Richard Henderson <r...@twiddle.net> > R: Paolo Bonzini <pbonz...@redhat.com> > S: Maintained > -F: cpus.c > +F: softmmu/cpus.c > F: cpus-common.c > F: exec.c > F: accel/tcg/ > @@ -1708,7 +1708,7 @@ M: David Hildenbrand <da...@redhat.com> > S: Maintained > F: hw/virtio/virtio-balloon*.c > F: include/hw/virtio/virtio-balloon.h > -F: balloon.c > +F: softmmu/balloon.c > F: include/sysemu/balloon.h > > virtio-9p > @@ -2177,12 +2177,12 @@ Memory API > M: Paolo Bonzini <pbonz...@redhat.com> > S: Supported > F: include/exec/ioport.h > -F: ioport.c > F: include/exec/memop.h > F: include/exec/memory.h > F: include/exec/ram_addr.h > F: include/exec/ramblock.h > -F: memory.c > +F: softmmu/ioport.c > +F: softmmu/memory.c > F: include/exec/memory-internal.h > F: exec.c > F: scripts/coccinelle/memory-region-housekeeping.cocci > @@ -2214,13 +2214,13 @@ F: ui/cocoa.m > Main loop > M: Paolo Bonzini <pbonz...@redhat.com> > S: Maintained > -F: cpus.c > F: include/qemu/main-loop.h > F: include/sysemu/runstate.h > F: util/main-loop.c > F: util/qemu-timer.c > F: softmmu/vl.c > F: softmmu/main.c > +F: softmmu/cpus.c > F: qapi/run-state.json > > Human Monitor (HMP) > @@ -2375,7 +2375,7 @@ M: Thomas Huth <th...@redhat.com> > M: Laurent Vivier <lviv...@redhat.com> > R: Paolo Bonzini <pbonz...@redhat.com> > S: Maintained > -F: qtest.c > +F: softmmu/qtest.c > F: accel/qtest.c > F: tests/qtest/ > X: tests/qtest/bios-tables-test-allowed-diff.h > diff --git a/Makefile.target b/Makefile.target > index 8ed1eba95b..7fbf5d8b92 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -152,16 +152,13 @@ endif #CONFIG_BSD_USER > ######################################################### > # System emulator target > ifdef CONFIG_SOFTMMU > -obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o > -obj-y += qtest.o > +obj-y += softmmu/ > +obj-y += gdbstub.o > obj-y += dump/ > obj-y += hw/ > obj-y += monitor/ > obj-y += qapi/ > -obj-y += memory.o > -obj-y += memory_mapping.o > obj-y += migration/ram.o > -obj-y += softmmu/ > LIBS := $(libs_softmmu) $(LIBS) > > # Hardware support > diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs > index dd15c24346..a4bd9f2f52 100644 > --- a/softmmu/Makefile.objs > +++ b/softmmu/Makefile.objs > @@ -1,3 +1,13 @@ > softmmu-main-y = softmmu/main.o > + > +obj-y += arch_init.o > +obj-y += cpus.o > +obj-y += balloon.o > +obj-y += ioport.o > +obj-y += memory.o > +obj-y += memory_mapping.o > + > +obj-y += qtest.o > + > obj-y += vl.o > vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS) > diff --git a/arch_init.c b/softmmu/arch_init.c > similarity index 100% > rename from arch_init.c > rename to softmmu/arch_init.c > diff --git a/balloon.c b/softmmu/balloon.c > similarity index 100% > rename from balloon.c > rename to softmmu/balloon.c > diff --git a/cpus.c b/softmmu/cpus.c > similarity index 100% > rename from cpus.c > rename to softmmu/cpus.c > diff --git a/ioport.c b/softmmu/ioport.c > similarity index 100% > rename from ioport.c > rename to softmmu/ioport.c > diff --git a/memory.c b/softmmu/memory.c > similarity index 100% > rename from memory.c > rename to softmmu/memory.c > diff --git a/memory_mapping.c b/softmmu/memory_mapping.c > similarity index 100% > rename from memory_mapping.c > rename to softmmu/memory_mapping.c > diff --git a/qtest.c b/softmmu/qtest.c > similarity index 100% > rename from qtest.c > rename to softmmu/qtest.c >
Queued, thanks. But I only got patch 1/3. Paolo
