Commit 5cf8ca22 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: ppc: adjust vcpu types to support 64-bit cores 



However, some of these fields could be split into separate per-core structures
in the future.

Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent db93f574

arch/powerpc/include/asm/kvm_host.h

+25 −25
Original line number Diff line number Diff line
@@ -84,32 +84,32 @@ struct kvm_vcpu_arch { 
	u32 host_msr;



	u64 fpr[32];

	u32 gpr[32];

	ulong gpr[32];



	u32 pc;

	ulong pc;

	u32 cr;

	u32 ctr;

	u32 lr;

	u32 xer;

	ulong ctr;

	ulong lr;

	ulong xer;



	u32 msr;

	ulong msr;

	u32 mmucr;

	u32 sprg0;

	u32 sprg1;

	u32 sprg2;

	u32 sprg3;

	u32 sprg4;

	u32 sprg5;

	u32 sprg6;

	u32 sprg7;

	u32 srr0;

	u32 srr1;

	u32 csrr0;

	u32 csrr1;

	u32 dsrr0;

	u32 dsrr1;

	u32 dear;

	u32 esr;

	ulong sprg0;

	ulong sprg1;

	ulong sprg2;

	ulong sprg3;

	ulong sprg4;

	ulong sprg5;

	ulong sprg6;

	ulong sprg7;

	ulong srr0;

	ulong srr1;

	ulong csrr0;

	ulong csrr1;

	ulong dsrr0;

	ulong dsrr1;

	ulong dear;

	ulong esr;

	u32 dec;

	u32 decar;

	u32 tbl;
@@ -117,7 +117,7 @@ struct kvm_vcpu_arch { 
	u32 tcr;

	u32 tsr;

	u32 ivor[16];

	u32 ivpr;

	ulong ivpr;

	u32 pir;



	u32 shadow_pid;
@@ -131,8 +131,8 @@ struct kvm_vcpu_arch { 
	u32 dbcr1;



	u32 last_inst;

	u32 fault_dear;

	u32 fault_esr;

	ulong fault_dear;

	ulong fault_esr;

	gpa_t paddr_accessed;



	u8 io_gpr; /* GPR used as IO source/target */

arch/powerpc/kvm/booke.c

+5 −5
Original line number Diff line number Diff line
@@ -120,14 +120,14 @@ void kvmppc_dump_vcpu(struct kvm_vcpu *vcpu) 
{

	int i;



	printk("pc:   %08x msr:  %08x\n", vcpu->arch.pc, vcpu->arch.msr);

	printk("lr:   %08x ctr:  %08x\n", vcpu->arch.lr, vcpu->arch.ctr);

	printk("srr0: %08x srr1: %08x\n", vcpu->arch.srr0, vcpu->arch.srr1);

	printk("pc:   %08lx msr:  %08lx\n", vcpu->arch.pc, vcpu->arch.msr);

	printk("lr:   %08lx ctr:  %08lx\n", vcpu->arch.lr, vcpu->arch.ctr);

	printk("srr0: %08lx srr1: %08lx\n", vcpu->arch.srr0, vcpu->arch.srr1);



	printk("exceptions: %08lx\n", vcpu->arch.pending_exceptions);



	for (i = 0; i < 32; i += 4) {

		printk("gpr%02d: %08x %08x %08x %08x\n", i,

		printk("gpr%02d: %08lx %08lx %08lx %08lx\n", i,

		       vcpu->arch.gpr[i],

		       vcpu->arch.gpr[i+1],

		       vcpu->arch.gpr[i+2],
@@ -305,7 +305,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			break;

		case EMULATE_FAIL:

			/* XXX Deliver Program interrupt to guest. */

			printk(KERN_CRIT "%s: emulation at %x failed (%08x)\n",

			printk(KERN_CRIT "%s: emulation at %lx failed (%08x)\n",

			       __func__, vcpu->arch.pc, vcpu->arch.last_inst);

			/* For debugging, encode the failing instruction and

			 * report it to userspace. */

arch/powerpc/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) 
		}

	}



	KVMTRACE_3D(PPC_INSTR, vcpu, inst, vcpu->arch.pc, emulated, entryexit);

	KVMTRACE_3D(PPC_INSTR, vcpu, inst, (int)vcpu->arch.pc, emulated, entryexit);



	if (advance)

		vcpu->arch.pc += 4; /* Advance past emulated instruction. */

arch/powerpc/kvm/powerpc.c

+2 −2
Original line number Diff line number Diff line
@@ -256,14 +256,14 @@ int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu, 
static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu,

                                     struct kvm_run *run)

{

	u32 *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr];

	ulong *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr];

	*gpr = run->dcr.data;

}



static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu,

                                      struct kvm_run *run)

{

	u32 *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr];

	ulong *gpr = &vcpu->arch.gpr[vcpu->arch.io_gpr];



	if (run->mmio.len > sizeof(*gpr)) {

		printk(KERN_ERR "bad MMIO length: %d\n", run->mmio.len);