From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9UpR-0004Eu-7v for qemu-devel@nongnu.org; Mon, 29 Jun 2015 04:54:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9UpQ-0002xy-E6 for qemu-devel@nongnu.org; Mon, 29 Jun 2015 04:54:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9UpQ-0002xm-9t for qemu-devel@nongnu.org; Mon, 29 Jun 2015 04:54:12 -0400 From: Gerd Hoffmann Date: Mon, 29 Jun 2015 10:53:39 +0200 Message-Id: <1435568020-8669-18-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> Subject: [Qemu-devel] [PATCH 17/18] virtio: use version 1.0 if available (flip the big switch) 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c index c80d38d..808e102 100644 --- a/src/hw/virtio-pci.c +++ b/src/hw/virtio-pci.c @@ -287,13 +287,16 @@ struct vp_device *vp_init_simple(struct pci_device *pci) } if (vp->common.cap && vp->notify.cap && vp->isr.cap && vp->device.cap) { - dprintf(1, "pci dev %x:%x supports virtio 1.0\n", + dprintf(1, "pci dev %x:%x using virtio 1.0 mode\n", pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf)); + vp->use_modern = 1; + } else { + dprintf(1, "pci dev %x:%x using legacy virtio mode\n", + pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf)); + vp->ioaddr = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) & + PCI_BASE_ADDRESS_IO_MASK; } - vp->ioaddr = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0) & - PCI_BASE_ADDRESS_IO_MASK; - vp_reset(vp); pci_config_maskw(pci->bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER); vp_set_status(vp, VIRTIO_CONFIG_S_ACKNOWLEDGE | -- 1.8.3.1