From patchwork Tue Jun 28 13:23:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9203263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5187C60752 for ; Tue, 28 Jun 2016 13:38:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 424D2285E7 for ; Tue, 28 Jun 2016 13:38:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36DBA28602; Tue, 28 Jun 2016 13:38:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C3FBC285E7 for ; Tue, 28 Jun 2016 13:38:41 +0000 (UTC) Received: from localhost ([::1]:36794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHtDs-0002BV-OF for patchwork-qemu-devel@patchwork.kernel.org; Tue, 28 Jun 2016 09:38:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHt1K-0002aK-44 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 09:25:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHt1I-0007wI-2t for qemu-devel@nongnu.org; Tue, 28 Jun 2016 09:25:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHt1H-0007wA-O9 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 09:25:39 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6063E3F724; Tue, 28 Jun 2016 13:25:39 +0000 (UTC) Received: from localhost (ovpn-112-80.ams2.redhat.com [10.36.112.80]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5SDPcS2000381; Tue, 28 Jun 2016 09:25:38 -0400 From: Stefan Hajnoczi To: Date: Tue, 28 Jun 2016 14:23:25 +0100 Message-Id: <1467120211-26495-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1467120211-26495-1-git-send-email-stefanha@redhat.com> References: <1467120211-26495-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 28 Jun 2016 13:25:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/9] virtio-blk: add VirtIOBlockConf->num_queues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The num_queues field is always 1 for the time being. A later patch will make it a configurable device property so that multiqueue can be enabled. Signed-off-by: Stefan Hajnoczi Reviewed-by: Fam Zheng Message-id: 1466511196-12612-2-git-send-email-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 1 + include/hw/virtio/virtio-blk.h | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index beb4e12..4a3781a 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -883,6 +883,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) s->rq = NULL; s->sector_mask = (s->conf.conf.logical_block_size / BDRV_SECTOR_SIZE) - 1; + conf->num_queues = 1; s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output); virtio_blk_data_plane_create(vdev, conf, &s->dataplane, &err); if (err != NULL) { diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 8f2b056..9b03b6a 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -38,6 +38,7 @@ struct VirtIOBlkConf uint32_t scsi; uint32_t config_wce; uint32_t request_merging; + uint16_t num_queues; }; struct VirtIOBlockDataPlane;