From 8296f2a98b769375f874ad566e07ef61e5884b73 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Feb 2010 11:00:45 +0100 Subject: [PATCH] --- yaml --- r: 197611 b: refs/heads/master c: c10207fe86b1761c3ad135eb922fdb41bbde3025 h: refs/heads/master i: 197609: 3c5873fc630132b127e15c7a19c8ded95d1e5276 197607: 3acbdb6a3884b77dfe75dd03c2f487ca42275d05 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/powerpc.c | 1 + trunk/include/linux/kvm.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 624d981aa089..322d51ddf135 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 831317b605e7d7ce0bdadb3b0f50560fc13cecbf +refs/heads/master: c10207fe86b1761c3ad135eb922fdb41bbde3025 diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c index 1266ed02b471..ad2b6275acb7 100644 --- a/trunk/arch/powerpc/kvm/powerpc.c +++ b/trunk/arch/powerpc/kvm/powerpc.c @@ -148,6 +148,7 @@ int kvm_dev_ioctl_check_extension(long ext) switch (ext) { case KVM_CAP_PPC_SEGSTATE: + case KVM_CAP_PPC_PAIRED_SINGLES: r = 1; break; case KVM_CAP_COALESCED_MMIO: diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 60df9c84ecae..360f85e8c435 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -501,6 +501,7 @@ struct kvm_ioeventfd { #define KVM_CAP_HYPERV_VAPIC 45 #define KVM_CAP_HYPERV_SPIN 46 #define KVM_CAP_PCI_SEGMENT 47 +#define KVM_CAP_PPC_PAIRED_SINGLES 48 #define KVM_CAP_X86_ROBUST_SINGLESTEP 51 #ifdef KVM_CAP_IRQ_ROUTING