From 54cb8a31fccaff3d013cdf90b04f41681eeeafa6 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 4 Jul 2012 23:39:58 +1000 Subject: [PATCH] kvm tool: Fix powerpc/kvm-cpu.c for new KVM_SET_ONE_REG API I think this code was based on an earlier version of the KVM_SET_ONE_REG API, which at the time was in agraf's tree but not mainline? Either way it doesn't compile as is, so fix it up. Acked-by: Alexander Graf Signed-off-by: Michael Ellerman Signed-off-by: Pekka Enberg --- powerpc/kvm-cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/powerpc/kvm-cpu.c b/powerpc/kvm-cpu.c index 2505c69..97fc759 100644 --- a/powerpc/kvm-cpu.c +++ b/powerpc/kvm-cpu.c @@ -137,6 +137,7 @@ static void kvm_cpu__setup_sregs(struct kvm_cpu *vcpu) */ struct kvm_sregs sregs; struct kvm_one_reg reg = {}; + u64 value; if (ioctl(vcpu->vcpu_fd, KVM_GET_SREGS, &sregs) < 0) die("KVM_GET_SREGS failed"); @@ -147,8 +148,9 @@ static void kvm_cpu__setup_sregs(struct kvm_cpu *vcpu) if (ioctl(vcpu->vcpu_fd, KVM_SET_SREGS, &sregs) < 0) die("KVM_SET_SREGS failed"); - reg.id = KVM_ONE_REG_PPC_HIOR; - reg.u.reg64 = 0; + reg.id = KVM_REG_PPC_HIOR; + value = 0; + reg.addr = (u64)&value; if (ioctl(vcpu->vcpu_fd, KVM_SET_ONE_REG, ®) < 0) die("KVM_SET_ONE_REG failed"); }