From nobody Sun Apr 12 06:06:52 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=1770940017; cv=none; d=zohomail.com; s=zohoarc; b=YhDC4ugBzAqWXCFwwDCMforpDgNu/HCb1UGCnUf+WMtm4mVNq5AWx8/3td6zm4J3/9oqo8JYioBvX3UeUuGlg9G5GdVjLlYiDCNfV/+k0i8TA3LYpzSZ896co49uMLZ+vAwHlwqFN0Bqw6y0EXp9KreR6XqhoJpO2lCiayElnbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770940017; h=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=/+sZ5I8NPsAH1XUC8CuVzuaEOJRie1BD5CLUQ6ZuKv0=; b=caDKlcPXdbP8r8ueGKxem7G0bb3TZByCJhyUZoC9Zr40ewecqpTquMfPOboni/wJKOVleB4tM98bWMVNnHn5uwsWpVZWkwcNyg8udlYe5IzWAxRsxubv3KycMvJz8qmtyOENTLjfpxlAP0eV85H8NieW+k2FG/0W31oH6dwR2KE= 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 1770940017189201.23660411186188; Thu, 12 Feb 2026 15:46:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqgO2-0004i2-5P; Thu, 12 Feb 2026 18:46:18 -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 1vqgNy-0004gQ-Dj for qemu-devel@nongnu.org; Thu, 12 Feb 2026 18:46:14 -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 1vqgNu-0008B7-HW for qemu-devel@nongnu.org; Thu, 12 Feb 2026 18:46:13 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-82318b640beso207908b3a.0 for ; Thu, 12 Feb 2026 15:46:10 -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 41be03b00d2f7-c6e1ac0e004sm5609936a12.6.2026.02.12.15.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Feb 2026 15:46:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770939969; x=1771544769; 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=/+sZ5I8NPsAH1XUC8CuVzuaEOJRie1BD5CLUQ6ZuKv0=; b=AFuQ0fM5ZxNiOy491CrM5V00UB+XHO6eC794JdyagzNShnCAvwxvxZrxivkMNuXgG6 HevcpbSYkRTP1fTHmEFcaedOTG/le2T9Z1ymA36Gkqxkppegs4fARk7CTOmuauI7/g0A 7lR4sVwJjCKRP2nloKJOu0l+s5IIKiO41Z7e4cjRX7B9SgrNHON9ePsH+ia816M5EYSr 5HrCCX31QlIVQdJD+qBSFqgawWdy+X/fIyoNV41v/+1eN3QwU6omZQPyRF3JXnL2cxxL O+3L0t+kWp6FyjYOnaUjKsKW8xD5ecQUEa9op0rteAq+tgbKpQxqYJKQw96dR5fLI5Pq hfqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770939969; x=1771544769; 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=/+sZ5I8NPsAH1XUC8CuVzuaEOJRie1BD5CLUQ6ZuKv0=; b=LRU5oLeEvotA+nRwYlp4hDwiDH0x59xqwuWivr3VgRfaMNo9MhNLdaYpVZPcEPJJrS eFai0MGr4YJYklewkh4HTpxWng/izly5OZgeyYSRIQvQyyKEMxT20VosIxQG4iDDudst JGmc2s5OpqAb4klY29wdposmaxtuMS5DcYWfdGmc4zSQ53kjPAky4m0SF0k1VzKP/74Y NJJ5uFwDTzRdtlrfpGTKEC0S2Tn9Hal4pFFwA77eK+XmfeTNwxnbuMh7+CDEENQYpsF0 P+MDLqduOQ2YPCuWO/iC22dFh6np/4PCs1dEyei0p9X6h+tiePKLHO+vsipHAWMsVq6T O/fg== X-Gm-Message-State: AOJu0YxQwyoMDI7cK23x/g8JmINO41cchNng4HncQ3e2BABqdsyZC8gt hUBeWB8MaFe5v2BTYHd5dyqieIMSSIL6iAWKYjcj/YTKUJoE00gUmuJywf9gOJOanymAdROizbs IeQL/ X-Gm-Gg: AZuq6aL4plxOSB7UuprI2e19nKvlqk+du8MFg4hhb/tZHWzr9PmQ8pky5JNErJx1wix JsME1w/VaRyMW9MN1lIcI6SiQT/M+1bYAxsZkKr43KmpIKYACNDIoPMAsMzn+daYvMsWyMQCAp1 7+mDch2QYzja1Y+0uOcChLqc9XWPsTZu6bcwLW8U/f0Z/Mc8o1o3h7hapDaw9gnSjtXODWBdi4a FZ6MGMfwYTGTCsB5E0eoioT0Elg8aFdz759waukGCFxQhzhOpGlIrbqx0SP137onvPXFYeIyWwJ uiLSBNShKNcvJOJ8Mn1yCI+lJTegpO3n/aw2t7ZpmljlDcnHxKRnaUJRobvd8guq3PYhln8eQJ/ /RIKX79J9qCXlHKEbRK7eGKduoaJJdE7Xt7ycpK63KH5de7x8QdVTYaeMbHfgSlSzBuSpvPLwKb ucUmCunjVFIU1jArYIBE1bANV4dr/TXe6AZRLWyV0ueDI3AJeX8uk961TSF4s7/xU2IwVRoiREy BGk X-Received: by 2002:a05:6a20:748b:b0:38b:de3d:d530 with SMTP id adf61e73a8af0-39467468ae4mr419290637.72.1770939968993; Thu, 12 Feb 2026 15:46:08 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , Harsh Prateek Bora , Stefano Garzarella , Jason Wang , Nicholas Piggin , stefanha@redhat.com, richard.henderson@linaro.org, "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] hw/virtio: add virtio_vdev_is_{modern, legacy} Date: Thu, 12 Feb 2026 15:46:00 -0800 Message-ID: <20260212234602.338131-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260212234602.338131-1-pierrick.bouvier@linaro.org> References: <20260212234602.338131-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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=unavailable 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: 1770940018228158500 Content-Type: text/plain; charset="utf-8" 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). Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio-access.h | 3 +-- include/hw/virtio/virtio.h | 12 +++++++++++- hw/net/virtio-net.c | 2 +- hw/virtio/vhost.c | 2 +- hw/virtio/virtio-pci.c | 2 +- hw/virtio/virtio.c | 16 ++++++++-------- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index cd17d0c87eb..324ba907e93 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -30,8 +30,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevi= ce *vdev) #if defined(LEGACY_VIRTIO_IS_BIENDIAN) return virtio_is_big_endian(vdev); #elif TARGET_BIG_ENDIAN - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - /* Devices conforming to VIRTIO 1.0 or later are always LE. */ + if (virtio_vdev_is_modern(vdev)) { return false; } return true; diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 27cd98d2fe1..8f1e4323599 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -468,9 +468,19 @@ 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_modern(const VirtIODevice *vdev) +{ + return virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1); +} + +static inline bool virtio_vdev_is_legacy(const VirtIODevice *vdev) +{ + return !virtio_vdev_is_modern(vdev); +} + static inline bool virtio_is_big_endian(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/net/virtio-net.c b/hw/net/virtio-net.c index 512a7c02c93..313d3b88400 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -217,7 +217,7 @@ static void virtio_net_set_config(VirtIODevice *vdev, c= onst uint8_t *config) memcpy(&netcfg, config, n->config_size); =20 if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR) && - !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1) && + virtio_vdev_is_legacy(vdev) && memcmp(netcfg.mac, n->mac, ETH_ALEN)) { memcpy(n->mac, netcfg.mac, ETH_ALEN); qemu_format_nic_info_str(qemu_get_queue(n->nic), n->mac); diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 52801c1796b..70a112242b0 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1168,7 +1168,7 @@ 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)) { + if (virtio_vdev_is_modern(vdev)) { return false; } #if HOST_BIG_ENDIAN diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 1e8f90df34e..6126187a164 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1449,7 +1449,7 @@ 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)) { + if (virtio_vdev_is_modern(vdev)) { return proxy->vqs[n].enabled; } =20 diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 77ca54e5206..b0987e66d5b 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2279,7 +2279,7 @@ int virtio_set_status(VirtIODevice *vdev, uint8_t val) trace_virtio_set_status(vdev, val); int ret =3D 0; =20 - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { if (!(vdev->status & VIRTIO_CONFIG_S_FEATURES_OK) && val & VIRTIO_CONFIG_S_FEATURES_OK) { ret =3D virtio_validate_features(vdev); @@ -2365,7 +2365,7 @@ void virtio_queue_enable(VirtIODevice *vdev, uint32_t= queue_index) * be re-enabled for new machine types only, and also after * being converted to LOG_GUEST_ERROR. * - if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_legacy(vdev)) { error_report("queue_enable is only supported in devices of virtio " "1.0 or later."); } @@ -2454,7 +2454,7 @@ void virtio_queue_set_align(VirtIODevice *vdev, int n= , int align) VirtioBusClass *k =3D VIRTIO_BUS_GET_CLASS(qbus); =20 /* virtio-1 compliant devices cannot change the alignment */ - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { error_report("tried to modify queue alignment for virtio-1 device"= ); return; } @@ -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. */ @@ -3228,7 +3228,7 @@ int virtio_set_features_ex(VirtIODevice *vdev, const = uint64_t *features) } if (!ret) { if (!virtio_device_started(vdev, vdev->status) && - !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + virtio_vdev_is_legacy(vdev)) { vdev->start_on_kick =3D true; } } @@ -3446,7 +3446,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int vers= ion_id) } =20 if (!virtio_device_started(vdev, vdev->status) && - !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + virtio_vdev_is_legacy(vdev)) { vdev->start_on_kick =3D true; } =20 @@ -3461,7 +3461,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int vers= ion_id) * to calculate used and avail ring addresses based on the desc * address. */ - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { virtio_init_region_cache(vdev, i); } else { virtio_queue_update_rings(vdev, i); @@ -4019,7 +4019,7 @@ void G_GNUC_PRINTF(2, 3) virtio_error(VirtIODevice *v= dev, const char *fmt, ...) error_vreport(fmt, ap); va_end(ap); =20 - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + if (virtio_vdev_is_modern(vdev)) { vdev->status =3D vdev->status | VIRTIO_CONFIG_S_NEEDS_RESET; virtio_notify_config(vdev); } --=20 2.47.3