From patchwork Thu Mar 20 15:47:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874980 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp398823wrb; Thu, 20 Mar 2025 08:48:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9AvSvva5WYj25u+nG26vGUhekWxZi7Ks9fESRsk4xafOR/Fsip9dHdRYZl7W6NOySiDKjgw==@linaro.org X-Google-Smtp-Source: AGHT+IGQilKTLOsrs3pp+mKfKPaM1eLeU/5cR0AkDTLKlFPQArZ2G+Zi+VPxSdp0kYcRebJ1M45g X-Received: by 2002:a05:6102:512a:b0:4bb:e14a:9451 with SMTP id ada2fe7eead31-4c4ec81b632mr7156414137.20.1742485737403; Thu, 20 Mar 2025 08:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742485737; cv=none; d=google.com; s=arc-20240605; b=W+HziGj935oKNPNxPc8G/asArYWWi5Y2qLkAXL6/YtSp+ifWLkQiT1zmfGRyF0aowT 8XwqG6wg5fILTwG9NjRA0+G+uW9wWTH+ql7OaWMrg0Cjce2Y2hO/fblbmpCnxsQRZIFK JndSRkPIPmMu6eGqB5JcrQ2hxaX90e45MUHEEXf53ewEDTP87mh/5x1XpH5UMlgK10FD Ak+uRBOHo6Y6UEP3sv65LRqL6O1owB+npdUDXG7wZEFtopnNI9EwssUjDBBEq0+ZjmBQ IrZaQ7rR+VpoBtdZXSCipvz34+wUbRUZx3PWlQCmizoLI5yD6Ck7gK1mKxaFHxuOlb/a 28wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hiZgm8pqiIPSqZSnhTLPdWvEW87iUNjwb11DtO5aXf4=; fh=qbC6fvdFrljuilVi+/v5x47AoPH9/ehlwoBVXcbRqbk=; b=Xuj+LJwi27rO0ka370o4t5TL3eUFXnfm7pYrhYB4v8wuHS+E4ztsEgwF743YpEvSsO S11DSqsur8bOfwxEAgHDbOOoLworCDPcMUW5VgvF8OmDl0Ool9zV+tRqKFL3fLP1NHjT AU2c+b1iewxjO2o9QkgYE6GM8cMgqZkFvL+o4gSSnY5cgEgNiU12pFxdPNS/4mVAiH2w TmWmP2e8k7pTRT8VEOeFQwo032HCwGbsbgSQcG4DpS9LscK3L0ThDrbEfBIeVsp/P9IZ kgHs4PZYG1uQByLm5tvR+1Q0WcNlzvA14ETIrdUcOw2kfoPaBc9/dK3RL6oDZ7uqIdWc n5+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BjWjj6QV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c50bcf1d15si61715137.101.2025.03.20.08.48.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Mar 2025 08:48:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BjWjj6QV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvI7r-0003rX-Cz; Thu, 20 Mar 2025 11:48:07 -0400 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 1tvI7I-0003Qm-Jd for qemu-devel@nongnu.org; Thu, 20 Mar 2025 11:47:33 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tvI7G-0007nZ-SR for qemu-devel@nongnu.org; Thu, 20 Mar 2025 11:47:32 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3913fdd003bso567891f8f.1 for ; Thu, 20 Mar 2025 08:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742485649; x=1743090449; 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=hiZgm8pqiIPSqZSnhTLPdWvEW87iUNjwb11DtO5aXf4=; b=BjWjj6QVdYsWWyPqNTkP34NN0hE6wyq+pBBUglXXe9wbyfga+J87e8WUcvILQDVfgp 8k7PmY4r2IwtKd0uLp24JV/NTX0ZibwqO+mXqQrr+ttj+LxjLC3iGYiOZwFtNI+H2b2a j4NJhZoMgQGVm11o+A/zhtF8xNj5S4UrqIBi34X3XqHkNMLRtvC8TZcKiFidI2WP1jqU 0EMZ9gSCOF1ShBMC1m5a53DzjrnCBAFOynSx/q6m/ylIcwp2i0y64sEyIhMq6fK2pYk9 bmW3916rbkptR6fAiGQqhXdBZ1y0R8xO8Re7SHidyg7n221skOfZ37BKkZOwUYxyV0lf 2mZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742485649; x=1743090449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hiZgm8pqiIPSqZSnhTLPdWvEW87iUNjwb11DtO5aXf4=; b=tt6fyXGFT5CBKm623HcR0UUO3yeh+a6B2Bt9Q6h489WT/MdPz+x7OWJ863FQ2atpDV WBNp46DBnZD9NGK3gADCSyvEUCqY8nkCfdVUPFr+/4mqQf5qmozgW98C/MTn0PrRgSSt IgnYpqwYFVEVb84soWKRulrlljYEUjFOh8if68PmuuqTPNYLhZCIoUDSEcrm3MLALeYc fm02TOXktYEKe7uxGJ5cc/No/CJxSoKUeH3rpcxMVRRgsOOvF+BIEdmXhWnVPcQf1e+V cHIPF6MakbSQFaKGY3ntGPanDZIjqCTkP8cKojQuve987dFq2+c4D01M3Ru8s79+xAzQ 0fhw== X-Gm-Message-State: AOJu0Yxusqso36oFdUzzt/1MTw3xIfUemoHm6Z/JwW/Ea+TAwLi0g1tn SXYvKClEf2bgzXsBUNArnnDt8vQcxBiv1nwwwGzy494IO+yiwgStIXH4CDrtSPCanuKDjzC02+4 Q X-Gm-Gg: ASbGncvzeqz+PyGOLaPRQj0tpG0FDSCHUf8F/K9CqJSa24/UEQsyRnT142iIKsEs8mC BdKieXARztrLjlMSaNiPXK2XCcRrRA14zYwU2OuxE68viYYXQXB6/JebQELLRc4S+aiGIH7auMR 8cWNmyjGeLIC0jy4R6QnmKccmyaMQw26hMjLVW+HDHh527LQp36Jcyd1+yCRQdDVbyquCFI93fg +eMJZScAlDLyZ+d95HJhWsaVICU0HpBABRv3Hinb4As2VxHOiU8+gh6BVRiraSHufFZ7hpYtgo9 JQZuxVHiWKCnY+5qQcgMQilj3fRMaGEJB7KqwmVnmVgg7lUmiDm0BiYUniudbHWtpuOQMNMIZ7S jpm2KjhXxmrUJNu0yAAroYPU9ME+iscHjrAk= X-Received: by 2002:a05:6000:178b:b0:390:f9e0:f0d0 with SMTP id ffacd0b85a97d-3997f8f751bmr13487f8f.6.1742485648791; Thu, 20 Mar 2025 08:47:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395cb318acfsm24566973f8f.70.2025.03.20.08.47.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 20 Mar 2025 08:47:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Eduardo Habkost , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH-for-10.1 1/6] qom: Factor object_class_dynamic_cast_ambiguous() out Date: Thu, 20 Mar 2025 16:47:17 +0100 Message-ID: <20250320154722.27349-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250320154722.27349-1-philmd@linaro.org> References: <20250320154722.27349-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In order to allow matching ambiguous types in the next commit, factor object_class_dynamic_cast_ambiguous() out of object_class_dynamic_cast(). Signed-off-by: Philippe Mathieu-Daudé --- qom/object.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/qom/object.c b/qom/object.c index 01618d06bd8..1620a87ef44 100644 --- a/qom/object.c +++ b/qom/object.c @@ -940,8 +940,9 @@ out: return obj; } -ObjectClass *object_class_dynamic_cast(ObjectClass *class, - const char *typename) +static ObjectClass *object_class_dynamic_cast_ambiguous(ObjectClass *class, + const char *typename, + bool *ambiguous) { ObjectClass *ret = NULL; TypeImpl *target_type; @@ -977,6 +978,9 @@ ObjectClass *object_class_dynamic_cast(ObjectClass *class, } } + if (ambiguous) { + *ambiguous = found > 0; + } /* The match was ambiguous, don't allow a cast */ if (found > 1) { ret = NULL; @@ -988,6 +992,12 @@ ObjectClass *object_class_dynamic_cast(ObjectClass *class, return ret; } +ObjectClass *object_class_dynamic_cast(ObjectClass *class, + const char *typename) +{ + return object_class_dynamic_cast_ambiguous(class, typename, NULL); +} + ObjectClass *object_class_dynamic_cast_assert(ObjectClass *class, const char *typename, const char *file, int line,