On 20.12.2016 18:43, Eduardo Habkost wrote: > This moves the KVM and Xen files to the an accel/ subdir. > > Instead of moving the *-stubs.c file to accel/ as-is, I tried to > move most of the stub code to libqemustub.a. This way the obj-y > logic for accel/ is simpler: obj-y includes accel/ only if > CONFIG_SOFTMMU is set. > > The Xen stubs could be moved completely to stubs/, but some of > the KVM stubs depend on cpu.h. So most of the kvm-stub.c code was > moved to stubs/kvm.c, but some of that code was kept in > accel/kvm-stub.c. > > About TCG: > ---------- > > It is not obvious to me which TCG-related files could be moved to > accel/, so this series don't move any of them yet. > > About other CONFIG_SOFTMMU top-level files: > ------------------------------------------- > > I would like to know what we should do with the top-level > CONFIG_SOFTMMU-only files that don't belong to hw/. Some > candidates: arch_init.c cpus.c monitor.c gdbstub.c balloon.c > ioport.c bootdevice.c memory.c cputlb.c memory_mapping.c dump.c. > > Maybe a sysemu/ subdir? In that case, should we still create an > accel/ subdir, or move xen-*, kvm-* and friends to sysemu/ too? > > Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Cc: kvm@xxxxxxxxxxxxxxx > Cc: Christoffer Dall <christoffer.dall@xxxxxxxxxx> > Cc: Anthony Perard <anthony.perard@xxxxxxxxxx> > Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx> > Cc: xen-devel@xxxxxxxxxxxxxxxxxxx > > Eduardo Habkost (7): > xen: Move xen-*-stub.c to stubs/ > xen: Move xen files to accel/ > kvm: Move some kvm-stub.c code to stubs/kvm.c > kvm: Include kvm-stub.o only on CONFIG_SOFTMMU > kvm: Move kvm*.c files to accel/ > accel: Move accel.c to accel/ > accel: Move qtest.c to accel/ > > Makefile.objs | 2 +- > Makefile.target | 10 ++---- > accel.c => accel/accel.c | 0 > kvm-all.c => accel/kvm-common.c | 0 > kvm-stub.c => accel/kvm-stub.c | 51 -------------------------- > qtest.c => accel/qtest.c | 0 > xen-common.c => accel/xen-common.c | 0 > xen-hvm.c => accel/xen-hvm.c | 0 > xen-mapcache.c => accel/xen-mapcache.c | 0 > stubs/kvm.c | 65 ++++++++++++++++++++++++++++++++++ > xen-hvm-stub.c => stubs/xen-hvm.c | 0 > xen-common-stub.c => stubs/xen.c | 0 > MAINTAINERS | 4 +-- > accel/Makefile.objs | 9 +++++ > stubs/Makefile.objs | 2 ++ > 15 files changed, 80 insertions(+), 63 deletions(-) > rename accel.c => accel/accel.c (100%) > rename kvm-all.c => accel/kvm-common.c (100%) > rename kvm-stub.c => accel/kvm-stub.c (71%) > rename qtest.c => accel/qtest.c (100%) > rename xen-common.c => accel/xen-common.c (100%) > rename xen-hvm.c => accel/xen-hvm.c (100%) > rename xen-mapcache.c => accel/xen-mapcache.c (100%) > rename xen-hvm-stub.c => stubs/xen-hvm.c (100%) > rename xen-common-stub.c => stubs/xen.c (100%) > create mode 100644 accel/Makefile.objs Now that the development tree is open again ... any chance that we could get this series into 2.10 ? Thomas
