[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 46/54] accel/kvm: move kvm_update_guest_debug to inline stub
From: |
Alex Bennée |
Subject: |
[PULL 46/54] accel/kvm: move kvm_update_guest_debug to inline stub |
Date: |
Tue, 4 Oct 2022 14:01:30 +0100 |
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220929114231.583801-47-alex.bennee@linaro.org>
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 6e1bd01725..790d35ef78 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -247,7 +247,23 @@ int kvm_on_sigbus(int code, void *addr);
void kvm_flush_coalesced_mmio_buffer(void);
+/**
+ * kvm_update_guest_debug(): ensure KVM debug structures updated
+ * @cs: the CPUState for this cpu
+ * @reinject_trap: KVM trap injection control
+ *
+ * There are usually per-arch specifics which will be handled by
+ * calling down to kvm_arch_update_guest_debug after the generic
+ * fields have been set.
+ */
+#ifdef KVM_CAP_SET_GUEST_DEBUG
int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap);
+#else
+static inline int kvm_update_guest_debug(CPUState *cpu, unsigned long
reinject_trap)
+{
+ return -EINVAL;
+}
+#endif
/* internal API */
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 6ebff6e5a6..423fb1936f 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -3395,12 +3395,6 @@ void kvm_remove_all_breakpoints(CPUState *cpu)
}
}
-#else /* !KVM_CAP_SET_GUEST_DEBUG */
-
-static int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)
-{
- return -EINVAL;
-}
#endif /* !KVM_CAP_SET_GUEST_DEBUG */
static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset)
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index 2d79333143..5d2dd8f351 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -46,11 +46,6 @@ int kvm_has_many_ioeventfds(void)
return 0;
}
-int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)
-{
- return -ENOSYS;
-}
-
int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr)
{
return 1;
--
2.34.1
- [PULL 22/54] tests/tcg: unify ppc64 and ppc64le Makefiles, (continued)
- [PULL 22/54] tests/tcg: unify ppc64 and ppc64le Makefiles, Alex Bennée, 2022/10/04
- [PULL 32/54] monitor: expose monitor_puts to rest of code, Alex Bennée, 2022/10/04
- [PULL 21/54] tests/tcg: add distclean rule, Alex Bennée, 2022/10/04
- [PULL 47/54] contrib/gitdm: add mapping for Loongson Technology, Alex Bennée, 2022/10/04
- [PULL 24/54] tests/tcg: move compiler tests to Makefiles, Alex Bennée, 2022/10/04
- [PULL 28/54] configure: build ROMs with container-based cross compilers, Alex Bennée, 2022/10/04
- [PULL 46/54] accel/kvm: move kvm_update_guest_debug to inline stub,
Alex Bennée <=
- [PULL 43/54] gdbstub: move sstep flags probing into AccelClass, Alex Bennée, 2022/10/04
- [PULL 31/54] pc-bios/vof: Adopt meson style Make output, Alex Bennée, 2022/10/04
- [PULL 20/54] tests/tcg: remove -f from Makefile invocation, Alex Bennée, 2022/10/04
- [PULL 48/54] contrib/gitdm: add Paul to individual contributors, Alex Bennée, 2022/10/04
- [PULL 39/54] contrib/plugins: reset skip when matching in execlog, Alex Bennée, 2022/10/04
- [PULL 23/54] tests/tcg: clean up calls to run-test, Alex Bennée, 2022/10/04
- [PULL 37/54] docs/devel: clean-up qemu invocations in tcg-plugins, Alex Bennée, 2022/10/04
- [PULL 27/54] configure: cleanup creation of tests/tcg target config, Alex Bennée, 2022/10/04
- [PULL 54/54] plugins: add [pre|post]fork helpers to linux-user, Alex Bennée, 2022/10/04
- Re: [PULL 00/54] testing, gdbstub, plugin and gitdm updates, Stefan Hajnoczi, 2022/10/05