From nobody Sat Feb 7 05:52:28 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=1770416471; cv=none; d=zohomail.com; s=zohoarc; b=ZukUtBUEnAXcdld5BINTqYn+84dzE3q+aTOMKsCen1l171OsClcNg9uAbXZVl6Hk/kqZWRsunFsAMUb/U+QteVpblAIJiNHjXXKDU/9UqdKCnRzaDhH38h9tlSR1ySLQuv1Y7I1OMGrSLvYdEasCZCjbYgTdBDGh679DnGYfn98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416471; 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=w7ciAN7O7/i54gZ3kSipLEjZsOBJSGqwrAABTmho6QI=; b=DnCuiixTr6WlCYSsRFudmmnJJzHmfn8YP9WHFCw/ZmvEAzr8wpgiKL5xlHzZVgwwFCCHi+ma6inrlGJZppwa8r8uciQR8Uw/Hh89b9JqI6blQLQvo2yjyFCSeHnzy850Sa7tj4IDW7qay9CGv+22oUK0UkeBcduFKhBZNORmr9Q= 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 177041647130633.861943483251025; Fri, 6 Feb 2026 14:21:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAd-00063m-1u; Fri, 06 Feb 2026 17:19:23 -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 1voUAb-000629-A0 for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:21 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAY-000792-HI for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:20 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2a9057b2ec3so13062605ad.2 for ; Fri, 06 Feb 2026 14:19:18 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416357; x=1771021157; 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=w7ciAN7O7/i54gZ3kSipLEjZsOBJSGqwrAABTmho6QI=; b=vRITGetwvsvOWyu1Sejd9qB15lXkItTD8py78Z6t20sTJXGGWTCBDnejGwzvbxbA/0 j4mRr0sfudU12AMo3JTpolu0GaCFDPazh+i0Oe1Hcexn0YxT+rrm6CkuVL3DKVNyQFHr cU0IK7tEcYJEp8PZ74Dq9CK6txFC9dKz0PY/eh3cnkiDG78i/J3xhGJ2JBD64yxYJHvF OT6MM9Lt6EWa9gSC290m6cf31ucGKpfxJXSxmKtAkRR9THhdxk+AOAvDWmHZsxRd1gvf pIHhZubBRZipuW+75iH+sZqqB5hgJh6QSnNMRK7vLuFf6VoiweRlrFStzPWDV4eL80Eq ISNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416357; x=1771021157; 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=w7ciAN7O7/i54gZ3kSipLEjZsOBJSGqwrAABTmho6QI=; b=ZEPZmsdXculVaSOyMaLgwqw7u8qpHdFmNa9wHkk0Em33/c2SjDWEM0HjGBMHkl0fuA n1b7PWwbm72/3sQyNikVr80JgH1vS0WAN+743JzAwhKk0Mh2u0ukmW2k/fd9YZc7lBcc J/7FR37oKEEE4FW3MAvHN8lB35xgMZ5OQOci3XkOQFCxr55lPCb08VXB6eEpkWZRNUmC 9j31kUKao0OtMXLeJVRAYEdh/e88hbsYwv/7kqhYObnSNbTt16jxBs+pSh6GCgrULTN8 bgt+zIvKyC6fjVXB28VYSXmzAZqqdMMBThUcF9fYnEun4/iZn3udoYEL133poHSY03vX i/BA== X-Gm-Message-State: AOJu0YxqRYoLNpx3q25GqppEnCKuvcA5uaDy7MjKuSKIgbqSKPd7/8af elh/IILTW/rT4elM+t3eD0Ex+vv0kQpiqnkA+Dzaq8NA3nMiepm6XcZrnkyV/MSMhzX5KLNFfzb XuQpM X-Gm-Gg: AZuq6aJEatl/T9UmEvv/tKFtsr2bYZ7i1v+GiKkIxrQaGP7m8WntYXk+iL58Fr/eKiR KfmzsyJPbVjUv+G0THr/fKdrdx/dlb1nnkrw+rFnYl0/GFx8ILTo1FO9V/Kdwc/40WUiToA+pvs 5/3VKVjNt1HUC1EG+ORSPZOF13dXiZSx/fLIdKHc48GQdBz+mAMnl6NaoH8OHw8sttOkt+ltSPY YUCH3jlqblO+HJLhEKLpSi1xm6Kiq1WMlCBIOxIO0kShNQjxwc7ZDag/8Lx7C/egB5RL4ThGZxl AQvswPG5snO2wq2kTpMOZ5Wmyyh1TYk9t3cHHub836EtskHcmXk7ds71KZdTwxn/2wU+Q/lPp4y 9Nhc1RoVJkLOgDCX12kTc457jxYFbqlvBETCdRRAIyNrzqqO4nRCNSpm7xX3v+nRIpw8i256KHe MY5vfveMwI+8+ycEuLl51duEWB7r2h6mCVv7SZdBtG5diJc4k4JAVGhJxfzuK8aVInwNJEahkfE Ss= X-Received: by 2002:a17:903:17c7:b0:2a9:62ce:1c15 with SMTP id d9443c01a7336-2a962ce20bcmr2663755ad.0.1770416356770; Fri, 06 Feb 2026 14:19:16 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 1/9] hw/virtio: Constify virtio_is_big_endian() argument Date: Fri, 6 Feb 2026 14:19:00 -0800 Message-ID: <20260206221908.1451528-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::630; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x630.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: 1770416473804154100 From: Philippe Mathieu-Daud=C3=A9 VirtIODevice argument is accessed read-only, make it const. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 27cd98d2fe1..65872f2c54c 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -468,7 +468,7 @@ static inline bool virtio_host_has_feature(VirtIODevice= *vdev, return virtio_has_feature(vdev->host_features, fbit); } =20 -static inline bool virtio_is_big_endian(VirtIODevice *vdev) +static inline bool virtio_is_big_endian(const VirtIODevice *vdev) { if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { assert(vdev->device_endian !=3D VIRTIO_DEVICE_ENDIAN_UNKNOWN); --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416411; cv=none; d=zohomail.com; s=zohoarc; b=CKjkXrODKTBlj2uWa/sQRXP0tXm8nV8jawyNEeMz5q1RpCo+CzjONH7i7avOJ4X/D3igsLjyr0wY6s+twMEI53SonFPy9DiCEEmjgj4cepdC/HwFRB/6EdFzEMvuFOteQzlGrsrvnDaZZn6VJF3Wte3iYS+VGu9Fwcqn96/G5D0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416411; 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=BDVf0HcSlG+DZgs/i7+uJFbsNebFbALD/dqSu3oQmMY=; b=e436EpvFjwKMsWdOxSyDrI3X9w0XAcoE5qX+fYXPEhz3Ch+rsnDm7HdfZUAAesNaZ7mLQFIGvOjgyM5+6WMRBetU+mbx+stIljw6UR21q6btSCpq2VVTDm02AQ4KN6le6WcWXB4UhSIlit8KRHuRQ/ktcojZf8eS+pDWApl8u5U= 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 1770416411487269.09230263578195; Fri, 6 Feb 2026 14:20:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAc-00063C-G8; Fri, 06 Feb 2026 17:19:22 -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 1voUAb-00062C-Ao for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:21 -0500 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAZ-00079A-IG for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:21 -0500 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-c6c444e89bcso933519a12.2 for ; Fri, 06 Feb 2026 14:19:18 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416357; x=1771021157; 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=BDVf0HcSlG+DZgs/i7+uJFbsNebFbALD/dqSu3oQmMY=; b=Trosb6454QyhFg1H2TJuX6LgGDSX76J60tXs5ti45lqSbIuXqLFzhq5hrTnTlSC34m 1RA3J+uA1lyjypwu1ts83Flpcf+jxFk1H1DylLKAZ86GJ7/xGX/IKpGliPk4aoMlcVkz lOzP5lifOgG3j6gX+U6cSx2sYBlQ8ANJzWIzX3mslNpGaw1KUzxXN2bcLKaqvHVDVgTm L1EFkdFCM6UogFsI5MqcXiIxKJIK7dChIebd7Jb0fXKE5dzTlyQNZnnfxaZ2oBqrTOPA SRxq6VKOfLYzQjhvGnvTLLHUcF8FPzkK/rAVzkmc8wSRM6Yw/bvCG6GvY9UT0ZHjFG7e 7Uzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416358; x=1771021158; 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=BDVf0HcSlG+DZgs/i7+uJFbsNebFbALD/dqSu3oQmMY=; b=bpFifCF28HjOMc/of3w72LEMl0g7ipG1mUx5hq8Km2cORTldya4N8vW0usLEOEfrUr 2djIhgZ4UIRR0kOlFkggZ1TMEN5wo1PlYxuWJXQZ0IwVAjcv2LTsjd6yShGFMYEXE8nf r5aZ9XMClpdJvjR9Ahd+Im9bsk+DVoOXVMWR4qhRw7F/FoUopq3O3ZovOpPPULNqqQ1A qZX5PwA35BfjE8Fr4pv3r4Fvj3o4S6OYZ866mVCgp36TyXCOglUI/JAcjjfvU6Gc1Lpq u+sM64i63O2n6X580W1kNo0iv5haCu+Ez2WKwShu0PTY1g41h73TW+mwzZdxjCQ3QdaR uUcw== X-Gm-Message-State: AOJu0YyrLhoeSijPbZA9M2QniqxopJIbvmbr4TPfe+6HddCRnQJoktXb qH6W5PmQypIOOJkZxPw7RUS5iiW4duT426M8bPHfVQnMzZRt6BYQLj7ysGCLyAMsqNkIltudVJG inzPo X-Gm-Gg: AZuq6aJNZ9JRAf7aEa7fqtwfdvYksR9n97sCEl+v83lOSVpU3dA9+qn/ax7Rr/M2+D8 IQ5g1vj8QrWK6POoO7v5ypDFwNd+84bk9ZIJBEeD1KXBXmvK2/mUeVDeEHUDd0Rwg3/ZG/jyqU8 t8DYzXnrRLeqrKPbxcbzgtMHQNFVOXK7VQWW7OY7f3quqJYX0Ss5r5p0Jp5VeeBQndgDdRlkV/8 ekIBpiwjAlzaCKQEwQnEy8/eNfzle/02ncFXL4PFbB0dqpfSJwFZNSFDByQOFaA9O3m4dvquIqY 8RQLNzoaUs8OuPAiVhzyyDzkbTT0kVnMwKQV9rSPp/U4nHcUVkwKEO3MCAoGjIr+sKgTp5xbhOR 6981+aNt1kmkB36p2XZa8hcz3EiPgD/qT6g0/NzwTRnPn6TQz7W8qi6m5/3ygWG7WWo9YZ/Iefr olzyW8LbU7ZcG/LE/OvTlxRveybBThEpzRsLyaX/lC88XIbMzEUOLeAe6QlESKU72iNSaYCiDh5 w+b X-Received: by 2002:a17:903:298b:b0:2a9:484c:ff21 with SMTP id d9443c01a7336-2a951666249mr45795875ad.25.1770416357498; Fri, 06 Feb 2026 14:19:17 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 2/9] hw/virtio: Introduce VirtIODevice::access_is_big_endian boolean field Date: Fri, 6 Feb 2026 14:19:01 -0800 Message-ID: <20260206221908.1451528-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::52a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x52a.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: 1770416412967158500 From: Philippe Mathieu-Daud=C3=A9 VirtIODevice::access_is_big_endian boolean field, initialized on device realize, and updated when setting device features. This happens on reset or when configuring device after initial realize. It represents whether load/store accesses are ordered using big endianness. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio.h | 5 +++++ hw/virtio/virtio.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 65872f2c54c..0f792e24f23 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -154,6 +154,11 @@ struct VirtIODevice VMChangeStateEntry *vmstate; char *bus_name; uint8_t device_endian; + /** + * @access_is_big_endian: whether load/store memory accesses are order= ed + * using big endianness. + */ + bool access_is_big_endian; /** * @user_guest_notifier_mask: gate usage of ->guest_notifier_mask() ca= llback. * This is used to suppress the masking of guest updates for diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 77ca54e5206..a429ff7de39 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -3154,6 +3154,10 @@ static int virtio_set_features_nocheck(VirtIODevice = *vdev, const uint64_t *val) } =20 virtio_features_copy(vdev->guest_features_ex, tmp); + if (!bad) { + /* set_features might enable VIRTIO_F_VERSION_1 */ + vdev->access_is_big_endian =3D virtio_access_is_big_endian(vdev); + } return bad ? -1 : 0; } =20 @@ -4075,6 +4079,7 @@ static void virtio_device_realize(DeviceState *dev, E= rror **errp) vdev->listener.commit =3D virtio_memory_listener_commit; vdev->listener.name =3D "virtio"; memory_listener_register(&vdev->listener, vdev->dma_as); + vdev->access_is_big_endian =3D virtio_access_is_big_endian(vdev); } =20 static void virtio_device_unrealize(DeviceState *dev) --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416390; cv=none; d=zohomail.com; s=zohoarc; b=fvcD9FosybYy7kLj3rOVsTIRLPZdMAqQH44Dw9qr4AzU7diZbIQsFxXY8CXHoxDicIZNB2hbQS/m78ZQ+yyYgJIusWtuKyKhKyY/3Qkb0vj2PvEHOMhFkMnev6HrsIVwQumEFPBjdrLoT+W81lXp298BjYolL9WR2844soyZ2eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416390; 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=klAu5HgA/rCTewGXJZJRvxMK6aIVCdRxxwUdqNQ0dtE=; b=kF8msAQa5iDhPiHlVlD6KXzTOHnMinNr1HWBXr2Gf2TOzBQDQGATKmofm7+SCNOVOpESEGQ1zVLqsQB69TISllG0PLhudIr3U/9sYzI1S0vSOgSAZavjwFJbu2u88ISNgDpNH7pWlMoMVFBU/lbSg2KbCeFD3xl/ebi+LuX0dSU= 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 1770416390187945.4230254766139; Fri, 6 Feb 2026 14:19:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAe-000652-Km; Fri, 06 Feb 2026 17:19:24 -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 1voUAc-00063D-Bp for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:22 -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 1voUAZ-00079H-KJ for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:22 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-81e821c3d4eso2283979b3a.3 for ; Fri, 06 Feb 2026 14:19:19 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416358; x=1771021158; 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=klAu5HgA/rCTewGXJZJRvxMK6aIVCdRxxwUdqNQ0dtE=; b=C0VAa9wfAAewNwxVtUayjl1Xo0LCcUgJw0bGDXuw6YZWC1SIxMSDiNbA31gV/yCgi0 0v9ORdxtkqzZBFU6yHdqH4bw+K0c2iz7TMukQGAA6wzmILS7lNK2IoIccgfoCjg9bHVf HgTg4svBTIy3rMk0IwahYR38co4TyGM/rE0MXQx5RzeXBeT8ySSOpUhzmsnlbpzX3d0o VIg5/W4BxS1rtNDLRGjWZL5iTiPX9IDFGeJ7OjVGNkqvxdeZuFsjt2zQ9QVaoPhlFm0k 4kzZNJFr73lKgBKgSlk7PVPpbzwEfGR+Gz5MNpaQE0w7LIf3b9R2kGC4RtM+jNBXrMJZ ZCdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416358; x=1771021158; 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=klAu5HgA/rCTewGXJZJRvxMK6aIVCdRxxwUdqNQ0dtE=; b=skwoUouzljRgqQnxwTzSvgooTRMCQV1f+xwlLonqfXXUdt5qNxpa55Qq1Nz8MdP1JJ PRDMQ9nrYK2jlROLXtyLv4AxwFcblt7J1hq5kfFuIi0h6PIGhtR7yiC80EwmLplf0aq3 ZN7pnTsYvfhdRZyc/V1MBx5honOyFuSFrXIbtb7DsIugWb13BnznaYURxmhgU6Y4XfI5 gApajV3/di8RaHFhWPbAaUR1sEIehPjF+j9GzQ/UBOOfKSRU/LgPMf+yuNrpRiwHPcTQ emDgcMVsZ2pYBSnVIN5jdg5E72bwkUI/7/w4zTKXSFPZKG4WPJi6CybydWIaDWYGooxg qBgg== X-Gm-Message-State: AOJu0YyWrGCf/P2NYBFlDMjVgNzAzusVtpfCnrvcI3E9tHmwYxHGo9f/ ddOvUW3ayRjJs0xAv+J6C1i8cGqrBSbvMugCoNkiLCH05j32KybbpYd08SK1dHdyZA9oNQGobkB zM8E0 X-Gm-Gg: AZuq6aIaQ9RfDb5/qXZScYqOkTzqHxLgyxtIcPA6MnU202Nxy16Uqrk1vKOv9w2MRow W2wmZ8s+W/MBc/2BIaeat6xv1R1qnTtYcnP0i7LQZbwTa0TZWPrG8ba/86qeGZE6NimdSyUyf9n oa2/t5s4U0wRiZfiyCBKLZczT85qMiqClwD476YW8nNkxEhaU1GwZX68v+qznvqbgZ30n0pfw7a CRMJaiTt9ZP8xUod1qP19TMnDu5tX+amdLNzeoGnUhA7urHQh+TunaI6q5whYJezOzdgeDMEPir 0h9DyIszeoeFP394TSer2hlsaj5AW6ZatOjDjRGZETQbSQ7xgjMDQ8Yiqa/9nX4w8WcUEuL3tnr nuDGUGc2TdEZEyMaPCn/A1KEwTMF7uqbzOZ1PVbkQO1hk/QsvdmyF+6/Z47upHHqPni5urE+fvj TQ3suQq0ArVXU75ugDIui/Vp5gdGfTKpfX7/wZH0uMvVw6ryHlTmIIxC7khwjNLGOf X-Received: by 2002:a05:6300:618d:b0:384:d0fc:f51b with SMTP id adf61e73a8af0-393ad41a505mr4150791637.80.1770416358230; Fri, 06 Feb 2026 14:19:18 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 3/9] hw/virtio: Use VirtIODevice::access_is_big_endian field Date: Fri, 6 Feb 2026 14:19:02 -0800 Message-ID: <20260206221908.1451528-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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: 1770416393512154100 From: Philippe Mathieu-Daud=C3=A9 Endianness access is constant between device resets. Use the field instead of calling the same function. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio-access.h | 24 ++++++++++++------------ hw/virtio/virtio.c | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index cd17d0c87eb..f3b4d0075b5 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -42,7 +42,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevi= ce *vdev) =20 static inline void virtio_stw_p(VirtIODevice *vdev, void *ptr, uint16_t v) { - if (virtio_access_is_big_endian(vdev)) { + if (vdev->access_is_big_endian) { stw_be_p(ptr, v); } else { stw_le_p(ptr, v); @@ -51,7 +51,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 (vdev->access_is_big_endian) { stl_be_p(ptr, v); } else { stl_le_p(ptr, v); @@ -60,7 +60,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 (vdev->access_is_big_endian) { stq_be_p(ptr, v); } else { stq_le_p(ptr, v); @@ -69,7 +69,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 (vdev->access_is_big_endian) { return lduw_be_p(ptr); } else { return lduw_le_p(ptr); @@ -78,7 +78,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 (vdev->access_is_big_endian) { return ldl_be_p(ptr); } else { return ldl_le_p(ptr); @@ -87,7 +87,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 (vdev->access_is_big_endian) { return ldq_be_p(ptr); } else { return ldq_le_p(ptr); @@ -97,9 +97,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 vdev->access_is_big_endian ? s : bswap16(s); #else - return virtio_access_is_big_endian(vdev) ? bswap16(s) : s; + return vdev->access_is_big_endian ? bswap16(s) : s; #endif } =20 @@ -111,9 +111,9 @@ static inline void virtio_tswap16s(VirtIODevice *vdev, = uint16_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 vdev->access_is_big_endian ? s : bswap32(s); #else - return virtio_access_is_big_endian(vdev) ? bswap32(s) : s; + return vdev->access_is_big_endian ? bswap32(s) : s; #endif } =20 @@ -125,9 +125,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 vdev->access_is_big_endian ? s : bswap64(s); #else - return virtio_access_is_big_endian(vdev) ? bswap64(s) : s; + return vdev->access_is_big_endian ? bswap64(s) : s; #endif } =20 diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index a429ff7de39..c92a70a41c7 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 (vdev->access_is_big_endian) { 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 (vdev->access_is_big_endian) { stw_be_phys_cached(cache, pa, value); } else { stw_le_phys_cached(cache, pa, value); --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416460; cv=none; d=zohomail.com; s=zohoarc; b=bl7BidjA5G/pIsDV+S85fb1pJBZS8CQrjmvTxElZ0MkLryFdJAUPUina4Kn2ooRHm8TPKU+PUO8rqvrwFyXRsKBPBpvLXgyBqtl0B/POGAsI5ebPDu+yDL0cHR1pcuVdXJ7Xj7IRlZ5VTfuqinGEnFsSELqV3kQxDv9l6vOx77U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416460; 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=YiECesYJ3egJUoiGbW69hBkBfEtGoUsIdKpeOrRz1rs=; b=iPcOB+rufy0FbPB0AxVk6DlpnBVms4zbrmszg3ywLJ9O0SIPSwPkyr63uk3vZAmlvr+vpFfYViEGhfGTqxqzZHz4PnTx4+6LdfasY7YczeW6Uupm5i3AAD4ZiAVLeNJF41liKQmJVwGBzEyOfLSl4BWZKUZJz4yXadKXGLLosRk= 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 1770416460234529.1531631105707; Fri, 6 Feb 2026 14:21:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAd-00064D-Pw; Fri, 06 Feb 2026 17:19:23 -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 1voUAc-00063B-B1 for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:22 -0500 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAa-00079f-G7 for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:22 -0500 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c61343f82d7so418685a12.1 for ; Fri, 06 Feb 2026 14:19:20 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416359; x=1771021159; 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=YiECesYJ3egJUoiGbW69hBkBfEtGoUsIdKpeOrRz1rs=; b=F5cf2y5JxyliUI0spKeAp3ItlpoeXmRmB2bWK3m5USGhc3ZVFO1iZ0vljBkN6lXXYv Nt8CCPQPvw3EuiPiljKtjuyWwN9dJrgYcPhZFTHsOAVEYk6JXbPnRSlbpvdWxxweodNl jry+4PWKXvK+VJ5YrhzA0D0xbkgnyr3ES0X4RpW8jPOCCTxsB8A9lLyNd6q8HuXkfAV4 WvTrgar8422zx244UTE3cra/ypSIAcTwJ6rXINe3lkhKJWsTTLmkPACH8JSVNLNhwIUp 01Gjzrgo66sl/m+hVVNlwnP6+38fUfMCRRqnz2xHCQvqOazfz/yHIBPOQxdGlPhsOWht KC5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416359; x=1771021159; 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=YiECesYJ3egJUoiGbW69hBkBfEtGoUsIdKpeOrRz1rs=; b=GtXk7pPOHTFLB/SK3q/H8/5fFUza+7wIDzw+5WjNz90x7/R1FmcpOtpL3I1uMKy+fw A0STKbV4imvhhYnzwNhn0CJ/OEqFcWmxyFfw60qHECfE3JXfh42FBZRp1TZDqKsqLdNe l3jpQXy7WQaPSO/eBVoMGio0rmODE4pdwbk3OKMB/7jrzBDe+0epY1z/9CUxQ39eTKn9 gU4OY4m5tOjqOqQuaRlkvuCmJFL/A6xSEftTNfLZWmdqVbtZcCShy0vwuHeMlxOEbF/U E9CeACN8T5TAg74UkwwPaA09f+n5FMQzAlGNe7rXkbfoML8GmGsTzK9LEMwUoQl35KKb +/Tg== X-Gm-Message-State: AOJu0YzVm1T9pQdQugmOsQp/4uer/ioybAPy2KnGxzzqtWMF3lAY0rck lHMKfKz0CfsAblOG8JgEwqmy4uxQCezv/MtOGgfpN1TTPdavrDJCiNIvlZU0GR8yg6MqX/pacYO cifrd X-Gm-Gg: AZuq6aKpcWNTTktcf5TR0PD0BzuucQSotmInUfp8A1qc8x3LDqfJDR0NxJGVkcCF19s 0eENOaI5hQZHuNLGvPKtrz1JJYycNO29CArL90OeDxoIeRkhLkmhTkhFsxoZG5LMy034r6r1vIf rM1ljCON8ONSGhJuwtHwyAer3vFXAUA9sIvSBwrxttjXDeowbPsH/siJAdyz205uRCn1Hey4rZB rU+bIjvvME22qFtAKx+zg5vESfv9QrhXLkqvZXMAn2DsWFtCtKVqIPhE7TAUmv/cz6wDSLgUCTU bsTzqRI4ZTHlSNNZuBfJ7FFbGN+b0obY9Lcm0WMnnpmQej/9N+Bzs6LtGS7+exKV8IzT4fOPfgs VzfJUVgZNJAtATCAcoEbVe4dLqWQOP3FcZ9c1m/yZ9CRHSt1vKJPiZ2+BTrYt8qvvaPNtUCdUOZ qZ5o3Cw/q81e6TIH1LfnFtl7Hzs94p8InP0wBkmLO6loKgcvqHEgs7OFFdBJJJHKOMEclEYtVYk X8= X-Received: by 2002:a17:902:e842:b0:2a7:7e00:6a96 with SMTP id d9443c01a7336-2a95165b8c5mr50467675ad.25.1770416358967; Fri, 06 Feb 2026 14:19:18 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 4/9] include/hw/virtio/virtio-access.h: remove target specifics define Date: Fri, 6 Feb 2026 14:19:03 -0800 Message-ID: <20260206221908.1451528-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::534; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x534.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: 1770416461115158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio-access.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index f3b4d0075b5..1bea3445979 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -17,27 +17,27 @@ #define QEMU_VIRTIO_ACCESS_H =20 #include "exec/hwaddr.h" +#include "qemu/target-info.h" #include "system/memory_cached.h" #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_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. */ - return false; + if (target_ppc64() || target_base_arm()) { + return virtio_is_big_endian(vdev); } - return true; -#else + + if (target_big_endian()) { + if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { + /* Devices conforming to VIRTIO 1.0 or later are always LE. */ + return false; + } else { + return true; + } + } + return false; -#endif } =20 static inline void virtio_stw_p(VirtIODevice *vdev, void *ptr, uint16_t v) --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416468; cv=none; d=zohomail.com; s=zohoarc; b=KNMprhvJymhkDbuY0dSFZWYztTL0OQOaHOl7Jc8yjP8oW1mJd8p7Rphwrs647WA8aWsnZqz8+U8Xl2zrhG4q7t863TxTrMfXqtpDqHc+fLIRRlV2x5Aklg2uDX6h533E/ngYwpMmBc3iJo3vGrbmKJCgHYLSWn9jJ+1ddjmWdvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416468; 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=4/nPjF8I/jK1WRoDGu+6dSuf4liZEvyFrUCZ7ZeWLxs=; b=hn+rX3Gjjf6URh5kALM/7cD350FbWdwm8xZPFyKbzM+7qV9ECPeuCMDg4kicNBLInbV1zMHmXE4QI9zdd2dSvuxIO3gKnukF6gWAJuUdQIuaaQ4Qjpawy9aMy5w64/Dt8+5cG7fPRfWwjopbZJpXgHfSJKQAERVWbnBUsLbQ76k= 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 1770416468063735.8398799590145; Fri, 6 Feb 2026 14:21:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAg-00067h-S2; Fri, 06 Feb 2026 17:19:26 -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 1voUAd-000649-KG for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:23 -0500 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAb-0007Au-8G for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:23 -0500 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-c626bd75628so841859a12.3 for ; Fri, 06 Feb 2026 14:19:20 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416360; x=1771021160; 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=4/nPjF8I/jK1WRoDGu+6dSuf4liZEvyFrUCZ7ZeWLxs=; b=hf6o/S+M6gKaTmd519kaqg61zRAIHKAFXNqzPN0NiTNiKiOoj+3VJSIOtNpyBAorrY DwpAmyu0CgPtXiQlfIM/x2xQfF3GzCDdHrSHewGpfhfqH16hGxDSS4uK8KkdjKR0DXIh vCaAtb6MHhRwgAsBisHdND0TGW0UyDUpnkDx13u4zt1d0eI17qE5f9N4eIOEJLFJwWnz TGOsdoJc7xnKSupjnAHQk8PvvIFtPc4vwV3sX9ysY0R5cYaqqezBSDYBSa3rWmP3VQwz 6Av+o+wvATb2xpCxjF1481A6bM4IjA2QIO4YQAMgn3Zquh7W5eV4+5ts3RYfwKPDKJBt 9QPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416360; x=1771021160; 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=4/nPjF8I/jK1WRoDGu+6dSuf4liZEvyFrUCZ7ZeWLxs=; b=H2BJALUILxzKuZ0PseW3EAAelbFVAYP033Yq4MQUcfg9bVQ0XqSeqFS98UFTbhT5zn 2SekpSoIaZF5oEocX3a8mQ2e7SDjGACHN1dtgIi7/T4u7aTUklMd9USirJT4ZRK0Sy3Q dIZwoGP1IMRd7lfso/O7ZR2CQJEQ4xOuGbc2rDzv1Blt/oCZJ/zf4G0AMXkB4jK4If/I PS1P2vLfgAuDTHr9zBKq0dqOksROTrhG6JzS/ToDBhBtdHTLpNa0OB5crolhK6XGAbIU Fn0iRp7UonJZFXZg5cscPtIB9B5WGLEqcmLKlBKz77yHwdTNTctdN34JljV5UaNIXXB3 2hqg== X-Gm-Message-State: AOJu0YzaRiBWzaq/Y0I3oELhjh9JiQiYm4PW9ltfLQQwOP4wzR1LPbFW CjP208C/VtWGEitlf319SMdd5bMQXOcLi+eKitYky4oPy47oZ6Q8/XBfCfp2AZdHa3gfrEeHffC CnGK0 X-Gm-Gg: AZuq6aKfvmMPAaUJ7ovr2LhpCOfBeO9IAS3Hqgy/eeqb8u9742vo1VuSwU8mOW88x1v CWJvjYW1S/5pN9V/qwYdpEfw4/ZZ+qNABt1xnz71QyBCcuRXYm6v0F3qF/obetNQ0gcJi4ffIn4 eHuFhIud2AVuE56EaATID5pzX/ZerE4irIu4B+BXxSXB2uETKH1agMBJ+1hQX4GDiUkYpuqxNjc CRnnT4QxJCqFrcRzcuzATtXaxWURTbwEGfWRPCmDq1DNqDlid7RD0/SOhR2XWmH20I10KQwlLu2 LcwPGZ/9H5vcHLUVZS9ceGtPCYhYkeXKJXoCMx5oQZ7TrxJpKzdYNt7/8dIKnsj4cCHogtskrqi gD/fbB0iKO3wZP8OTnUjG3syZjwbEsfMNs+cg/bEE09OZ+8Ol+iDyeH0wBXxulM+nHOchk+S+ni 5kVmvO4NfSgOgIJmLBlq8KIuPRWxFoPSHZQLYYLXicxp9iZu6ycAYdMl65DEOJESWy X-Received: by 2002:a17:902:e541:b0:2a0:d629:903f with SMTP id d9443c01a7336-2a951607922mr39370405ad.9.1770416359667; Fri, 06 Feb 2026 14:19:19 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 5/9] include/hw/virtio/virtio-access.h: simplify virtio_access_is_big_endian Date: Fri, 6 Feb 2026 14:19:04 -0800 Message-ID: <20260206221908.1451528-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::533; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x533.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: 1770416469842154100 Content-Type: text/plain; charset="utf-8" virtio_is_big_endian already checks for VIRTIO_F_VERSION_1 feature, so this is redundant with big_endian_code. Also, clarify why we explicitly check for ppc64 and arm arch. Signed-off-by: Pierrick Bouvier --- include/hw/virtio/virtio-access.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-a= ccess.h index 1bea3445979..9aed3d1da4f 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -22,21 +22,16 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" =20 +static inline bool legacy_virtio_is_biendian(void) +{ + return target_ppc64() || target_base_arm(); +} + static inline bool virtio_access_is_big_endian(VirtIODevice *vdev) { - if (target_ppc64() || target_base_arm()) { + if (target_big_endian() || legacy_virtio_is_biendian()) { return virtio_is_big_endian(vdev); } - - if (target_big_endian()) { - if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { - /* Devices conforming to VIRTIO 1.0 or later are always LE. */ - return false; - } else { - return true; - } - } - return false; } =20 --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416421; cv=none; d=zohomail.com; s=zohoarc; b=P4M75zUivJUUPM7XAvhXq5/WPVPcuqJh/8c9WgWQAqATRu7wsHT4ThxPNoPKGTp4LmG5PyWiRMNwg7+j49vy7YKm/JX5+S0r3FRIpGrXT3rmBvZ8VItIelfz6JqtAmfc11aA6AQfhhEAM8DtQLpJQQYxspKswb4M1Qqm7NQSnBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416421; 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=FKrFbIzO+OqhM9EqMf1DvtMtDYxv5MFzwPEplnrkp6c=; b=OjO71NoQ2NGXD0jOixBExf/gxzzL3PGC31DxMFmW+91lkSEClQ1AC22+CEi2zsXnElm/7sNCXdTByt27fH/ZYeI8zNzK8ERu3659UfL5ySk+VZ2tzq3Ht8uLBNB/2u6W1oSYo4lC9tS63qQN41N0DTdmlOlgAHYxivNpAmsxAOw= 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 1770416421962926.5363875910828; Fri, 6 Feb 2026 14:20:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAg-00066x-BA; Fri, 06 Feb 2026 17:19:26 -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 1voUAd-00064A-MX for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:23 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAb-0007C6-Ux for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:23 -0500 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-81f4ba336b4so2150332b3a.1 for ; Fri, 06 Feb 2026 14:19:21 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416360; x=1771021160; 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=FKrFbIzO+OqhM9EqMf1DvtMtDYxv5MFzwPEplnrkp6c=; b=j8ztdZ2AwAgLiS4tpFtziacHtW7A8c1p+vtHYSbHMDi8k5SqqWy50KmU2cRqcOuSVX h19hVBKUsNyrnv/E4qcb8HkGt8nL33JDnE73Rl82qbc3UGvJxYOtZsZR+0wDXaaKdS9i 3S/PL1BIoYyL9ccmKGAMgt9lzCZTj0uu393c1vOmcuek2aGuAWeG3Z/RsZHXnsFOm1yF 5gYKIhg7Ria2Tveqdgr116DyyHte59/h4w1laaFpbhZBvd3u1o7No4333+xDiKr/b39I NOvjS6laY4TR4+v+CJaR9hpz8D+ca5dw6f+Foqhjvz6YtFWCmKDxAxBgCuOVBt4EfgcP l2qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416360; x=1771021160; 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=FKrFbIzO+OqhM9EqMf1DvtMtDYxv5MFzwPEplnrkp6c=; b=SrAkXPyIa6GawYJnx60qR9AvVNRQJD9zxGhyepL8sTJi4ENg/1xvLHY/ei/VNS7AAW Mrjy3T9E84CqVcN5yWc1V9YiSJsE6JlJmTPkZK3N8rOQbo+gjUoSf75ul+zJHMNm9iew hDleKf8dDu0p6fc53TqNctjYmEB4POYFiGbTAukOqlW/X9pwivWIAdap1W/M5LXQPCDe Y7EyXQSpsuelc9+kDzwS8q504di/Ps+WQEtFEkbCKn0ptqJP19C6OpYWYrjjukQ39Zuq QkaXeWh9jgERXqEwxRB0YGcrBW48e0W2MpAYbEyWH3dzks8zOg8JXLmVtSXBXwmAORzf cB5Q== X-Gm-Message-State: AOJu0YxEzDR3qIdmW2uJfYg/0Afk+I1B6spQYLEdBLIEPnaAbNEevnHM 4kHyCS+yNH+r6UbYjaDf3sSzP7bOsEniDM9YL92c59a2Sn2pjc0x6an+DxB1nZdAQ0ism13IleV HlZmG X-Gm-Gg: AZuq6aKpjAT/9/Q1Dp8RpElF/udZQcqEnvtuV1iQkug1epbpq6ltAo4ZnTrkbF4UL7m L2ddGcDd6NotonfZBntMiv/cR59wCgTJrcVqq14oxq3mXpQMc+1LTpM5L+ba/NkD4VIdYxh71ue ijhX9OJPbigpT/B0PCb+NUaLL5Rkd3/yXGOD3ZP8S1sAM4GHSi+Fzmv8T/5wem+9r46scQWGbJT zEW5u8RXyD49arjJiiv4V6jkcGZyvaMLkAcW7CvxMLUrd/1yleRABRtAGOtXBgrWEeOTly4M3bX w+108qihVB1AcMYfuSYTjMhwXR8ml7R11ZUz3ab6lpBi0jK5TppItePSvFdlAUvzYDSxmLTToqd WArOAp+WrTXGrWgukqpdRwC4n8ota3m0fESuVApSfZU4YAiN5buTLeQG8xJ4rdhwcvU1eX9s+SO 1ZsuL/7gjJlY3DeaPQArAC/FWDLcA9JexekTjqrH8PvN+r5/CkZdUO7sGyAhfpH5jB X-Received: by 2002:a05:6a21:138f:b0:38d:f623:f876 with SMTP id adf61e73a8af0-393ad41a179mr3681972637.79.1770416360419; Fri, 06 Feb 2026 14:19:20 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 6/9] include/hw/ppc/spapr: extract SPAPR_MAX_RAM_SLOTS in a new header Date: Fri, 6 Feb 2026 14:19:05 -0800 Message-ID: <20260206221908.1451528-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::429; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x429.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: 1770416423227154100 Content-Type: text/plain; charset="utf-8" Allow to include it from common code (vhost-user, in next commit), else it pulls ppc/cpu.h which has target specifics. Signed-off-by: Pierrick Bouvier --- include/hw/ppc/spapr.h | 8 +------- include/hw/ppc/spapr_common.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 include/hw/ppc/spapr_common.h diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5476ac7ce7b..b022f8dd25d 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -4,6 +4,7 @@ #include "qemu/units.h" #include "system/dma.h" #include "hw/core/boards.h" +#include "hw/ppc/spapr_common.h" #include "hw/ppc/spapr_drc.h" #include "hw/mem/pc-dimm.h" #include "hw/ppc/spapr_ovec.h" @@ -946,13 +947,6 @@ int spapr_rtc_import_offset(SpaprRtcState *rtc, int64_= t legacy_offset); =20 #define SPAPR_MEMORY_BLOCK_SIZE ((hwaddr)1 << 28) /* 256MB */ =20 -/* - * This defines the maximum number of DIMM slots we can have for sPAPR - * guest. This is not defined by sPAPR but we are defining it to 32 slots - * based on default number of slots provided by PowerPC kernel. - */ -#define SPAPR_MAX_RAM_SLOTS 32 - /* 1GB alignment for hotplug memory region */ #define SPAPR_DEVICE_MEM_ALIGN (1 * GiB) =20 diff --git a/include/hw/ppc/spapr_common.h b/include/hw/ppc/spapr_common.h new file mode 100644 index 00000000000..d799927ff5c --- /dev/null +++ b/include/hw/ppc/spapr_common.h @@ -0,0 +1,16 @@ +/* + * Common definitions for PPC SPAPR + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_SPAPR_COMMON_H +#define HW_SPAPR_COMMON_H + +/* + * This defines the maximum number of DIMM slots we can have for sPAPR + * guest. This is not defined by sPAPR but we are defining it to 32 slots + * based on default number of slots provided by PowerPC kernel. + */ +#define SPAPR_MAX_RAM_SLOTS 32 + +#endif /* HW_SPAPR_COMMON_H */ --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416451; cv=none; d=zohomail.com; s=zohoarc; b=m2EbD8CoFrXah2NcbwXbK6hhPZd4MIy+T46YwPo1Y6s3gPF1cF8SrS7z+9gWubg0Qdo1zLBsJXkvW9NNvtmxpgaLyhdMUXRw3DJFUBRXMfrqXwFpQWHtNvl0RGksFDAHwfyp+Ox5pUBXA3c6lB22GUTLTlYZ0qalku9ZwAoOPk8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416451; 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=wR8eQ5ZxxmM/HWX8a067tu8BKTDOb21TMqDSCE6svOU=; b=UAQFI+tlCzdjEEqo4w5lduqXp9noQvPZWMGAeQD1fKQSROJbBEDtPQmUI5/3F3CwFAbHRVUKKuAoiKUZTMyAx2z9HbnUGAW443ndgwhjUUPLjuS+Y3j17WDPsHUGjG3api42swR5Hnkg0l3++tvMnQTqYKglYY4QEtwwsBDhwGg= 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 1770416451354191.4464277198134; Fri, 6 Feb 2026 14:20:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAj-000688-Bq; Fri, 06 Feb 2026 17:19:29 -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 1voUAe-00064b-6y for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:24 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAc-0007Ct-JF for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:23 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2a7b23dd036so5747235ad.3 for ; Fri, 06 Feb 2026 14:19:22 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416361; x=1771021161; 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=wR8eQ5ZxxmM/HWX8a067tu8BKTDOb21TMqDSCE6svOU=; b=YmTYRJ1bVOMoxdga5Lqf4Ea6h0jGcjRLBjmJVS43iTPGM6+GZqpHCCrKZEGMW0BdYm lyW2S59rdHGLVzgfzQ8eBu+rtrGUoSLm+7uI/4OhwuGvlqxsXmmoVz4Tj24tJEuiJpX6 AZYhUdqNKOalQ/sYC3bDwmj8F1r717o7Sz9eVyr7mTTCrJSrjp4dk000qFw+HvP25dZH rPnK8fQh3p6mAoFgeZ4MxefXUykCJFJDrfQ0BrGZFFTFP0bEatuA6yw9TqOWfm8Bis1f 8LKFKomSTFb0ohkMOz8Upj4TZXjRwFZaNWUiFeA1aQdt1qNToM5p0L0VR77y+OfmvZ58 HNEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416361; x=1771021161; 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=wR8eQ5ZxxmM/HWX8a067tu8BKTDOb21TMqDSCE6svOU=; b=Ds4zO3DioAOxVDxPNF1ojjJpKL6mVwa7NXiFcmcqd/yMn10S2B8zZY1M7d5qGtVvjY 1LhWu/UJjN8DzDv2HN7iWyIvJroT9FnovqUHuoHfjjcn3V8aMdH9m2GxnCJO/RhUF2lN 5gaWfZtgiuAtzBt6yr4vrCZ/WA4AyN3ubeVz9bzwZ9mBtDlXT8HdG5OWe957UNpzRHzq yF9y5CBgAe/oHNgmQ0Bt4xShZ7ZQFPWauWS4/bcoD4uhcMbIffn8UZFfwp3fhLZhN9SW HLK3VIyHk7n+HQT9/PclXM6l42Sthd/jR2uL2zPaXdoswk+/3K267fo7hOkfcBAPvh1O O7pA== X-Gm-Message-State: AOJu0Yy+liu3lLosZxwZOwfcnaKoHstaMFFg5lyfqe6LOSykkoehHQ4j v2m06vn7SCVGncmNMxji7I4u55RkSTFumX6m5n4JsrW3q8XB9Zba3m+IJoa3esVU/Q5oqfL8twj M7zu1 X-Gm-Gg: AZuq6aJLlyeEBnH/Re/aqdvhtfN4EJAY3D+FU1Kpvg+o9JEXAKGMgz2V9tCYtdGHL4a uPnD4mXPtyOT6Xo0yqyNAat+IBNhoVglCo5v2S/up8KLNo+lpmRFidsHavE/8yA63bxkMw7iUR4 Gqvoxnk3HSwb52rJ+qVSHZeF9reBPjfWvzf2YfV8+VuNTC0BGBezATZOPPMyr4eN+36mL1RRb/j FduV55pvtQ6ou12lChLZLdvOxLVacRdvr1ARvM8x6lrp8GWqEdhVRTJ8gQVTxgl8aUmbo+76sS9 3qp7eqa0lV1eHFZmLRXOsQl00UECdmPDfDsB0bYdKumhCCddaI2sJFM6hUdnWp6+yIM7pOV0v7m wUxXvyxFz/aNt7pb+XIm8zEykw+kGdehSD0Gf9YQIYhDNcatIVI1UnRc16ErLCRjAVC09LeSZg0 8R7GOIcRGt7KCyM7ER/jihyXhpzx5XJsbCn6MrqsDPRgsSNGnytRWcrUOyQ5T00HFPG0oo0J/RP mdu X-Received: by 2002:a17:902:ffcb:b0:2a0:e94e:5df6 with SMTP id d9443c01a7336-2a95192ba16mr33199035ad.50.1770416361138; Fri, 06 Feb 2026 14:19:21 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 7/9] hw/virtio/vhost-user: make compilation unit common Date: Fri, 6 Feb 2026 14:19:06 -0800 Message-ID: <20260206221908.1451528-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::62e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.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: 1770416453700154100 Content-Type: text/plain; charset="utf-8" PPC architectures use a custom value for VHOST_USER_MAX_RAM_SLOTS (32 instead of 512). vhost_user struct and several functions use VHOST_USER_MAX_RAM_SLOTS to define stack allocated buffers. To avoid changing all functions to use heap allocated buffers, we keep this max, and simply add a target_base_ppc() conditional for the single place where size really matters. Signed-off-by: Pierrick Bouvier --- hw/virtio/vhost-user.c | 11 ++++------- hw/virtio/meson.build | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index bb8f8eab77e..a8907cca74e 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -44,13 +44,8 @@ #define VHOST_USER_F_PROTOCOL_FEATURES 30 #define VHOST_USER_BACKEND_MAX_FDS 8 =20 -#if defined(TARGET_PPC) || defined(TARGET_PPC64) -#include "hw/ppc/spapr.h" -#define VHOST_USER_MAX_RAM_SLOTS SPAPR_MAX_RAM_SLOTS - -#else +#include "hw/ppc/spapr_common.h" #define VHOST_USER_MAX_RAM_SLOTS 512 -#endif =20 /* * Maximum size of virtio device config space @@ -2287,7 +2282,9 @@ static int vhost_user_backend_init(struct vhost_dev *= dev, void *opaque, return -EINVAL; } =20 - u->user->memory_slots =3D MIN(ram_slots, VHOST_USER_MAX_RAM_SL= OTS); + const uint64_t vhost_user_max_ram_slots =3D target_base_ppc() ? + SPAPR_MAX_RAM_SLOTS : VHOST_USER_MAX_RAM_SLOTS; + u->user->memory_slots =3D MIN(ram_slots, vhost_user_max_ram_sl= ots); } } =20 diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 6675b63ce65..ae33d403cf7 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -17,8 +17,7 @@ if have_vhost system_virtio_ss.add(files('vhost.c')) system_virtio_ss.add(files('vhost-backend.c', 'vhost-iova-tree.c')) if have_vhost_user - # fixme - this really should be generic - specific_virtio_ss.add(files('vhost-user.c')) + system_virtio_ss.add(files('vhost-user.c')) system_virtio_ss.add(files('vhost-user-base.c')) =20 # MMIO Stubs --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416390; cv=none; d=zohomail.com; s=zohoarc; b=HqYFGHFK5UxnT95dJHzRDNBq1FqGGfbyNggLlJR9XFUKB1DqKNPBvUch+AdqrFqBstNojGIewpxq7mTlosk183I8sGD3YBygX1V11AWyNjVopQq4k37Ip8UYF6UNYaiBGFfBvW/iu7ACiy5A4GN8dISRlZXGeaDhF18MxqSfgio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416390; 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=kZyVLIbEJo0Wk5YkLmH7yh3NiSpSnL/riDyzdg7xUbw=; b=AveKs+gVdybiMP6I5KGZ2rcbyeOpQXi9N6u9rcUcrp1sQJwKffoY2rA1thP5nZOaqtwq1QX/9XuLFGn3v7LdMRzdDqdj4MRHobkN2I6g4CmIlr3o264LGGKgvTd3gO/MKbHUl/N8pD87eJMsA1kMODTEJZscj/mEzEQGbhM5Vng= 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 1770416390871832.9371389691879; Fri, 6 Feb 2026 14:19:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAm-00068j-TE; Fri, 06 Feb 2026 17:19:32 -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 1voUAf-00066I-SW for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:26 -0500 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAd-0007EX-Fp for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:25 -0500 Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-c075ec1a58aso937580a12.0 for ; Fri, 06 Feb 2026 14:19:23 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416362; x=1771021162; 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=kZyVLIbEJo0Wk5YkLmH7yh3NiSpSnL/riDyzdg7xUbw=; b=RB9puf77BEg4rtz/QNPkrJiVQ7fC1RqTi7TeiYb2jTQl24R3HgJt3Zbm7sL6Dr1g+W ZcWpegoIFE6+qFeEZctqnTlMnHEuKhNPmuvgCPFaautIO/WpNubC9fvTIY9Zw1Ce9qQP Pt4qL981cLSANdiToN03X0GMqZZJobZZ8JBSub7o7XPxAdyLzZ3Jvw1wRVYdiEP9CtiH csYjHXjnJlwvg6Fs1zOZ3QhMxz1mIG6NbA6PkUeOksLSMByz+PyxTkfw69moovrIPN5B tmR3ql7fv1dNpg+cqBcDHDgbQgv7wFCPj/GI0vR4j1mKnh98pPVESV/W1xGISKtmY0sq 5X1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416362; x=1771021162; 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=kZyVLIbEJo0Wk5YkLmH7yh3NiSpSnL/riDyzdg7xUbw=; b=UhVLJod6qmRHsnWD8Z6uma5zYpnWyLfMvDGYNDxxhG+X/mhlCMH9oBuwAzo3ZLHCpm qUBIXSV2hruF/GXGRU56wI/3KZ3SLICX9c2QRn3N7+pFgCIiPV5tA4xPkbL3iYHbDk2O gi0Ih2tv01se+kFXYTfJgsQrEtjFwaNaK4AEEiNN2Ahifg4s+IJma5K8KOSF3kC3UIHK g170GfGWeFxAg2OWIWnVDzn5DwpNWD6gcTEr1nPgG8RW1dgOXiTJuH2sl/EHCBcuVKEA MOI+q6fyzvMGtxKqVPFIMLfdAQWFe5FPBCObJYNKQGhNRMeTamNV+c2GqJEf8Izt1XGH uHnQ== X-Gm-Message-State: AOJu0YxLpZd3IOI2oyudEDpt9/DZ7kwGNFnnFqCcV2d1cbUqLTAR4htP 0j7zAoYuyj6XpF2yp4UAKB5d7B8HfQsiPbjfbS1zNwjGUPcJayq50Al0bCfr49M1tTrPJs0cS+P eId9X X-Gm-Gg: AZuq6aJXIroe32z+zJyiUc1grf8hZqb29OWlD4GToqQNnq1PEai4oVhyxpZenx9XkFR kONPgHFfTdpfIbvhdP1lk+E49Ar6NLaNo/Ge7R+lIsIvwSlE3yYcLV46IzsNle/ngXDBnwTo+Ic /Y6b41DFXgMaaE/loNronYsFTeSTo9SNvUu8sTomXfDuhqtjGk2J+8oviFUmNx4nt7E6AuH7+zy iELhayn077XS3O5yXTcmHzHB91UyR2ZwOpRl/iiytXlq1HAQeEykghLRWUBGWf5F5b7ctkm1eCi iyHmSMMNBGkVfz9dHE6nDopLY3Okz/3333AEGQE75iZZjcREExG8vOfyl3w15YQyRNmYaeTAVj+ mV+I3ps+LgoCJcZYq14EWflf8GcQsntsaD7sgBovGBcVaDMylIagVfG+scSzS8eiIqbIkCLMRGa yJ03w4jUvQkkRBOSfoMq3Dl8p1NeJzhHfr/2xCPbr+LFNKmsNE15n02SdlufoMxH7w X-Received: by 2002:a17:902:fc47:b0:2a7:3daa:583f with SMTP id d9443c01a7336-2a951607b7dmr39057605ad.2.1770416361964; Fri, 06 Feb 2026 14:19:21 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 8/9] hw/virtio/virtio-qmp: make compilation unit common Date: Fri, 6 Feb 2026 14:19:07 -0800 Message-ID: <20260206221908.1451528-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::52c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x52c.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: 1770416393354158500 Content-Type: text/plain; charset="utf-8" All compile time conditionals have no impact at runtime, since they are representing only possible features for devices present at runtime. In case they are not present, associated features table will never be used. In case they are present but some features are not, matching bits will never be enabled, so those entries will be unused. Thus, simply expose everything and call it a day. Signed-off-by: Pierrick Bouvier --- hw/virtio/virtio-qmp.c | 70 ------------------------------------------ hw/virtio/meson.build | 2 +- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c index 968299fda0c..f9cdca50d99 100644 --- a/hw/virtio/virtio-qmp.c +++ b/hw/virtio/virtio-qmp.c @@ -33,21 +33,17 @@ #include "standard-headers/linux/virtio_vsock.h" #include "standard-headers/linux/virtio_gpio.h" =20 -#include CONFIG_DEVICES - #define FEATURE_ENTRY(name, desc) (qmp_virtio_feature_map_t) \ { .virtio_bit =3D name, .feature_desc =3D desc } =20 /* Virtio transport features mapping */ static const qmp_virtio_feature_map_t virtio_transport_map[] =3D { /* Virtio device transport features */ -#ifndef VIRTIO_CONFIG_NO_LEGACY FEATURE_ENTRY(VIRTIO_F_NOTIFY_ON_EMPTY, \ "VIRTIO_F_NOTIFY_ON_EMPTY: Notify when device runs out of avai= l. " "descs. on VQ"), FEATURE_ENTRY(VIRTIO_F_ANY_LAYOUT, \ "VIRTIO_F_ANY_LAYOUT: Device accepts arbitrary desc. layouts"), -#endif /* !VIRTIO_CONFIG_NO_LEGACY */ FEATURE_ENTRY(VIRTIO_F_VERSION_1, \ "VIRTIO_F_VERSION_1: Device compliant for v1 spec (legacy)"), FEATURE_ENTRY(VIRTIO_F_IOMMU_PLATFORM, \ @@ -149,7 +145,6 @@ static const qmp_virtio_feature_map_t virtio_config_sta= tus_map[] =3D { }; =20 /* virtio-blk features mapping */ -#ifdef CONFIG_VIRTIO_BLK static const qmp_virtio_feature_map_t virtio_blk_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_BLK_F_SIZE_MAX, \ "VIRTIO_BLK_F_SIZE_MAX: Max segment size is size_max"), @@ -173,7 +168,6 @@ static const qmp_virtio_feature_map_t virtio_blk_featur= e_map[] =3D { "VIRTIO_BLK_F_SECURE_ERASE: Secure erase supported"), FEATURE_ENTRY(VIRTIO_BLK_F_ZONED, \ "VIRTIO_BLK_F_ZONED: Zoned block devices"), -#ifndef VIRTIO_BLK_NO_LEGACY FEATURE_ENTRY(VIRTIO_BLK_F_BARRIER, \ "VIRTIO_BLK_F_BARRIER: Request barriers supported"), FEATURE_ENTRY(VIRTIO_BLK_F_SCSI, \ @@ -183,7 +177,6 @@ static const qmp_virtio_feature_map_t virtio_blk_featur= e_map[] =3D { FEATURE_ENTRY(VIRTIO_BLK_F_CONFIG_WCE, \ "VIRTIO_BLK_F_CONFIG_WCE: Cache writeback and writethrough mod= es " "supported"), -#endif /* !VIRTIO_BLK_NO_LEGACY */ FEATURE_ENTRY(VHOST_F_LOG_ALL, \ "VHOST_F_LOG_ALL: Logging write descriptors supported"), FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \ @@ -191,10 +184,8 @@ static const qmp_virtio_feature_map_t virtio_blk_featu= re_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio-serial features mapping */ -#ifdef CONFIG_VIRTIO_SERIAL static const qmp_virtio_feature_map_t virtio_serial_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_CONSOLE_F_SIZE, \ "VIRTIO_CONSOLE_F_SIZE: Host providing console size"), @@ -204,10 +195,8 @@ static const qmp_virtio_feature_map_t virtio_serial_fe= ature_map[] =3D { "VIRTIO_CONSOLE_F_EMERG_WRITE: Emergency write supported"), { -1, "" } }; -#endif =20 /* virtio-gpu features mapping */ -#ifdef CONFIG_VIRTIO_GPU static const qmp_virtio_feature_map_t virtio_gpu_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_GPU_F_VIRGL, \ "VIRTIO_GPU_F_VIRGL: Virgl 3D mode supported"), @@ -227,10 +216,8 @@ static const qmp_virtio_feature_map_t virtio_gpu_featu= re_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio-input features mapping */ -#ifdef CONFIG_VIRTIO_INPUT static const qmp_virtio_feature_map_t virtio_input_feature_map[] =3D { FEATURE_ENTRY(VHOST_F_LOG_ALL, \ "VHOST_F_LOG_ALL: Logging write descriptors supported"), @@ -239,10 +226,8 @@ static const qmp_virtio_feature_map_t virtio_input_fea= ture_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio-net features mapping */ -#ifdef CONFIG_VIRTIO_NET static const qmp_virtio_feature_map_t virtio_net_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_NET_F_CSUM, \ "VIRTIO_NET_F_CSUM: Device handling packets with partial check= sum " @@ -313,10 +298,8 @@ static const qmp_virtio_feature_map_t virtio_net_featu= re_map[] =3D { "device with same MAC addr. supported"), FEATURE_ENTRY(VIRTIO_NET_F_SPEED_DUPLEX, \ "VIRTIO_NET_F_SPEED_DUPLEX: Device set linkspeed and duplex"), -#ifndef VIRTIO_NET_NO_LEGACY FEATURE_ENTRY(VIRTIO_NET_F_GSO, \ "VIRTIO_NET_F_GSO: Handling GSO-type packets supported"), -#endif /* !VIRTIO_NET_NO_LEGACY */ FEATURE_ENTRY(VHOST_NET_F_VIRTIO_NET_HDR, \ "VHOST_NET_F_VIRTIO_NET_HDR: Virtio-net headers for RX and TX " "packets supported"), @@ -341,10 +324,8 @@ static const qmp_virtio_feature_map_t virtio_net_featu= re_map[] =3D { "header"), { -1, "" } }; -#endif =20 /* virtio-scsi features mapping */ -#ifdef CONFIG_VIRTIO_SCSI static const qmp_virtio_feature_map_t virtio_scsi_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_SCSI_F_INOUT, \ "VIRTIO_SCSI_F_INOUT: Requests including read and writable dat= a " @@ -364,10 +345,8 @@ static const qmp_virtio_feature_map_t virtio_scsi_feat= ure_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio/vhost-user-fs features mapping */ -#ifdef CONFIG_VHOST_USER_FS static const qmp_virtio_feature_map_t virtio_fs_feature_map[] =3D { FEATURE_ENTRY(VHOST_F_LOG_ALL, \ "VHOST_F_LOG_ALL: Logging write descriptors supported"), @@ -376,10 +355,8 @@ static const qmp_virtio_feature_map_t virtio_fs_featur= e_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio/vhost-user-i2c features mapping */ -#ifdef CONFIG_VIRTIO_I2C_ADAPTER static const qmp_virtio_feature_map_t virtio_i2c_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_I2C_F_ZERO_LENGTH_REQUEST, \ "VIRTIO_I2C_F_ZERO_LEGNTH_REQUEST: Zero length requests suppor= ted"), @@ -390,10 +367,8 @@ static const qmp_virtio_feature_map_t virtio_i2c_featu= re_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio/vhost-vsock features mapping */ -#ifdef CONFIG_VHOST_VSOCK static const qmp_virtio_feature_map_t virtio_vsock_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_VSOCK_F_SEQPACKET, \ "VIRTIO_VSOCK_F_SEQPACKET: SOCK_SEQPACKET supported"), @@ -404,10 +379,8 @@ static const qmp_virtio_feature_map_t virtio_vsock_fea= ture_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio-balloon features mapping */ -#ifdef CONFIG_VIRTIO_BALLOON static const qmp_virtio_feature_map_t virtio_balloon_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_BALLOON_F_MUST_TELL_HOST, \ "VIRTIO_BALLOON_F_MUST_TELL_HOST: Tell host before reclaiming " @@ -424,19 +397,15 @@ static const qmp_virtio_feature_map_t virtio_balloon_= feature_map[] =3D { "VIRTIO_BALLOON_F_REPORTING: Page reporting VQ enabled"), { -1, "" } }; -#endif =20 /* virtio-crypto features mapping */ -#ifdef CONFIG_VIRTIO_CRYPTO static const qmp_virtio_feature_map_t virtio_crypto_feature_map[] =3D { FEATURE_ENTRY(VHOST_F_LOG_ALL, \ "VHOST_F_LOG_ALL: Logging write descriptors supported"), { -1, "" } }; -#endif =20 /* virtio-iommu features mapping */ -#ifdef CONFIG_VIRTIO_IOMMU static const qmp_virtio_feature_map_t virtio_iommu_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_IOMMU_F_INPUT_RANGE, \ "VIRTIO_IOMMU_F_INPUT_RANGE: Range of available virtual addrs.= " @@ -458,15 +427,11 @@ static const qmp_virtio_feature_map_t virtio_iommu_fe= ature_map[] =3D { "available"), { -1, "" } }; -#endif =20 /* virtio-mem features mapping */ -#ifdef CONFIG_VIRTIO_MEM static const qmp_virtio_feature_map_t virtio_mem_feature_map[] =3D { -#ifndef CONFIG_ACPI FEATURE_ENTRY(VIRTIO_MEM_F_ACPI_PXM, \ "VIRTIO_MEM_F_ACPI_PXM: node_id is an ACPI PXM and is valid"), -#endif /* !CONFIG_ACPI */ FEATURE_ENTRY(VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE, \ "VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE: Unplugged memory cannot = be " "accessed"), @@ -475,10 +440,8 @@ static const qmp_virtio_feature_map_t virtio_mem_featu= re_map[] =3D { "plugged when suspending+resuming"), { -1, "" } }; -#endif =20 /* virtio-rng features mapping */ -#ifdef CONFIG_VIRTIO_RNG static const qmp_virtio_feature_map_t virtio_rng_feature_map[] =3D { FEATURE_ENTRY(VHOST_F_LOG_ALL, \ "VHOST_F_LOG_ALL: Logging write descriptors supported"), @@ -487,10 +450,8 @@ static const qmp_virtio_feature_map_t virtio_rng_featu= re_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 /* virtio/vhost-gpio features mapping */ -#ifdef CONFIG_VHOST_USER_GPIO static const qmp_virtio_feature_map_t virtio_gpio_feature_map[] =3D { FEATURE_ENTRY(VIRTIO_GPIO_F_IRQ, \ "VIRTIO_GPIO_F_IRQ: Device supports interrupts on GPIO lines"), @@ -499,7 +460,6 @@ static const qmp_virtio_feature_map_t virtio_gpio_featu= re_map[] =3D { "negotiation supported"), { -1, "" } }; -#endif =20 #define CONVERT_FEATURES(type, map, is_status, bitmap) \ ({ \ @@ -595,96 +555,66 @@ VirtioDeviceFeatures *qmp_decode_features(uint16_t de= vice_id, =20 /* device features */ switch (device_id) { -#ifdef CONFIG_VIRTIO_SERIAL case VIRTIO_ID_CONSOLE: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_serial_feature_map, bitmap= ); break; -#endif -#ifdef CONFIG_VIRTIO_BLK case VIRTIO_ID_BLOCK: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_blk_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_GPU case VIRTIO_ID_GPU: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_gpu_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_NET case VIRTIO_ID_NET: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_net_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_SCSI case VIRTIO_ID_SCSI: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_scsi_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_BALLOON case VIRTIO_ID_BALLOON: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_balloon_feature_map, bitma= p); break; -#endif -#ifdef CONFIG_VIRTIO_IOMMU case VIRTIO_ID_IOMMU: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_iommu_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_INPUT case VIRTIO_ID_INPUT: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_input_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VHOST_USER_FS case VIRTIO_ID_FS: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_fs_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VHOST_VSOCK case VIRTIO_ID_VSOCK: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_vsock_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_CRYPTO case VIRTIO_ID_CRYPTO: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_crypto_feature_map, bitmap= ); break; -#endif -#ifdef CONFIG_VIRTIO_MEM case VIRTIO_ID_MEM: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_mem_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_I2C_ADAPTER case VIRTIO_ID_I2C_ADAPTER: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_i2c_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VIRTIO_RNG case VIRTIO_ID_RNG: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_rng_feature_map, bitmap); break; -#endif -#ifdef CONFIG_VHOST_USER_GPIO case VIRTIO_ID_GPIO: features->dev_features =3D CONVERT_FEATURES_EX(strList, virtio_gpio_feature_map, bitmap); break; -#endif /* No features */ case VIRTIO_ID_9P: case VIRTIO_ID_PMEM: diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index ae33d403cf7..20356fba812 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -11,7 +11,7 @@ system_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_tr= ue: files('vdpa-dev.c') =20 specific_virtio_ss =3D ss.source_set() specific_virtio_ss.add(files('virtio.c')) -specific_virtio_ss.add(files('virtio-qmp.c')) +system_virtio_ss.add(files('virtio-qmp.c')) =20 if have_vhost system_virtio_ss.add(files('vhost.c')) --=20 2.47.3 From nobody Sat Feb 7 05:52:28 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=1770416390; cv=none; d=zohomail.com; s=zohoarc; b=JI0nCsz0+5gklb72cWBn3K4Pq3L5ktbxKVFCLAfzPuuz10S3s6FMQNEGn27S/t38+HtqBOZgyIIvtdq244ft9eX6T0aXvw4tqIlR2NmWvO4dj6WbxWmFnTV7JXLBZeUtU3yxXPTvC/qb4fq5aQzoWasWKoMEYCSK8fBmPnAdNjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770416390; 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=3PhMuVFYdPnBkd5n0hx4mNEJNR/NbmY6F8F2L8WVLKE=; b=QkZruBB7Ci4tPDSDmC0X4wpEkRdRQi4inpPPEbjr6HqHOWekZsYZVHSJlvmkEMerJpDayK/heC6P3Zo0RQ/x/P7e84Bv53p+7Fm3+F/Dh1se7+0pGuKOWbItxTn2tWyNtE7z00SacVYCSuDXeBV7/uOj9C6TewS+h/SmXjtBFY4= 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 1770416390308487.40684483509324; Fri, 6 Feb 2026 14:19:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1voUAp-00069h-GC; Fri, 06 Feb 2026 17:19:36 -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 1voUAf-00066J-Sx for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:26 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1voUAe-0007Em-8n for qemu-devel@nongnu.org; Fri, 06 Feb 2026 17:19:25 -0500 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-29f102b013fso12161625ad.2 for ; Fri, 06 Feb 2026 14:19:23 -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 d9443c01a7336-2a95bff42f7sm13316575ad.68.2026.02.06.14.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 14:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770416363; x=1771021163; 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=3PhMuVFYdPnBkd5n0hx4mNEJNR/NbmY6F8F2L8WVLKE=; b=gwkGALvSyD4B95gT0P518JMFz83L9S2SJegMnsRu/z/sDhLsgqjRZYNGzfia8DSVLI EnbRKK+vq1u2gqBX1G2QM2EN+smaTkfOOQXXrnDhYyMRCwOvzoLkn+nwmv29uLch80o7 bJ023RcKdKVCpCf2Quzt0mjjjxBCneBgbi5TIDVCKm2cEPMw/6aupYkHNug7JqcxdVAy Zyq+/GC8P9Cq0mP8Ps4hPzT9dyu9kciP7KJDafeP9129DNK7skdIcDSvR2ROmtHhq15E ZhDPVX9g5M8iK/wJeBHWN8jqhBisrx7v9pdr/vUGMM2FJEm6bhrX4SgT4AvACusBiZtc F6Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770416363; x=1771021163; 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=3PhMuVFYdPnBkd5n0hx4mNEJNR/NbmY6F8F2L8WVLKE=; b=vyjTEx1b3uBML9TY9i8qzkZynQVIWRGdR1usmdGTduQzYBd6llq6J1zVkMsPS9g5dW K2vPN2UlpK38hkL/sHVHr4LdEIALYh+E7d2WHJe8kWvsd4XvBw+vziWsa9jwfZ+Ql5dg ryEIbi9uLZUWHVvXpaAKjBuDKaMoOQZYSrdK3GPFCVf275sdaR374pRNcfevPu4BymY/ Ml/niDxZbwcOPfhIlyxfSL1bskBc8ye7q7rm9eOxZjSqjBEmA2aiqnzUVD7RfqU8L8D6 6w/J/WNzA4XS2zbHDjG3mkkTYshxgmgAxp89pLa8Qo64bAPWBbJ0dTRuZGI7xfRZV8Bi i82A== X-Gm-Message-State: AOJu0YzTacYBxm1N5BuVWlo2PH0fu/M3kEEodECzK+1EM5upzmcWJq8H kbx+CBnqzaJqFkbwG0lrkDWVGGQO0Pek+POO+k571hNxK0VdcVqcxX/drlG06iucZrYlTwF+Zli BxX1d X-Gm-Gg: AZuq6aIUEQhqviNlA/bGsp/ZrHLvDdpodiTYrWk7n24G4rG8Xj3p+P+jDYV6ImlDCZb 3SP7RchAfhALgndDD1xWOVjs3g3j1hOfOuU7oEY8cfKXyuNFOci/G36ueXizQ9Jmg6Re1EiHtoN rds2MV94y5HWU28BqT7EER/p1efMZ203NQ8GWjPk2cfdn42dGEZudgccbQ9bVoAnknIbnkjuUJA fKoPj+aOdJ92EgdLdWeLn0IH7r+P5cJlBiB850lMWuNg/01JubVTZuJtLz4WIf2HCOUVSORzQRW zHzg+uGf5ZnxtujdmHbRcfLibDFjy6HJKkz/GpOvjRaOJu5aEyLBQ+g157xyvh7jns8rrnFx/BD +sMf/B23SBfY1wqdBqe/o5Ag45HtQdk9j4JccefnVbg9Py/F2PAZKKJ7BKQcv1UiOj5mrrBke1R pZnu751smFny6HkbX7i6R7dM81YbyUORQTV0KawxY4xnMbSMhmYPwcuHEQJvEEm7U2 X-Received: by 2002:a17:902:fc4e:b0:2a9:4c2:e47 with SMTP id d9443c01a7336-2a9519b5dadmr39036905ad.56.1770416362740; Fri, 06 Feb 2026 14:19:22 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Nicholas Piggin , Harsh Prateek Bora , "Michael S. Tsirkin" , Pierrick Bouvier , stefanha@redhat.com, richard.henderson@linaro.org, qemu-ppc@nongnu.org Subject: [PATCH v5 9/9] hw/virtio/: make all compilation units common Date: Fri, 6 Feb 2026 14:19:08 -0800 Message-ID: <20260206221908.1451528-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260206221908.1451528-1-pierrick.bouvier@linaro.org> References: <20260206221908.1451528-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::633; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x633.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: 1770416393562154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier --- hw/virtio/meson.build | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 20356fba812..821366f5e90 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -9,8 +9,7 @@ system_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_= true: files('vhost-vs system_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-i= ommu.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-d= ev.c')) =20 -specific_virtio_ss =3D ss.source_set() -specific_virtio_ss.add(files('virtio.c')) +system_virtio_ss.add(files('virtio.c')) system_virtio_ss.add(files('virtio-qmp.c')) =20 if have_vhost @@ -55,10 +54,10 @@ endif system_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhos= t-user-vsock.c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng= .c')) =20 -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virt= io-balloon.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost= -user-fs.c')) -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-= pmem.c')) -specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-v= sock.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio= -balloon.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-u= ser-fs.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: files('virtio-pm= em.c')) +system_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vso= ck.c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem= .c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_NSM', if_true: files('virtio-nsm= .c')) system_virtio_ss.add(when: 'CONFIG_VIRTIO_NSM', if_true: [files('cbor-help= ers.c'), libcbor]) @@ -100,5 +99,4 @@ system_ss.add(when: ['CONFIG_VIRTIO_MD', 'CONFIG_VIRTIO_= PCI'], =20 system_ss.add(files('virtio-hmp-cmds.c')) =20 -specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss) system_ss.add(when: 'CONFIG_ACPI', if_true: files('virtio-acpi.c')) --=20 2.47.3