From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsVo-0000pX-5Y for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQsVj-0006C0-T1 for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsVj-0006Bm-L6 for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:27 -0500 From: Jason Wang Date: Thu, 26 Feb 2015 15:04:42 +0800 Message-Id: <1424934286-7099-8-git-send-email-jasowang@redhat.com> In-Reply-To: <1424934286-7099-1-git-send-email-jasowang@redhat.com> References: <1424934286-7099-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH V2 07/11] 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 , Anthony Liguori , mst@redhat.com Cc: Anthony Liguori Cc: Michael S. Tsirkin Signed-off-by: Jason Wang --- hw/virtio/virtio-mmio.c | 6 +++--- include/hw/virtio/virtio.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index ad03218..3be2ce8 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -237,7 +237,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 +257,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 +403,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 = { diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 8f4da77..e538f5a 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -95,6 +95,7 @@ typedef struct VirtQueueElement #define VIRTIO_PCI_QUEUE_MAX 64 #define VIRTIO_CCW_QUEUE_MAX 64 #define VIRTIO_S390_QUEUE_MAX 64 +#define VIRTIO_MMIO_QUEUE_MAX 64 #define VIRTIO_NO_VECTOR 0xffff -- 1.9.1