From 2ee037acfeb15bbea48422199e09ce9911dfe117 Mon Sep 17 00:00:00 2001 From: Louis Burda Date: Fri, 27 Jan 2023 17:26:54 +0100 Subject: Make CPC_TRACK_PAGES_RESOLVE the default since no extra overhead --- test/kvm-pagestep.c | 12 +++--------- test/qemu-pagestep | Bin 98536 -> 98504 bytes test/qemu-pagestep.c | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/kvm-pagestep.c b/test/kvm-pagestep.c index 9bbb7bc..67bc021 100644 --- a/test/kvm-pagestep.c +++ b/test/kvm-pagestep.c @@ -41,12 +41,6 @@ monitor(struct kvm *kvm, bool baseline) return 1; } -void -kill_child(void) -{ - kill(child, SIGKILL); -} - int main(int argc, const char **argv) { @@ -80,7 +74,6 @@ main(int argc, const char **argv) vm_init(&kvm, &guest); guest_deinit(&guest); - /* reset kernel module state */ ret = ioctl(kvm_dev, KVM_CPC_RESET, NULL); if (ret < 0) err(1, "KVM_CPC_RESET"); @@ -103,8 +96,6 @@ main(int argc, const char **argv) } else { pin_process(0, SECONDARY_CORE, true); - atexit(kill_child); - ipc_wait_child(ipc); printf("Monitor start\n"); @@ -125,6 +116,9 @@ main(int argc, const char **argv) ipc_free(ipc); + ret = ioctl(kvm_dev, KVM_CPC_RESET, NULL); + if (ret < 0) err(1, "KVM_CPC_RESET"); + kvm_setup_deinit(); } diff --git a/test/qemu-pagestep b/test/qemu-pagestep index 819523b..c8a6690 100755 Binary files a/test/qemu-pagestep and b/test/qemu-pagestep differ diff --git a/test/qemu-pagestep.c b/test/qemu-pagestep.c index 412fefb..11c425f 100644 --- a/test/qemu-pagestep.c +++ b/test/qemu-pagestep.c @@ -53,7 +53,7 @@ main(int argc, const char **argv) ret = ioctl(kvm_dev, KVM_CPC_RESET); if (ret) err(1, "KVM_CPC_RESET"); - arg = CPC_TRACK_PAGES_RESOLVE; + arg = CPC_TRACK_PAGES; ret = ioctl(kvm_dev, KVM_CPC_TRACK_MODE, &arg); if (ret) err(1, "KVM_CPC_TRACK_MODE"); -- cgit v1.2.3-71-gd317