From nobody Mon Feb 9 21:19:41 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=1768934604; cv=none; d=zohomail.com; s=zohoarc; b=MyeI5EsltMZar+B6xn8zLwbDQHB34siZ8d9UM0bh1c6zJaOwm3xgZKWHfKREuh4FwSOXSQ92WEAL8ECtLxuUDoGiyVuR8UVBz+6L4MVDRh9UI7UnbLNXoiV6ksxFm4T1Pjljz8BFyptYlYaAmWHr+ZG8d4clRl59DuUcmQ1lea4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768934604; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=lZ4calIf/kw/c+hbg+qyJSLSji7C9qv973kqSG9pMSs=; b=ka8JPau1IQnVx2O3Yoq5PrCQvNHKTSYwhWca9asP8BEd6btxga5sfXMM9XaqOy3+zHHFHSetf++TOVeSudrlZe4mY75rfp3U8G8afgXDCOZH+GSWpf51LamGt3O0Ea6cXhoEJ+dViL+F0Ssg31OjWXgttqsFKGWs4wW2L21/v30= 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 1768934604168408.2363428331439; Tue, 20 Jan 2026 10:43:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1viGgo-00089I-Gk; Tue, 20 Jan 2026 13:42:56 -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 1viGgP-0007ra-88 for qemu-devel@nongnu.org; Tue, 20 Jan 2026 13:42:34 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1viGgL-0006hJ-45 for qemu-devel@nongnu.org; Tue, 20 Jan 2026 13:42:28 -0500 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-47ee9817a35so33102395e9.1 for ; Tue, 20 Jan 2026 10:42:24 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e8c0475sm310188685e9.10.2026.01.20.10.42.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Jan 2026 10:42:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768934543; x=1769539343; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lZ4calIf/kw/c+hbg+qyJSLSji7C9qv973kqSG9pMSs=; b=hqR+IxgFzMHAKJOkeKJ1FiyN8k6ATlJlgpSwHsDwCgt44y/isUhK8Bna3Z4WdOrQSd ezbXAeb1Z+CHjufDjV8WWyJiZuDA6ZnjuLeD+GVlDv5yGr2LUjd0TvkKKHULz5gOwu7W 87ac5itfGv08URVxhDSuR7Lt+/uj8Te6upxuUL1UzZB3YYFWEbiItimDVeVNqNI6soLj jpKMTrMRl5SYSSPOHVXkYgGis+qrxOgOlosbk8D0tzJoqBl7dajnPO9MmAW3pHEzslhD l6yw3Eg03ZPd9kwz3g98sbWCHWyOnJj3d1Vp3mZ3OrNm9zAh/E5IovOiyBosuQHvn/xF sXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768934543; x=1769539343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=lZ4calIf/kw/c+hbg+qyJSLSji7C9qv973kqSG9pMSs=; b=eClN9eCkoWcD8TF5nxAKLz3y5JIoTM8goKfaKJ/8S7fhNDEvgiMRk3rsc9xG+Bm0tI 6B7j4yaqTSSp5kkzN7+BvGmsN7ETdx9jVSkU/AX+I+SsH4Eq32v2f1i6Mg9FKyHrN8+E IizSSfMR7Mx2BV7xTq4halQn4bPBNvnzwSLZBV+8kA+8AEtXFQr9Gs2aAtcdSwg6zlTk KCKzTXz3W8HTnK2jj0gOHo/sI9CL1WVry2F7+RoSuvV9vEkNGzeonSWm9nTVZDTOsZAH isIzRi+/I6nxybtT9uGXKd1gArjWqp/fp1GfCvrfxpvtYlr1E91Cf8NXZFobSGh6y25h pSew== X-Gm-Message-State: AOJu0YxnvWQ9hzSpJKOQQM242XuSu4pZYnvhUFfy4D9ldnWvHD84XJ9p pIt7lx0Fj/db3H8oblWghhXc3O1Blk5Q+7AcG+Vk8S1U479ICyFffoe+j/+m4xBXtkGLFlzndpH nFD5NmvU= X-Gm-Gg: AY/fxX5eLc57tK6+QpUGB+MM9ePn6ZcWkvT95eoKDn8gv1rUdtiQQ7bC4G3rVRhnW76 NUZ17UOYFxzufAu9PFLV9r7ksbs+8fsFUfc8QvtAhF8T8BAZZL9jG4Vla0QdOicC0nvIvd3npF9 huOXN8sZWY9yonZ8vrxzP/pSbcaT+7fw9bio7+ofJ1YZgHbBT/oSVwT9yc+dOvb8Pezq4WjpYUX qo5OLFNiGUAnN18k5TaeC3zdMfHDvBvBtZrkE+Dfs1BO9oIxh0Wf+Xxm6nycbd4/tGJR9lZNIC1 aD14wjUqp/XmLFg4Z/4PK7RCkBXesoPMrPMdC7XJStNusiocbn1eHxcRDyflVxGmQ5iEaEFWnUB YcsXNCV2TjSGmVhkKy7Tmoju7cAmiuJGaVYNRJejFm1bw/feHBCFg8TOLzWy7LXelhtckoY2H7S HxykEJvsqmSIYtGboQsbkQ++zywNmonB07YYYYyhZbywB1hCmXZDZYE7QsEgu0 X-Received: by 2002:a05:600c:190d:b0:477:abea:9028 with SMTP id 5b1f17b1804b1-4803e79bbbamr40511875e9.6.1768934542723; Tue, 20 Jan 2026 10:42:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 29/29] meson: Do not try to build module for empty per-target hw/ directory Date: Tue, 20 Jan 2026 19:39:02 +0100 Message-ID: <20260120183902.73845-30-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120183902.73845-1-philmd@linaro.org> References: <20260120183902.73845-1-philmd@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 (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=2a00:1450:4864:20::344; envelope-from=philmd@linaro.org; helo=mail-wm1-x344.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: 1768934605622158500 In commit 83d5db95d38 ("meson: Allow system binaries to not have target-specific units") we allowed targets with empty target_system_arch[] source set, but missed hw_arch[] could also be empty when building modules. Skip such case, otherwise due to commit a1ced487549 ("hw/microblaze: Build files once"), building with --enable-modules triggers: ../meson.build:4034:14: ERROR: Key microblaze is not in the dictionary. Fixes: a1ced487549 ("hw/microblaze: Build files once") Reported-by: Frederic Bezies Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3272 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260116131817.38009-1-philmd@linaro.org> --- meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3108f01e887..a84f14258b0 100644 --- a/meson.build +++ b/meson.build @@ -3957,6 +3957,11 @@ if enable_modules foreach target : target_dirs if target.endswith('-softmmu') config_target =3D config_target_mak[target] + arch =3D config_target['TARGET_NAME'] =3D=3D 'sparc64' ? 'sparc64' := config_target['TARGET_BASE_ARCH'] + if not hw_arch.has_key(arch) + continue + endif + config_devices_mak =3D target + '-config-devices.mak' modinfo_src =3D custom_target('modinfo-' + target + '.c', output: 'modinfo-' + target + '.c', @@ -3966,8 +3971,6 @@ if enable_modules =20 modinfo_lib =3D static_library('modinfo-' + target + '.c', modinfo_s= rc) modinfo_dep =3D declare_dependency(link_with: modinfo_lib) - - arch =3D config_target['TARGET_NAME'] =3D=3D 'sparc64' ? 'sparc64' := config_target['TARGET_BASE_ARCH'] hw_arch[arch].add(modinfo_dep) endif endforeach --=20 2.52.0