diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-06 15:04:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-06 15:04:10 +0100 |
| commit | f2687fdb7571a444b5af3509574b659d35ddd601 (patch) | |
| tree | a9e0ad482699be555e957d3a622b6b6068e96d8b /target/i386/whpx-all.c | |
| parent | d7c5b788295426c1ef48a9ffc3432c51220f69ba (diff) | |
| parent | be52eca309788aa69dc10a8cae63e8a40de7a2f7 (diff) | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* Reverse debugging (Pavel)
* CFLAGS cleanup (Paolo)
* ASLR fix (Mark)
* cpus.c refactoring (Claudio)
# gpg: Signature made Tue 06 Oct 2020 07:35:09 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream: (37 commits)
tests/acceptance: add reverse debugging test
replay: create temporary snapshot at debugger connection
replay: describe reverse debugging in docs/replay.txt
gdbstub: add reverse continue support in replay mode
gdbstub: add reverse step support in replay mode
replay: flush rr queue before loading the vmstate
replay: implement replay-seek command
replay: introduce breakpoint at the specified step
replay: introduce info hmp/qmp command
qapi: introduce replay.json for record/replay-related stuff
migration: introduce icount field for snapshots
qcow2: introduce icount field for snapshots
replay: provide an accessor for rr filename
replay: don't record interrupt poll
configure: don't enable ASLR for --enable-debug Windows builds
configure: consistently pass CFLAGS/CXXFLAGS/LDFLAGS to meson
configure: do not clobber environment CFLAGS/CXXFLAGS/LDFLAGS
dtc: Convert Makefile bits to meson bits
slirp: Convert Makefile bits to meson bits
accel/tcg: use current_machine as it is always set for softmmu
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/i386/whpx-all.c')
| -rw-r--r-- | target/i386/whpx-all.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 2a8fcb68fd..f4f3e33eac 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -24,6 +24,8 @@ #include "migration/blocker.h" #include "whp-dispatch.h" +#include "whpx-cpus.h" + #include <WinHvPlatform.h> #include <WinHvEmulation.h> @@ -1486,15 +1488,6 @@ static void whpx_memory_init(void) memory_listener_register(&whpx_memory_listener, &address_space_memory); } -static void whpx_handle_interrupt(CPUState *cpu, int mask) -{ - cpu->interrupt_request |= mask; - - if (!qemu_cpu_is_self(cpu)) { - qemu_cpu_kick(cpu); - } -} - /* * Load the functions from the given library, using the given handle. If a * handle is provided, it is used, otherwise the library is opened. The @@ -1649,7 +1642,7 @@ static int whpx_accel_init(MachineState *ms) whpx_memory_init(); - cpu_interrupt_handler = whpx_handle_interrupt; + cpus_register_accel(&whpx_cpus); printf("Windows Hypervisor Platform accelerator is operational\n"); return 0; |