From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tiejun Chen Subject: [PATCH] kvm_irqchip_assign_irqfd: just set irqfd in case of kvm_irqfds_enabled() Date: Fri, 26 Dec 2014 16:05:26 +0800 Message-ID: <1419581126-12927-1-git-send-email-tiejun.chen@intel.com> Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-trivial@nongnu.org To: pbonzini@redhat.com Return-path: Received: from mga02.intel.com ([134.134.136.20]:20926 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbaLZIIP (ORCPT ); Fri, 26 Dec 2014 03:08:15 -0500 Sender: kvm-owner@vger.kernel.org List-ID: We should avoid to set irqfd{} unconditionally. Signed-off-by: Tiejun Chen --- kvm-all.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 18cc6b4..5b9786b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1257,21 +1257,21 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int rfd, int virq, bool assign) { - struct kvm_irqfd irqfd = { - .fd = fd, - .gsi = virq, - .flags = assign ? 0 : KVM_IRQFD_FLAG_DEASSIGN, - }; + struct kvm_irqfd irqfd = {}; + + if (!kvm_irqfds_enabled()) { + return -ENOSYS; + } + + irqfd.fd = fd; + irqfd.gsi = virq; + irqfd.flags = assign ? 0 : KVM_IRQFD_FLAG_DEASSIGN; if (rfd != -1) { irqfd.flags |= KVM_IRQFD_FLAG_RESAMPLE; irqfd.resamplefd = rfd; } - if (!kvm_irqfds_enabled()) { - return -ENOSYS; - } - return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); } -- 1.9.1