[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/22] tcg: tcg_handle_interrupt() function
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/22] tcg: tcg_handle_interrupt() function |
Date: |
Tue, 4 Jul 2017 13:12:00 +0200 |
From: Yang Zhong <address@hidden>
Move tcg_handle_interrupt() from translate-common.c to
accel/tcg/tcg-all.c.
Signed-off-by: Yang Zhong <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
accel/tcg/Makefile.objs | 2 +-
accel/tcg/tcg-all.c | 32 +++++++++++++++++++++++++
accel/tcg/translate-common.c | 56 --------------------------------------------
qom/cpu.c | 2 ++
4 files changed, 35 insertions(+), 57 deletions(-)
delete mode 100644 accel/tcg/translate-common.c
diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs
index f173cd5..70cd474 100644
--- a/accel/tcg/Makefile.objs
+++ b/accel/tcg/Makefile.objs
@@ -1,3 +1,3 @@
obj-$(CONFIG_SOFTMMU) += tcg-all.o
obj-$(CONFIG_SOFTMMU) += cputlb.o
-obj-y += cpu-exec.o cpu-exec-common.o translate-all.o translate-common.o
+obj-y += cpu-exec.o cpu-exec-common.o translate-all.o
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index e327d90..c1ccad3 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -27,13 +27,45 @@
#include "sysemu/accel.h"
#include "sysemu/sysemu.h"
#include "qom/object.h"
+#include "qemu-common.h"
+#include "qom/cpu.h"
+#include "sysemu/cpus.h"
+#include "qemu/main-loop.h"
unsigned long tcg_tb_size;
static bool tcg_allowed = true;
+#ifndef CONFIG_USER_ONLY
+/* mask must never be zero, except for A20 change call */
+static void tcg_handle_interrupt(CPUState *cpu, int mask)
+{
+ int old_mask;
+ g_assert(qemu_mutex_iothread_locked());
+
+ old_mask = cpu->interrupt_request;
+ cpu->interrupt_request |= mask;
+
+ /*
+ * If called from iothread context, wake the target cpu in
+ * case its halted.
+ */
+ if (!qemu_cpu_is_self(cpu)) {
+ qemu_cpu_kick(cpu);
+ } else {
+ cpu->icount_decr.u16.high = -1;
+ if (use_icount &&
+ !cpu->can_do_io
+ && (mask & ~old_mask) != 0) {
+ cpu_abort(cpu, "Raised interrupt while not in I/O function");
+ }
+ }
+}
+#endif
+
static int tcg_init(MachineState *ms)
{
tcg_exec_init(tcg_tb_size * 1024 * 1024);
+ cpu_interrupt_handler = tcg_handle_interrupt;
return 0;
}
diff --git a/accel/tcg/translate-common.c b/accel/tcg/translate-common.c
deleted file mode 100644
index 40fe5a1..0000000
--- a/accel/tcg/translate-common.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Host code generation common components
- *
- * Copyright (c) 2015 Peter Crosthwaite <address@hidden>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qom/cpu.h"
-#include "sysemu/cpus.h"
-#include "qemu/main-loop.h"
-
-uintptr_t qemu_real_host_page_size;
-intptr_t qemu_real_host_page_mask;
-
-#ifndef CONFIG_USER_ONLY
-/* mask must never be zero, except for A20 change call */
-static void tcg_handle_interrupt(CPUState *cpu, int mask)
-{
- int old_mask;
- g_assert(qemu_mutex_iothread_locked());
-
- old_mask = cpu->interrupt_request;
- cpu->interrupt_request |= mask;
-
- /*
- * If called from iothread context, wake the target cpu in
- * case its halted.
- */
- if (!qemu_cpu_is_self(cpu)) {
- qemu_cpu_kick(cpu);
- } else {
- cpu->icount_decr.u16.high = -1;
- if (use_icount &&
- !cpu->can_do_io
- && (mask & ~old_mask) != 0) {
- cpu_abort(cpu, "Raised interrupt while not in I/O function");
- }
- }
-}
-
-CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt;
-#endif
diff --git a/qom/cpu.c b/qom/cpu.c
index 585419b..1d7aa59 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -31,6 +31,8 @@
#include "hw/qdev-properties.h"
#include "trace-root.h"
+CPUInterruptHandler cpu_interrupt_handler;
+
bool cpu_exists(int64_t id)
{
CPUState *cpu;
--
1.8.3.1
- [Qemu-devel] [PATCH v4 00/22] add disable-tcg option for x86 build, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 03/22] configure: add --disable-tcg configure option, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 02/22] configure: early test for supported targets, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 04/22] vl: convert -tb-size to qemu_strtoul, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 01/22] configure: factor out list of supported Xen/KVM/HAX targets, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 06/22] tcg: move page_size_init() function, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 05/22] vl: add tcg_enabled() for tcg related code, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 07/22] tcg: tcg_handle_interrupt() function,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 08/22] tcg: make tcg_allowed global, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 09/22] monitor: disable "info jit" and "info opcount" if !TCG, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 10/22] vapic: use tcg_enabled, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 11/22] tcg: add the tcg-stub.c file into accel/stubs/, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 12/22] tcg: move tb_lock out of translate-all.h, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 13/22] exec: elide calls to tb_lock and tb_unlock, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 14/22] tcg: add CONFIG_TCG guards in headers, Paolo Bonzini, 2017/07/04