From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] KVM: x86: Adjust KVM_VCPUEVENT flag names Date: Tue, 15 Dec 2009 23:57:10 +0100 Message-ID: <4B281446.7020903@web.de> 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> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig953DC2258692527B3EB9C57C" Cc: Marcelo Tosatti , kvm , Gleb Natapov To: Avi Kivity Return-path: 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 In-Reply-To: <4B27C27F.9090504@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig953DC2258692527B3EB9C57C Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Avi Kivity wrote: > On 12/15/2009 06:41 PM, Jan Kiszka wrote: >> >> OK, but calling these bits "SET" makes no sense anymore. What about >> KVM_VCPUEVENT_VALID_*? >> =20 >=20 > Sure. Want to patch? >=20 Here we go: ---------> KVM: x86: Adjust KVM_VCPUEVENT flag names They are also used on KVM_GET_VCPU_EVENTS, so 'VALID' is a better name element than 'SET'. Signed-off-by: Jan Kiszka --- Documentation/kvm/api.txt | 4 ++-- arch/x86/include/asm/kvm.h | 4 ++-- arch/x86/kvm/x86.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) 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 sip= i_vector. Keep the corresponding bits in the flags field cleared to suppress overwriting th= e current in-kernel state. The bits are: =20 -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 =20 =20 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 { }; =20 /* When set in flags, include corresponding fields on KVM_SET_VCPU_EVENT= S */ -#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 =20 /* 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(stru= ct kvm_vcpu *vcpu, =20 events->sipi_vector =3D vcpu->arch.sipi_vector; =20 - events->flags =3D (KVM_VCPUEVENT_SET_NMI_PENDING - | KVM_VCPUEVENT_SET_SIPI_VECTOR); + events->flags =3D (KVM_VCPUEVENT_VALID_NMI_PENDING + | KVM_VCPUEVENT_VALID_SIPI_VECTOR); =20 vcpu_put(vcpu); } @@ -1954,8 +1954,8 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(stru= ct 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; =20 vcpu_load(vcpu); @@ -1972,11 +1972,11 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(str= uct kvm_vcpu *vcpu, kvm_pic_clear_isr_ack(vcpu->kvm); =20 vcpu->arch.nmi_injected =3D events->nmi.injected; - if (events->flags & KVM_VCPUEVENT_SET_NMI_PENDING) + if (events->flags & KVM_VCPUEVENT_VALID_NMI_PENDING) vcpu->arch.nmi_pending =3D events->nmi.pending; kvm_x86_ops->set_nmi_mask(vcpu, events->nmi.masked); =20 - if (events->flags & KVM_VCPUEVENT_SET_SIPI_VECTOR) + if (events->flags & KVM_VCPUEVENT_VALID_SIPI_VECTOR) vcpu->arch.sipi_vector =3D events->sipi_vector; =20 vcpu_put(vcpu); --------------enig953DC2258692527B3EB9C57C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAksoFEsACgkQitSsb3rl5xRajwCeOkNJhpRl3UMkVdRpVZpbl4MT 6PIAoJDJ+D0OwMbCcSu3SQQVu6hZdAgJ =AFa4 -----END PGP SIGNATURE----- --------------enig953DC2258692527B3EB9C57C--