From 22e4bb34a2022458a594738a846d6bc2f8607862 Mon Sep 17 00:00:00 2001 From: Louis Burda Date: Tue, 25 Oct 2022 14:29:44 +0200 Subject: Further prune and refactor sevstep --- test/sevstep.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'test/sevstep.c') diff --git a/test/sevstep.c b/test/sevstep.c index 27d94c4..c812bbc 100755 --- a/test/sevstep.c +++ b/test/sevstep.c @@ -439,8 +439,7 @@ runonce(struct kvm *kvm) int monitor(void) { - page_fault_event_t event; - ack_event_t ack; + struct cpc_track_event event; int ret; /* Get page fault info */ @@ -450,9 +449,8 @@ monitor(void) event.retired_instructions); faultcnt++; - ack.id = event.id; - printf("Acking event %llu\n", ack.id); - ret = ioctl(kvm_dev, KVM_CPC_ACK_EVENT, &ack); + printf("Acking event %llu\n", event.id); + ret = ioctl(kvm_dev, KVM_CPC_ACK_EVENT, &event.id); if (ret == -1) err(1, "ioctl ACK_EVENT"); } else if (ret != CPC_USPT_POLL_EVENT_NO_EVENT) { perror("ioctl POLL_EVENT"); @@ -466,9 +464,9 @@ int main(int argc, const char **argv) { struct kvm kvm_with_access; - track_all_pages_t track_all; + uint64_t track_mode; pid_t ppid, pid; - int i, ret; + int ret; setvbuf(stdout, NULL, _IONBF, 0); @@ -503,8 +501,8 @@ main(int argc, const char **argv) if (ret == -1) err(1, "ioctl RESET_TRACKING"); /* Init page tracking */ - track_all.track_mode = KVM_PAGE_TRACK_ACCESS; - ret = ioctl(kvm_dev, KVM_CPC_TRACK_ALL, &track_all); + track_mode = KVM_PAGE_TRACK_ACCESS; + ret = ioctl(kvm_dev, KVM_CPC_TRACK_ALL, &track_mode); if (ret == -1) err(1, "ioctl TRACK_ALL"); ppid = getpid(); -- cgit v1.2.3-71-gd317