Commit-ID: 178bb529bf160f3b9a284e904fea37c38ad3e3bb
Gitweb: http://git.kernel.org/tip/178bb529bf160f3b9a284e904fea37c38ad3e3bb
Author: Michael Ellerman <michael@xxxxxxxxxxxxxx>
AuthorDate: Wed, 4 Jul 2012 23:39:58 +1000
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Wed, 4 Jul 2012 17:12:20 +0300
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@xxxxxxx>
Signed-off-by: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/powerpc/kvm-cpu.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/kvm/powerpc/kvm-cpu.c b/tools/kvm/powerpc/kvm-cpu.c
index 2505c69..97fc759 100644
--- 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, ®) < 0)
die("KVM_SET_ONE_REG failed");
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|