From nobody Wed Nov 27 12:30:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699271591; cv=none; d=zohomail.com; s=zohoarc; b=nIrGwQpT7hXQJCsEzS7Cop8sp03OZFceXIleJPGpx7gWT8ahJk/iEuFarQlG0HjWrwa0SLi+/LW4Uq3yo0SBTxg01KXiPRTOJv2v/Cdj8XVfCcJWpWHXATeUnMYgsi7yutwGHdcNB7bmNsMkPOu04FAL+2lnydrpuRgif2tq1fQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699271591; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HJUvqWW9yoZqCljtAReh0jRJiy7SYpKqsreR0+FkXW4=; b=hWYH4Hr/oOXbn90VHFEHGKygPoHgvEAs1NbhHcy6yR147ezi2bhBn0ZlQ16KjEXbQu48iLNoaXF2HMQfUTEmHZLEmSvqJYmnuxyFbSN7SJdunpUKHMRklxqy3rUqdUNV3eZFAgKpZU405ltYo6NlnMgfLNtwb3rmkuXIBUicOJs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699271591669581.3023506523524; Mon, 6 Nov 2023 03:53:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzxuA-0003Pe-Kq; Mon, 06 Nov 2023 06:36:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzxu3-0003HB-C6 for qemu-devel@nongnu.org; Mon, 06 Nov 2023 06:36:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzxu1-0003MC-Ry for qemu-devel@nongnu.org; Mon, 06 Nov 2023 06:36:22 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-ox9--JsOOjq-WEXRYBy-vQ-1; Mon, 06 Nov 2023 06:36:18 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB18C1019C88; Mon, 6 Nov 2023 11:36:17 +0000 (UTC) Received: from localhost (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDF632026D68; Mon, 6 Nov 2023 11:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699270581; 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=HJUvqWW9yoZqCljtAReh0jRJiy7SYpKqsreR0+FkXW4=; b=KaPHOoE7iWaooOjFb89+rnz/kOusjMabVKFJYTumyAtLCDl41PhqYwStpsAy+IAozuurSc 7THUQ8IOunQe7tZFMpTRoxO3PVwgIDjJATF8TOpUdICt0mQg+mYWB/iav3UClepidAYbn3 7Hd6k3t4sF+jiqfIpyI850R26cGKMvc= X-MC-Unique: ox9--JsOOjq-WEXRYBy-vQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Peter Xu , Samuel Thibault , Kevin Wolf , Juan Quintela , Fabiano Rosas , "Michael S. Tsirkin" , Leonardo Bras , qemu-block@nongnu.org, Hanna Reitz , Jason Wang , John Snow , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v3 2/6] virtio: make endian_needed() work during loading Date: Mon, 6 Nov 2023 15:35:56 +0400 Message-ID: <20231106113601.2052601-3-marcandre.lureau@redhat.com> In-Reply-To: <20231106113601.2052601-1-marcandre.lureau@redhat.com> References: <20231106113601.2052601-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1699271593384100003 From: Marc-Andr=C3=A9 Lureau There is no simple way to distinguish when the callback is used for load or save, AFAICT. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/virtio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e5105571cf..22aeb88235 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2517,7 +2517,11 @@ static bool virtio_device_endian_needed(void *opaque) { VirtIODevice *vdev =3D opaque; =20 - assert(vdev->device_endian !=3D VIRTIO_DEVICE_ENDIAN_UNKNOWN); + /* On load, endian is UNKNOWN. The section might be loaded as required= . */ + if (vdev->device_endian =3D=3D VIRTIO_DEVICE_ENDIAN_UNKNOWN) { + return false; + } + if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { return vdev->device_endian !=3D virtio_default_endian(); } --=20 2.41.0