From nobody Mon Apr 6 09:16:03 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 Acked-by: Stefan Hajnoczi --- 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 From nobody Mon Apr 6 09:16:03 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=1770940030; cv=none; d=zohomail.com; s=zohoarc; b=MYtKoZzpq/3vstnUbUfXi6hV76JXJ+ul/RGzQx1KxHennR3WgJSe2wXfslDlIt67cQh7qEiek/Rck1zaMu07WtLEpHTNL3C9kuadlh3I6eoE5YjeFks9ZC+ZxvDOysuEFptGusFRktbMg/1k/h9EemheL+oOVHJ0m5hwPp7tThk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770940030; 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=gEmb+NuIA92kpdVxEe8MYTCkuvizaCU9Eyv3aVlm5ok=; b=Kkh5/s45sclX3TJfzQWen/IKP0a8uqjX7PV9Azl4viJxgmrR3gOG/GX5Jy2g/zzU1Jo2Oq0NydjtHf1oXjZaD4L9PbPJbCk7L44CNcwtqOQ92c7yXDQ4F/0jp1WqxdJWRYyZrqGAWHvP829qKMLF2a/hpYfpeYMUrALYcb4WEr4= 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 1770940030601822.3368911358699; Thu, 12 Feb 2026 15:47:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqgO2-0004iX-Kb; 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-0004gO-DY for qemu-devel@nongnu.org; Thu, 12 Feb 2026 18:46:14 -0500 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vqgNv-0008BG-En for qemu-devel@nongnu.org; Thu, 12 Feb 2026 18:46:13 -0500 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-82311f4070cso217541b3a.0 for ; Thu, 12 Feb 2026 15:46:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Feb 2026 15:46:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770939970; x=1771544770; 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=gEmb+NuIA92kpdVxEe8MYTCkuvizaCU9Eyv3aVlm5ok=; b=JMRz/3Liil+BgWILxGICt2E54KOZhcjo1lYPjGG3fKlnAFnSfntFrLgZugihDbkEbp 81wbom1rWIpwWlvaICXOusuNUZmP1uihiUG4xBWhVjd3xBcLbnwpO+BoraIPOh8soFn+ f3UhLnobEuIxM5HOE/A/uTYofKs9j9H5WRuUVmZ3TY22xy2dkcbUeojST0AenzdFfYH2 SUQ1Mc9pp1l/SfYkAo3gW7ieSNAb30IKNDLhctomWOseb+SGTiTTF9t13Nda9brDnJJ4 xgAYDQlo6LfhkXGAPX0LKFPwmZsdWG5CvpVDkRdlNTZXzi8WPqpgxcGXrFCEQTbEzebC F92w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770939970; x=1771544770; 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=gEmb+NuIA92kpdVxEe8MYTCkuvizaCU9Eyv3aVlm5ok=; b=MRu85AfBPACyLXV+Q3dWFzwf4zXyFojIdxA+9sUBEHskV8ek9aPDyAqolV+3PpOV4N 2d7jcoGyfM3Tejyc9K9/XaHdnBbmwygAQ+/XZYSObhyj2MKKCKDlL7ij1DPaZCKsUR5s jIvleLnYk/MvPHxEQpIa1r0DwS5WKRpIAqcPiMpOGlMzczER3I856woaRLNwNtcAHKc4 wHUvTlKd5LasNtgtj6rLWUwjr6PJgDVEMm0Hb5DsPGpJH/1yX/oNHu0AaIrayC+0iumY SBcIpGF89m81MNpKpOZRhPs4oM5IMOX7Whty52YzZ3BBaLusguUBjUaPVZB5QGqh3oUu 6y0g== X-Gm-Message-State: AOJu0YyICLCuNqfeTnzWDUZexOuy7eM8Kp0/1CYoW+hRsnfByTmifWoT LE07T9SVJ9R76PT4ZlSivWKj5GCiTRtOCpXfvJlDJUmVOyUczyZp6Z/T8Oy6KAMyYHOoIwfGyVc LQX75 X-Gm-Gg: AZuq6aLGjjaLDyLud1rtIEKGIILOiO6vCBcm/WSIx3gcA2pdRxs3MF8jm1u82e5TQ/l 50ShN1jW3AksPztryfZDN8CR617ewhsYYrSrNqePx2E6QSyGSsgP8Y0NWO5F0m37XH02jiouuQz s9yHbIV9okHbRhVra4KW6O9oW3yWo0sL35ZkEs/iw6nH/isKb7K615lc0fSryD2w73o1UcX9YdW ZoGUK+PtE44ZMaGqDUrDnAu9yP3F5FezhpXmQ6B2H7T5+tzZh161lgmq1HfCKaXL4piD/hzSE1R gPWZ2KDH+Pj+mQAYz1HNL8JUWZkf/VhmrmobEmVANW3Lz3PbvILrWVyM6wYNIB19BhyoLdJL4J7 41l5iicCDAkAuIq2vs0JML66z0Z7Kh4KxXt3Z8Ys7AJ0WJLPdHUB/45We/5yniafn0hXnKFozLr A9ja4KXALkT3DlaahIgjcg0607BUcdv+Y+MyGmOBbbX5VJ6K4u8LCdYvKUY0tMhpeM5sTaILyhQ T2j X-Received: by 2002:a05:6a21:6f0d:b0:37c:b74c:d8c7 with SMTP id adf61e73a8af0-3946a887081mr31448637.22.1770939969849; Thu, 12 Feb 2026 15:46:09 -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 2/3] hw/virtio: rename virtio_is_big_endian to virtio_vdev_is_big_endian Date: Thu, 12 Feb 2026 15:46:01 -0800 Message-ID: <20260212234602.338131-3-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::434; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x434.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: 1770940031954158500 Content-Type: text/plain; charset="utf-8" Renaming this function removes the confusion with existing virtio_is_big_endian cpu ops. Indeed, virtio_vdev_is_big_endian is *not* calling cpu virtio_is_big_endian everytime. Signed-off-by: Pierrick Bouvier Acked-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 2 +- include/hw/virtio/virtio.h | 2 +- hw/net/virtio-net.c | 4 ++-- hw/virtio/vhost.c | 4 ++-- hw/virtio/virtio-pci.c | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 324ba907e93..0c5514178e4 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -28,7 +28,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) { #if defined(LEGACY_VIRTIO_IS_BIENDIAN) - return virtio_is_big_endian(vdev); + return virtio_vdev_is_big_endian(vdev); #elif TARGET_BIG_ENDIAN if (virtio_vdev_is_modern(vdev)) { return false; diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 8f1e4323599..ed1a0967ed8 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -478,7 +478,7 @@ static inline bool virtio_vdev_is_legacy(const VirtIODe= vice *vdev) return !virtio_vdev_is_modern(vdev); } =20 -static inline bool virtio_is_big_endian(VirtIODevice *vdev) +static inline bool virtio_vdev_is_big_endian(VirtIODevice *vdev) { if (virtio_vdev_is_legacy(vdev)) { assert(vdev->device_endian !=3D VIRTIO_DEVICE_ENDIAN_UNKNOWN); diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 313d3b88400..ec85e5a949a 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -301,7 +301,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8= _t status) if (n->needs_vnet_hdr_swap) { error_report("backend does not support %s vnet headers; " "falling back on userspace virtio", - virtio_is_big_endian(vdev) ? "BE" : "LE"); + virtio_vdev_is_big_endian(vdev) ? "BE" : "LE"); return; } =20 @@ -343,7 +343,7 @@ static int virtio_net_set_vnet_endian_one(VirtIODevice = *vdev, NetClientState *peer, bool enable) { - if (virtio_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { return qemu_set_vnet_be(peer, enable); } else { return qemu_set_vnet_le(peer, enable); diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 70a112242b0..1f5e70ad197 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1306,7 +1306,7 @@ int vhost_virtqueue_start(struct vhost_dev *dev, =20 if (vhost_needs_vring_endian(vdev)) { r =3D vhost_virtqueue_set_vring_endian_legacy(dev, - virtio_is_big_endian(v= dev), + virtio_vdev_is_big_end= ian(vdev), vhost_vq_index); if (r) { return r; @@ -1423,7 +1423,7 @@ static int do_vhost_virtqueue_stop(struct vhost_dev *= dev, */ if (vhost_needs_vring_endian(vdev)) { vhost_virtqueue_set_vring_endian_legacy(dev, - !virtio_is_big_endian(vdev= ), + !virtio_vdev_is_big_endian= (vdev), vhost_vq_index); } =20 diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 6126187a164..33c5cec01cd 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -586,13 +586,13 @@ static uint64_t virtio_pci_config_read(void *opaque, = hwaddr addr, break; case 2: val =3D virtio_config_readw(vdev, addr); - if (virtio_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { val =3D bswap16(val); } break; case 4: val =3D virtio_config_readl(vdev, addr); - if (virtio_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { val =3D bswap32(val); } break; @@ -625,13 +625,13 @@ static void virtio_pci_config_write(void *opaque, hwa= ddr addr, virtio_config_writeb(vdev, addr, val); break; case 2: - if (virtio_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { val =3D bswap16(val); } virtio_config_writew(vdev, addr, val); break; case 4: - if (virtio_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { val =3D bswap32(val); } virtio_config_writel(vdev, addr, val); --=20 2.47.3 From nobody Mon Apr 6 09:16:03 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=ZRRTSe7BK0D5lJulJm2049+SgbjOOcayn6g8TLYCdB1QmjkpeNTTuAReQPlUfcC6ubzAXWnHoj4zCU8Y/5uLYJPXV+I+eKCtjqVDZG//3j3W7ONAkMFJTGc7NBKPRBnfJ7/AkJOCyrlw9RlA21gKDusQvH0XwvBMv9DyIEnxbZM= 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=JsSjHgAuxzH7z5UZfo3F29FRTsMy8IItwqoYG77XBoE=; b=ZtjeGsNnQwauysw6mIyPy3zYQGeM6J3j+1BSVuKs7CcWB+X4HTVfY8cV2VAWxrO4Puc3NrtoAjCeloDxEsEle8OG8XjtCRt0oDiO+Ce+734yqNuEZ99TDNiXJgg+l0qUfxHFec4rFXvSTAtzYPyAIeuwO4r5rJzyVFYexP4W2II= 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 1770940017357811.1907165175955; 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 1vqgO0-0004hj-Vt; Thu, 12 Feb 2026 18:46:17 -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-0004gS-F0 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 1vqgNw-0008BO-AV for qemu-devel@nongnu.org; Thu, 12 Feb 2026 18:46:14 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-824a3ba5222so224596b3a.2 for ; Thu, 12 Feb 2026 15:46:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Feb 2026 15:46:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770939971; x=1771544771; 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=JsSjHgAuxzH7z5UZfo3F29FRTsMy8IItwqoYG77XBoE=; b=Y0dXnkYZGeGu4oLZZEftJRpA5qqVcsECGTFzjSqnzWH1XPHOiX/G9f5jBBbio8hIuV lZJWs3ZAedv6G/7Qt6x+KZdfwxEt7U24FzgRyzLdUcNvG2rw1Oed/DwtXvB9NlGmCpTK t4yv15VgG3vV6ckpMJuuteL8g16oMjfzlbSAbhWVE1QBFk0UpBHp5Ggq7VFf6WSsFUqS wc9hyNNIa07CsMwsVAI8HcdUPcDmhNx8gI/nTWbTOqojtM3VgNxEV2Nk9pGcxcad2c/5 m2DI83d8EzGUulMdlHyQFLB/bNFueithqUOvQ0O882soIp/u8eaBaniJWRsLHK5bUwug gTqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770939971; x=1771544771; 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=JsSjHgAuxzH7z5UZfo3F29FRTsMy8IItwqoYG77XBoE=; b=hckB69QLTq8IVXfA3N3NgRV1enQ4qrLPRg/tGgm20ryvp/h0Wz+oybdK/m+SZogvFc wXzAvq8J7Z9Buyjr7PNobrBbrt7FeaOQBaaQ5Z7FdOK1R62lF284RVbd/mCpmFc4xZhd wigNeOy1cAaqlE2v5dSGjU7/BFiS8q51OS52mTB8uhS5R4HVXmQnQikiNyiUZ+jAKMfS 0WEMitJWPY6Q7qqRUVeRhZhOpYhLEG9V+hBrYhVcGAszdoQtyEfv37eThOna4ZwovKqu Umc/gFsIHqQIMJP/lcJJVZkVzQH+TcfZBKYs2BoRxI/ttnaqKenTVOVf3DE/98BPqLbG HrLw== X-Gm-Message-State: AOJu0Yw7Jq09rPFoaWa7WQy0nQUfDZ5jKVM1Hv0+SKenP70DXjbkrqvn sMvr58PkkamVZTZIvTGPFmRZJ+AjgMO6Khg8+Lt0HGkFfMLn+4HUL0wT69mwc9+OZTTnwc3Zatz 6V/3v X-Gm-Gg: AZuq6aIF/xeL0YY5gjnHlDKFYosOvSuQ5Mr+Ww7yGC/6yhCo4NRCqFAW0uTDtK5EauK s4ge7Ck6RJXfixRnK/HeTlAKFU8deFS6JAawxrapsk9TBJGt1PcqUhLXHIg/BqPghLEqNhxpPkn qTwYUtyKhDQZtw6NkDP5DcJgVHnMvWsIZzb19p2yiRB8U3+Rj901xh3TTtdk4Dap6ZPGJqFuNWw 8TT1GLn3YQsbHPAO8+K8JIind7MezoSzWMCNl4wt5GwgQd80v1ge/Ac8oa9qDiIHy8GK8X9GNJ/ GNogDUoEUhylX3nkU/lxc7cP9laaeCHDPcxQTxrizWOV1Uz7EBtef3tk1qhWLuolvFjW5SL6tDm IcIzfzmjdSQQxH0bxJB1UlcalCfHID4U04dc/RCM3nUDMYGwO+D8/udklQR3uQXT5/7zH7BUQXV my9Zi1HtYxcG5bgDvA8WAqXQqQ2UBtMNk1ZHqbDOIGd+OD9TDFmlam8YkKi3cg/xWosgaLE+evp Rb5 X-Received: by 2002:a05:6a20:2d21:b0:38e:9ebe:5267 with SMTP id adf61e73a8af0-394673315aemr444713637.57.1770939970664; Thu, 12 Feb 2026 15:46:10 -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 3/3] hw/virtio: remove virtio_access_is_big_endian Date: Thu, 12 Feb 2026 15:46:02 -0800 Message-ID: <20260212234602.338131-4-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=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: 1770940019813158500 Content-Type: text/plain; charset="utf-8" Thanks to previous refactoring, we can see more easily it is strictly equivalent to always call virtio_vdev_is_big_endian. static inline bool virtio_vdev_is_big_endian(VirtIODevice *vdev) { 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; } /* Devices conforming to VIRTIO 1.0 or later are always LE. */ return false; } The key is to understand that vdev->device_endian is initialized as expected. It always contains cpu endianness, and not device endianness, ignoring if device is legacy or not. By default, it's initialized to vdev->device_endian =3D virtio_default_endian(), which matches target default endianness. Then, on virtio_reset, it will be initialized with current_cpu endianness (if there is one current_cpu). void virtio_reset() { ... if (current_cpu) { /* Guest initiated reset */ vdev->device_endian =3D virtio_current_cpu_endian(); } else { /* System reset */ vdev->device_endian =3D virtio_default_endian(); } Now, we can see how existing virtio_access_is_big_endian is equivalent to virtio_vdev_is_big_endian. Let's break the existing function in its 3 variants, and compare that to virtio_vdev_is_big_endian. static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) - #if defined(LEGACY_VIRTIO_IS_BIENDIAN) return virtio_vdev_is_big_endian(vdev); This is the exact replacement we did, so equivalent. - #elif TARGET_BIG_ENDIAN if (virtio_vdev_is_modern(vdev)) { return false; } return true; we know target_is_big_endian(), so vdev->device_endian =3D=3D VIRTIO_DEVICE_ENDIAN_BIG. if (virtio_vdev_is_legacy(vdev)) { return VIRTIO_DEVICE_ENDIAN_BIG =3D=3D VIRTIO_DEVICE_ENDIAN_BIG; } return false; It's written in opposite style compared to existing code (if legacy vs if modern), but it's strictly equivalent. - #else return false; we know !target_is_big_endian(), so vdev->device_endian =3D=3D VIRTIO_DEVICE_ENDIAN_LITTLE. if virtio_vdev_is_legacy(vdev) { return VIRTIO_DEVICE_ENDIAN_LITTLE =3D=3D VIRTIO_DEVICE_ENDIAN_BIG; } return false; So it always return false, as expected. Signed-off-by: Pierrick Bouvier Acked-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/virtio/virtio-access.h | 42 +++++++++---------------------- hw/virtio/virtio.c | 4 +-- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 0c5514178e4..506be642c9f 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -21,27 +21,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" =20 -#if defined(TARGET_PPC64) || defined(TARGET_ARM) -#define LEGACY_VIRTIO_IS_BIENDIAN 1 -#endif - -static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) -{ -#if defined(LEGACY_VIRTIO_IS_BIENDIAN) - return virtio_vdev_is_big_endian(vdev); -#elif TARGET_BIG_ENDIAN - if (virtio_vdev_is_modern(vdev)) { - return false; - } - return true; -#else - return false; -#endif -} - static inline void virtio_stw_p(VirtIODevice *vdev, void *ptr, uint16_t v) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { stw_be_p(ptr, v); } else { stw_le_p(ptr, v); @@ -50,7 +32,7 @@ static inline void virtio_stw_p(VirtIODevice *vdev, void = *ptr, uint16_t v) =20 static inline void virtio_stl_p(VirtIODevice *vdev, void *ptr, uint32_t v) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { stl_be_p(ptr, v); } else { stl_le_p(ptr, v); @@ -59,7 +41,7 @@ static inline void virtio_stl_p(VirtIODevice *vdev, void = *ptr, uint32_t v) =20 static inline void virtio_stq_p(VirtIODevice *vdev, void *ptr, uint64_t v) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { stq_be_p(ptr, v); } else { stq_le_p(ptr, v); @@ -68,7 +50,7 @@ static inline void virtio_stq_p(VirtIODevice *vdev, void = *ptr, uint64_t v) =20 static inline int virtio_lduw_p(VirtIODevice *vdev, const void *ptr) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { return lduw_be_p(ptr); } else { return lduw_le_p(ptr); @@ -77,7 +59,7 @@ static inline int virtio_lduw_p(VirtIODevice *vdev, const= void *ptr) =20 static inline int virtio_ldl_p(VirtIODevice *vdev, const void *ptr) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { return ldl_be_p(ptr); } else { return ldl_le_p(ptr); @@ -86,7 +68,7 @@ static inline int virtio_ldl_p(VirtIODevice *vdev, const = void *ptr) =20 static inline uint64_t virtio_ldq_p(VirtIODevice *vdev, const void *ptr) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { return ldq_be_p(ptr); } else { return ldq_le_p(ptr); @@ -96,9 +78,9 @@ static inline uint64_t virtio_ldq_p(VirtIODevice *vdev, c= onst void *ptr) static inline uint16_t virtio_tswap16(VirtIODevice *vdev, uint16_t s) { #if HOST_BIG_ENDIAN - return virtio_access_is_big_endian(vdev) ? s : bswap16(s); + return virtio_vdev_is_big_endian(vdev) ? s : bswap16(s); #else - return virtio_access_is_big_endian(vdev) ? bswap16(s) : s; + return virtio_vdev_is_big_endian(vdev) ? bswap16(s) : s; #endif } =20 @@ -110,9 +92,9 @@ static inline void virtio_tswap16s(VirtIODevice *vdev, u= int16_t *s) static inline uint32_t virtio_tswap32(VirtIODevice *vdev, uint32_t s) { #if HOST_BIG_ENDIAN - return virtio_access_is_big_endian(vdev) ? s : bswap32(s); + return virtio_vdev_is_big_endian(vdev) ? s : bswap32(s); #else - return virtio_access_is_big_endian(vdev) ? bswap32(s) : s; + return virtio_vdev_is_big_endian(vdev) ? bswap32(s) : s; #endif } =20 @@ -124,9 +106,9 @@ static inline void virtio_tswap32s(VirtIODevice *vdev, = uint32_t *s) static inline uint64_t virtio_tswap64(VirtIODevice *vdev, uint64_t s) { #if HOST_BIG_ENDIAN - return virtio_access_is_big_endian(vdev) ? s : bswap64(s); + return virtio_vdev_is_big_endian(vdev) ? s : bswap64(s); #else - return virtio_access_is_big_endian(vdev) ? bswap64(s) : s; + return virtio_vdev_is_big_endian(vdev) ? bswap64(s) : s; #endif } =20 diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index b0987e66d5b..2ae238001dc 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -222,7 +222,7 @@ static inline uint16_t virtio_lduw_phys_cached(VirtIODe= vice *vdev, MemoryRegionCache *cache, hwaddr pa) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { return lduw_be_phys_cached(cache, pa); } return lduw_le_phys_cached(cache, pa); @@ -232,7 +232,7 @@ static inline void virtio_stw_phys_cached(VirtIODevice = *vdev, MemoryRegionCache *cache, hwaddr pa, uint16_t value) { - if (virtio_access_is_big_endian(vdev)) { + if (virtio_vdev_is_big_endian(vdev)) { stw_be_phys_cached(cache, pa, value); } else { stw_le_phys_cached(cache, pa, value); --=20 2.47.3