From patchwork Mon Oct 17 09:28:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 120121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 24B5FB6F9C for ; Mon, 17 Oct 2011 20:31:20 +1100 (EST) Received: from localhost ([::1]:54912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjXM-0001DU-1Z for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2011 05:31:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUt-0005Mg-M2 for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFjUl-0004LT-Fm for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:39 -0400 Received: from david.siemens.de ([192.35.17.14]:19108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUl-0004Kb-2T for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:31 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9STnI023525; Mon, 17 Oct 2011 11:28:29 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9SKVm023511; Mon, 17 Oct 2011 11:28:29 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 17 Oct 2011 11:28:06 +0200 Message-Id: <447707b15bc869938a9a1a210d6ddd49fb268a7f.1318843693.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Alex Williamson , qemu-devel@nongnu.org, kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [RFC][PATCH 32/45] pci-assign: Factor out deassign_irq 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 Will have more users soon. Signed-off-by: Jan Kiszka --- hw/device-assignment.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index e0b9cfe..e5ac54c 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -807,10 +807,25 @@ static int assign_device(AssignedDevice *dev) return r; } +static void deassign_irq(AssignedDevice *dev) +{ + int ret; + + if (dev->irq_requested_type) { + ret = kvm_device_irq_deassign(kvm_state, + calc_assigned_dev_id(dev), + dev->irq_requested_type); + if (ret) { + perror("assigned_dev: deassign irq"); + } + dev->girq = -1; + dev->irq_requested_type = 0; + } +} + static int assign_intx(AssignedDevice *dev) { struct kvm_assigned_irq assigned_irq_data; - uint32_t dev_id; int irq, r; /* Interrupt PIN 0 means don't use INTx */ @@ -824,19 +839,10 @@ static int assign_intx(AssignedDevice *dev) return 0; } - dev_id = calc_assigned_dev_id(dev); - - if (dev->irq_requested_type) { - r = kvm_device_irq_deassign(kvm_state, dev_id, - dev->irq_requested_type); - if (r) { - perror("assign_intx: deassign"); - } - dev->irq_requested_type = 0; - } + deassign_irq(dev); memset(&assigned_irq_data, 0, sizeof(assigned_irq_data)); - assigned_irq_data.assigned_dev_id = dev_id; + assigned_irq_data.assigned_dev_id = calc_assigned_dev_id(dev); assigned_irq_data.guest_irq = irq; assigned_irq_data.flags = KVM_DEV_IRQ_GUEST_INTX; if (dev->features & ASSIGNED_DEVICE_PREFER_MSI_MASK &&