From nobody Fri Mar 27 04:02:45 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=1772744884; cv=none; d=zohomail.com; s=zohoarc; b=eUxvCTzSHaNBSq9CPUMvETPZl9N8FMF8uPLcM7hlboo3f/SJ57rJJ8Dgm0kcdsKg1w3Il0vvoXiEfJ6S565TYCM4w3g+oSYuX9Rak8fVW2AEdKc0WToLuR2BXsHgPeao8/L2d4qO2pIxCXKLeioCZ3ZF5SHpH2w0jlJGdQx+YiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772744884; 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=76kT1LLbzqR90+aCRQBHop//yXjVEoX7825LzBvy7WA=; b=RTuadm+wqd9qe4QWLF5//GGhdlqibsaWcqoZIJsNem3xJ/4MEMdA3W8mmOPbhR7Kmapg6tkcwa4AUs4nL7tQ7ulYHD1DPRkXRE8Bp4Uamyn5XEPz1SKaeyoH6jY96zzm/d7lBvzLOnZYBAQ3nlJ6LnlnOri6HsCZSg6NC9iFl54= 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 1772744884685528.9396708712776; Thu, 5 Mar 2026 13:08:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyFub-0000oG-I5; Thu, 05 Mar 2026 16:07:13 -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 1vyFua-0000nb-Ao for qemu-devel@nongnu.org; Thu, 05 Mar 2026 16:07:12 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyFuY-0008Ob-Ka for qemu-devel@nongnu.org; Thu, 05 Mar 2026 16:07:12 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2ae3a2f6007so41761545ad.2 for ; Thu, 05 Mar 2026 13:07: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-2adfb6b5813sm236992505ad.63.2026.03.05.13.07.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 13:07:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772744829; x=1773349629; 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=76kT1LLbzqR90+aCRQBHop//yXjVEoX7825LzBvy7WA=; b=PKpCaYS+wTXlnrM6OY0kI28q87K/qIvr604w61uJUyTj9TfoF2XgdppwNsuooBDNlO BHV/+aM5gAxLUGK7mP3p3R9k0smI6cI4mR87jXm9hqxtMiKTgb+ceMPAlshuqbl96zdp W7AIHwzEHYc92qUSRBLyrmFsSmxC3laJojh1Y4bwwi9xXZWZJ7yZda7ygZL/rfFV8IKQ +eJceAO9cMhmobXtOU35Oy31VzNj9VY1To62wU3NDcwCD/3eUiKpry6zeIYcQghF5hi6 E1RHykMtiEvgde2vYo6p2LpaWq7ZIBFOqQZAJRISzfQLtTyYvbZioiRpIA7gVEUU7ADd 1XVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772744829; x=1773349629; 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=76kT1LLbzqR90+aCRQBHop//yXjVEoX7825LzBvy7WA=; b=nAtlOMNXGQdgKgmRZ8dD1SMAYyxc3iwesBlVVzNn1z9Pg9AljgEhricbD9aoVCy7Rg aT8WJlGn/ernBMRp2LL08UMGl2dX9f1boKII1o2MxVfWvb9JOAjZ99lPlJQoGqjwsr/D 9KketdYq4/7S/CZkmLq7HeCKaQOoaa5BFtP/P9+rFT29z5rrqj1vE+pNC5UsxXy32wGQ 9eY+KFiGCaiE03leooRHkc+52CItFeX/x+OryTmHcuYPbJod5Ma4jsZTQnWTHYjkJ9kx z42JWrdjZkgE6R8gp4XcH8xsOGL31/1+Nf+kZMsBsabFzjV8VusQzPeUGFXyOnFYes6x GqtA== X-Gm-Message-State: AOJu0Ywi3IpbI5CkXhPjSEUPBPcGkaoShFGVsKgFebks3pxeLuFZGo2o 9Sb4jatp+Rnj3xDe2zxQpz/9e2ciQBEq0NYtU+XmGBvwVHnArqVIuJo4R4mDr+U0ph5qeEnOEl3 zdbie X-Gm-Gg: ATEYQzwr4bbPuKEoYS0lxIFA4BO1SRPjT1HdtiiQ7wcYGsMUQQCuLXn07YRf3wUupvc jqH1NPUNtqCKMy7IIOTPnLK8lmU7qLsali/iTD0ayxcB3SMjwwln+fl9tfS2pxpQyWG7nm2HizH dhyvt2BJErPuN9Vv8IIaxSWh1n5dxxU2TroLbm1BZ4UXS+aUFe6kMuwwYsTJ7bjXJ1XTSooY8fl 6Qp7TD+kwdP/s1ZoPWAalv4iKsYcZsQkJhBmfnQ+c0iF86mbjyOIeS7z2zgirleQpNwxGyHCJCi KPFjWXGLPqC5N5mTVb+xErA36G8Hc73Br0TICX2mQpTKiAHXETfkn3VJUtssHavbH1RGI+c9rRS xJ81OdPuF7fTGXVgifCvjgUZpS2BwI4yx3q2EmgjYXrcal44alK/miMh3YujCQv7Rzil67Nps9+ ivtwZGczxqLfnyAGZTmCpXRK0Q0/DFSh0Dv5labexxPujJ8dm74j/mGqg9pjELqt+tUpGaVycvZ 3ZT X-Received: by 2002:a17:902:dac3:b0:2ae:62c8:771a with SMTP id d9443c01a7336-2ae6aa04b60mr63022585ad.5.1772744828913; Thu, 05 Mar 2026 13:07:08 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org, peter.maydell@linaro.org, richard.henderson@linaro.org, pbonzini@redhat.com, stefanha@redhat.com Cc: pierrick.bouvier@linaro.org Subject: [PULL 4/6] hw/virtio/vhost-user: make compilation unit common Date: Thu, 5 Mar 2026 13:06:54 -0800 Message-ID: <20260305210656.2140206-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260305210656.2140206-1-pierrick.bouvier@linaro.org> References: <20260305210656.2140206-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::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.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: 1772744886014158500 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. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/qemu-devel/20260225041948.52929-5-philmd@lina= ro.org 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