From patchwork Fri Aug 17 06:58:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1337431 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C2C5DDF266 for ; Fri, 17 Aug 2012 06:59:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964891Ab2HQG7Y (ORCPT ); Fri, 17 Aug 2012 02:59:24 -0400 Received: from goliath.siemens.de ([192.35.17.28]:32141 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964832Ab2HQG7V (ORCPT ); Fri, 17 Aug 2012 02:59:21 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q7H6xIOw011226; Fri, 17 Aug 2012 08:59:18 +0200 Received: from mchn199C.mchp.siemens.de.com ([146.254.78.141]) by mail1.siemens.de (8.13.6/8.13.6) with SMTP id q7H6xF6s015872; Fri, 17 Aug 2012 08:59:18 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alex Williamson , "Michael S. Tsirkin" Subject: [PATCH v2 03/20] pci-assign: Rename assign_irq to assign_intx Date: Fri, 17 Aug 2012 08:58:51 +0200 Message-Id: <19739ffc409298a3f11803468e8b64c08585cb4e.1345186746.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The previous name may incorrectly suggest that this function assigns all types of IRQs though it's only dealing with legacy interrupts. Signed-off-by: Jan Kiszka --- hw/device-assignment.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 3f6196a..ee64c33 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -851,7 +851,7 @@ static int assign_device(AssignedDevice *dev) return r; } -static int assign_irq(AssignedDevice *dev) +static int assign_intx(AssignedDevice *dev) { struct kvm_assigned_irq assigned_irq_data; PCIINTxRoute intx_route; @@ -881,7 +881,7 @@ static int assign_irq(AssignedDevice *dev) assigned_irq_data.flags = dev->irq_requested_type; r = kvm_deassign_irq(kvm_state, &assigned_irq_data); if (r) { - perror("assign_irq: deassign"); + perror("assign_intx: deassign"); } dev->irq_requested_type = 0; } @@ -943,7 +943,7 @@ static void assigned_dev_update_irq_routing(PCIDevice *dev) Error *err = NULL; int r; - r = assign_irq(assigned_dev); + r = assign_intx(assigned_dev); if (r < 0) { qdev_unplug(&dev->qdev, &err); assert(!err); @@ -1008,7 +1008,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev) assigned_dev->intx_route.irq = -1; assigned_dev->irq_requested_type = assigned_irq_data.flags; } else { - assign_irq(assigned_dev); + assign_intx(assigned_dev); } } @@ -1141,7 +1141,7 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev) assigned_dev->intx_route.irq = -1; assigned_dev->irq_requested_type = assigned_irq_data.flags; } else { - assign_irq(assigned_dev); + assign_intx(assigned_dev); } } @@ -1769,8 +1769,8 @@ static int assigned_initfn(struct PCIDevice *pci_dev) if (r < 0) goto out; - /* assign irq for the device */ - r = assign_irq(dev); + /* assign legacy INTx to the device */ + r = assign_intx(dev); if (r < 0) goto assigned_out;