From patchwork Thu Aug 16 13:54:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1332271 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 75D8140214 for ; Thu, 16 Aug 2012 13:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932545Ab2HPN4K (ORCPT ); Thu, 16 Aug 2012 09:56:10 -0400 Received: from goliath.siemens.de ([192.35.17.28]:22679 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756947Ab2HPNyk (ORCPT ); Thu, 16 Aug 2012 09:54:40 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsY6t030760; Thu, 16 Aug 2012 15:54:35 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsYJD012893; Thu, 16 Aug 2012 15:54:34 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alex Williamson Subject: [PATCH 03/19] pci-assign: Rename assign_irq to assign_intx Date: Thu, 16 Aug 2012 15:54:17 +0200 Message-Id: <2d5d89e536f98b47b0c93d49b1c8fcce8c24088d.1345125266.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;