diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 10:35:53 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-01-16 17:52:35 +0100 |
commit | 5564edb19e06129b62b4b272c290db2efb87cefc (patch) | |
tree | 9ea4a05d6fd285090747f9cfec73f3454ffd04d7 | |
parent | 2f7b92a03f1e3813fc046d757138da519f4218d3 (diff) | |
download | qemu-5564edb19e06129b62b4b272c290db2efb87cefc.zip qemu-5564edb19e06129b62b4b272c290db2efb87cefc.tar.gz qemu-5564edb19e06129b62b4b272c290db2efb87cefc.tar.bz2 |
stubs: group stubs for user-mode emulation
Some stubs are used for user-mode emulation only; they are not
needed by tools. Move them out of stubs/.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | Makefile.target | 4 | ||||
-rw-r--r-- | stubs/Makefile.objs | 2 | ||||
-rw-r--r-- | stubs/cpus.c | 11 | ||||
-rw-r--r-- | stubs/replay-user.c | 33 | ||||
-rw-r--r-- | user-exec-stub.c | 34 |
6 files changed, 37 insertions, 48 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1444b26..39e8230 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1494,6 +1494,7 @@ M: Riku Voipio <riku.voipio@iki.fi> S: Maintained F: thunk.c F: user-exec.c +F: user-exec-stub.c BSD user S: Orphan diff --git a/Makefile.target b/Makefile.target index 8ae82cb..9e8edd9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -115,7 +115,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 +obj-y += gdbstub.o thunk.o user-exec.o user-exec-stub.o endif #CONFIG_LINUX_USER @@ -128,7 +128,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 +obj-y += gdbstub.o user-exec.o user-exec-stub.o endif #CONFIG_BSD_USER diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index c89a9da..1eec1fb 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -25,7 +25,6 @@ stub-obj-y += monitor.o stub-obj-y += notify-event.o stub-obj-y += qtest.o stub-obj-y += replay.o -stub-obj-y += replay-user.o stub-obj-y += runstate-check.o stub-obj-y += set-fd-handler.o stub-obj-y += slirp.o @@ -35,7 +34,6 @@ stub-obj-y += uuid.o stub-obj-y += vm-stop.o stub-obj-y += vmstate.o stub-obj-$(CONFIG_WIN32) += fd-register.o -stub-obj-y += cpus.o stub-obj-y += kvm.o stub-obj-y += qmp_pc_dimm_device_list.o stub-obj-y += target-monitor-defs.o diff --git a/stubs/cpus.c b/stubs/cpus.c deleted file mode 100644 index e192722..0000000 --- a/stubs/cpus.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "qom/cpu.h" - -void cpu_resume(CPUState *cpu) -{ -} - -void qemu_init_vcpu(CPUState *cpu) -{ -} diff --git a/stubs/replay-user.c b/stubs/replay-user.c deleted file mode 100644 index b29e7eb..0000000 --- a/stubs/replay-user.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * replay.c - * - * Copyright (c) 2010-2015 Institute for System Programming - * of the Russian Academy of Sciences. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "sysemu/replay.h" - -bool replay_exception(void) -{ - return true; -} - -bool replay_has_exception(void) -{ - return false; -} - -bool replay_interrupt(void) -{ - return true; -} - -bool replay_has_interrupt(void) -{ - return false; -} diff --git a/user-exec-stub.c b/user-exec-stub.c new file mode 100644 index 0000000..dbcf1ad --- /dev/null +++ b/user-exec-stub.c @@ -0,0 +1,34 @@ +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qom/cpu.h" +#include "sysemu/replay.h" + +void cpu_resume(CPUState *cpu) +{ +} + +void qemu_init_vcpu(CPUState *cpu) +{ +} + +/* User mode emulation does not support record/replay yet. */ + +bool replay_exception(void) +{ + return true; +} + +bool replay_has_exception(void) +{ + return false; +} + +bool replay_interrupt(void) +{ + return true; +} + +bool replay_has_interrupt(void) +{ + return false; +} |