From nobody Mon Nov 17 17:47:13 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=1614091834; cv=none; d=zohomail.com; s=zohoarc; b=fN+IJb0KKY9p3CdmiXuoWq9dGwLa0fCkXz19XnMyw9c010tTvCukBasR0T47mo10RtzUtGJTyG5vbsRrFgfiRfwzhc3xn/GCmN1+fdAFG1xq8yFmv+ExR83VSwOfdyAYtNxYj8ZEqtR8dh2MwH2dZPzQ8ZKzbqxS7H4ZAg/4/Ss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614091834; 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=epNbZK0R37t9TJfruEcwMWO3mwlxvKJUXYHn7CqV7Q8=; b=BULxdbAjtJs+uqmEfmHTKfKEfwuuSsPqZPvIjrTDfIkHkt61/aQJgGGA5Oo07hwZvdWH0f/LdBC9zfkwcjz/OeeL5BGIf7CkspeasUUypxQPEAyOTerrnS/EQKk0Xs1NT/9mvigsLAfDA1xybO3uYlp5Gk1s3W5YmS3mhC4iBLU= 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 1614091834129163.2581086809156; Tue, 23 Feb 2021 06:50:34 -0800 (PST) Received: from localhost ([::1]:56930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEZ1F-0007pf-3N for importer@patchew.org; Tue, 23 Feb 2021 09:50:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEYzq-00065w-5t for qemu-devel@nongnu.org; Tue, 23 Feb 2021 09:49:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lEYzn-0002r5-6H for qemu-devel@nongnu.org; Tue, 23 Feb 2021 09:49:05 -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-262-URm9yOB3MK2onVIM-jCAhQ-1; Tue, 23 Feb 2021 09:49:01 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BF7FC7451; Tue, 23 Feb 2021 14:47:11 +0000 (UTC) Received: from localhost (ovpn-114-203.ams2.redhat.com [10.36.114.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30C2A5C8BE; Tue, 23 Feb 2021 14:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614091742; 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=epNbZK0R37t9TJfruEcwMWO3mwlxvKJUXYHn7CqV7Q8=; b=U3RTwlG30cxAI6UqfECbPfYoTdUb+BlNjM6W/j2uDi8ljdUpuElnhu2LLEa/x2IpmFJKP8 Q6NDd4x6Vtaf16b3hcq7P0Eo0x7n8B9oz5o8rKVlO0QE5b3sYzvDVFakZn+V6FXpZ6wpbs u2AYntXcg8CiDqgP1fRuv62+PfYlGNo= X-MC-Unique: URm9yOB3MK2onVIM-jCAhQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v3 01/12] vhost-user-blk: fix blkcfg->num_queues endianness Date: Tue, 23 Feb 2021 14:46:42 +0000 Message-Id: <20210223144653.811468-2-stefanha@redhat.com> In-Reply-To: <20210223144653.811468-1-stefanha@redhat.com> References: <20210223144653.811468-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=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: Kevin Wolf , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, "Michael S. Tsirkin" , Peter Maydell , qemu-stable@nongnu.org, 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. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Reviewed-by: Raphael Norwitz Reviewed-by: Michael S. Tsirkin --- 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 da4fbf9084..b870a50e6b 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -54,6 +54,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 @@ -491,10 +494,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.29.2