From nobody Tue Nov 18 04:25:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607365516; cv=none; d=zohomail.com; s=zohoarc; b=f4KHC02WDcdss6XGKj3NrtbycdRlLrmv9QpYruIad+BBmGq7LczOAcd6AIqZ4w9Pa0hp0Xm3/FBe+1WcfouLdyVpw7x+7MIJgv2ZhvBf7usdxvcL+tYDcVskbkqlqHnmd+B9J6d6WvnSy7NFBtLwFkxqvb0dPYrrFj9CnDrqkTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607365516; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gDRl+/6B0Wo8EkHXmtwjEYRM2pzBAX9HbpbNK3tNtwM=; b=mNOFD83urDV25mkylQWDrFrly5aCp2cRDGI826ZuQayMr369n9+KhniLhOBeIdv6hGzV5HapFle/3/gSV4HrMormCWX6mzcpa1KW8+bm2zHi6i0CA0CaQQw/YCe8EQ4Lmn8wNc7gDZYDIXN3JBez1aRO5nVa7VGvFToPkOeyRmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1607365516281933.9202786191573; Mon, 7 Dec 2020 10:25:16 -0800 (PST) Received: from localhost ([::1]:41912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmKNf-0006UG-9p for importer@patchew.org; Mon, 07 Dec 2020 12:32:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmKFS-0000IS-0H for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:24:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmKFL-0006ss-JH for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:24:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-523-3MzuTHoTPuuq5LVeIW1aGg-1; Mon, 07 Dec 2020 12:24:21 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D50F11842142; Mon, 7 Dec 2020 17:24:19 +0000 (UTC) Received: from localhost (ovpn-114-128.ams2.redhat.com [10.36.114.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 743525D6AD; Mon, 7 Dec 2020 17:24:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607361862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gDRl+/6B0Wo8EkHXmtwjEYRM2pzBAX9HbpbNK3tNtwM=; b=SXgCL43Xk+PPH70wgJpGeha5ZhHsNLEaBi6atlSueUi31EoYqetvQmnNN50ZgtGGL58APY 2CI2KTbDAoTe+ZkDjSl3a3/7Yivw1ejRmrJGzBIpXwL0/22O3mW8K9P8/+4yASqQD0hTpY DhYMe/bKBe1nZoq5TfXiDXZ/X3vARn8= X-MC-Unique: 3MzuTHoTPuuq5LVeIW1aGg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 01/12] vhost-user-blk: fix blkcfg->num_queues endianness Date: Mon, 7 Dec 2020 17:20:19 +0000 Message-Id: <20201207172030.251905-2-stefanha@redhat.com> In-Reply-To: <20201207172030.251905-1-stefanha@redhat.com> References: <20201207172030.251905-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , "Michael S . Tsirkin" , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Raphael Norwitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Treat the num_queues field as virtio-endian. On big-endian hosts the vhost-user-blk num_queues field was in the wrong endianness. Move the blkcfg.num_queues store operation from realize to vhost_user_blk_update_config() so feature negotiation has finished and we know the endianness of the device. VIRTIO 1.0 devices are little-endian, but in case someone wants to use legacy VIRTIO we support all endianness cases. Signed-off-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Reviewed-by: Raphael Norwitz --- hw/block/vhost-user-blk.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 2dd3d93ca0..d9d9dc8a89 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -53,6 +53,9 @@ static void vhost_user_blk_update_config(VirtIODevice *vd= ev, uint8_t *config) { VHostUserBlk *s =3D VHOST_USER_BLK(vdev); =20 + /* Our num_queues overrides the device backend */ + virtio_stw_p(vdev, &s->blkcfg.num_queues, s->num_queues); + memcpy(config, &s->blkcfg, sizeof(struct virtio_blk_config)); } =20 @@ -490,10 +493,6 @@ reconnect: goto reconnect; } =20 - if (s->blkcfg.num_queues !=3D s->num_queues) { - s->blkcfg.num_queues =3D s->num_queues; - } - return; =20 virtio_err: --=20 2.28.0