From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9r4e-0001dY-U2 for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9r4b-0000go-3f for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9r4a-0000gJ-Uo for qemu-devel@nongnu.org; Tue, 30 Jun 2015 04:39:21 -0400 From: Gerd Hoffmann Date: Tue, 30 Jun 2015 10:38:59 +0200 Message-Id: <1435653553-7728-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1435653553-7728-1-git-send-email-kraxel@redhat.com> References: <1435653553-7728-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 08/22] virtio: create vp_cap struct for legacy bar List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: seabios@seabios.org Cc: Gerd Hoffmann , qemu-devel@nongnu.org, "Michael S. Tsirkin" Signed-off-by: Gerd Hoffmann --- src/hw/virtio-pci.c | 5 ++++- src/hw/virtio-pci.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c index 0acf65f..3badb15 100644 --- a/src/hw/virtio-pci.c +++ b/src/hw/virtio-pci.c @@ -144,8 +144,11 @@ struct vp_device *vp_init_simple(struct pci_device *pci) pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf)); } - vp->ioaddr = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) & + vp->legacy.bar = 0; + vp->legacy.addr = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) & PCI_BASE_ADDRESS_IO_MASK; + vp->legacy.is_io = 1; + vp->ioaddr = vp->legacy.addr; /* temporary */ vp_reset(vp); pci_config_maskw(pci->bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); diff --git a/src/hw/virtio-pci.h b/src/hw/virtio-pci.h index 0f57ca8..29cd969 100644 --- a/src/hw/virtio-pci.h +++ b/src/hw/virtio-pci.h @@ -124,7 +124,7 @@ struct vp_cap { struct vp_device { unsigned int ioaddr; - struct vp_cap common, notify, isr, device; + struct vp_cap common, notify, isr, device, legacy; }; static inline u32 vp_get_features(struct vp_device *vp) -- 1.8.3.1