From patchwork Mon Jun 29 08:53:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 489254 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 01798140761 for ; Mon, 29 Jun 2015 18:56:40 +1000 (AEST) Received: from localhost ([::1]:41204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9Url-0008Fg-VB for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2015 04:56:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9UpA-0003gP-NM for qemu-devel@nongnu.org; Mon, 29 Jun 2015 04:53:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9Up9-0002nl-HA for qemu-devel@nongnu.org; Mon, 29 Jun 2015 04:53:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9Up9-0002na-9g for qemu-devel@nongnu.org; Mon, 29 Jun 2015 04:53:55 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id D9912B7A7C; Mon, 29 Jun 2015 08:53:54 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5T8rs9d012286; Mon, 29 Jun 2015 04:53:54 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 88FF6808D2; Mon, 29 Jun 2015 10:53:53 +0200 (CEST) From: Gerd Hoffmann To: seabios@seabios.org Date: Mon, 29 Jun 2015 10:53:26 +0200 Message-Id: <1435568020-8669-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1435568020-8669-1-git-send-email-kraxel@redhat.com> References: <1435568020-8669-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 04/18] 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 13cf09a..4f39aa2 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; - vdrive->vp = vp_init_simple(bdf); + vdrive->vp = vp_init_simple(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 a1e9939..ed5bfcb 100644 --- a/src/hw/virtio-pci.c +++ b/src/hw/virtio-pci.c @@ -85,15 +85,15 @@ fail: return -1; } -struct vp_device *vp_init_simple(u16 bdf) +struct vp_device *vp_init_simple(struct pci_device *pci) { struct vp_device *vp = malloc_low(sizeof(*vp)); - 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 ); return vp; diff --git a/src/hw/virtio-pci.h b/src/hw/virtio-pci.h index 47bef3d..3cf0327 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; -struct vp_device *vp_init_simple(u16 bdf); +struct vp_device *vp_init_simple(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 25d2db7..b208d49 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -145,7 +145,7 @@ init_virtio_scsi(struct pci_device *pci) dprintf(1, "found virtio-scsi at %x:%x\n", pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf)); struct vring_virtqueue *vq = NULL; - struct vp_device *vp = vp_init_simple(bdf); + struct vp_device *vp = vp_init_simple(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));