From patchwork Thu Apr 24 22:20:59 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: 883996 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3673114wrs; Thu, 24 Apr 2025 15:24:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpAfxXTaRy0cMwFktEPm/C/PQQtIQ8kn6ITXffdZPXePbZkrGSsU/5TdbRRMvQG+oBDvf2jA==@linaro.org X-Google-Smtp-Source: AGHT+IH6tg/c4giNvwjArxO+Rx5Bqe8Vi2GPYqGmLKMd0eUpFMna9tW/jSqmsanveuBIEd/OWEF6 X-Received: by 2002:a05:620a:4116:b0:7c5:54d8:3d43 with SMTP id af79cd13be357-7c9607c49acmr37410185a.58.1745533481457; Thu, 24 Apr 2025 15:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745533481; cv=none; d=google.com; s=arc-20240605; b=d1mcj4H2WkWZrEQQWqHSAh2+YW8DZNhmAxVqI/JBVDpbUO2sCh691f/qfw7IPYhNmQ wEry+bnLzcrQ967hsQSUABeoAqa5rTpgwNJUlvkkBgkYr/3T5JgycXYlQ143ZraYmjFJ qlnyH04LYLITLHn4FN4/ly7Pr+T6W9xMylC5uUqPPBqhWf/UYsCbXkTxG8Su8krM/qsQ khJGSBOn8spT2BEExf7y/ntpljizV92SIx8zIdpIEfm1Gj8ue1Vn2dSoGwH4xL3vcmGI F+GPOHnUxcpsZ8byTpHX/M9HNDBxz/8jb7ZY/fzNaKSfCfwABm0EDoFxZBlY9QvdF5Vx ZVJA== 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=yIUYggzBbwK532QnEX63ouNuUzspZ2vfdklTznzqOpk=; fh=O1sGeJR8/pPJoMBQA+D2rIk4MFEu+dNnttw4WNe7Mfs=; b=TRRYwKhTUDUhdiholiQJqF+zM2zRAt7FFbWqlJdrFbKv+yyLJxke4O7j62Dh5pjbHo gaifKOEkerMcs8Z1DajVudKPuCyUDnFriRJJJg/3iaPn2qk5RNZEu/QYAEJAuwxohRKL ZgPF48DWIFc7CfSFtySMhLe23zCLs7yLe66Wl+hSEpTkZeIj0RDpGFmLpygY5EcBhr7E qVaEiWLYmYSAcVx9+4bS8q/0Iwo9KIINyz/B1zNLwajtLsJuE8JPmfmOdr0vu1JH13H0 9cVE0z75tlWMUZrphgiNVXXzl0fA9yl/20hFkP5EyKjG5B7XfB8VjB0lwMyj8WUMr5Y+ H6VQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GdYRwBUe; 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 af79cd13be357-7c958ee17b2si221062685a.618.2025.04.24.15.24.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 15:24:41 -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=GdYRwBUe; 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 1u84xI-0004Yh-He; Thu, 24 Apr 2025 18:22:04 -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 1u84xF-0004YP-HD for qemu-devel@nongnu.org; Thu, 24 Apr 2025 18:22:01 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u84x9-0000ye-U4 for qemu-devel@nongnu.org; Thu, 24 Apr 2025 18:22:00 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-39ee57c0b8cso1667633f8f.0 for ; Thu, 24 Apr 2025 15:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745533314; x=1746138114; 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=yIUYggzBbwK532QnEX63ouNuUzspZ2vfdklTznzqOpk=; b=GdYRwBUecHV1m5gBPRvKqaRp8FuPD3P+CBajcCt2Z4Z2Es3iG+a9wswZInXWmTH6ey M1g6m3zu2OnlxYi54K0c6tWiHkuDNa12ELPo1mocEb1owIVB10f2mvVz4x17CStimB84 4EV8+f79Ag5atWsAh7AV01iH4wx9D7kK9nUneGCuH/KTFktKkHrGiUXWDHcUdIDM63ER LAhGB0LsR+AbH1A372q/DdB72T85ZeGZkzJoFm3x9bePY3JtlHQdrmLDpEU5LEicXKvX qvpdTMHb22MfuGJUaHgu7xkc4fvO99ghnHzVrEHgIjmeFjrrjjUVJgBHGejAOJUxwZpj Ze/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745533314; x=1746138114; 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=yIUYggzBbwK532QnEX63ouNuUzspZ2vfdklTznzqOpk=; b=dPkLUzWAyVExhgXfhorVCPYn9YibB8zdf82NJ8OmSWodHBL8fFddqEMu4rdAWKD4fK 5tee5upLbbexj5o/Vu/ZjbkQDXuh7pXHGaRU1P+jGfKQ2ryW02nyv1kM6TIMiWAcdTWP sdr0/ppNCdQm9Ld5XhX5Y1OLjFVpUh4tZEmHxtLjxJjV4j6j2xSxKm8/qwl9ee+h5Roj PJ6QNPyzsA8pKpalRN0AXbAMOHcl2wHqa08KgiRP/95ZWHYullC36Vl1C+E+Gp4cNbil mH82IVICvl7zaN69GBVxCYvye6P+pTnRsh0RVlWifPf0ljLa+lUhkLiivvSjsT9oPfbs M9jQ== X-Forwarded-Encrypted: i=1; AJvYcCWJCsJVMlefdSqQKq3mN/e4MCwDeRhrNq05FvFLcUYQnD+3rkcgsJohuT5HIrdQO6l0PyV8tSChILS3@nongnu.org X-Gm-Message-State: AOJu0Yz/TfEtzkdLNQKGiJpZl8amw3dxOGp3Lh5dsIw6ud5iiXEiq/+p UrLL/NUOwYBvGe5cX3vzdCD+d9WxUPvqCyK5VGsnCS/Cz14t0B2Xt0V7Lp68kSI= X-Gm-Gg: ASbGncvmAooNkLiHZTC3AqrOZPJTQgak6H+bECfgltLk7qm9F3MDsSR8aoq/gdJfLC9 0XRD9AyiyfAPYFjLt7m/RJ5iJid2eSTDEPmFga28gJpGP/7W8cVadLChPKY6Y4/y2B3o/3U0WHX /Nam4bUisqTg00DoRpmmPJKbSx1bMwBGiZyI4rpuXdpVzm9Qrz5TQFQmfM86OUI6O7n0f6x4kud /0NX2cwrwS5mgSUofH5yLiazvnqcNssI5VgG3F27wZZg9ibPc++mZD2zDOIgaOpzqu5fjA8mQKy LmIb1PY6UggSmHJ1s3OxSB3wZ0Xs3Y176obqdefDrDv3z1sUEVE3LB+ZYw5RShN7X9GVUyLfvDf FzotPu31vXJKArcg= X-Received: by 2002:a05:6000:22c4:b0:391:4914:3c6a with SMTP id ffacd0b85a97d-3a072acc1aemr777112f8f.29.1745533314304; Thu, 24 Apr 2025 15:21:54 -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-3a073ca497esm512937f8f.24.2025.04.24.15.21.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 24 Apr 2025 15:21:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Pierrick Bouvier , Richard Henderson , qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Anton Johansson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v5 08/21] hw/arm: Add DEFINE_MACHINE_[ARM_]AARCH64() macros Date: Fri, 25 Apr 2025 00:20:59 +0200 Message-ID: <20250424222112.36194-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250424222112.36194-1-philmd@linaro.org> References: <20250424222112.36194-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 A machine defined with the DEFINE_MACHINE_ARM_AARCH64() macro will be available on qemu-system-arm and qemu-system-aarch64 binaries. One defined with DEFINE_MACHINE_AARCH64() will only be available in the qemu-system-aarch64 binary. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier --- include/hw/arm/machines-qom.h | 13 +++++++++++++ target/arm/machine.c | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index a17225f5f92..6277ee986d9 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -9,10 +9,23 @@ #ifndef HW_ARM_MACHINES_QOM_H #define HW_ARM_MACHINES_QOM_H +#include "hw/boards.h" + #define TYPE_TARGET_ARM_MACHINE \ "target-info-arm-machine" #define TYPE_TARGET_AARCH64_MACHINE \ "target-info-aarch64-machine" +extern InterfaceInfo arm_aarch64_machine_interfaces[]; +extern InterfaceInfo aarch64_machine_interfaces[]; + +#define DEFINE_MACHINE_ARM_AARCH64(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, \ + arm_aarch64_machine_interfaces) + +#define DEFINE_MACHINE_AARCH64(namestr, machine_initfn) \ + DEFINE_MACHINE_WITH_INTERFACES(namestr, machine_initfn, \ + aarch64_machine_interfaces) + #endif diff --git a/target/arm/machine.c b/target/arm/machine.c index 978249fb71b..193c7a9cff0 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -8,6 +8,7 @@ #include "cpu-features.h" #include "migration/cpu.h" #include "target/arm/gtimer.h" +#include "hw/arm/machines-qom.h" static bool vfp_needed(void *opaque) { @@ -1111,3 +1112,14 @@ const VMStateDescription vmstate_arm_cpu = { NULL } }; + +InterfaceInfo arm_aarch64_machine_interfaces[] = { + { TYPE_TARGET_ARM_MACHINE }, + { TYPE_TARGET_AARCH64_MACHINE }, + { } +}; + +InterfaceInfo aarch64_machine_interfaces[] = { + { TYPE_TARGET_AARCH64_MACHINE }, + { } +};