From patchwork Fri Dec 26 08:05:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 424100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A1C8A14009B for ; Fri, 26 Dec 2014 19:08:44 +1100 (AEDT) Received: from localhost ([::1]:52706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4Pwq-0005hM-MS for incoming@patchwork.ozlabs.org; Fri, 26 Dec 2014 03:08:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4Pwb-0005P6-6X for qemu-devel@nongnu.org; Fri, 26 Dec 2014 03:08:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4PwY-000615-0y for qemu-devel@nongnu.org; Fri, 26 Dec 2014 03:08:21 -0500 Received: from mga11.intel.com ([192.55.52.93]:54510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4PwX-0005yy-Rl; Fri, 26 Dec 2014 03:08:17 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 26 Dec 2014 00:08:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="433582968" Received: from tchen0-linux.bj.intel.com ([10.238.135.72]) by FMSMGA003.fm.intel.com with ESMTP; 25 Dec 2014 23:56:32 -0800 From: Tiejun Chen To: pbonzini@redhat.com Date: Fri, 26 Dec 2014 16:05:26 +0800 Message-Id: <1419581126-12927-1-git-send-email-tiejun.chen@intel.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH] kvm_irqchip_assign_irqfd: just set irqfd in case of kvm_irqfds_enabled() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }