Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 092d62ee authored by Bharat Bhushan's avatar Bharat Bhushan Committed by Alexander Graf
Browse files

KVM: PPC: debug stub interface parameter defined 



This patch defines the interface parameter for KVM_SET_GUEST_DEBUG
ioctl support. Follow up patches will use this for setting up
hardware breakpoints, watchpoints and software breakpoints.

Also kvm_arch_vcpu_ioctl_set_guest_debug() is brought one level below.
This is because I am not sure what is required for book3s. So this ioctl
behaviour will not change for book3s.

Signed-off-by: default avatarBharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent adccf65c

arch/powerpc/include/uapi/asm/kvm.h

+23 −0
Original line number Diff line number Diff line
@@ -272,8 +272,31 @@ struct kvm_debug_exit_arch { 


/* for KVM_SET_GUEST_DEBUG */

struct kvm_guest_debug_arch {

	struct {

		/* H/W breakpoint/watchpoint address */

		__u64 addr;

		/*

		 * Type denotes h/w breakpoint, read watchpoint, write

		 * watchpoint or watchpoint (both read and write).

		 */

#define KVMPPC_DEBUG_NONE		0x0

#define KVMPPC_DEBUG_BREAKPOINT		(1UL << 1)

#define KVMPPC_DEBUG_WATCH_WRITE	(1UL << 2)

#define KVMPPC_DEBUG_WATCH_READ		(1UL << 3)

		__u32 type;

		__u32 reserved;

	} bp[16];

};



/* Debug related defines */

/*

 * kvm_guest_debug->control is a 32 bit field. The lower 16 bits are generic

 * and upper 16 bits are architecture specific. Architecture specific defines

 * that ioctl is for setting hardware breakpoint or software breakpoint.

 */

#define KVM_GUESTDBG_USE_SW_BP		0x00010000

#define KVM_GUESTDBG_USE_HW_BP		0x00020000



/* definition of registers in kvm_run */

struct kvm_sync_regs {

};

arch/powerpc/kvm/book3s.c

+6 −0
Original line number Diff line number Diff line
@@ -612,6 +612,12 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
	return 0;

}



int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg)

{

	return -EINVAL;

}



void kvmppc_decrementer_func(unsigned long data)

{

	struct kvm_vcpu *vcpu = (struct kvm_vcpu *)data;

arch/powerpc/kvm/booke.c

+6 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,12 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg) 
	return r;

}



int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					 struct kvm_guest_debug *dbg)

{

	return -EINVAL;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	return -ENOTSUPP;

arch/powerpc/kvm/powerpc.c

+0 −6
Original line number Diff line number Diff line
@@ -531,12 +531,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
#endif

}



int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

                                        struct kvm_guest_debug *dbg)

{

	return -EINVAL;

}



static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu,

                                     struct kvm_run *run)

{