{"id":2226841,"url":"http://patchwork.ozlabs.org/api/patches/2226841/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422195746.88865-36-philmd@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260422195746.88865-36-philmd@linaro.org>","list_archive_url":null,"date":"2026-04-22T19:57:33","name":"[PULL,35/48] hw/arm/smmuv3: Have smmuv3_accel_init() take an Error* parameter","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"14c4963272321088fb372905f3ccfe443f4ff40a","submitter":{"id":85046,"url":"http://patchwork.ozlabs.org/api/people/85046/?format=json","name":"Philippe Mathieu-Daudé","email":"philmd@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422195746.88865-36-philmd@linaro.org/mbox/","series":[{"id":501099,"url":"http://patchwork.ozlabs.org/api/series/501099/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501099","date":"2026-04-22T19:56:59","name":"[PULL,01/48] hw/avr: Build as common unit files","version":1,"mbox":"http://patchwork.ozlabs.org/series/501099/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226841/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226841/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=Cfr+p2cS;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g19H86wGZz1yGs\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 23 Apr 2026 06:07:00 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wFdme-0005HN-VV; Wed, 22 Apr 2026 16:02:53 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1wFdlr-0004Jl-2w\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 16:02:07 -0400","from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1wFdlp-00039N-DO\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 16:02:02 -0400","by mail-wm1-x32e.google.com with SMTP id\n 5b1f17b1804b1-48334ee0aeaso61296605e9.1\n for <qemu-devel@nongnu.org>; Wed, 22 Apr 2026 13:02:01 -0700 (PDT)","from localhost.localdomain (88-187-86-199.subs.proxad.net.\n [88.187.86.199]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488fc1c0354sm439039655e9.11.2026.04.22.13.01.57\n for <qemu-devel@nongnu.org>\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Wed, 22 Apr 2026 13:01:58 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776888119; x=1777492919; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:from:to:cc:subject:date:message-id\n :reply-to; bh=FGWUqnekPtGd8GYqKaTYj2Uvkrw/01LXnqQh3k67lwg=;\n b=Cfr+p2cS/vZSzv6Swp5wFyMyxeJfTq3/S3A8YzD/CXcRthpgj8S9P6eqTC5aREM0v4\n HmaiGH5E5d8yDp7p3uPZuwmtbaE1GrgSdniu3/7SoetDw5eKvTDkM6m2/do0O2dJStsl\n YmdxO1gkcPSknHPh/lRLCX2fGYKOBXw/6SuIpZQL3UuSXPVrKpe9fSWiQJ+7quK1xa3V\n neL4rpXc3ipB8vWmu0kLM6pAW9F9FMNT8egm2GP/ARQ7WtVA8cBzbEyexGXYAXbClOpp\n Aq1Ay0zMYdCv2htxsqgMmMVYP8ye2zyTpae4ChNyIPBT2MYkiDUdekzN58oPeFVGOJzh\n TUHA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776888119; x=1777492919;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=FGWUqnekPtGd8GYqKaTYj2Uvkrw/01LXnqQh3k67lwg=;\n b=pp8IGR8W/kwsTRCI/ITQwm7U19kygI3ohqHZupFd5dl81e39l4BJDnJzTCuRzYqNjG\n V9Iv+l72X3cDcgP9OA4nrzF81x9Aigr4nMMaPzLDcnEyuHGWpKMCEeKCPz3qIpTXjIdd\n KAs4edIiE1N7iW2JwEe3awHQdEEBJoVeElnqEnu9lzY8YJG9qHwyHo5MDmQHYtz4W5kH\n 0zsXhiJyMaHwxhYud6LXl717f3n2QzRReAFWsjPiWzxBue+MBRKIHGV639cIk8JCLj4M\n wFi0dh4/OsH2QzLV0yqnlL2U9R5YclF6qT9zrfwiUYkH5Q73CxjjlMo2KHrC2woWTmBr\n l1pg==","X-Gm-Message-State":"AOJu0YwcEdx4KGgHSsreEj05bMBcSKD4qOSUD6iZqw4xTa0mxEwd04P7\n WYLfuxD7kZyhmUEukt+gE3sNUtsOsSy9DqAc54HGKgJbFDIvXU8CZdOb6o8l6eL8LWq/+Uvo7F8\n oG4pmTms=","X-Gm-Gg":"AeBDievG2CiD3bCeUwsHMuV0uo0eh5GeeDDRyyRKVH0jCsz5buXMmQfeVe1HcUt6Rfp\n Ce/vofIkDsF0GZW3dPr76vxfhXKsuc2UYZWEajUJ95XXGJQY0vZXecAIIp+tz830fXu/H6BzrkO\n 6aRao1xzqNBgUAUnWEqNgO5EnBZOEZ3Nw8s3u1ldyWq+xE8VPpT8CUhV86Z6B/XQ6uNhAkMwiGj\n jQ4LQDCjPjFUpmdi3qqQovjKrJH5nYLLUYQ0ipuE5z2k3N+ygafZo+dxiGarvpBcJoal1cIf1LP\n m8icpsuDuiltYAatF0AFs5IkW/Cz0TAlTOIY36GhiGzoSaA156Cp5ULzQ1RxagNIMKnBdoGNsYt\n rduGW1r8B0yWcM/xK4TPajhC1eBESfhU9SRXjywtTNi5hVZAdSEBlnsVJLbYd/nE3Y4kZTc1gBJ\n OPjo+OhcsbcaeOmfOSi4JCfeepOr9s4aJm2qbxFUkWeGbI/vSzDJGcL9Kad4J+VmdNB2ANE4Mfe\n +wK2/ZfXTc=","X-Received":"by 2002:a05:600c:4f0c:b0:489:1c1f:35e6 with SMTP id\n 5b1f17b1804b1-4891c1f38c8mr225565695e9.6.1776888118871;\n Wed, 22 Apr 2026 13:01:58 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>","To":"qemu-devel@nongnu.org","Subject":"[PULL 35/48] hw/arm/smmuv3: Have smmuv3_accel_init() take an Error*\n parameter","Date":"Wed, 22 Apr 2026 21:57:33 +0200","Message-ID":"<20260422195746.88865-36-philmd@linaro.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260422195746.88865-1-philmd@linaro.org>","References":"<20260422195746.88865-1-philmd@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32e;\n envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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 <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"By giving smmuv3_accel_init() the ability to populate an error,\nwe can fail early in smmu_realize() when CONFIG_ARM_SMMUV3_ACCEL\nis not available, simplifying smmu_validate_property().\n\nSuggested-by: Shameer Kolothum Thodi <skolothumtho@nvidia.com>\nCo-developed-by: Shameer Kolothum Thodi <skolothumtho@nvidia.com>\nSigned-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>\nReviewed-by: Shameer Kolothum <skolothumtho@nvidia.com>\nMessage-Id: <20260410200031.18572-2-philmd@linaro.org>\n---\n hw/arm/smmuv3-accel.h |  7 +++++--\n hw/arm/smmuv3-accel.c |  3 ++-\n hw/arm/smmuv3.c       | 11 +++--------\n 3 files changed, 10 insertions(+), 11 deletions(-)","diff":"diff --git a/hw/arm/smmuv3-accel.h b/hw/arm/smmuv3-accel.h\nindex dba6c71de52..1ca2c80a933 100644\n--- a/hw/arm/smmuv3-accel.h\n+++ b/hw/arm/smmuv3-accel.h\n@@ -42,7 +42,7 @@ typedef struct SMMUv3AccelDevice {\n } SMMUv3AccelDevice;\n \n #ifdef CONFIG_ARM_SMMUV3_ACCEL\n-void smmuv3_accel_init(SMMUv3State *s);\n+bool smmuv3_accel_init(SMMUv3State *s, Error **errp);\n bool smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid,\n                               Error **errp);\n bool smmuv3_accel_install_ste_range(SMMUv3State *s, SMMUSIDRange *range,\n@@ -54,8 +54,11 @@ void smmuv3_accel_idr_override(SMMUv3State *s);\n bool smmuv3_accel_alloc_veventq(SMMUv3State *s, Error **errp);\n void smmuv3_accel_reset(SMMUv3State *s);\n #else\n-static inline void smmuv3_accel_init(SMMUv3State *s)\n+#include \"qapi/error.h\"\n+static inline bool smmuv3_accel_init(SMMUv3State *s, Error **errp)\n {\n+    error_setg(errp, \"accel=on support not compiled in\");\n+    return false;\n }\n static inline bool\n smmuv3_accel_install_ste(SMMUv3State *s, SMMUDevice *sdev, int sid,\ndiff --git a/hw/arm/smmuv3-accel.c b/hw/arm/smmuv3-accel.c\nindex 65c2f44880a..ae031f1eccf 100644\n--- a/hw/arm/smmuv3-accel.c\n+++ b/hw/arm/smmuv3-accel.c\n@@ -917,11 +917,12 @@ static void smmuv3_accel_as_init(SMMUv3State *s)\n     address_space_init(shared_as_sysmem, &root, \"smmuv3-accel-as-sysmem\");\n }\n \n-void smmuv3_accel_init(SMMUv3State *s)\n+bool smmuv3_accel_init(SMMUv3State *s, Error **errp)\n {\n     SMMUState *bs = ARM_SMMU(s);\n \n     s->s_accel = g_new0(SMMUv3AccelState, 1);\n     bs->iommu_ops = &smmuv3_accel_ops;\n     smmuv3_accel_as_init(s);\n+    return true;\n }\ndiff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c\nindex 5570a13c8a6..5c2855c3770 100644\n--- a/hw/arm/smmuv3.c\n+++ b/hw/arm/smmuv3.c\n@@ -1965,13 +1965,6 @@ static void smmu_reset_exit(Object *obj, ResetType type)\n \n static bool smmu_validate_property(SMMUv3State *s, Error **errp)\n {\n-#ifndef CONFIG_ARM_SMMUV3_ACCEL\n-    if (s->accel) {\n-        error_setg(errp, \"accel=on support not compiled in\");\n-        return false;\n-    }\n-#endif\n-\n     if (s->ats == ON_OFF_AUTO_AUTO) {\n         error_setg(errp, \"ats auto mode is not supported\");\n         return false;\n@@ -2033,7 +2026,9 @@ static void smmu_realize(DeviceState *d, Error **errp)\n     }\n \n     if (s->accel) {\n-        smmuv3_accel_init(s);\n+        if (!smmuv3_accel_init(s, errp)) {\n+            return;\n+        }\n         error_setg(&s->migration_blocker, \"Migration not supported with SMMUv3 \"\n                    \"accelerator mode enabled\");\n         if (migrate_add_blocker(&s->migration_blocker, errp) < 0) {\n","prefixes":["PULL","35/48"]}