Move KVM_SET_REGS to kvm__reset_vcpu()

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index c245dfd2f982c5b58fe2962eec9a42eda1c061f6..1dceb768c9f569aae7be5d9d181264b34ac4631d 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -136,9 +136,6 @@ static struct kvm *kvm__init(void)
 
 static void kvm__run(struct kvm *self)
 {
-       if (ioctl(self->vcpu_fd, KVM_SET_REGS, &self->regs) < 0)
-               die_perror("KVM_SET_REGS failed");
-
        if (ioctl(self->vcpu_fd, KVM_RUN, 0) < 0)
                die_perror("KVM_RUN failed");
 }
@@ -280,6 +277,9 @@ static void kvm__reset_vcpu(struct kvm *self, uint64_t rip)
 {
        self->regs.rip          = rip;
        self->regs.rflags       = 0x0000000000000002ULL;
+
+       if (ioctl(self->vcpu_fd, KVM_SET_REGS, &self->regs) < 0)
+               die_perror("KVM_SET_REGS failed");
 }
 
 static void kvm__emulate_io_out(struct kvm *self, uint16_t port, void *data, int size, uint32_t count)