From: "Radim Krčmář" <rkrcmar@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [PATCH v3 5/5] KVM: refactor asynchronous vcpu ioctl dispatch
Date: Fri, 14 Aug 2015 12:08:37 +0200 [thread overview]
Message-ID: <1439546917-17391-6-git-send-email-rkrcmar@redhat.com> (raw)
In-Reply-To: <1439546917-17391-1-git-send-email-rkrcmar@redhat.com>
I find the switch easier to read and modify.
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
v3: precisely #ifdef arch-specific ioctls [Christian]
v2: new
virt/kvm/kvm_main.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index dfa2d5f27713..c059c01161fe 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2255,12 +2255,16 @@ static long kvm_vcpu_ioctl(struct file *filp,
* Special cases: vcpu ioctls that are asynchronous to vcpu execution,
* so vcpu_load() would break it.
*/
-#if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS)
- if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_S390_IRQ || ioctl == KVM_INTERRUPT)
- return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
+ switch (ioctl) {
+#if defined(CONFIG_S390)
+ case KVM_S390_INTERRUPT:
+ case KVM_S390_IRQ:
+#elif defined(CONFIG_PPC) || defined(CONFIG_MIPS)
+ case KVM_INTERRUPT:
#endif
- if (ioctl == KVM_USER_EXIT)
+ case KVM_USER_EXIT:
return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
+ }
r = vcpu_load(vcpu);
if (r)
--
2.5.0
next prev parent reply other threads:[~2015-08-14 10:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 10:08 [PATCH v3 0/5] KVM: optimize userspace exits with a new ioctl Radim Krčmář
2015-08-14 10:08 ` [PATCH v3 1/5] KVM: add kvm_has_request wrapper Radim Krčmář
2015-08-14 10:08 ` [PATCH v3 2/5] KVM: add KVM_REQ_EXIT request for userspace exit Radim Krčmář
2015-08-20 3:55 ` Wanpeng Li
2015-08-22 7:04 ` Paolo Bonzini
2015-08-14 10:08 ` [PATCH v3 3/5] KVM: x86: add request_exits debug counter Radim Krčmář
2015-08-14 10:08 ` [PATCH v3 4/5] KVM: add KVM_USER_EXIT vcpu ioctl for userspace exit Radim Krčmář
2015-08-14 10:08 ` Radim Krčmář [this message]
2015-08-14 23:37 ` [PATCH v3 0/5] KVM: optimize userspace exits with a new ioctl Paolo Bonzini
2015-09-02 10:31 ` Christian Borntraeger
2015-09-07 12:33 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439546917-17391-6-git-send-email-rkrcmar@redhat.com \
--to=rkrcmar@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®