From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D59E9CCD19F for ; Mon, 20 Oct 2025 22:10:32 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy4w-0006UQ-Rd; Mon, 20 Oct 2025 18:10:10 -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 1vAy4u-0006Tl-Vn for qemu-arm@nongnu.org; Mon, 20 Oct 2025 18:10:08 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy4s-0006G9-So for qemu-arm@nongnu.org; Mon, 20 Oct 2025 18:10:08 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-471066cfc2aso3942915e9.0 for ; Mon, 20 Oct 2025 15:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998205; x=1761603005; 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=pTh/TXHrRxWOV1KvlT5RHXxmysc4zuKbZjFKHXnGbRQ=; b=vTywkx/9HpPP4gFVhxgZrbUv/HMXUTEVpo5KemlzbgJHYy1MhyxoXdnc8XgRysyxkv gcBPrfmr2BqyNq1IZIsfH5Gmp5w3QvQ8Lh/3xZZYdiNZH/coLDtfGKnrsbkGROrFnLXF 5DTCxDINxpttYI5I07ozPglimF4ScDxknLi+WRGMBL09QQvI/ILwTqs4FYiNNVIY3Boz 8xaKQ5/SFA6m4O16CxYAtwH7wGAzGwbK3ruoXg8kTjJGkqfaExyStt7q4RLnSUl8TATB K2yXR13QYO5bTBF2juL6O8qKPY+oyyTIq6ZovxZLJErihOcj1au0Q2fIwU2yiIPN3yMF JiXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998205; x=1761603005; 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=pTh/TXHrRxWOV1KvlT5RHXxmysc4zuKbZjFKHXnGbRQ=; b=cP6nvPlxVtZNZHqenkOztnliYLcBhBqcFAURDC/GRNyIh8+vvZl3uMr/hEjoyVxOkX wURQ+EFo6goUKssWYiuoNN6xttMllpib+YxyDYRU1dLB+4wirL3TdOwtexDv2vEnvosC 4R8CZ372QNfPGXCf7V4h2oFR5jgHLj0KiKs5Z8lCGtiuBFiPsEg78xOk1QO1Gb4fegLw EJ4l8nekSnM0DW2jKhES6kcWmId9w/HuqeMsPok8rgqe2lDFdYcLDJqNenQbHsz4ZGEA tr04Bv3FAUvp37NKqwj0uI92Nuek9ZAgFXcbQw7fAY11QYMRvRNfbGMtqO7wLwuyrOaS 5yCA== X-Forwarded-Encrypted: i=1; AJvYcCXf6Qfj+YgvNeOMxZ0TzauHxr1c163sYf589YN+azLtg/qBwX61eRAoJqahE5wn1EFkCVDIJPPZfg==@nongnu.org X-Gm-Message-State: AOJu0YwQbP2dPqPRvAmMra86L8EqOLE6coK2XAGkB4RJI+X8fsqGX/WO mrkPNO/XtTrAtACIxSQjkB5TYnA6WRTkhzkqkqIH0/3kw8Oq6GtS3n3t/qJDuP/uNOU= X-Gm-Gg: ASbGncvxZTl/Eq2zbtqTugGsgfYbV6tPtbbkSllsywpmQtpGd30zSUwfxs8wqNeq/wk LOyRmwleLfqcBq3/c5p3nyU6+qmFy487RoRjAjIzszfC6O1Gk7aPoyuuXJebrdt8kolF3pHynb3 oz3cU4vgxDfo75KkSB5p4YInX691F/7zPyegxCPUXhC0PMQQ+CXY+kUv5yqU8msBiKW7X+acWSK FPj/i44OoGQJO/XXx/q9LYm5oNDTcIWeeZRm5eZYewXiP6b7/1lp7iVyR1c0B9HWMPci5gB753L yisw8b3gJKnla2TqrBxUFi5VKH3ILX51WavDCUcHHbWuI3DQTD2H4/7DK7jyiivAzo8JTWhTphL r9KOCUAK+YDESbHRYMpWrqqAz1KNafY6M0G37ib2iWQzxT4aoDs73z3xQEXqpYZhIo/g4BA1IfM 1ZTfJxtpVceGddl7+AGCWoPyMkn6rpZDyWP/gYe20bJ0SHR2zeYA5gCZalSLY3rRAJSGcEAVs= X-Google-Smtp-Source: AGHT+IGWxyXvKDwNF/DwAbM5Sh3jmQMh/rBRb4o4Yyw3vAcpz6nRLQd8zWBy8X44SuKWzwgtihli7w== X-Received: by 2002:a05:6000:2010:b0:426:ff7c:86e4 with SMTP id ffacd0b85a97d-42704d8df97mr9666760f8f.19.1760998205024; Mon, 20 Oct 2025 15:10:05 -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-427ea5b3acfsm17032038f8f.14.2025.10.20.15.10.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:10:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, Paolo Bonzini , Bernhard Beschow , Peter Maydell , Richard Henderson , Zhao Liu , Eduardo Habkost , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Yanan Wang Subject: [PATCH v6 04/30] hw/boards: Introduce DEFINE_MACHINE_WITH_INTERFACE_ARRAY() macro Date: Tue, 21 Oct 2025 00:09:13 +0200 Message-ID: <20251020220941.65269-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org DEFINE_MACHINE_WITH_INTERFACE_ARRAY() is similar to DEFINE_MACHINE_WITH_INTERFACES() but allows to pass an InterfaceInfo[] pointer. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- include/hw/boards.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 99292edf5a8..a60e1d83390 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -504,7 +504,7 @@ struct MachineState { */ #define DEFINE_MACHINE_EXTENDED(namestr, PARENT_NAME, InstanceName, \ - machine_initfn, ABSTRACT, ...) \ + machine_initfn, ABSTRACT, ifaces...) \ static void machine_initfn##_class_init(ObjectClass *oc, const void *data) \ { \ MachineClass *mc = MACHINE_CLASS(oc); \ @@ -516,7 +516,7 @@ struct MachineState { .class_init = machine_initfn##_class_init, \ .instance_size = sizeof(InstanceName), \ .abstract = ABSTRACT, \ - .interfaces = (const InterfaceInfo[]) { __VA_ARGS__ }, \ + .interfaces = ifaces, \ }; \ static void machine_initfn##_register_types(void) \ { \ @@ -526,11 +526,15 @@ struct MachineState { #define DEFINE_MACHINE(namestr, machine_initfn) \ DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn, \ - false, { }) + false, NULL) + +#define DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, ifaces...)\ + DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn, \ + false, ifaces) #define DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, ...) \ - DEFINE_MACHINE_EXTENDED(namestr, MACHINE, MachineState, machine_initfn, \ - false, __VA_ARGS__) + DEFINE_MACHINE_WITH_INTERFACE_ARRAY(namestr, machine_initfn, \ + (const InterfaceInfo[]) { __VA_ARGS__ }) /* * Helper for dispatching different macros based on how -- 2.51.0