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 <agraf@suse.de>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/powerpc/kvm-cpu.c b/tools/kvm/powerpc/kvm-cpu.c
index 2505c69d134437f3343f62e628f7a59bc81daa60..97fc759c13012c7e7b6fc496a4ab44e7802833f2 100644 (file)
--- a/tools/kvm/powerpc/kvm-cpu.c
+++ b/tools/kvm/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, &reg) < 0)
                die("KVM_SET_ONE_REG failed");
 }