From nobody Fri Mar 27 03:59:51 2026 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772744155; cv=none; d=zohomail.com; s=zohoarc; b=CHUF6sbdboxtFJWtSul18gCwDELx3d1Tb0QOQoMDCpK7+q6lQQcFXJ3lRKA827TDYdC4WuHBnLVsJ4Zj3bAtydKCHWyEql2RAYHa2FMAQ5qeq+8pqTZoQsPd2BnTAV93thA+g18Z9ZvpU7747mpZ7sKEegSHkwMdwDvokyGjx1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772744155; 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=fjVg4k8L5YS0+fbIU3cK5+QxAukvdu0K3zvehSjPnuA=; b=lSNrZiOi/jK0fYtA30VY6/ScftL7VfrxcEEcRF8aNeKKE36ThX3ho8zbOjXYqCTKnSRvOzilXVhOH2GdCKnW327tsoUzIC60DX5+bn930bsNxvG1XxI4xjMwZ2vScVt9nFRq49A5+njpZeVAV+YTnuKpDfh0smZ4EdJArjoIyd4= 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 1772744155779892.5415156375913; Thu, 5 Mar 2026 12:55:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyFjV-0003Us-Cp; Thu, 05 Mar 2026 15:55:47 -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 1vyFjI-0003Oy-8x for qemu-devel@nongnu.org; Thu, 05 Mar 2026 15:55:32 -0500 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyFjE-0006ft-EA for qemu-devel@nongnu.org; Thu, 05 Mar 2026 15:55:30 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-827270d50d4so8878560b3a.3 for ; Thu, 05 Mar 2026 12:55:27 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8297e4fbbd4sm3847454b3a.53.2026.03.05.12.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 12:55:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772744127; x=1773348927; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fjVg4k8L5YS0+fbIU3cK5+QxAukvdu0K3zvehSjPnuA=; b=gQyRl7wkDZW27QxBw/tTfH5BXTwzGnmq3GABnSkVaJ6vQQXuKJubLcSdr5sPI9APFP O+VxOg7XRwrnGLOUj3/C//kYYUkLtqBCPphkL3JHGWNSPowIcQuvBc8COgLDjx+okPD1 OctUMkHE1BS6m+4UrhOyQsAMi19fwr+Oe/OxcKiywsbVVlzi4Y28AY70XDYbeAD+Buin 2W/pQUG114zlpPnsa+jIIVcI8St70kS2WPU8qCyNIdJZsGEOP08HKbEfDzccDCQE7MId A8JEfpyYN18knTShPIBHC4JYGLfo+DgHj+1/+AgBumyV4cz9NGU266VHgmzHVMpZrGx+ nsyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772744127; x=1773348927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fjVg4k8L5YS0+fbIU3cK5+QxAukvdu0K3zvehSjPnuA=; b=f4BTd5cL1MCzsbHA4mDWIkUFXug31Y0aMnNBl1HSgiEgw72mX5vPMgz2alq8ffOZJR Qt7myZvxHU72e2hkQYxpJidh6k5me4LvFVn1OYTuBEzz2FFccchHw4K22rJYKaHXydPH R38+JRH90wuBUivDDKY4mmloajpyInp5FJM0119L9aXsN32iCfBq2uHD/c3im7UTbotl khkFAzjjDDmHzRIMkjKkE9u9KVpEwTO3FBVaWH0I6dBNhFdZVpxa81PjJ6oVltHGhCfx BziGvCX5zvb/pwk9zxZHkly00MypLhfFjoAV3Mkmx2TvXQU3Va1snHGv0qrQzzvi2TiH peGw== X-Gm-Message-State: AOJu0Yw9M9X+AcdV7K3Mro0Wo/WjTLcqA7LFZ9zP7GtLH/U1mbcbG/Ff eMd+DdRj4v0pHmBJrwCUC+hcs3hDxH8JkZlHMa69DAvcKybZpOM6zEWRMZz1/GgVA30LSUCt17p w452U X-Gm-Gg: ATEYQzwdjm7l5KUnsHA4yH7DrTzsd6m+RkoBhjCVAFiGd5RsOqt4I8E1GmQF22MLqyf v7BhhsqbzcwT+9ka4Fy8DJpBtvSoakTbDMXKpQLsLD2w4g0HG5OIY6+ycA1VVJjeptl3EtIlJa5 SR5Ocl1d7TDI3G5lpPCUwoEKPrhKEgzoRzBpm22JMKEtv7pLVFniFio+jo8ddPg0wvoD/N26WNg zoUtS5G5s+H84/UR/42l4Kg6NEDxsXU9i88jbSyXcYnPMjBC6nXlL1v33lFxQNnPGSqNl7aOy8O FTcTYIcOtGmL7nrEDjLPC07F95U0Jvf4h2vUlriyZVjjUMDuUOlvxwIPr446EQnyrt/3aj/pPH+ nAF4hiJmQT47/pWT9EYKrguFG9y0o0Th99ihb7CWMtxT24dP15W1RgaG8k6qeNNSs8pipGP+PnK t0eoQlSmYkIk7mYQJsAXQIXqCjfvj6eDwSOFc9yLxzg7XgwNqUDw+SJyF74KjpePveInTagMBQk Aun X-Received: by 2002:a05:6a00:a1b:b0:829:8bb4:1034 with SMTP id d2e1a72fcca58-8299aa6d247mr984598b3a.28.1772744126676; Thu, 05 Mar 2026 12:55:26 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org, peter.maydell@linaro.org, richard.henderson@linaro.org, pbonzini@redhat.com, stefanha@redhat.com Cc: pierrick.bouvier@linaro.org Subject: [PULL 1/6] hw/virtio: Add virtio_vdev_is_legacy() Date: Thu, 5 Mar 2026 12:55:15 -0800 Message-ID: <20260305205520.2125218-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260305205520.2125218-1-pierrick.bouvier@linaro.org> References: <20260305205520.2125218-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2607:f8b0:4864:20::435; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x435.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: qemu development 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 @linaro.org) X-ZM-MESSAGEID: 1772744156206158500 This simplifies code compared to having virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) or !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1). Acked-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Link: https://lore.kernel.org/qemu-devel/20260225041948.52929-2-philmd@lina= ro.org Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio-access.h | 2 +- include/hw/virtio/virtio.h | 7 ++++++- hw/virtio/vhost.c | 12 +++++------- hw/virtio/virtio-pci.c | 6 +++--- hw/virtio/virtio.c | 8 ++++---- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index b58fb6ed7ea..b8aa7a520f5 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -30,7 +30,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevi= ce *vdev) #if defined(LEGACY_VIRTIO_IS_BIENDIAN) return virtio_vdev_is_big_endian(vdev); #elif TARGET_BIG_ENDIAN - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (!virtio_vdev_is_legacy(vdev)) { /* Devices conforming to VIRTIO 1.0 or later are always LE. */ return false; } diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 9dd93cf965a..42d20899390 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -468,9 +468,14 @@ static inline bool virtio_host_has_feature(VirtIODevic= e *vdev, return virtio_has_feature(vdev->host_features, fbit); } =20 +static inline bool virtio_vdev_is_legacy(const VirtIODevice *vdev) +{ + return !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1); +} + static inline bool virtio_vdev_is_big_endian(const VirtIODevice *vdev) { - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_legacy(vdev)) { assert(vdev->device_endian !=3D VIRTIO_DEVICE_ENDIAN_UNKNOWN); return vdev->device_endian =3D=3D VIRTIO_DEVICE_ENDIAN_BIG; } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index b4cdb7762f9..b9dc4ed13ba 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1168,14 +1168,12 @@ static void vhost_log_stop(MemoryListener *listener, */ static inline bool vhost_needs_vring_endian(VirtIODevice *vdev) { - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - return false; + if (virtio_vdev_is_legacy(vdev)) { + return vdev->device_endian =3D=3D (HOST_BIG_ENDIAN + ? VIRTIO_DEVICE_ENDIAN_LITTLE + : VIRTIO_DEVICE_ENDIAN_BIG); } -#if HOST_BIG_ENDIAN - return vdev->device_endian =3D=3D VIRTIO_DEVICE_ENDIAN_LITTLE; -#else - return vdev->device_endian =3D=3D VIRTIO_DEVICE_ENDIAN_BIG; -#endif + return false; } =20 static int vhost_virtqueue_set_vring_endian_legacy(struct vhost_dev *dev, diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 0f5654f459e..bcab2d18b80 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1449,11 +1449,11 @@ static bool virtio_pci_queue_enabled(DeviceState *d= , int n) VirtIOPCIProxy *proxy =3D VIRTIO_PCI(d); VirtIODevice *vdev =3D virtio_bus_get_device(&proxy->bus); =20 - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - return proxy->vqs[n].enabled; + if (virtio_vdev_is_legacy(vdev)) { + return virtio_queue_enabled_legacy(vdev, n); } =20 - return virtio_queue_enabled_legacy(vdev, n); + return proxy->vqs[n].enabled; } =20 static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy, diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e9d55329525..c0c4599b586 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2753,7 +2753,7 @@ static bool virtio_device_endian_needed(void *opaque) VirtIODevice *vdev =3D opaque; =20 assert(vdev->device_endian !=3D VIRTIO_DEVICE_ENDIAN_UNKNOWN); - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_legacy(vdev)) { return vdev->device_endian !=3D virtio_default_endian(); } /* Devices conforming to VIRTIO 1.0 or later are always LE. */ @@ -3460,10 +3460,10 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int ve= rsion_id) * to calculate used and avail ring addresses based on the desc * address. */ - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - virtio_init_region_cache(vdev, i); - } else { + if (virtio_vdev_is_legacy(vdev)) { virtio_queue_update_rings(vdev, i); + } else { + virtio_init_region_cache(vdev, i); } =20 if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) { --=20 2.47.3