From nobody Mon Feb 9 18:08:00 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=1769824945; cv=none; d=zohomail.com; s=zohoarc; b=NaarTXNDw4+PpkREahze2uIAzzEQnaMC8EheuwmTHAhqY/RX1Pd8OHj3YJDeB/4cpxKNfjqNajHwv0rh/tqRXeXvBdDcnI1CNGxI/5xxpYeQWorbhFl5/IdCu7GqHnv7rACCbgML/uE5VkPiOcjSTJjZFtFvxmrhj7smSlZmdYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769824945; 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=r1N6ECMEDgMFdthr2Z2jMnkq5f/37eqmOzrEyVZJugI=; b=IJjyQ8wjZ8qjbfYBrov2loi5g7oUMxy3q2pk0RNGEZs2GNacnsGpo/MTcikW+k7BAdPEqM3pJ6+Gyuw3yZx+ITBio87fyad39y+6uCndwo6lfWygV+oDLPeR/HhFrDt9ztAVrnF/0VZh7I+AXLlRyCeadxBu4mWsUT8AZApuPJ0= 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 1769824945516220.89073730177722; Fri, 30 Jan 2026 18:02:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vm0Id-0007SL-Is; Fri, 30 Jan 2026 21:01: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 1vm0IW-0007IL-4w for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:17 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vm0IO-0000Tz-Qo for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:13 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-29f30233d8aso17590605ad.0 for ; Fri, 30 Jan 2026 18:01:08 -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-2a88b41390bsm84697975ad.23.2026.01.30.18.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:01:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769824867; x=1770429667; 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=r1N6ECMEDgMFdthr2Z2jMnkq5f/37eqmOzrEyVZJugI=; b=y/3TklbVvBd+AApX/9Qvl9Mqxb9w+e9y8PcIUhHuxTSjzzoJW9AfUrt7TKom5XjcNz rU88ihNXjcrOOMUnAfsZxXhoedF6FISj4jdPT0NzZIS0fqAIZnqSXp3w0xSDfC4Kiy8O Vb3YGLomVIDnTZdLQPHjUZ8SGqfy74w0iDaipj17360stE1QMwW0OtgBOFIYeMgOVhTP Yu56BcE5hXIiADwrMRpALutGnMrHGxnQkTSMMy5XkZrv4AYlk4c3kW178ONWX55p1+jD bjzWjNGvGxzhUhj4+wTLSQCRJKiDnIu1WPJpcglFMmmcGQbDLtl5bXf4cP8PT1q6gLoa +Nww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769824867; x=1770429667; 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=r1N6ECMEDgMFdthr2Z2jMnkq5f/37eqmOzrEyVZJugI=; b=MSksbeHhhkiaykCV8Bsj7urgp+uzfC3ueLGUXBWLYEMpcjgjuB9IcFjkE04ZiOvlDN t2FkpaFr2UBBLjv5rgjJkCgd5yZD1Cx5ncLKvqR3W4TcYTRjI3hhi5cs4bZVgVe6r1nx wwsZTMXXywoU0c+ooi0sr3LDcpUoCb3wYs3NfX5Zb3MgSZsGmRG/eIynYeOyJ9iM/DPj JqC8JmKypaHfl76xcUQUM84H3R8MZ5sgFkBwfccQw88ndVq1oiga3HvoajMQXvwNDDmN /G129ivIU2A6iqX1L3/PEXx9C8XnkVduqKbBKyeJhxDUIiAGOrYGsw4Gy68CsfcQBBP2 03Xg== X-Gm-Message-State: AOJu0YxezX/d/C94CozEBSxXgG24vtMisP4S6wdCiK8auGlG1k7GmmUC hEWSbIYXYVN3Nn1hO3AoEt/asxEdTEoSmoP6GZ42WBDCijd0MQzcrFVYYzJYF2ihhqrgJgD/w9+ Xsrhj X-Gm-Gg: AZuq6aJxG8I+XH16X9PMfGPcH8IyPBPDyzyeEMiJtUtSvi3TgwDg1IxEYB5yAS5e7JY m+3bEh0JVMWadvSkbY5imm1pNW8wIf/4UVQYBQuT20rB1T4JXKwo/FslJlBnsoRc3T7VRwM82YL edAYvRRNNw7uk5UlRhTeV5/WCbSZry/AipY3qmLoS7cc07UnLI2lf+0GpTaioPluC22fXsIvGtL hUiLT7v3bAFxeDmFMexbBO4g7AxLWH0REIhj0d8riwwllfPdfQ70qpY7/SaAhmKxYiuY0CC5yPU TAvFMyrdwQ9C6E8OR4TlD9F42ScoA/xCvUznsx+1KDLnht5UjFgBAmt/Gz2qoFpz+dp8mIPjxUW my4C1xAcP6GSBowylQhmIFtJrRZ/k7K5V50EMFPGVRHyAK8QnATwVS6iBo5ygGvWuKegx9tjwS3 0ZpH0v8oRMQsgwyqeXo7lfzQrxam9ag/RbulepJt3TUoUKZXdvi1kocML8tpq4L2bh X-Received: by 2002:a17:902:d50e:b0:2a4:8cd:c3cf with SMTP id d9443c01a7336-2a8d8181601mr51103125ad.49.1769824867242; Fri, 30 Jan 2026 18:01:07 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Harsh Prateek Bora , "Michael S. Tsirkin" , Nicholas Piggin Subject: [PATCH 1/6] target-info: add target_base_ppc, target_ppc and target_ppc64 Date: Fri, 30 Jan 2026 18:00:55 -0800 Message-ID: <20260131020100.1115203-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260131020100.1115203-1-pierrick.bouvier@linaro.org> References: <20260131020100.1115203-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::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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: 1769824946324158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/target-info.h | 21 +++++++++++++++++++++ target-info.c | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h index 62359622232..e3287334304 100644 --- a/include/qemu/target-info.h +++ b/include/qemu/target-info.h @@ -71,4 +71,25 @@ bool target_arm(void); */ bool target_aarch64(void); =20 +/** + * target_base_ppc: + * + * Returns whether the target architecture is PowerPC 32-bit or 64-bit. + */ +bool target_base_ppc(void); + +/** + * target_ppc: + * + * Returns whether the target architecture is PowerPC 32-bit. + */ +bool target_ppc(void); + +/** + * target_ppc64: + * + * Returns whether the target architecture is PowerPC 64-bit. + */ +bool target_ppc64(void); + #endif diff --git a/target-info.c b/target-info.c index 24696ff4111..5a6d7282524 100644 --- a/target-info.c +++ b/target-info.c @@ -73,3 +73,24 @@ bool target_aarch64(void) { return target_arch() =3D=3D SYS_EMU_TARGET_AARCH64; } + +bool target_base_ppc(void) +{ + switch (target_arch()) { + case SYS_EMU_TARGET_PPC: + case SYS_EMU_TARGET_PPC64: + return true; + default: + return false; + } +} + +bool target_ppc(void) +{ + return target_arch() =3D=3D SYS_EMU_TARGET_PPC; +} + +bool target_ppc64(void) +{ + return target_arch() =3D=3D SYS_EMU_TARGET_PPC64; +} --=20 2.47.3 From nobody Mon Feb 9 18:08:00 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=1769824922; cv=none; d=zohomail.com; s=zohoarc; b=apRDlRbBHr5eq04P3FmAfzbVYNnoUHcyfobXw68n7t7jZF2Rdgr/R8Qc8OA2emBRsgggOyPidO+G2IeN2tWBmTCax0QhsYY9nyfpJ7eaTDbA59alEqKtlQ4NMEi7VvSpp7Pw34U9XiVkypXG37P0n+Ym+Hr4/mdzBRl3GtUuGx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769824922; 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=oWd58wnvbFOx8aJINbxb8qM4WgMJ3IcZKS3b5FQOgOA=; b=S7BedgIYXT9SNIhfSUWr7PUZkiDhC1Z4/Ur75A2QPjcqahS4Xioc8cXfvIMjn9lLXL/1zv3mSa67TIzxRRICRbRirER8Eq4j2vSZcEzY3HkKfuqhxfdpfWXVP0rZBND1hQn7YjXGTwcQi1ZpWcmN2w1evJtpOCiK0lCiYqqit9I= 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 1769824922276432.8326031816532; Fri, 30 Jan 2026 18:02:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vm0If-0007UT-O9; Fri, 30 Jan 2026 21:01: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 1vm0IW-0007I8-34 for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:17 -0500 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vm0IQ-0000U9-Fv for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:13 -0500 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-c61343f82d7so1070751a12.1 for ; Fri, 30 Jan 2026 18:01:09 -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-2a88b41390bsm84697975ad.23.2026.01.30.18.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769824868; x=1770429668; 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=oWd58wnvbFOx8aJINbxb8qM4WgMJ3IcZKS3b5FQOgOA=; b=SM/D/HmG3loe4V8GkJXW6Fo6W6PsjoV2fPG6OVzfiN8pU8gMXha9x2HfCtGJiEdKGl 1KYoHDL2hUCyitu5HR0vJsQWJfRiO66VUGEfVRZIwe9BwusY/P29JfmoqeDMudOnt7PY wwDxcQu72VJtzvzgiZvH7nO8ZXCubmHcdpV9SLildZFP/MmEGUGfTv1kZxRa5HPykH+E Sq04HlpVoca11VZ2H818UiRRJVza5ftkAaS0fw35xBy8Z+qXL/Uqbr0K7oe4a4OxDGIK 2zParUNhEsryYWS2DH6W4jtfzjfYSRYJ3SBhXFV1gzfaQnJLmHMlt3wq/+1yzjZOOg6b zc+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769824868; x=1770429668; 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=oWd58wnvbFOx8aJINbxb8qM4WgMJ3IcZKS3b5FQOgOA=; b=VW29iGqN5zMq8gMcsXklTCZIq5JBA5GuxlCKuRErdSPCmIvEifZ6dpedag46dydQbd LfNV7/FLUgfY1mR2Yx/tIbhZpD7PnCEfzDFGHtcBcX3zxOvwEy1uxhTXqdhJgsBBsPMh OljSsxWlRrJdN7gmyu3iIXQ1jhBipwK665jGk+eKgDpST1Kv6q6dxyejYzrbrQI2XnsE cDNU4MK86Epn2gHI1mlZXvONNJ4f81vyI5Q0xjr9Mm/UrNJSAPeqs3AfiAo9YVUcj/5B 5ktinFgXJhRSsqzblhaT2s4VLv58tP7QqdkZpOK1EIlA4j/N5CGro8SeCRNuic+2C47t aMXA== X-Gm-Message-State: AOJu0YxQhPPpR9KKdr92VDAPQ2umEn8cL/3xsQMN8y1u9t6lLr806/CB NyjiBr62ypPEgkwW4IFkYLk18gT1OjjZ+B5vEHfCvjPaCOCIbOGPy1BOHqsiZDGxQDGIc+IjkLv 3uESL X-Gm-Gg: AZuq6aJpEZBWWvGcqSP05CYaUmpUyFYQiYNd8qdVqKhxccADpR2SDj7wCW/tNmCIrKj DDCdMzNf/MmM8b0kl8nkdQbVcIKfACvDU9OqO8dCqcZbmEZP5Oj0r27NiQC83v9f0mtpM0pzPT2 aI8bJI4lCy7XBjU/GLQkYNs4saFMWZ10F/yyFzM487mC9criU7JkoEXJIvwS7gc8jxqlH34UXZt 8Buki7vUEMZCNy9w+NjJfxqxcD0dE0YMlhwUQDXMyFj5KNP2hvptl5wCZRp76MWgjPVcn+EOLuP 6q2nc0yjBj8n+0MzZUq+4T8p/8sxq8MI/kmMlotHV01IM2/gmKlPTaeXh3JR2WmbPaVXn3XzcDm lbzkuQxt7tYujKVI0kD0H839xZ50oafJvSDxLPPV0yLgBIpqa5wYwtSFQgBlL4NVwWr9BTjG28P ohaadyrRz3in9M+obc9yQnJaqehyOHvpU9mmkgGAKIyeJgcp8DBu/KOoDdy9WJ8U+UOsK3IWw+f LI= X-Received: by 2002:a17:902:e78c:b0:2a1:3cd9:a73a with SMTP id d9443c01a7336-2a8d8163c80mr55269685ad.40.1769824868007; Fri, 30 Jan 2026 18:01:08 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Harsh Prateek Bora , "Michael S. Tsirkin" , Nicholas Piggin Subject: [PATCH 2/6] include/hw/virtio/virtio-access.h: remove target specifics define Date: Fri, 30 Jan 2026 18:00:56 -0800 Message-ID: <20260131020100.1115203-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260131020100.1115203-1-pierrick.bouvier@linaro.org> References: <20260131020100.1115203-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::529; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x529.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: 1769824924604158500 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 cd17d0c87eb..51d9d725690 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 Mon Feb 9 18:08:00 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=1769824932; cv=none; d=zohomail.com; s=zohoarc; b=VT+mfB/gkrHUHNxKIUPHiGrMbGQBRd3ySLphD9XNdYdN/SVjBn4K73PnOrV8BjRGEZOkcLBI2GNm1A26pQhYG5aSbvVb/tynBIcObo/2PZRmN4IvJU1Xc9EqrkTZkS5U3cembmnl8JvgHUdTe3Taqu3HWaG4norfyuIW1gY25tY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769824932; 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=oGnRS71ono7XdJqYboCkP67YtPEo3jgTuW1VHlgPZtvGkS7dKn3Vx0kpE44kSF9AvtpAw1NCDov44ld26yiT1HoNpsn9zbGzYtjjoJkAMXwcEoZdvT6nRc78kfVnsU9yFSbkQhurfV4yrkq7XhYRK/4JjV2Y9oUMHWpOjqPXId0= 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 1769824932474950.3668843670447; Fri, 30 Jan 2026 18:02:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vm0Ib-0007QR-Mk; Fri, 30 Jan 2026 21:01:21 -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 1vm0IW-0007II-50 for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:17 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vm0IR-0000UJ-6H for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:13 -0500 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-c2af7d09533so1656032a12.1 for ; Fri, 30 Jan 2026 18:01: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 d9443c01a7336-2a88b41390bsm84697975ad.23.2026.01.30.18.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:01:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769824869; x=1770429669; 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=ebIkOPXZviBxdLO3F0xbnQ0twAR+qJ82m3YHFQ5rP13aoPHQndd12MjkehRc4FNokp 35m+uEwM3E7FiSsnVb9gsoWGnxTSNXIuwjz8cU09vKKXYC5VXJpV5GsoCR+m/G6fpTk4 Zx87sc35WB6StKjyv+/37ek3RpYre/yq7r3+WZFMrxxsiGcaPORhqwJBam8ar4YNttME TKSkoG9CuJ/jYQtPvWDg96WAaVOnVkoPSZMA0+gyxzqFkHWFDl/9M4h7T5Pytk5tGfkm lIPgHp+iQyuEfLKhbnouG4f49oA4qj3L+umZYO4pSKZ1ISn+ug1SgEJA96hxboTHK587 gxBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769824869; x=1770429669; 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=N0MDF3GIBOA/fneaX59Qpa1XuSqRUKbsuaByAwqyCzwLHhqEc/Sa7yMWRHwT+us63A XeuyBvAKyVwp3ogiQuV2f+2ieqa11Q3V5S1aXT1w9SyxTK59IejiPBOChl4oYV9p4q9X 2xdINdIgsFnX22j+K2jb5+LWcGpFnfvNSAuRb5tLwjYfyKK+YO8Ukq04xRhALGtuLsXh 6g1BmRMXCXtImw2Au0Dp6Mv5kYkB5B3XNo17GaOqCKyPwUrBUqmXArea2DladgaauAxA qIxcQvY/frxNhINKVHO/GHJ+BQ7K9M+3+x8BaIUFsYUir8yktgbrxPI+j4Tcqdkm/sWh artg== X-Gm-Message-State: AOJu0YxahdjXf1aXHWkEJjLz8qwlqJTAeJLgmFuUyZzrU34OD7gZU0WE jprgWYwNqmKw57kCDPF3bacFEeiaEiWYiNObdtGXwpa5M8PlGvQgwPNxu21R9Wd44ydqiEBoioM Y9b22 X-Gm-Gg: AZuq6aL6mxKUh9hwR6mktTGpHPx7SoHqJRfCBJWELlc3PCw4+j/OcSG3fAlxAOJ8KEg WlZfxGFEwF7J36qpwzmjAt30y9dJrf7EdbGCrHaIThmXQArjMvRI9F3fO7dkuuaeG96Hy53SQWL 5wKO/8rLdMmYPwSHHiMIFYLIFW1Z/VXqb40pjurBgbMTQwVtQk6mRtcaYXEpTau2/XtjlUqp0vj cV+LKHCIyKHxGfCKXWwoCyH+GUjVSyr4dH5pCWBX0nQH8QBEUACNpmLgZ9vcgvhVett2XIbJ0LL BG+z+Mm/oE+cTsRmHdUNGICsZfltuT9x0TKMCeMRvVg1IfdW/ly3/jDc3F4G3XHzUcJ+A8N6+5B nm9hWdJYzo6C5wk+Y/lmOgO6tjLVwLZ6247nJSdnDliJJ0ewF8ZuH43fcTjgQXb19k7InnaqIaz 9I1+8E2DUMApBV7U8j01/0b23excWXV2tMq/5RKh8hsSZWDdEzRH0Szt9WLnw62kTj X-Received: by 2002:a17:903:3bc3:b0:2a7:80bf:312e with SMTP id d9443c01a7336-2a8d991922amr51888845ad.28.1769824869079; Fri, 30 Jan 2026 18:01:09 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Harsh Prateek Bora , "Michael S. Tsirkin" , Nicholas Piggin Subject: [PATCH 3/6] include/hw/ppc/spapr: extract SPAPR_MAX_RAM_SLOTS in a new header Date: Fri, 30 Jan 2026 18:00:57 -0800 Message-ID: <20260131020100.1115203-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260131020100.1115203-1-pierrick.bouvier@linaro.org> References: <20260131020100.1115203-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::52e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x52e.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: 1769824934215158500 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 Mon Feb 9 18:08:00 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=1769824936; cv=none; d=zohomail.com; s=zohoarc; b=gPgeCvT1cv8DqVGpaWgQMRhM8vEBZv/uaIZeV0nmYCXrP/7Ax6m75rWpbFHcRSWetLyPsm3ijbVXwyNBSxRMwAlLuGaqCpwL/fg+mZPaCLHZEiUr6uhgqYgARxgzk+hLODGPOrTZbk12Fnl+E8ZIAZWkx/1pIbstQpAURVV+Yq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769824936; 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=QZCg+s/m9b/nMMAn0vsiLxhr9BOJ5/srz6yP+nxhqz4=; b=GG879teqr5c6PJt48KRkOmZGuRCLZDE7ujC2xcDGTn6Xff7mq+lLm2oQElcBdv+J2Q8eYfgxSbl4OKkpWJ6qPQHp8RLOKZZh9E2/DVEJamNRhOcxHWrKXTNpysZ2PhjBFQ1gQpGQ/jmNVWZeoRFtDJD0QjNnqMNoyJAHW0iMIDI= 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 1769824936432184.69614270956185; Fri, 30 Jan 2026 18:02:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vm0Ic-0007Rs-7y; Fri, 30 Jan 2026 21:01: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 1vm0IY-0007LI-6H for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:18 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vm0IT-0000US-Du for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:17 -0500 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2a7a94c6d4fso13029525ad.0 for ; Fri, 30 Jan 2026 18:01: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 d9443c01a7336-2a88b41390bsm84697975ad.23.2026.01.30.18.01.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769824870; x=1770429670; 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=QZCg+s/m9b/nMMAn0vsiLxhr9BOJ5/srz6yP+nxhqz4=; b=FJiZoHeOzINBXQhoKFreDXu0tlUNnFkllg/qQBSjbkSlJ8xhwHixbdjzZMtzBPUwKE qKTpyerJfW9Cn0upcFXJ5BQkwcD4VAvdmMYh4RS0jpBhNTfqJ16zNVl9upCeyzFV4lkU SkKvWLPAawBldA26FWi08syD8dyHq7OFl8/jTZAlzHUy98N7k0L6wRp1OKDHbmmcjVz3 IqxXpiPjWafag0IkRQDbiIs+UxDWs3UcwKXzHHYaZqcW1RiT1rKGBF7BF6FKUXMipQVQ e6PzLZ84cVn+6NudKyiH/cBu1ycGdRSZMtItlZCVND36nFPRSDEPlnXVRalsy6m61WfF zLGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769824870; x=1770429670; 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=QZCg+s/m9b/nMMAn0vsiLxhr9BOJ5/srz6yP+nxhqz4=; b=TQioX87S2DPAplKwUdFrWQGW9q7+h0UFEiUVB4x/9hkx0ScgTWUO5wCUOL0LVEtCu2 TJNIiixUwrSILJmZ8vfKUdr2Y+nyN58uicqrs7nWKU1gPc8aMxUQFmVZMJYt5xOiHhpg nXorZJbc8FZUYUveOoKR6xodiF9illQXnaL+tikjVR5EhGI8rIw88AUgOvFiiP5lqNYn KmAzUpEg6LwEWbaRr/lywdjpkj2FKHTGQOSscD+HNHcv4ln9s5nOiniOxsEv19gV9dLd 9CZ9zZBXmOkpyJbvHtCtfT/zq0Ab6JfBF/mr2mOgxccxg93eNj+iQhZIXbG1qfpKEqAI kgLA== X-Gm-Message-State: AOJu0YxJaGrOjjLhsHY8/XxTOPC3nBRHoUNKO4vpAn9F0mpaNViNKzzJ AZcxoz/4IBlzyYOk12ydVoDg6DzdMOosNKHMikeJsmQGtpS3memY+1RTVKK8OMNrdMTOppzvd2d 3qwql X-Gm-Gg: AZuq6aLyroDlWcUuUyK4fdfuiR0F71qZLG4h3b7G2/j0naxj4v4vkWpa2Ep6BuqIW/8 fLSbcN5yKChJ/G9tnbtnOOv03Wkz3oTWqOeFoJiytgiuz0B3oQiNNgAWBESn0uqUY7MS+/S7iKz Kbuxdu52bHPFYiNrRDkpaRkyPKjtsBTLzWXJtxQV2j39B6N6Jz93Wf5txIphOhNL8WAujwgkyno K1O6gZKfZw5g604pPVMRLk8QZp6SEUAKELNxdqHFM5N/E34DSfGPsN7iAppyefRkKKMtBx9k2kr w7QRtCJjsLzCsIVV0hBwKZvZ0qYEpx68rPviMhLd1nlvZyUuNArkmp/fn7rvGAuxjqBDAIxQdP0 FoihdBTXx1U/MaAiPJaZfygTAIV5kcd4lxEVTAB/OU7f11FZ7grruWxLL5HgDkOTBNUcC8XBc6Q z7YLU55Ci+m+5cAGUYpNxDB6m89yKpGar2dr+3CET9E6rut6xRiYBvM6Nsid3c6gMu X-Received: by 2002:a17:902:d4c9:b0:2a7:99c9:1086 with SMTP id d9443c01a7336-2a8d9a56c95mr47008875ad.47.1769824869937; Fri, 30 Jan 2026 18:01:09 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Harsh Prateek Bora , "Michael S. Tsirkin" , Nicholas Piggin Subject: [PATCH 4/6] hw/virtio/vhost-user: make compilation unit common Date: Fri, 30 Jan 2026 18:00:58 -0800 Message-ID: <20260131020100.1115203-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260131020100.1115203-1-pierrick.bouvier@linaro.org> References: <20260131020100.1115203-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::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.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: 1769824938121158500 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 63fa9a1b4b1..c8a004c6d2d 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 @@ -2280,7 +2275,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 affd66887db..ee397aaf196 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 Mon Feb 9 18:08:00 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=1769824960; cv=none; d=zohomail.com; s=zohoarc; b=OBTJVpnoqWXNexl7eA5yVO274YXeSn1ZPmFs6VyUdn2zVhY8HRkLqNm7XdA5qZGmba/TzGh5j90eTtTHZGM37g5iSyOFsRAFuB3WqnFpLpK3rNemvAhv0x07l4yFYGqb/zs0qvV/AvQAOiFeyDU1R6j9PyjSXIDd4fKIq7JYE5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769824960; 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=1d+/91JShFPwrkJUMSmFdVCFBtHWCReGt22lXLOogUI=; b=nh9NgazQXhWTwwQqG8QJd7caraAEcaefc5SK1WUAsDcZEZ2J18hqZw3Ds/tlpkkPaIVNHkiU/hQevpxwjQ0nfgtL59MbgwNKmc36jncabbXOS10jbSqvZr7SeLhutbFgIDc6jcOSWXjho6uK1celmVs3wF+1eJgRmWrOKnUqmiw= 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 1769824960387165.6287169592556; Fri, 30 Jan 2026 18:02:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vm0Id-0007SH-1l; Fri, 30 Jan 2026 21:01: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 1vm0IZ-0007QY-SH for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:21 -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 1vm0IV-0000Ue-Rq for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:19 -0500 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c635559e1c3so1124448a12.0 for ; Fri, 30 Jan 2026 18:01:12 -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-2a88b41390bsm84697975ad.23.2026.01.30.18.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:01:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769824871; x=1770429671; 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=1d+/91JShFPwrkJUMSmFdVCFBtHWCReGt22lXLOogUI=; b=Lc/OS24pN5amN5P9Oj7Z3T0vDHkOtfPWsYUeGOepZvVpN4m5/P0V1QXPg6oGFRYqn0 /65nwP07qJMmNCo/VLqCERkN6XDwlilnZU6r1+NlszcGGN8ml1wNxreR+Ki0SMH02NgS CErLKcSf+UYlzeBG4/t8b8nEHSeJPxVK54Lp9gIyx0WzBbF0eNmyz2qu+hBji9FE6Sah npaZtycCzj5zX5hchao4/FprMZjEtuDgC5u8M+B3OUgDgoSifAINdf5QzjZxy4o7A4c9 7Yj5w1zgngFxyzCIDk4ChHKInJ9AtsoUwSW0C51e4FxNN9Gaa1GaH7OQVkrF9/H0Zdz1 t94g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769824871; x=1770429671; 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=1d+/91JShFPwrkJUMSmFdVCFBtHWCReGt22lXLOogUI=; b=Gj8xyyEPQ7dNEg8YQMBLwOOmDI/RjMZBq3jeXiiTTvUWwPZMnWkNiU/suLrqf6XSyt mNRuVpF8aXVVt6dvpPxSKJGJh2a/GA6mO9qYBArOtpuI5ru4jTqu/Sh0tlWFYPTqcQUU RjH2KEgAifuZakE/GqwriEk/sTApyugqYvU3/Qu2GSfKEcDBpT+i8lv6Sidn5fILnng+ DRea76a9duyLH+QcUC3WtMGetT89WVxlYVHG6oAULIt5qKPfZj6C97GvIJbdTi3D6l6K vuljkjHaFs9IFal9bf8n83NRpAIbQPjLHBCHpJyaf0K9SPGUGwoIeUxfIoP4dpJng5cZ +eMA== X-Gm-Message-State: AOJu0YzHdNvJWTW16QlQMjf7QAfHStxnfJqAYth6u11vXLBCEu6zrU2N gQOoz6cJJg0y7MXXFMcrD71i/2kt9Zhm+0afd2TEqs2PtTw1wv4e3lVgfFTRQb6NapmsdxuP3KA HaKMv X-Gm-Gg: AZuq6aIN+Jgwb8DxGRZ6j6ZBgRBJdHK8yiQHgBTnA/LXTtNe3lJ6US3Y0eioecttq4V /M3vDREiHnL6rfx3QPZpT/uL3SMykoAOBCEboFcLk+8eDGZz6+uJTPL91PvmK39AHw2eNn8diKh u6+tsguc7YBa97Zj0NnTIPNcUPidD7XQwCC7gOR9J4h/8zdSbl2lHmIaAai8nK92K7sxlqBwwo0 2oBq7JkAqTlelIj4ooC8JGwAtfExSk1kQl4SWmQS7KzVBNzXPindkiDWnlC2Y8IVXbUVot6wc9N wqa/TXRuMU7xPCrdamZypqjJ/sx7wfbqa5aX6wGL6JKjH1Kb4wk9O18kXsVwReN6jO2a9eHxc1Y fcR0+D23K4ksowBV5zpiDfIJiE6hx8jai22Asopp7i7/a/kVQ/BFxYeZt8Nbg9QRNZfSp/MwwLr 5j7UKnDg8NhLH/vtdOPsv314J1r7NzySZKu19+dNy3iqwIYBmqX/9x+yh+XcxO3P96 X-Received: by 2002:a17:903:32c7:b0:2a0:906b:db3e with SMTP id d9443c01a7336-2a8bd5243c6mr85013985ad.27.1769824870940; Fri, 30 Jan 2026 18:01:10 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Harsh Prateek Bora , "Michael S. Tsirkin" , Nicholas Piggin Subject: [PATCH 5/6] hw/virtio/virtio-qmp: make compilation unit common Date: Fri, 30 Jan 2026 18:00:59 -0800 Message-ID: <20260131020100.1115203-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260131020100.1115203-1-pierrick.bouvier@linaro.org> References: <20260131020100.1115203-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: 1769824962382158500 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 ee397aaf196..d913b94e1ca 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 Mon Feb 9 18:08:00 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=1769824932; cv=none; d=zohomail.com; s=zohoarc; b=PG9QXrFjOvIs753Gl2T2VcvNHbYjMrzjsp2tA5gsgmCz+OXuYw1UJf4kQ5fFABPDFtERX17rMvEHL1elqH+rj3Ui0USz4CPtKS/TsjMTha15YpFpTSqTk0yN/ZC1WUDqlzG2s33XCkWlmzPV5PpOqkqvkG+o2UoxL1QPMmivSfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769824932; 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=vj+J65/hVHAdLn3TpalL7Huy1Q4mzDUSA7K1x00Tkbg=; b=Z/YS5B2m3uJRIKy4JS1GazqIbKvSzc74eQRJculsMmAGv1rFOwjV5TRvITXYGWrS/9d5ipPOM14NnS3TeskT9nUOTogkb3rFtNnOzCcvTbeZrOsBoWqGk5zI78HW/JCTFMUBiAmyWKUo5FrGMlc1fIflH4Jt8W39Ve53jwletrs= 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 1769824932499933.0834603025829; Fri, 30 Jan 2026 18:02:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vm0Ic-0007Rw-Fw; Fri, 30 Jan 2026 21:01: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 1vm0IZ-0007QZ-Sn for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:21 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vm0IV-0000Un-Ra for qemu-devel@nongnu.org; Fri, 30 Jan 2026 21:01:18 -0500 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2a1022dda33so17491965ad.2 for ; Fri, 30 Jan 2026 18:01:12 -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-2a88b41390bsm84697975ad.23.2026.01.30.18.01.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 18:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1769824872; x=1770429672; 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=vj+J65/hVHAdLn3TpalL7Huy1Q4mzDUSA7K1x00Tkbg=; b=JlVyB11gKQpdcsfXQEUZcCW/UYHnb4wrthit9+I8h17GD2GhbbI4bj9mECXYcpm9pP WTQWkuTWZwdte6LvtJKDUNCe1vvFEzS7hZR2WmPuY6Y/EGDoHDPy+xWqo7nU9SQcaSfL DuG3KFz3GIW+0rK0y1Uwks1FJqhVwdNyWHjcvDOmQ6u4hoNy4wleeRz+E/3FILdyaczO M6HWIXVV+Z51psTcpPf8zrptH5mqxubpKTRfHdsm4DAyZ1kLRoF0JZpyBLbq8b6St/Jk IXSfQVFHaqJdTbzJryEbP9ia1qZVkn+xueqGpGpFC72MD8us9//MKncAoZZePqdT6RxV W84A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769824872; x=1770429672; 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=vj+J65/hVHAdLn3TpalL7Huy1Q4mzDUSA7K1x00Tkbg=; b=Vb036ivN6rwFXzYBsiv1kIN+X4cfSHqKSZ7rhOHsiANHOhOzW1FVeyP27NVD1b0lt3 ZPnR14ihyKbTzQxdrRRHbmhm0Usf39Gvg1TnvA+u7ZQ4CmmMpKNdd4uoLM79rO90jSHH CkGviB5i2JADG1vT0F0s+Ad0dQ19OccruuKCm850wAE2eaB9gMIJM7DKeGbzIztACmMg qy5ClAssSeznIAiDrMvyK658f1/sTvWMUPcC5T2gVsrmun4dhz0NNWNJBODH6r5lX8m1 bH205H53JBt2u9h/O6JygroE9JoqgArXpmXqzjRr8xzwuJ4cIU5HdGJw7r7g8jUGr2iW ia4g== X-Gm-Message-State: AOJu0YwP7Zr6K2z/9BkL261VDtuIxZ2mkJLPwQs/X/8ZQOkmoWLvzFFF JYe5d7FwRMVO1lu3G73baMeHMpkjFgngDSmwqMIHGyalT3VNYemBDlRzWHK+SSbwr8Drw5Xu7pD 7gncx X-Gm-Gg: AZuq6aLTbgQtI0NGvSQqO0wzvPlSi6f3+VhjGu4QIgINyXgzZIPsZzxAhSKAhfXqQAV r0NwuZlWdO08/NHRtUBin6mfWtcaOs954uwuEpL1sc+qd2cWctMT2Hj4F1cCTMvqtr8ijYwDb90 zhm4sn24BGs5oSEx85WUOKcdMYbl7YDCzAL6L/IB/5L25pooyESYE07iIPZvlWixbxgIo6BfAZN SJ8pc0TIL+enlrl2Qio8t45zKz184J/x9+n84dG6rTboThci7g0dNGSMmFMJssduGx1FosiRaOq kNnMgeqsvTykeQm4jo1p0+c/Tc0BhPJKQwJKhe8xm8vkspVrdX/TwdaJS5Yy9+tk+q7iHj0YVas iElvxQ8HY+KIINjJrBhJAsEIOHrNi9B83ndOn5+4QmK3MYIHt5BAM+bg1lZYPMmzdud9bAY91PO rrZfrxJOPSRv05V+E/S0iCOydaHDoghwFEMS3WgQ74i+3xb1cPeQ2fNxWokUhWLu0joUS2CrFkk /g= X-Received: by 2002:a17:902:fc8d:b0:2a0:f47c:cfc with SMTP id d9443c01a7336-2a8d990b3e5mr43871715ad.34.1769824871803; Fri, 30 Jan 2026 18:01:11 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Garzarella , Harsh Prateek Bora , "Michael S. Tsirkin" , Nicholas Piggin Subject: [PATCH 6/6] hw/virtio/: make all compilation units common Date: Fri, 30 Jan 2026 18:01:00 -0800 Message-ID: <20260131020100.1115203-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260131020100.1115203-1-pierrick.bouvier@linaro.org> References: <20260131020100.1115203-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::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.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: 1769824934226158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 d913b94e1ca..4f308beb961 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 @@ -52,10 +51,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]) @@ -97,5 +96,4 @@ system_ss.add(when: ['CONFIG_VIRTIO_MD', 'CONFIG_VIRTIO_P= CI'], =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