From patchwork Thu Feb 26 07:04:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 443818 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 6267514008F for ; Thu, 26 Feb 2015 18:10:43 +1100 (AEDT) Received: from localhost ([::1]:57625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsan-00041y-I6 for incoming@patchwork.ozlabs.org; Thu, 26 Feb 2015 02:10:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsVc-0000S7-GL for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQsVY-0006A6-0e for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQsVX-0006A2-QY for qemu-devel@nongnu.org; Thu, 26 Feb 2015 02:05:15 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1Q75CVI026751 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 26 Feb 2015 02:05:12 -0500 Received: from jason-ThinkPad-T430s.redhat.com (vpn1-4-223.pek2.redhat.com [10.72.4.223]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1Q74l2J029074; Thu, 26 Feb 2015 02:05:07 -0500 From: Jason Wang To: qemu-devel@nongnu.org Date: Thu, 26 Feb 2015 15:04:39 +0800 Message-Id: <1424934286-7099-5-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mst@redhat.com, Jason Wang , Alexander Graf , Christian Borntraeger , Cornelia Huck , Richard Henderson Subject: [Qemu-devel] [PATCH V2 04/11] virtio-ccw: introduce ccw specific queue limit 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 depending on marco, using a bus specific limit. Cc: Alexander Graf Cc: Cornelia Huck Cc: Christian Borntraeger Cc: Richard Henderson Signed-off-by: Jason Wang --- hw/s390x/s390-virtio-ccw.c | 7 +++++-- hw/s390x/virtio-ccw.c | 13 +++++++------ include/hw/virtio/virtio.h | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 71bafe0..6aeb815 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -43,6 +43,7 @@ void io_subsystem_reset(void) static int virtio_ccw_hcall_notify(const uint64_t *args) { + VirtIODevice *vdev; uint64_t subch_id = args[0]; uint64_t queue = args[1]; SubchDev *sch; @@ -55,10 +56,12 @@ static int virtio_ccw_hcall_notify(const uint64_t *args) if (!sch || !css_subch_visible(sch)) { return -EINVAL; } - if (queue >= VIRTIO_PCI_QUEUE_MAX) { + + vdev = virtio_ccw_get_vdev(sch); + if (queue >= virtio_get_queue_max(vdev)) { return -EINVAL; } - virtio_queue_notify(virtio_ccw_get_vdev(sch), queue); + virtio_queue_notify(vdev, queue); return 0; } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 4874622..98a1a90 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -170,7 +170,7 @@ static void virtio_ccw_start_ioeventfd(VirtioCcwDevice *dev) return; } vdev = virtio_bus_get_device(&dev->bus); - for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { + for (n = 0; n < virtio_get_queue_max(vdev); n++) { if (!virtio_queue_get_num(vdev, n)) { continue; } @@ -205,7 +205,7 @@ static void virtio_ccw_stop_ioeventfd(VirtioCcwDevice *dev) return; } vdev = virtio_bus_get_device(&dev->bus); - for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { + for (n = 0; n < virtio_get_queue_max(vdev); n++) { if (!virtio_queue_get_num(vdev, n)) { continue; } @@ -265,8 +265,9 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, uint16_t index, uint16_t num) { VirtIODevice *vdev = virtio_ccw_get_vdev(sch); + int queue_max = virtio_get_queue_max(vdev); - if (index > VIRTIO_PCI_QUEUE_MAX) { + if (index > queue_max) { return -EINVAL; } @@ -291,7 +292,7 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, virtio_queue_set_vector(vdev, index, index); } /* tell notify handler in case of config change */ - vdev->config_vector = VIRTIO_PCI_QUEUE_MAX; + vdev->config_vector = queue_max; return 0; } @@ -1026,7 +1027,7 @@ static void virtio_ccw_notify(DeviceState *d, uint16_t vector) return; } - if (vector < VIRTIO_PCI_QUEUE_MAX) { + if (vector < virtio_get_queue_max(virtio_bus_get_device(&dev->bus))) { if (!dev->indicators) { return; } @@ -1695,7 +1696,7 @@ static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data) k->load_queue = virtio_ccw_load_queue; k->save_config = virtio_ccw_save_config; k->load_config = virtio_ccw_load_config; - k->queue_max = VIRTIO_PCI_QUEUE_MAX; + k->queue_max = VIRTIO_CCW_QUEUE_MAX; } static const TypeInfo virtio_ccw_bus_info = { diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 9fe0d92..04ad532 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -93,6 +93,7 @@ typedef struct VirtQueueElement } VirtQueueElement; #define VIRTIO_PCI_QUEUE_MAX 64 +#define VIRTIO_CCW_QUEUE_MAX 64 #define VIRTIO_NO_VECTOR 0xffff