From patchwork Tue Dec 15 22:57:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 68262 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI4ixjD005715 for ; Fri, 18 Dec 2009 04:45:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754507AbZLOW5S (ORCPT ); Tue, 15 Dec 2009 17:57:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752263AbZLOW5S (ORCPT ); Tue, 15 Dec 2009 17:57:18 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:52392 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbZLOW5R (ORCPT ); Tue, 15 Dec 2009 17:57:17 -0500 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate02.web.de (Postfix) with ESMTP id 13744148C2348; Tue, 15 Dec 2009 23:57:16 +0100 (CET) Received: from [88.65.240.148] (helo=[192.168.1.10]) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1NKgKR-0005Ip-00; Tue, 15 Dec 2009 23:57:15 +0100 Message-ID: <4B281446.7020903@web.de> Date: Tue, 15 Dec 2009 23:57:10 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity CC: Marcelo Tosatti , kvm , Gleb Natapov Subject: [PATCH] KVM: x86: Adjust KVM_VCPUEVENT flag names References: <4B1BE216.2090407@web.de> <4B1BE452.6090107@redhat.com> <4B1BE60D.5070107@web.de> <4B27A32F.7030302@redhat.com> <4B27BC55.4070606@web.de> <4B27C27F.9090504@redhat.com> In-Reply-To: <4B27C27F.9090504@redhat.com> X-Enigmail-Version: 0.95.7 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/J/ZfbR+ItkVCGTB3RdpL6dSenqqKNs8HBG3WX OM3VppWqaKhzBNAYp5rNfdC6L1No4zaKdH3e1SPfwZqX8BBAmZ BIE5+Lg5Q= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/Documentation/kvm/api.txt b/Documentation/kvm/api.txt index b22592d..2811e45 100644 --- a/Documentation/kvm/api.txt +++ b/Documentation/kvm/api.txt @@ -706,8 +706,8 @@ from the update. These fields are nmi.pending and sipi_vector. Keep the corresponding bits in the flags field cleared to suppress overwriting the current in-kernel state. The bits are: -KVM_VCPUEVENT_SET_NMI_PENDING - transfer nmi.pending to the kernel -KVM_VCPUEVENT_SET_SIPI_VECTOR - transfer sipi_vector +KVM_VCPUEVENT_VALID_NMI_PENDING - transfer nmi.pending to the kernel +KVM_VCPUEVENT_VALID_SIPI_VECTOR - transfer sipi_vector 5. The kvm_run structure diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h index d1a67ae..f46b79f 100644 --- a/arch/x86/include/asm/kvm.h +++ b/arch/x86/include/asm/kvm.h @@ -255,8 +255,8 @@ struct kvm_reinject_control { }; /* When set in flags, include corresponding fields on KVM_SET_VCPU_EVENTS */ -#define KVM_VCPUEVENT_SET_NMI_PENDING 0x00000001 -#define KVM_VCPUEVENT_SET_SIPI_VECTOR 0x00000002 +#define KVM_VCPUEVENT_VALID_NMI_PENDING 0x00000001 +#define KVM_VCPUEVENT_VALID_SIPI_VECTOR 0x00000002 /* for KVM_GET/SET_VCPU_EVENTS */ struct kvm_vcpu_events { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e181c6f..0113752 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1945,8 +1945,8 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, events->sipi_vector = vcpu->arch.sipi_vector; - events->flags = (KVM_VCPUEVENT_SET_NMI_PENDING - | KVM_VCPUEVENT_SET_SIPI_VECTOR); + events->flags = (KVM_VCPUEVENT_VALID_NMI_PENDING + | KVM_VCPUEVENT_VALID_SIPI_VECTOR); vcpu_put(vcpu); } @@ -1954,8 +1954,8 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu, static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu, struct kvm_vcpu_events *events) { - if (events->flags & - ~(KVM_VCPUEVENT_SET_NMI_PENDING | KVM_VCPUEVENT_SET_SIPI_VECTOR)) + if (events->flags & ~(KVM_VCPUEVENT_VALID_NMI_PENDING + | KVM_VCPUEVENT_VALID_SIPI_VECTOR)) return -EINVAL; vcpu_load(vcpu); @@ -1972,11 +1972,11 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu, kvm_pic_clear_isr_ack(vcpu->kvm); vcpu->arch.nmi_injected = events->nmi.injected; - if (events->flags & KVM_VCPUEVENT_SET_NMI_PENDING) + if (events->flags & KVM_VCPUEVENT_VALID_NMI_PENDING) vcpu->arch.nmi_pending = events->nmi.pending; kvm_x86_ops->set_nmi_mask(vcpu, events->nmi.masked); - if (events->flags & KVM_VCPUEVENT_SET_SIPI_VECTOR) + if (events->flags & KVM_VCPUEVENT_VALID_SIPI_VECTOR) vcpu->arch.sipi_vector = events->sipi_vector; vcpu_put(vcpu);