From c17703fd06c3641111c72b3e9627d11eee2fd70f Mon Sep 17 00:00:00 2001 From: Stuart Yoder Date: Tue, 9 Apr 2013 10:36:23 +0000 Subject: [PATCH] --- yaml --- r: 373063 b: refs/heads/master c: c32498ee64165cfcbcac9c4318d537c97fd66428 h: refs/heads/master i: 373061: 20c6bbefaa5621c51a040e3eca7a4390f8dd979a 373059: 6aee81fdcacc53d0ed551bc29e634d90ec933a93 373055: 41ed46b8d7b17b79257a75a0a114fa171fe67c4e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/emulate.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9df0f14ff907..2d5956a9d0a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c32a2ea655d035798d3270717924ad8be903e24 +refs/heads/master: c32498ee64165cfcbcac9c4318d537c97fd66428 diff --git a/trunk/arch/powerpc/kvm/emulate.c b/trunk/arch/powerpc/kvm/emulate.c index 7a73b6f72a8b..631a2650e4e4 100644 --- a/trunk/arch/powerpc/kvm/emulate.c +++ b/trunk/arch/powerpc/kvm/emulate.c @@ -38,6 +38,7 @@ #define OP_31_XOP_TRAP 4 #define OP_31_XOP_LWZX 23 +#define OP_31_XOP_DCBST 54 #define OP_31_XOP_TRAP_64 68 #define OP_31_XOP_DCBF 86 #define OP_31_XOP_LBZX 87 @@ -370,6 +371,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) emulated = kvmppc_emulate_mtspr(vcpu, sprn, rs); break; + case OP_31_XOP_DCBST: case OP_31_XOP_DCBF: case OP_31_XOP_DCBI: /* Do nothing. The guest is performing dcbi because