From patchwork Wed Jul 1 14:40:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 490169 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 744641402A3 for ; Thu, 2 Jul 2015 00:42:11 +1000 (AEST) Received: from localhost ([::1]:59236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJDF-0000Lf-LN for incoming@patchwork.ozlabs.org; Wed, 01 Jul 2015 10:42:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJCR-0007Re-C0 for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAJCO-0003c5-S3 for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:41:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJCO-0003bI-LG for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:41:16 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 35CF5373BCE; Wed, 1 Jul 2015 14:41:16 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t61EfFb1026277; Wed, 1 Jul 2015 10:41:15 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id E3A0D8261A; Wed, 1 Jul 2015 16:41:13 +0200 (CEST) From: Gerd Hoffmann To: seabios@seabios.org Date: Wed, 1 Jul 2015 16:40:49 +0200 Message-Id: <1435761670-19520-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1435761670-19520-1-git-send-email-kraxel@redhat.com> References: <1435761670-19520-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , qemu-devel@nongnu.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH v3 04/25] virtio: pass struct pci_device to vp_init_simple 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 ... instead of the bdf only. Signed-off-by: Gerd Hoffmann --- src/hw/virtio-blk.c | 2 +- src/hw/virtio-pci.c | 6 +++--- src/hw/virtio-pci.h | 3 ++- src/hw/virtio-scsi.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c index 3a71510..1a13129 100644 --- a/src/hw/virtio-blk.c +++ b/src/hw/virtio-blk.c @@ -113,7 +113,7 @@ init_virtio_blk(struct pci_device *pci) vdrive->drive.type = DTYPE_VIRTIO_BLK; vdrive->drive.cntl_id = bdf; - vp_init_simple(&vdrive->vp, bdf); + vp_init_simple(&vdrive->vp, pci); if (vp_find_vq(&vdrive->vp, 0, &vdrive->vq) < 0 ) { dprintf(1, "fail to find vq for virtio-blk %x:%x\n", pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf)); diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c index f648328..9428d04 100644 --- a/src/hw/virtio-pci.c +++ b/src/hw/virtio-pci.c @@ -85,13 +85,13 @@ fail: return -1; } -void vp_init_simple(struct vp_device *vp, u16 bdf) +void vp_init_simple(struct vp_device *vp, struct pci_device *pci) { - vp->ioaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0) & + vp->ioaddr = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) & PCI_BASE_ADDRESS_IO_MASK; vp_reset(vp); - pci_config_maskw(bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); + pci_config_maskw(pci->bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); vp_set_status(vp, VIRTIO_CONFIG_S_ACKNOWLEDGE | VIRTIO_CONFIG_S_DRIVER ); } diff --git a/src/hw/virtio-pci.h b/src/hw/virtio-pci.h index c1caf67..85e623f 100644 --- a/src/hw/virtio-pci.h +++ b/src/hw/virtio-pci.h @@ -106,8 +106,9 @@ static inline void vp_del_vq(struct vp_device *vp, int queue_index) outl(0, ioaddr + VIRTIO_PCI_QUEUE_PFN); } +struct pci_device; struct vring_virtqueue; -void vp_init_simple(struct vp_device *vp, u16 bdf); +void vp_init_simple(struct vp_device *vp, struct pci_device *pci); int vp_find_vq(struct vp_device *vp, int queue_index, struct vring_virtqueue **p_vq); #endif /* _VIRTIO_PCI_H_ */ diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c index eb7eb81..8073c77 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -150,7 +150,7 @@ init_virtio_scsi(struct pci_device *pci) warn_noalloc(); return; } - vp_init_simple(vp, bdf); + vp_init_simple(vp, pci); if (vp_find_vq(vp, 2, &vq) < 0 ) { dprintf(1, "fail to find vq for virtio-scsi %x:%x\n", pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf));