From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 24 Mar 2010 20:03:16 +0000 (+0200)
Subject: Move KVM_SET_REGS to kvm__reset_vcpu()
X-Git-Tag: next-20110824~3^2~528^2~250
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=82afc23446026e8f49332b923a22200b06f1fd00;p=karo-tx-linux.git

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 c245dfd2f982..1dceb768c9f5 100644
--- 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)