From f2739e0b41cc24389c36fcde1678268c8a611df1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 30 Jul 2007 16:41:57 +1000 Subject: [PATCH] --- yaml --- r: 68369 b: refs/heads/master c: 3077c4513c46f66537c1205acc464e49c9847dc0 h: refs/heads/master i: 68367: 541cfb66c2a4bd4a17853bc7752a97877a8e8b42 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/kvm_main.c | 2 +- trunk/drivers/kvm/svm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a59e449e209b..b14da6ba5276 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b9cf98cc7ea7354d6d4cbc4ffdb18a26a1129d3 +refs/heads/master: 3077c4513c46f66537c1205acc464e49c9847dc0 diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index 5b42731beba4..6ad1b04f3099 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/drivers/kvm/kvm_main.c @@ -413,7 +413,7 @@ static void free_pio_guest_pages(struct kvm_vcpu *vcpu) { int i; - for (i = 0; i < 2; ++i) + for (i = 0; i < ARRAY_SIZE(vcpu->pio.guest_pages); ++i) if (vcpu->pio.guest_pages[i]) { __free_page(vcpu->pio.guest_pages[i]); vcpu->pio.guest_pages[i] = NULL; diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 9a840e08b207..c18f0b2d3d3e 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/drivers/kvm/svm.c @@ -241,7 +241,7 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu) printk(KERN_DEBUG "%s: NOP\n", __FUNCTION__); return; } - if (svm->next_rip - svm->vmcb->save.rip > 15) { + if (svm->next_rip - svm->vmcb->save.rip > MAX_INST_SIZE) { printk(KERN_ERR "%s: ip 0x%llx next 0x%llx\n", __FUNCTION__, svm->vmcb->save.rip,