From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiyDK-0000D3-UB for qemu-devel@nongnu.org; Fri, 17 Apr 2015 00:49:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiyDK-0006MV-5n for qemu-devel@nongnu.org; Fri, 17 Apr 2015 00:49:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56365) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiyDK-0006MO-1f for qemu-devel@nongnu.org; Fri, 17 Apr 2015 00:49:14 -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 A354EAC7BE for ; Fri, 17 Apr 2015 04:49:13 +0000 (UTC) From: Jason Wang Date: Fri, 17 Apr 2015 12:48:35 +0800 Message-Id: <1429246120-29439-12-git-send-email-jasowang@redhat.com> In-Reply-To: <1429246120-29439-1-git-send-email-jasowang@redhat.com> References: <1429246120-29439-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH v6 11/16] virtio-mmio: switch to bus specific queue limit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jason Wang , mst@redhat.com Cc: Michael S. Tsirkin Signed-off-by: Jason Wang --- hw/virtio/virtio-mmio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 2ae6942..dbd44b6 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -34,6 +34,8 @@ do { printf("virtio_mmio: " fmt , ## __VA_ARGS__); } while (0) #define DPRINTF(fmt, ...) do {} while (0) #endif +#define VIRTIO_MMIO_QUEUE_MAX 64 + /* QOM macros */ /* virtio-mmio-bus */ #define TYPE_VIRTIO_MMIO_BUS "virtio-mmio-bus" @@ -237,7 +239,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, proxy->guest_page_shift); break; case VIRTIO_MMIO_QUEUESEL: - if (value < VIRTIO_PCI_QUEUE_MAX) { + if (value < virtio_get_queue_max(vdev)) { vdev->queue_sel = value; } break; @@ -257,7 +259,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, } break; case VIRTIO_MMIO_QUEUENOTIFY: - if (value < VIRTIO_PCI_QUEUE_MAX) { + if (value < virtio_get_queue_max(vdev)) { virtio_queue_notify(vdev, value); } break; @@ -403,7 +405,7 @@ static void virtio_mmio_bus_class_init(ObjectClass *klass, void *data) k->device_plugged = virtio_mmio_device_plugged; k->has_variable_vring_alignment = true; bus_class->max_dev = 1; - k->queue_max = VIRTIO_PCI_QUEUE_MAX; + k->queue_max = VIRTIO_MMIO_QUEUE_MAX; } static const TypeInfo virtio_mmio_bus_info = { -- 2.1.0