Suggested-by: Paolo Bonzini <pbonz...@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- Makefile.target | 4 ++-- user-exec-stub.c => accel/tcg/user-exec-stub.c | 0 user-exec.c => accel/tcg/user-exec.c | 0 MAINTAINERS | 3 +-- accel/tcg/Makefile.objs | 3 +++ 5 files changed, 6 insertions(+), 4 deletions(-) rename user-exec-stub.c => accel/tcg/user-exec-stub.c (100%) rename user-exec.c => accel/tcg/user-exec.c (100%)
diff --git a/Makefile.target b/Makefile.target index 7f42c45db8..520305b025 100644 --- a/Makefile.target +++ b/Makefile.target @@ -119,7 +119,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/linux-user obj-y += linux-user/ -obj-y += gdbstub.o thunk.o user-exec.o user-exec-stub.o +obj-y += gdbstub.o thunk.o endif #CONFIG_LINUX_USER @@ -132,7 +132,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) obj-y += bsd-user/ -obj-y += gdbstub.o user-exec.o user-exec-stub.o +obj-y += gdbstub.o endif #CONFIG_BSD_USER diff --git a/user-exec-stub.c b/accel/tcg/user-exec-stub.c similarity index 100% rename from user-exec-stub.c rename to accel/tcg/user-exec-stub.c diff --git a/user-exec.c b/accel/tcg/user-exec.c similarity index 100% rename from user-exec.c rename to accel/tcg/user-exec.c diff --git a/MAINTAINERS b/MAINTAINERS index a6b7e1c19f..b2d4a4711f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1602,8 +1602,7 @@ Overall M: Riku Voipio <riku.voi...@iki.fi> S: Maintained F: thunk.c -F: user-exec.c -F: user-exec-stub.c +F: accel/tcg/user-exec*.c BSD user S: Orphan diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index 22642e6f75..f2422d0fb3 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -2,3 +2,6 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o obj-y += cpu-exec.o cpu-exec-common.o translate-all.o obj-y += translator.o + +obj-$(CONFIG_USER_ONLY) += user-exec.o +obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.o -- 2.14.1