From patchwork Tue Feb 12 04:25:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Changpeng" X-Patchwork-Id: 10807311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CD8F1390 for ; Tue, 12 Feb 2019 04:08:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 588FD2AE31 for ; Tue, 12 Feb 2019 04:08:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 457CF2AE47; Tue, 12 Feb 2019 04:08:41 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8F5442AE31 for ; Tue, 12 Feb 2019 04:08:30 +0000 (UTC) Received: from localhost ([127.0.0.1]:60894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtPMy-0000IM-U5 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Feb 2019 23:08:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtPM1-00083C-EE for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:07:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtPLk-0006qK-4P for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:07:13 -0500 Received: from mga04.intel.com ([192.55.52.120]:43346) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtPLj-0006hs-6F for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:07:11 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2019 20:07:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,361,1544515200"; d="scan'208";a="143470363" Received: from fedora.sh.intel.com ([10.67.114.176]) by fmsmga004.fm.intel.com with ESMTP; 11 Feb 2019 20:07:04 -0800 From: Changpeng Liu To: qemu-devel@nongnu.org Date: Tue, 12 Feb 2019 12:25:16 +0800 Message-Id: <1549945516-25643-1-git-send-email-changpeng.liu@intel.com> X-Mailer: git-send-email 1.9.3 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.120 Subject: [Qemu-devel] [PATCH] virtio-blk: set correct config size for the host driver 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: ldoktor@redhat.com, mst@redhat.com, dgilbert@redhat.com, stefanha@redhat.com, changpeng.liu@intel.com, sgarzare@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features support" introduced extra fields to existing struct virtio_blk_config, when migration was executed from older QEMU version to current head, it will break the migration. While here, set the correct config size when initializing the host driver, for now, discard/write zeroes are not supported by virtio-blk host driver, so set the config size as before, users can change config size when adding the new feature bits support. Signed-off-by: Changpeng Liu --- hw/block/virtio-blk.c | 15 +++++++++++---- include/hw/virtio/virtio-blk.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 9a87b3b..fac5d33 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -761,7 +761,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) blkcfg.alignment_offset = 0; blkcfg.wce = blk_enable_write_cache(s->blk); virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues); - memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); + memcpy(config, &blkcfg, s->config_size); } static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) @@ -769,7 +769,7 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) VirtIOBlock *s = VIRTIO_BLK(vdev); struct virtio_blk_config blkcfg; - memcpy(&blkcfg, config, sizeof(blkcfg)); + memcpy(&blkcfg, config, s->config_size); aio_context_acquire(blk_get_aio_context(s->blk)); blk_set_enable_write_cache(s->blk, blkcfg.wce != 0); @@ -847,6 +847,13 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) } } +static void virtio_blk_set_config_size(VirtIOBlock *s) +{ + /* VIRTIO_BLK_F_MQ is supported by host driver */ + s->config_size = offsetof(struct virtio_blk_config, num_queues) + + sizeof_field(struct virtio_blk_config, num_queues); +} + static void virtio_blk_save_device(VirtIODevice *vdev, QEMUFile *f) { VirtIOBlock *s = VIRTIO_BLK(vdev); @@ -952,8 +959,8 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) return; } - virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, - sizeof(struct virtio_blk_config)); + virtio_blk_set_config_size(s); + virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, s->config_size); s->blk = conf->conf.blk; s->rq = NULL; diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 5117431..9181a93 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -51,6 +51,7 @@ typedef struct VirtIOBlock { void *rq; QEMUBH *bh; VirtIOBlkConf conf; + size_t config_size; unsigned short sector_mask; bool original_wce; VMChangeStateEntry *change;