[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/33] stubs: group stubs for user-mode emulation
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/33] stubs: group stubs for user-mode emulation |
Date: |
Wed, 11 Jan 2017 20:35:04 +0100 |
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 <address@hidden>
---
MAINTAINERS | 1 +
Makefile.target | 4 ++--
stubs/Makefile.objs | 2 --
stubs/cpus.c | 11 -----------
stubs/replay-user.c | 33 ---------------------------------
user-exec-stub.c | 34 ++++++++++++++++++++++++++++++++++
6 files changed, 37 insertions(+), 48 deletions(-)
delete mode 100644 stubs/cpus.c
delete mode 100644 stubs/replay-user.c
create mode 100644 user-exec-stub.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 1444b26..39e8230 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1494,6 +1494,7 @@ M: Riku Voipio <address@hidden>
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;
+}
--
1.8.3.1
- [Qemu-devel] [PULL 00/33] Misc patches for 2017-01-11, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 01/33] bugfix: vm halt when in reset looping, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 02/33] megasas: fix guest-triggered memory leak, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 03/33] qom: Make all interface types abstract, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 04/33] smbios: filter based on CONFIG_SMBIOS rather than TARGET, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 05/33] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 06/33] stubs: move smbios stubs to hw/smbios, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 07/33] stubs: move acpi stubs to hw/acpi, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 08/33] stubs: remove unused stub for serial_hd, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 09/33] hw: move reset handlers from vl.c to hw/core, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 10/33] stubs: group stubs for user-mode emulation,
Paolo Bonzini <=
- [Qemu-devel] [PULL 14/33] build: remove --enable-colo/--disable-colo, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 12/33] stubs: move vhost stubs to stubs/vhost.o, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 13/33] event_notifier: cleanups around event_notifier_set_handler, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 11/33] stubs: group all monitor_fdset_* functions in a single file, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 15/33] stubs: remove stubs/kvm.c, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 17/33] target-i386: Correctly apply patch for syscall eflags.TF handling, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 16/33] acpi: filter based on CONFIG_ACPI_X86 rather than TARGET, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 18/33] pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 19/33] scsi-block: fix direction of BYTCHK test for VERIFY commands, Paolo Bonzini, 2017/01/11
- [Qemu-devel] [PULL 20/33] serial: fix memory leak in serial exit, Paolo Bonzini, 2017/01/11