From patchwork Thu Apr 17 23:58:04 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: 882132 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573930wrs; Thu, 17 Apr 2025 17:02:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdnwjFn9HuQNlMspzdqx95OASArcMv1CCtHJ1HAyPUU/9lIs2d/gBnYLtKM645WaC3Cf5Spw==@linaro.org X-Google-Smtp-Source: AGHT+IGtFhafNJ74ARSckgy2toVMyOZQUSRsOR+rw6CNFhPUhegdDpMkBp/ljcxRHDBp7xpBj1tp X-Received: by 2002:a05:620a:2484:b0:7c7:9813:4ad9 with SMTP id af79cd13be357-7c92804d0e4mr130567985a.58.1744934535373; Thu, 17 Apr 2025 17:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934535; cv=none; d=google.com; s=arc-20240605; b=SBF+8FTd4S5mB4fTnrqw8OXRO9zYx8Jk//v/96DqfVvaEXOK9UDtObVvVLD03DZanU jJiz2fLls9wCctAJmkPWiacatmO1ZbZ7ydcHGsqFRlZF6gP4LxnjgLlqCge0mWRCPNKc P/wrzylJPWyuVh2SgV/ky7NC+9NX4O55/2sxKtlR8xPNe9Uzbs4UlJWXzaPRCII/LLLi 6xldNmE005YpyddqCMRPyrzcQ3eUHXfC1CM8yluyQB5qRgNS3XXSNWgNLJo9qty61FX1 6daRgf8jUOmy27lviXOhFghTzZD5WqKnqUgHWJbvuAzkJ03UBClSCV2nBa3j2+/LPnvU Sazg== 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=JwNdCVQK4SCHhqiHgDn0u2GpHg+WdyoIk2s3HtNhdH8=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=OzU3fQDaVmoXSxd9yKr7ByWNICaeT6tnGGO1b8P7Jh3TQsflMM/Am0JqvEvRCOBZm0 hdQoJmRubKabripUb1MnltNY3g+AmjsUbDg7zSH374gwU1zDUnPiNRR0AvPJUi1oEzx0 AhdRNDf2a8q+3blDGVmyiRqZFJV6G+0qf1RHt5yzEQN4mGStmQ+/D4vfn32TNKk0wREc uB883YT02eAmsMIIpdXccwVMk0hk/4KH9whr9m9RAlmcqy+KHou3/cVYbkKV62kSAK2h L3Q2VTyMDZjCJxYbv4BAZTZ2LKjalLHV3wdL2z6QJR/QO7Lq9jEXS9wH2V2s5zkbtFo+ ns7Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CMfc+wPP; 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-7c925b81469si92420985a.320.2025.04.17.17.02.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:02:15 -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=CMfc+wPP; 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 1u5Z7t-0006ri-GP; Thu, 17 Apr 2025 19:58:37 -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 1u5Z7n-0006mF-HZ for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z7h-0003ni-3s for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:28 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso13327215e9.2 for ; Thu, 17 Apr 2025 16:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934303; x=1745539103; 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=JwNdCVQK4SCHhqiHgDn0u2GpHg+WdyoIk2s3HtNhdH8=; b=CMfc+wPP1hV2v+nhzRNG8aPPWaCzFaCnBCyTsYgyuai+m+tSaVswu2aBMwV8bPq2Gv sPKV3jcadd7SSPEZgDgxLQjNBklNCqQu0HAnjbJ3TWA98XwF6opPi2i1DJArFHfJWcyH jQUObieQadHb8YKA98CmoN1c92YIDXQ7FQ9g65R+zZqZn4OC6z8jR2C35FUQAJZhjA9v VcRAE9fI8EGtvHXfiMA3ZWBtQsjhIts7zUyajKn1GZQhcejZVENZdBHnLOp7aYApb3PK BPOUPV1A2HA6MZU7oDvvVCkH+HfAsICBh8vneG/k7vXj8DOA/MZOg2/PZjhVwqs4TaSF YDDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934303; x=1745539103; 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=JwNdCVQK4SCHhqiHgDn0u2GpHg+WdyoIk2s3HtNhdH8=; b=AkEz2j3akT9bS6gf0lpq/kgWKMT/nTc7JXp5jeynv7fFmMWwNLNpLZPBIBhHJ/xwiH kyqHtslCi4y/aRgWSEKezfIZAObcINJ9idlY4nNVatoAwGXMP6Tz+mQPHYI5k85N08gd au5wflrg9PC8ufrnwL1jRGSPGPxd48a1n4xg7CARyKJMUz3a0iwnic6qAo2bWvnboCbS TXVQY5+f4xOKoTsRbtCKPJdtTy6/XKj0QmLuHY3YJFz2L+mB5kiNO6ZrNp1cp99BT+qJ +Xij4X0u0jC2NG5KMTKq1/fjX1B90v8mosuUjEfE2Rg5lm0tqZIFd1nZTxevZ6DP9Svc gefA== X-Gm-Message-State: AOJu0YyWhKk3CmaUQ1oLcl1RFlmfqKRCH4/oweRXfba6LEjnLGy8mGcQ rBN3Wl9tYfCn3Fy2aHOLBRUO3YDFRjp8jgU3Yf4kLrVKgUBmVe3sdWPu+5RZ/TYc7HrB/I4VfBW t X-Gm-Gg: ASbGncuS718HcLdkof1j5KJ7QDZ149oXBw/RfIZRVX3UUvGdUkZze3XCJ6TPOumH4wd nsNeM3yCAk7lzKitF7sejjlfnYcxtBV29M0NpEUiJAgc2mzTgAB0+JuXfIDaBWIyIMS18QzycrB ZftMMDinsu+mnMwnz2N8AcbbGhdNZ5A2yjlwLhAJPMEBjdx9Wu8V43DpGdg601vRapR6/igyFDD EJxlo5EiSvvoKMeW7+U6/wuLT/LEQrdG6jHR8RfIY2cByM9EWdFbMVCDEr5BS8f1EP8KruH06sp ixrpmd2YM8OCl8C4wSTbmLniAdC9Td3yua9fJMet+Zvv1ZROuaFqU0JsAnzYdLB1BrzHut0cpEG F3MyEyKW8h36rxk4Ochoy X-Received: by 2002:a05:6000:250f:b0:39e:f51d:9cf9 with SMTP id ffacd0b85a97d-39efbb01f56mr501047f8f.48.1744934302803; Thu, 17 Apr 2025 16:58:22 -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-39efa421c79sm1074033f8f.1.2025.04.17.16.58.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 01/11] hw/core/null-machine: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:04 +0200 Message-ID: <20250417235814.98677-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/core/null-machine.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index a6e477a2d88..1ccaf652eb4 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -42,8 +42,10 @@ static void machine_none_init(MachineState *mch) } } -static void machine_none_machine_init(MachineClass *mc) +static void null_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "empty machine"; mc->init = machine_none_init; mc->max_cpus = 1; @@ -55,4 +57,12 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_cdrom = 1; } -DEFINE_MACHINE("none", machine_none_machine_init) +static const TypeInfo null_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("none"), + .parent = TYPE_MACHINE, + .class_init = null_machine_class_init, + }, +}; + +DEFINE_TYPES(null_machine_types) From patchwork Thu Apr 17 23:58:05 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: 881876 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp572565wrs; Thu, 17 Apr 2025 16:59:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVT9ZSQEH/tjlLKuzuhZ8ru10jbfXuaSdRh95ZUf76DfkKBV7KA0UWmO/QR/H5bKAEgP0lh+A==@linaro.org X-Google-Smtp-Source: AGHT+IGi2QwXA86GEgOiRqOfwM1XvQTWuEHVGEefS4Ss9pC7z7ul2ej4rt12rQ25UK84L05XoLpJ X-Received: by 2002:a05:6214:1bcd:b0:6f2:c10b:db00 with SMTP id 6a1803df08f44-6f2c450ab08mr18123626d6.1.1744934352737; Thu, 17 Apr 2025 16:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934352; cv=none; d=google.com; s=arc-20240605; b=bVMWidB9+7CGfSeeZV0zzPszUUHnqSipTRW4ekMTdO0KpuN/FOecoGMwBxLrvcknlF mkAotghmfbs1QiGabXHEpy/YWFtJ2fBN6qJ/tnJ1CGphmrXB4oDR560UQPa13Y8yZR4/ qcs5cTcW7BZuv40f6eMGrkQTD4i/aY+lBxsTghl3fIVpyCYVeIygQ1AG9hW/BG9l9Bqr gy719MS7Ij6DyOouIJGoGFRHr5Lx/tRYFmWs11T/OZcwBZfQZ1hjGOR7wBjuU23h8vXd lopTFPy7Nl07d7aUwbmOd8jwcxAj8Z92CXqbcg7SKt44Tpf4lCvlsQ4LDZ0F2lU3BbOC 8dvw== 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=MV1FxMb+Pm3l1uMqumgJWytel4/bj0k8yst6ffjyOR0=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=JvqGxktjs9W9CopYPfgdoFgeqAfhkvvCmmGV/CWVQBx1WGELrnMpjFBkATYvJfEakU 7zOAL55lBF7aUdgWcccF4TJY0ZSM1nW48wZl8/ZpZ+9n3K4zMfiSYKx5wKNXCsUwfZ1M 0K1hIdeK7l+4up/9D2i3wSOFm0EqBdbjxd6/uI4+NEOJruaxalaHPFeCS0B782y82rY8 C7Amne6pNBr3dMByYmbzaDCLaZAdvtmSZbPVHqudoSMmSE9luEeQg9NVrT7mUvNmdVzL uSbXXkQbuY2/vxwM+GeiozTmwUpvdKJj5p5Y0Dy38kzwuV+eAjZqsa+ayRChNEs9Eo05 vbjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t0xiYozB; 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 6a1803df08f44-6f2c2be7f0esi9341116d6.231.2025.04.17.16.59.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 16:59:12 -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=t0xiYozB; 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 1u5Z7u-0006tU-Os; Thu, 17 Apr 2025 19:58:38 -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 1u5Z7r-0006q3-Ti for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:35 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z7p-0003oi-5U for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:35 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso13835605e9.1 for ; Thu, 17 Apr 2025 16:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934308; x=1745539108; 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=MV1FxMb+Pm3l1uMqumgJWytel4/bj0k8yst6ffjyOR0=; b=t0xiYozBzTMuov5PGC9MpGUqtGqdEcfwRROyHss3rW2xuzY+G8CBzsUHm7bHtSmE8p HGQc+415tfVEOlFAmgBxJgZl1Ytvn4Xx/QCjC2OcjpaEks45JmTBcA6j7LHj/VvgJSkV x08nToDXtabnyCpS0XkaaRjkCXqc34BzIlAtwwx73p95SmwmDIZmAdJNbqrjjwItXr0R jm7MJXt8w3BhM9eD7KSxRdoejBjOjZjCH1uLxiC7z2MMiDT2MG0ntBkdydDu5tIKkU17 RA4UKPb3rSX+lItCV2mUHA6xfcs8/VkNRe6a3Nl8BRZrdF785dxINKInFUJ01cOQaNks xqCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934308; x=1745539108; 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=MV1FxMb+Pm3l1uMqumgJWytel4/bj0k8yst6ffjyOR0=; b=wovSzhi2DuAzJMBZ2le0OS+dGrGtSrkQ9hS3ZF4xAucnbjfxtNIMWK+XNAYKiMy8hS LkW4rklR40xN9WkV/uVxLlyifd6P14nbbJTvInFepqJytw/UyVLWawt4SYY9F1NZF/XS X5VRxyxe5Qs+q2MvNLsLn6TaelhzAVBkITdVKcZtd6zWMj1qHMta7esYIMU3vqYkvWoz 6kqLV49ECXp5RN2TbbTBUPEgpK2DH3DlM1dtBWzWAXD44ANoNKvAciiED9v7TYF4GVdK ptNS5EmfzGSvqA10qDA6RGIccVTWwRT1EQrvH/PekWd7r5p0+gp240YaJVClaqd1OeEP Pn0A== X-Gm-Message-State: AOJu0YzYV62jcJXwwXvyMa8KfmxzNA2MHJ2QXxk4DdSnBUkdvEfvnAoi RbMvwRlIioIcxcxI9vGo8Br0jg/RcVXnsGjnxPWUtMwUyeEyxhZHnWl3j0SFrE3HkJrlEXRgPGJ j X-Gm-Gg: ASbGnctUaAN4X3IFhcZBbhSEeR+eo4QgkDjJeNmEamyN7YgAYhHRqbrs90+NV9YWQFi 4JRqG3nc7AGIi80+cNS95S1Jy0U5C1eFHKoKLq3dTCnp++K1GjeVLzynQF+re5LBhaAKuWJjtUz h81zq08lr736vxkjvnuYe5zFoiZ+nuHkRBEkJcOv3bZEbFa+3tO6LKmU/Glo1CpRXRU0B/P2uW+ /+gwQUB4A+ccKedejC+nOpY/TKYKl0BZGG+qlNgfE4nsgjCoxU3VYF33ZpkCAGgRG5xcT57fkxW FUJRCKrZVyeHKFneB+hYaodpNsC0SzeP+HGu0h/y9ZW+L35Nl8hhyuKcDrTquGaudrbfYMSLC1c VBNnyfGuGucO08VFWa7X4 X-Received: by 2002:a05:600c:4ecc:b0:43c:f969:13c0 with SMTP id 5b1f17b1804b1-4406ac17729mr4620585e9.29.1744934307991; Thu, 17 Apr 2025 16:58:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-44034fd8f37sm66264105e9.0.2025.04.17.16.58.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 02/11] hw/arm/bananapi: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:05 +0200 Message-ID: <20250417235814.98677-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bananapi_m2u.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index b750a575f72..724ee4b05e5 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -125,12 +125,13 @@ static void bpim2u_init(MachineState *machine) arm_load_kernel(&r40->cpus[0], machine, &bpim2u_binfo); } -static void bpim2u_machine_init(MachineClass *mc) +static void bpim2u_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-a7"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Bananapi M2U (Cortex-A7)"; mc->init = bpim2u_init; @@ -144,4 +145,12 @@ static void bpim2u_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("bpim2u", bpim2u_machine_init) +static const TypeInfo bananapi_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("bpim2u"), + .parent = TYPE_MACHINE, + .class_init = bpim2u_machine_class_init, + }, +}; + +DEFINE_TYPES(bananapi_machine_types) From patchwork Thu Apr 17 23:58:06 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: 881877 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp572589wrs; Thu, 17 Apr 2025 16:59:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV10c88p317sECcpTwM3b/FPRKWj+vasPeFHD821HjTvkfU4isG+lKxRMKBnizTgEss9fNDBA==@linaro.org X-Google-Smtp-Source: AGHT+IGMnSmto+CgT7+V8Vp+d+fj4LIygIsPd8sJBPHah4ZguR37h8IfhQiq92XOznDCOZEDE42W X-Received: by 2002:a05:6214:509b:b0:6e8:f945:ec5 with SMTP id 6a1803df08f44-6f2c456c7c9mr11653426d6.24.1744934360053; Thu, 17 Apr 2025 16:59:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934360; cv=none; d=google.com; s=arc-20240605; b=dO6xlcZAX1NMCzUlTdrJckHsv2PYCdcuYZ69u7yuqw6xen8duOicglymscMdLAQrxX y6t8D7JXa7rNR/sETk97rCkpmzWw3BeXpTY5QVIiOxzaB0a4boSPXIsgQb2SC9vYaIOo P8jnwdhLj4tN+NUK56r51xGxwrjEnmoLWTvg1yJiy9C4ps6eL66rMeAWvBDzrGSnIvJH hpL9OXusj8tPXyAWtIm60jJ+77RJS8wI5yTdf97KWz2AilorGg0akhf9gqc1qdBrA1WM 94vUzmnoPmAT4m/1fPPihCCsTJrfxcd8Fi4CvtyY/5nkxKcHkS9EY8XC9MSCO1C2IQKN OA7w== 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=SRLDxPi9DU57mRVzZF+y7gziW65NUViWJDX+QKf250M=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=V6woKxmeYh9PfretW9U1LyNTNhPZbc2YImNxWS/xEkDttZQKzeWxHpE1PtWLIBxhjl yR3Ba27RUeQJuNtwdEkcWfURRcJLsr2FnNbMBql3QZkWopD9y/sQUUF3DBK7fBKTY5PY fNO92uSAkpUGcark1JSAtfKB3itVdDRiw8nOOMbmCqHcUGZmSz+1yC2KD97vLUfBtKpe b60e1fNQlWlqL9MoWwYOJhcpirxvIkQsFGNMqDSpN7YhYhmiw9GoQ7c2ooxawQUlYLLP 7YVFVQ0CQmoFgoqnrCAK3hshpYgtfCSb0osO2zAmGxsO8XP1e/SSr5NiMnMgPwM3wFp9 JyWg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cA0XvlqF; 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 6a1803df08f44-6f2c2c331b4si8889616d6.468.2025.04.17.16.59.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 16:59:20 -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=cA0XvlqF; 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 1u5Z7x-0006ui-RW; Thu, 17 Apr 2025 19:58:41 -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 1u5Z7t-0006rq-Dc for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:37 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z7r-0003qK-Dx for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:37 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso10022445e9.3 for ; Thu, 17 Apr 2025 16:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934313; x=1745539113; 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=SRLDxPi9DU57mRVzZF+y7gziW65NUViWJDX+QKf250M=; b=cA0XvlqF5DHk+8lbH2dqSM5tpqY862Rw+tr2NYeP9JbA726mmLm7rltZBlz78oWORc FtmR/2QkKaEHsV6k+EBSUWbpEwFcRaB/VZPfAMgAH0f9iLHO0zXNVBU486SOXgYVztAc ZF1xPwM+8cf9/G0MDuA/wOdahSB7ADrimOmTnW43KK9iIV9ta65fB/uP60imdlIUdgXd 8ItY3/xItVnsKd17sUcAuDwe0Xchy5bOR30tcKlzzqCH1KI/8CB7UVxGIUVCKxNYonyU fVFKrh2KG78lVrTlBgawRH3rGOtSCgj6x4uD4DK3esjC/uF7FZWrPiOexfmj+W12UHGM HZ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934313; x=1745539113; 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=SRLDxPi9DU57mRVzZF+y7gziW65NUViWJDX+QKf250M=; b=lld1NQ1ujW6Vt5Ip+bBDWS+Hsyq8jG8wN5tJCn0nVqPktkQdRlOCdRU4QrVrD+VVzm oTvi1KZwBJxD3Re6IQpo3u+DgqxU+At+3mXBzfvj/GsoQFtWQSW5v5f/3ncdeT++MEqy rY6KCha2pFM5ly5w3tmBgiJYGe4P++SBi9+cOrTV+3CxUU/G590GarB6n2W2MAsf6A5v D5toJqRG5qkBXSSTLpoO/SgBZm4Kr78Sme6g77CTB0VARGVHm/cDP9/pt7xENCctzgM5 sT+qLd+l0eN6XFohSsXSXElX5EOfewyssmA97fb6+oznHcEmyIuy/CDEeFLh6y1Ukw4R Di2w== X-Gm-Message-State: AOJu0Yz+Xd2JOPTE03Ftz2Z70tkglV8+b+8nM18U+ORf9/N/N5PONUHO vtl6Y9ayz3toOB+364zj9n6ZdZ+DNFaThb8oduNgIMBB3wvdyAdWkUXWXEbKaNaUie6tBNBSP+h u X-Gm-Gg: ASbGncu7eADGJ8pGVVwrxNkIs7HRoU6Jt9pXx2I9uqJEdT45xWyQtfufA6Sjw+rl52S ebaRc6UXOIqQ5rZn7qkNIfl/EGSF+CFa1DtWBGSxRNMTZaPZFk434avhmj3QFqr+V9Uh+TW3/v3 ubkbcCI5l052whjLJRvTMZRQ8P4EJzYnzyHHJzhVofzekB5UzV1oEh+Ch9/ewTUUhYi32kJslGT w5VKVQQ9i7q5I8nOsd05Gc9HjXlkzHVS09V+JELFsg+Snn8iSPrM3Bvep+oFU9CMjYUtyCPwn8m d9dHCOhX2tOUpIvZdDYh6FvF9MIhJkRgxPQFvMa6B7ZfMytADD2wocjmb/Irci2JYgK2skciWqb TGqQaNbzmJrCWXXYSPbqM X-Received: by 2002:a05:600c:5107:b0:43d:fa58:700d with SMTP id 5b1f17b1804b1-4406ac2179dmr4288955e9.32.1744934313162; Thu, 17 Apr 2025 16:58:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5d712esm907335e9.36.2025.04.17.16.58.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 03/11] hw/arm/cubieboard: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:06 +0200 Message-ID: <20250417235814.98677-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/cubieboard.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index d665d4edd97..36062ac7037 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -106,12 +106,13 @@ static void cubieboard_init(MachineState *machine) arm_load_kernel(&a10->cpu, machine, &cubieboard_binfo); } -static void cubieboard_machine_init(MachineClass *mc) +static void cubieboard_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-a8"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "cubietech cubieboard (Cortex-A8)"; mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8"); @@ -125,4 +126,12 @@ static void cubieboard_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("cubieboard", cubieboard_machine_init) +static const TypeInfo cubieboard_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("cubieboard"), + .parent = TYPE_MACHINE, + .class_init = cubieboard_machine_class_init, + }, +}; + +DEFINE_TYPES(cubieboard_machine_types) From patchwork Thu Apr 17 23:58:07 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: 882104 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573434wrs; Thu, 17 Apr 2025 17:01:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkK1PsIPKNsZpTXObQzWgvfHDfF907eEufGwpddvFtx7llsGaHE7ndUYcv+n8T31V4/iwFMA==@linaro.org X-Google-Smtp-Source: AGHT+IGGG9+7IK90hNTQEGVTQJgLmPI9nY+L7m9U6n05jzEJ/BaRrdhSBc8lWWqi8s1hn+p1SIST X-Received: by 2002:a05:620a:319a:b0:7c5:d1b3:d9b with SMTP id af79cd13be357-7c927f6f522mr127509185a.10.1744934476593; Thu, 17 Apr 2025 17:01:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934476; cv=none; d=google.com; s=arc-20240605; b=koU/FpCkfVMk57fX4ybsNmx+MlxcsvhQ0Q2ZKrpyP0FIsRkVRZMuNQ4kZU87nWfFac ve/GxU84af0ZglQ0EfeIwKN/1sk6jkp7DUz3VjOYH8mqJJD0bwFcQ7P8O4zPq27MDi7v u/7cyH8pMU9arBB6kdwk3ylzJcwuojMdHflI7qtx29hrw0+XT3vJIgWdxXTgHKQYNRin 6YFrgx7HnjhuxNj9dGUaVpWzO7ACq+eSokNNIWBX0zfwICa+DulrTWjgBZSsO7XAsCA0 zr/FM1ho9MA+itqiufO/63mU9kj4NoHqo/w3uD75/DXthn6yRpbb7hlijgZFGv12OlQq Sphw== 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=AOUZObtkL1pnrtX/HUZz7JN00TbmXk0vW2RpCKqJB7c=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=j/H1/ZQEREdXcr1r01QGQQheYcqz5hUE1knOAl8CKNxWOJrVmZpKnDb0L6z8I6tFkg gOxa+/tcPflbUWLetDEHuDRO2Alzkn7XrJUBPsPecnAjbZ0d6heIJqlU+osQWF9AsDpr EyGki5oCqp3Vh5wHeFpqIFbSVxXeEcOTUeWkFqRDGSVu3M1/pvVmpQfxQMzLEdN+zll9 fq9qeqgo1sRecjdtr1Jrb1twF7UUyOqpgj3giOquN8awOdpqPdQi9RZQiBI+zQHAFlHI 3KHoyn6mLE44vUFcXMSJWWGd/NrAkHdpGK30dQ4gbweEVZi9YYnPv14VXrP7mEVdD2Hl 1imQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PAFAo2Pp; 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-7c925ba4cfbsi92418385a.430.2025.04.17.17.01.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:01:16 -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=PAFAo2Pp; 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 1u5Z80-0006xZ-6Q; Thu, 17 Apr 2025 19:58:44 -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 1u5Z7y-0006uy-Qr for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:42 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z7w-0003sc-8y for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:42 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso1332141f8f.2 for ; Thu, 17 Apr 2025 16:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934318; x=1745539118; 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=AOUZObtkL1pnrtX/HUZz7JN00TbmXk0vW2RpCKqJB7c=; b=PAFAo2Pp0wgCkq+BChyAr860QFHxBpZWeB7EPQAsx5igLUkJjy6m6FrFRhmUQlon6Q 9tmYyjKCjhUXsWyqwGOuRS3mCLa3aoqwXWPjzP+vqbo22VG/Aj7fJKm/LwEzUyI8BMhS VcerR7gzOxY9S9YXANUFDAi7svQQBXGJ9l/UN1fAOM7yvjyAP2cZVDfvWxtu/qJ1HvaL OIyHGq9ATeCpnQExpK+nMdJgNdguB7Y4ZOrLbKGXDb0P9Vlg86t+/ZDDo0ycpRZOr1yk rSvaZHlnvWqTnN1+0EZsMdlsJrRD3vTZgFAo5xHM6Z5eXBxx3+Jlp4WsKqieL6Petoae RNdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934318; x=1745539118; 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=AOUZObtkL1pnrtX/HUZz7JN00TbmXk0vW2RpCKqJB7c=; b=VtdkyjM8KrJv0lw2yhJrcddnmhcIaZhSoeE/wSqoMyoS0YlBkNSEMdIGeuAWoNvpjP ArdjvUJyw7XRGbrk/3cZqWW0ZdtjWWsQet8zeQE0DZK4z/XRldBC7H/bpLKm83VPfm6a d2OkMBxFQ/JCxegGkCT/B6AwpZXs7pdb1hduezEJcC7ldggkSHNX/aNsh8d++snPj0Pn 45TJriiklEHw0J/ZhBxtOEPB8xjy/rxfz3QEXZkwmz51juBWJV6D291CtgPZJZtpwnQb kXzpNpdeFGrpK1VWrcaEvuaSH9uX1CelWPBOGg0JGSJi5mR3Ls1v2CVDVhL9GstN5dqp EMlA== X-Gm-Message-State: AOJu0Yzu8ZIqnGQcgEN7IWKlLQ0HJYOpU/x5vQxcY40+iJGg/1Ivewua AZJfn1Rvmdz5a999ExzHy1bC5R7FUHpsSknAiRp67osaMFWplTdHoXp03df5Mb5ffeFkAnAbPAp Y X-Gm-Gg: ASbGncs8SDzTtPwMMlSjgQRL90kkBngNyxJBZ3LlyysfxJz1tebZMEUGD69DqcHvySY 6B5EqAGgMu1/5KRiXDZ+H7gb18LcA64ZlYkw5g4X8iHfpK5zwMLgQe73uC088AzaRJAp1SE8Wud HRKrZ8YOjgpW6yOyrzB1mqBbqRBEwq9z5Df8w8rUaOHp3X2yRhYHbdmPPjoUtBBtf4Tw0KEfYZo GN8A2O/xLSSqupCaW/3QGS7ouV2uk+ACsXCR6tpR2MMluBHuCdU5D7TfiJ28+i1YH6RuBtaOUlp hS9NEbAco7z8FsYdbWXRQnP+XHySeJKC5lfCMt0eWBniDK1dqRjdIsHfDFccp2WHZnwfBXfoIwP RdmnMgBRaBPPVthWQUN0C X-Received: by 2002:a05:6000:4006:b0:390:f4f9:8396 with SMTP id ffacd0b85a97d-39efba5c77emr501897f8f.28.1744934318310; Thu, 17 Apr 2025 16:58:38 -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-39efa49312fsm1045268f8f.70.2025.04.17.16.58.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 04/11] hw/arm/digic: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:07 +0200 Message-ID: <20250417235814.98677-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/digic_boards.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 466b8b84c0e..3c0cc6e4370 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -136,8 +136,10 @@ static void canon_a1100_init(MachineState *machine) digic4_board_init(machine, &digic4_board_canon_a1100); } -static void canon_a1100_machine_init(MachineClass *mc) +static void digic_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Canon PowerShot A1100 IS (ARM946)"; mc->init = &canon_a1100_init; mc->ignore_memory_transaction_failures = true; @@ -145,4 +147,12 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->default_ram_id = "ram"; } -DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) +static const TypeInfo digic_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("canon-a1100"), + .parent = TYPE_MACHINE, + .class_init = digic_machine_class_init, + }, +}; + +DEFINE_TYPES(digic_machine_types) From patchwork Thu Apr 17 23:58:08 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: 882103 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573373wrs; Thu, 17 Apr 2025 17:01:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBiqVW+QlPfVm/Fk3dJEgnPDj8CXooDjJho/7o+cHu34YqMy8r5yzg48kxoVTeoG3RgmOOBA==@linaro.org X-Google-Smtp-Source: AGHT+IEsQMjo38cF/q8P4ar5FdvAUv0nmUzkIBTfW7YqfYJ1CUS77DuCZShGbS6/AVBCo6nhxvo5 X-Received: by 2002:a05:6102:53ce:b0:4c3:858:f07c with SMTP id ada2fe7eead31-4cb8014582amr797037137.14.1744934470867; Thu, 17 Apr 2025 17:01:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934470; cv=none; d=google.com; s=arc-20240605; b=G7xgDOXBlkxkJVINvn5GesjdFIg18qFmX12i/ibDQNsDGJ6zZcHuM7M9Gd+QOqdIFQ NM68YcbexZc+KONBU9G9bdDX2xMQarpvD50c/D+bv4FR7mzRP6LFcgP4mKomgSOXwxvY hVtNAWo5DrFOBF5vNmJ/EuUVnOgpBDOngOztPBL+9DDjjYcLk9dGVAVFyVsOpu945Abm pge9Mi34WXtSCFF3Z5HJI8bDV+3Ep8hmXsnmdJ7mrYNgSZGZZBkKJ0kbF4ZiLlwPnQAp uix7Vl2ZwuU8V/BdroBiZPAYvM//+sWap11xjKVQ81XG20lSqbrJf/yS7e7Q2rohoRec y23w== 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=BisZb8cnL3Qhu4Zao2XQnv9XLrWqIWO9ZQzoyvXQRoc=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=DUjYak7/r/ltunuhh+GojsMSgWzgfUk1s5ORwP/05jjyzlHZdVcnDOxA9v2eOWRvPA kRG206QnQic9OpZlf1UO9/bT1sgSzVOgNE6Vqlf4eobVPcV7hJXC7uhr6jGf2RhqnP19 69hGnrnHb30GHN45KgyIpb+gx77Popkjyol0q4sHH19pQf82sFVyA35x5FRyFVTrFasV oel6TegeBFG+9csMT3IFdObRCyrxXTgPd+da34eXPcYc0A9QCOhL7pO5B3bSRKJIvolp AR6UqVBPGeiKOukjSz1LlmsPaCQLt7g3Cs1+mTz/zmQtf/TKw1keFUOT77tLRQR/4cKo WzaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lH7Hs1+F; 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-4cb7dec2aebsi416443137.315.2025.04.17.17.01.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:01:10 -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=lH7Hs1+F; 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 1u5Z85-00073d-57; Thu, 17 Apr 2025 19:58:49 -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 1u5Z83-0006zn-T6 for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:47 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z82-0003uI-27 for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:47 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43d07ca6a80so6976875e9.1 for ; Thu, 17 Apr 2025 16:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934324; x=1745539124; 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=BisZb8cnL3Qhu4Zao2XQnv9XLrWqIWO9ZQzoyvXQRoc=; b=lH7Hs1+FoFYAUi8RHv3bSg/9yng2VfplsQQ2jPxN2rRVm83H6sbMY6cogNXrV0VLxY Ad6NB6vTc4zBH/D9GMdus7048UGjG4NExofgjknZmiC43Sj4ikZ/z5Il5J9RdZuzUL2g T+mzpBaLrBCOn+OYd1oUszIZ67ssdw4ng/AN7Whr5BmUxY6+8d2z2HjB8AwVeTdJroGu 1RJzhpuZN7W7DQI8w7EJHin3OiNgNLk8eQm8t32IsVHWVpsRJA9wUapOIH/wnYoZWIv2 yhhjmwg1gYiXbmHDPf5cpQ9Bm3Lwk79WYCfd9AX43y2kEGXun6nnm7feBC4Ct9LLb2N7 Nnqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934324; x=1745539124; 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=BisZb8cnL3Qhu4Zao2XQnv9XLrWqIWO9ZQzoyvXQRoc=; b=Bbks1+hwOnt/OYXs5go4FZea9eRSpAN3cKCztAI6V/R9zJ6Klrm35UJKsQTWMtZJkW uYcAJKxbGyyuhCNwI7vfEuX/ufOeQBkCLO+YDGTb8LE05o4SdgeJ8XcH3vio+G33M/IN CIO+NK/wn5jBAFPw1cE/w0SzSP01XDp0laoy3wbFaDmva6lymhvYcdjWGeOk/M2E9ZeF 92tPyQ8dPbou+5+ng5ANaCvFiOyv4pW4Ewa3YLeLi4jwlr/owpuu0Zi/NOxNtIDkb3H0 rNp1LPEznJFPEo1yBHmkWk57t4vgj3+DX8vBojVdjKUaHM6p/I6rDDoZZvvKKWYI3dhD p6Sw== X-Gm-Message-State: AOJu0YyaEoMk+4cKqln/wdggYvZqkVU5jgXRutxqy0gB+zEOowB3J4VC hJJCjGBFOYSTHmMBD+dsxIgKauVzfSjkOPp9IUCQ+fRB6gmoaa9VYIy9Gz5FGMxFGQA5s2EJokr g X-Gm-Gg: ASbGncuCVBDyZgJUMIQti3rhes7IunGS/x7ehiaSOMB2K9yNvaMSgkRzGms8+HkgTgC pF+3aOw3/uCcLAS3iB3wXe4Zzxcsjo3ZyLC0fAuAGnQKZ1E+gln+/yWAnJ1GV9cs9Se6WzW4xvJ CEOoagavvTrN/SfqqLMCIsfqMNuEntvJjoU26Shbi6cUfkRdkd578/nvzqY3xJEHr6zlZljCR3/ L76W+dhkY6sQmotSErTRs1Ja8zWhoPqxOXZaX08caKnXmG2zbBDDjry4NmO7k9tOjRLJffMxUTV TlD8NMNoYXRLkSc0ngshOmHuTec1/BwaTXCTwP+C/riUO6rgPj5s6nE2ut5ze5UWPLRdeYe+ZAv 8rm+nO7/Z/9iHLTsL/sFz X-Received: by 2002:a05:600c:1e10:b0:43c:f513:9591 with SMTP id 5b1f17b1804b1-4406ab95a4bmr6529345e9.14.1744934324153; Thu, 17 Apr 2025 16:58:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5d712esm910885e9.36.2025.04.17.16.58.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 05/11] hw/arm/imx: Define machines as generic QOM types Date: Fri, 18 Apr 2025 01:58:08 +0200 Message-ID: <20250417235814.98677-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/imx25_pdk.c | 14 ++++++++++++-- hw/arm/imx8mp-evk.c | 15 +++++++++++++-- hw/arm/mcimx6ul-evk.c | 15 +++++++++++++-- hw/arm/mcimx7d-sabre.c | 15 +++++++++++++-- hw/arm/sabrelite.c | 14 ++++++++++++-- 5 files changed, 63 insertions(+), 10 deletions(-) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index e95ea5e4e18..a90def7f1a2 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -141,8 +141,10 @@ static void imx25_pdk_init(MachineState *machine) } } -static void imx25_pdk_machine_init(MachineClass *mc) +static void imx25_pdk_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "ARM i.MX25 PDK board (ARM926)"; mc->init = imx25_pdk_init; mc->ignore_memory_transaction_failures = true; @@ -150,4 +152,12 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) +static const TypeInfo imx25_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("imx25-pdk"), + .parent = TYPE_MACHINE, + .class_init = imx25_pdk_machine_class_init, + }, +}; + +DEFINE_TYPES(imx25_machine_types) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 967258e6484..c7d87d99230 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -64,11 +64,22 @@ static void imx8mp_evk_init(MachineState *machine) } } -static void imx8mp_evk_machine_init(MachineClass *mc) +static void imx8mp_evk_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "NXP i.MX 8M Plus EVK Board"; mc->init = imx8mp_evk_init; mc->max_cpus = FSL_IMX8MP_NUM_CPUS; mc->default_ram_id = "imx8mp-evk.ram"; } -DEFINE_MACHINE("imx8mp-evk", imx8mp_evk_machine_init) + +static const TypeInfo imx8_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("imx8mp-evk"), + .parent = TYPE_MACHINE, + .class_init = imx8mp_evk_machine_class_init, + }, +}; + +DEFINE_TYPES(imx8_machine_types) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 86982cb0772..d947836d2be 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -68,12 +68,23 @@ static void mcimx6ul_evk_init(MachineState *machine) } } -static void mcimx6ul_evk_machine_init(MachineClass *mc) +static void mcimx6ul_evk_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Freescale i.MX6UL Evaluation Kit (Cortex-A7)"; mc->init = mcimx6ul_evk_init; mc->max_cpus = FSL_IMX6UL_NUM_CPUS; mc->default_ram_id = "mcimx6ul-evk.ram"; mc->auto_create_sdcard = true; } -DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init) + +static const TypeInfo imx6_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("mcimx6ul-evk"), + .parent = TYPE_MACHINE, + .class_init = mcimx6ul_evk_machine_class_init, + }, +}; + +DEFINE_TYPES(imx6_machine_types) diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 33119610113..f5dc9c211dd 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -68,12 +68,23 @@ static void mcimx7d_sabre_init(MachineState *machine) } } -static void mcimx7d_sabre_machine_init(MachineClass *mc) +static void mcimx7d_sabre_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Freescale i.MX7 DUAL SABRE (Cortex-A7)"; mc->init = mcimx7d_sabre_init; mc->max_cpus = FSL_IMX7_NUM_CPUS; mc->default_ram_id = "mcimx7d-sabre.ram"; mc->auto_create_sdcard = true; } -DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init) + +static const TypeInfo imx7_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("mcimx7d-sabre"), + .parent = TYPE_MACHINE, + .class_init = mcimx7d_sabre_machine_class_init, + }, +}; + +DEFINE_TYPES(imx7_machine_types) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index df60d47c6fd..ea59ba301e7 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -103,8 +103,10 @@ static void sabrelite_init(MachineState *machine) } } -static void sabrelite_machine_init(MachineClass *mc) +static void sabrelite_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex-A9)"; mc->init = sabrelite_init; mc->max_cpus = FSL_IMX6_NUM_CPUS; @@ -113,4 +115,12 @@ static void sabrelite_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("sabrelite", sabrelite_machine_init) +static const TypeInfo sabrelite_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("sabrelite"), + .parent = TYPE_MACHINE, + .class_init = sabrelite_machine_class_init, + }, +}; + +DEFINE_TYPES(sabrelite_machine_types) From patchwork Thu Apr 17 23:58:09 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: 882100 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp572767wrs; Thu, 17 Apr 2025 17:00:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbHHBYDqydGLoCT+LrcsawjnqM20OfhsyB4Lm9kDk9kA+jJiF2sYr+7w9gEORvsMw54Axryg==@linaro.org X-Google-Smtp-Source: AGHT+IEY0gM72S/pdUZfpj2Eni8DladeRgPD7RaHf2oVvruHBrQd3DtOueCGhbc8uLSjngeobtTL X-Received: by 2002:a05:6214:d6f:b0:6d8:b115:76a6 with SMTP id 6a1803df08f44-6f2c438a70cmr16409866d6.0.1744934402958; Thu, 17 Apr 2025 17:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934402; cv=none; d=google.com; s=arc-20240605; b=bPLRgBOACB3ILfkWyYWLmdW8JI/tiLc4b5FHBFwd8Cb3aQo8CVCGD2DVzvwUzvApol q9+YD0WMeo1kK+CyNRUpegGZ5N0me4W25936tOgvmg+Ed8CRimrY/68EgV45u0L3IGQ3 eOMMpeSZeLIMl3YPatfvDNp/HAQbki58Cok2i5roGrANqmI+ryIT2hh+pS62Dj8+/kYg NIKrqePmwEkst9UxCZOHu7vHlWLPY3hkdLFEE7WqJS6HD73ta1Bzp19ZbT5craGaBAli Bz+MdD+4s7v1BWVR796TbaqXYKROi/IA5mO7bCCvUyq8fhQEbfxfliuK/y9Si1plzic1 N06Q== 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=IV76PRrNanbqrM8g0qKEhby3o8+8x24HZf+5mnfPp+c=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=UXnUpAp/V3UoPKnvA7AIQyvuf5l1pq5iJ4dLtZt0y93Ja+fVCr9G0pZdQ+PORiqFnE bq3QLtARe2X8uGiQZBtQmPyrEwXtXQ0cIvaUMJ8/S4vQVD+LoW3o78Lr/wtBA+IQgTHA DvDUcKsCzMe0xCrXh7kANAuLtbtcu32r4Lm1u1lwf68anNGtUvLXQW2AlWxqkdtfdNYc fFF9nJ8NCJJlmZBVidg5J4pi29RpyOs+5m6U2J2BwCiICO5LL8/D8pqcwHiE909kt8dF v64j2LHIILgqZHOlr8f1nnEgy8yBEIpBUAvH3p34A4y/dVr7AB3iVzoXEPlKjYVoO/VU D+Qw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K4WzrWpe; 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 6a1803df08f44-6f2c2c19b47si9247076d6.364.2025.04.17.17.00.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:00:02 -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=K4WzrWpe; 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 1u5Z89-00076b-Iq; Thu, 17 Apr 2025 19:58:53 -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 1u5Z88-00076S-SA for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:52 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z87-0003vP-4g for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:52 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39bf44be22fso954836f8f.0 for ; Thu, 17 Apr 2025 16:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934329; x=1745539129; 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=IV76PRrNanbqrM8g0qKEhby3o8+8x24HZf+5mnfPp+c=; b=K4WzrWpe4zvJ3y8lGd1kHUw24Kczgpd7Ceq2ybWVporvbZsAE1AnSOaOLx5bhHPxgH k7Nh+Gyru9PSwA4lOQUurAdfgT+Uo6gVkLvWiyDJ2ydHlnp8Xck5bHFQRsjHrj7y1gYI t+VmgHZpbUToiY7FZBaewNh0YUwza/EBa6/qGF9p8DeDjvincOt4B5DH4jO8yd6ERS0L WTQesLAHJq63xf3XfIIgUoac4kfIbMlAkM3ze3Q0wf+JUtS/I2tz0nqTuGl2VrKbaj2D 16QKVocK3AnmJqznCPTxbcsQ3pmv1TjolPPBdhho4aVv6g90AqIgq8f3IydtxsZZzZR+ 0mjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934329; x=1745539129; 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=IV76PRrNanbqrM8g0qKEhby3o8+8x24HZf+5mnfPp+c=; b=pLVdg8sKueqd3XZ+61W2MuYs4ORST3bvrHFo+iYDuW4BIR97CM5Jl8qx2yC+MOEXgf GSo+QC8BA1V9C/L/M+ZZxycAIsd9ZsdBHWshLE39HmMuBFAqgyxCEfh689bKtNHoExmR gymXmTHgfRVp+v4zZ4mJYUgYAQzn7hHvzbDeo15unM4lqGV+DQ8sp2UI2D6ulA/qBt3p 9MtSam6OYl7+WQ6UTKg6/xYLo322nnzW0Q6/XkSO9WJH+MNTreIOZaIOm72abmXGMr5i nR3AfDAdBSZqJQ/P/ENm+Fnggw/8ak5e9vjZbjurwjoLRq39ySbr/TMsNvdpYeKhyL+n nExA== X-Gm-Message-State: AOJu0Ywwp7Rug5Ffm09+OfdGJb+QIPRbbRXbiECyMAxEV3Pz5t1pfOVh 6cSL5WwNVXGhtMIrCO9GA/IXZug/65FH0kkfzmb8CMR68bZKtOgtuLsDDsjH9Mxq6TKgTAkYE9p P X-Gm-Gg: ASbGncuyt6uWg+A+zOez78eh7bzU6Sb7TbkPs+yun/jeKKc2/ReRqMGL48PgSXHodRA 0jPmnaotvsWptK5CYDphqit4tbI2UbBIb7Yfw/psE64SVAMC6lvUG1ZjdVN+wnwIKQt6tNAWTsC GnRsa+br4ClGrYct3bM3zdxMBJ+4RqB5nxdXYq5LRFr/wJI5HSV7MfNYcD6utRFm3Zs2RRGtqYS fgsSTxRhg/nXDh0gcOZtrvUuz5JGOhj8Zu74BithqKhzVssPb1rMvO+7Dkz9aE3z4CIyyTTtZGL 9Yhdkijw9RcA9Mo0gAV1roaOABBdShONGS3AtGKPDK33c8nYi5zp1H+e53F/TVmInzv1Bw98tF6 jqd6I+g3CbJtfj45U8U9O X-Received: by 2002:a05:6000:1888:b0:391:4743:6dc2 with SMTP id ffacd0b85a97d-39efba5a416mr531019f8f.25.1744934329322; Thu, 17 Apr 2025 16:58:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d6db230sm836565e9.31.2025.04.17.16.58.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 06/11] hw/arm/integratorcp: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:09 +0200 Message-ID: <20250417235814.98677-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/integratorcp.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index ac0c6c60961..f95916b517d 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -681,8 +681,10 @@ static void integratorcp_init(MachineState *machine) arm_load_kernel(cpu, machine, &integrator_binfo); } -static void integratorcp_machine_init(MachineClass *mc) +static void integratorcp_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "ARM Integrator/CP (ARM926EJ-S)"; mc->init = integratorcp_init; mc->ignore_memory_transaction_failures = true; @@ -693,8 +695,6 @@ static void integratorcp_machine_init(MachineClass *mc) machine_add_audiodev_property(mc); } -DEFINE_MACHINE("integratorcp", integratorcp_machine_init) - static const Property core_properties[] = { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), }; @@ -754,3 +754,13 @@ static void integratorcp_register_types(void) } type_init(integratorcp_register_types) + +static const TypeInfo integratorcp_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("integratorcp"), + .parent = TYPE_MACHINE, + .class_init = integratorcp_machine_class_init, + }, +}; + +DEFINE_TYPES(integratorcp_machine_types) From patchwork Thu Apr 17 23:58:10 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: 882113 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573447wrs; Thu, 17 Apr 2025 17:01:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWy1oy4qp5ngDpNnRt6QLJg0sm5g3RIXym+MSNAJRB+UqLYKAIR31Cm3Ve4D85HExA0r9MzaA==@linaro.org X-Google-Smtp-Source: AGHT+IEjsSHI/NCBdivM8CdMjPOBloYo6rWnSK4pIuYKm1YL3OCt2nnUFrHkmplnFXNtLh2XThpl X-Received: by 2002:ac8:5811:0:b0:477:1e85:1e1b with SMTP id d75a77b69052e-47aec35503amr13129851cf.8.1744934477907; Thu, 17 Apr 2025 17:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934477; cv=none; d=google.com; s=arc-20240605; b=apGstFeTxlQ/8y0x+pfh6ne2wXiiPGptMwYUuuC+Psm3eAk+aPGY495n437YRIhiMh XLwLB1EOGcs1VelTj8ar+jP6Zo2WPhuTENrDEXJKZFhLRrI2cm7JnVXeWbQA73ow6zrn wK2MCmXWda99AfKx8jHbpgXcd8sBkJHDRLGtCgJ7NsN7TEsPTt9s3had+g5luhF1ObbB VBl3j/H/ROgql7/71QPo7t2cE1cvFKK73NUT6lc4zem2/9UhKZTCN52eucoBRfZWxfBC hZokj3NbaXZPQKxY7vLq9Z5njZch5BJt8dmh2gDozmpihA5uqLUhMc/08Do75KW95Gcc MBrA== 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=nXmcwYVTU4L9Er4BkpjqN8dz0sYT7bRQoVVZQuGVa5c=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=H1FofsPqQ+8LP4a3ksKFms9Or6LqUU/XvgI9bC6shuYLHyBLEIHiEC4xH/ChFFhg8Z uhqdQIlnwIIHOfkOMhQHgg7KuOq6O7wiEhKKMvDyAz5u45ZrqhZaINese03zM1HnSioZ CJy/UpMPKKIe5Z8Td/4JgJ30FHa4tSEn54sTOQZx2wDelR2zGmGC1dFr+1fc0NannQJ1 vGIZ3zXMcdgphBwk4mDCj4mxUnpmlZMdu2woYXGMS9wOGiwFfLn/Di/O/YH38XQycfyj js40fZ/wowZKCMFZY61spvtWXCLwWqZJvOWmYvStTOL9OlXQQNw1wAQTB2mKYs2oeFf1 mu4w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="eWW/rGz7"; 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 d75a77b69052e-47ae9c11e69si10091091cf.41.2025.04.17.17.01.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:01:17 -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="eWW/rGz7"; 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 1u5Z8G-0007Ab-HE; Thu, 17 Apr 2025 19:59:00 -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 1u5Z8E-00079z-7N for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:58 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z8C-0003wI-J1 for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:58:57 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so13869775e9.1 for ; Thu, 17 Apr 2025 16:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934334; x=1745539134; 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=nXmcwYVTU4L9Er4BkpjqN8dz0sYT7bRQoVVZQuGVa5c=; b=eWW/rGz7gyAkjB9n4/xM/0D7bALy2i6b0ODl1zy/Z9l9cECg4JsfisZy6igp02nWSv InSCfAwmQgLLrrVT/UL4S8MRM2w7Ao3wdIvMs4hTYCIKkt5XcnFi4rza2609Gmh6UwBY kKjvHQx3Wvrt62orsxLDXEhscx62iKp5rHD7TlUI81h6Tknt1tRwlUqkvEF7VaKsTl03 NBSTmBB5dnjTxgdi9RE4tLlgqLXgDBkYB9b+156IOK0UWoPN+Pq+47x4+LyBuqAv5EsI hPDX0nnD9VDhf0ziM7B2sNFZYmo8OG4hPINj+PoZMB9mLCbx4jZG3SWshExpmkMUk9TM G3Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934334; x=1745539134; 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=nXmcwYVTU4L9Er4BkpjqN8dz0sYT7bRQoVVZQuGVa5c=; b=nqaf4KrBOn0P54KFF6izUtJ48Km08HoExdJ65t/NywjGb0khmuvtp5OpJN3lPSim9A /br2V9ztABb4PeJm2lp+RAMZeFFMiCnRuNU71RB32dLwUCkPBVvTKoI0Hy2D/qyr7WP4 RLbej4VYnFry5KDeD2Dzfp5iKTVvL901vW/m+033XkUoysuFp3rUabdH9D/aaLvNRTs1 n3uDO4nzqBtob19igVBv9dA+pGV1W6HT88flGWS9D0jHsbrHwNd259GrhR7CwjXCLRCq WDCbvDLab0gvR1Wm/UQI5crrhUqozrIyrAFc/9RXZgwO86xqyTZgMPgoUfbV/kkXk8kw rQYA== X-Gm-Message-State: AOJu0YwRQzW+5IW6F1446giPf1whQ3dQDQICat0GhgzN/fx6G7WVrolh GGS7HszoNLmQCBiXGSOdlouy+cz7kux9kqH8UQdpVe/UZZ+MAM0sxtvilOwJstN2+82WDq6vIR8 v X-Gm-Gg: ASbGncuOvgHKI1DG67nn7UswzlrYiLJaehoH+fBfXFC0posorCh4jW89gJpqpRhCBV5 NoLsWVkoP4PA6UBqEfLS4Ts35GI4xoxRFRfrybDxQgm4+FJhj2UdHmoeMHVKwWeVdI85UdpeXq7 6IbO/PhHYOk1+8y1UcH3q64Wd3qNK6kFq8uUJKPQaBLfJO1g1j3wBLytk4nL4BzWoPkinXbhObN PLEB/WuwfhWf9MQXEbglfInPxxICLPvEKaaVkasRiP0atR9F7aKeb3X8rOql9qHCvOpL3u4Sa6h ZfvN7UTEtyQCUbPReuxhtk3zXgzfuc5q/bnA5TSEr1Ktn2OqdQaO7Vjx1P0Bgx/LXWuezntStoC Gx8zRRJYr293xZWiAxVaS X-Received: by 2002:a05:6000:1acb:b0:39c:268e:ae04 with SMTP id ffacd0b85a97d-39efb947474mr596531f8f.0.1744934334502; Thu, 17 Apr 2025 16:58: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 5b1f17b1804b1-4406d6e034csm800435e9.39.2025.04.17.16.58.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 07/11] hw/arm/kzm: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:10 +0200 Message-ID: <20250417235814.98677-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/kzm.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 362c1454099..b56cabe9f94 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -131,12 +131,22 @@ static void kzm_init(MachineState *machine) } } -static void kzm_machine_init(MachineClass *mc) +static void kzm_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "ARM KZM Emulation Baseboard (ARM1136)"; mc->init = kzm_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_id = "kzm.ram"; } -DEFINE_MACHINE("kzm", kzm_machine_init) +static const TypeInfo kzm_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("kzm"), + .parent = TYPE_MACHINE, + .class_init = kzm_machine_class_init, + }, +}; + +DEFINE_TYPES(kzm_machine_types) From patchwork Thu Apr 17 23:58:11 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: 882101 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573056wrs; Thu, 17 Apr 2025 17:00:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULIAndi6AT2m8KNlzhfZmNmlfknMMGpoGW0hlcQbrkVhL7rt3OMUDkr9Eohi7MlegINWz+XQ==@linaro.org X-Google-Smtp-Source: AGHT+IFD1GoQ8/t5yZ7VlD4XbYGBEHW93wNARPUAFMx+vZTfatNfcN+/YByJHvHb7VDtKTxuoL52 X-Received: by 2002:a05:622a:180c:b0:477:13b7:8336 with SMTP id d75a77b69052e-47aec394c93mr11090401cf.17.1744934437260; Thu, 17 Apr 2025 17:00:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934437; cv=none; d=google.com; s=arc-20240605; b=TZ8kw5+GcuCxQxLwvSia0nx9tldrTRAGP6MG9K+79PDlF6+EaVBDHL+uzEV9RdvDjW yJDy/CuN7yyRldBKrQziVi2aauUiV37Wt+lj03I5B2+D6cZkgLVTtKKf0WRwHLpxx5uo MUuqyG5ArTOPz9Aj1t9TT8PDWUkTa4q7o99sYpl1T97Bnz/hW6pDNSms2ds+geD6eTP0 LTZZSEPrCYABX/6bv6fDAfoxDtq83FWFZ/bhRVJJL9tD0VnfdkJaatNY3s12HS4YB23M 7OopZkK1Z6N95yJ+ei3wcm+PEut9tUGqwEeYmIzPY4xVSOKDc5pnZ2lZIgQgmjnkOyhf mX4g== 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=Q1BCsGCYDAReQc5VOE8gGZJI4mqG04gHq5Y6jpZDaC4=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=hwxevFFCgh9gHvvSizHPoechM97YM0xXan4OdngMWtFLZsgADoQD/0UXkfni/15OOS hy305bTn1q8qC5IKnRCFjAMsav//RFNB2FPd+F8cjSW6z1a+ezZGMXzIa+dliCP06tT0 MUBOD7159wBpS+nra6AUoH4bG3hnUNv7FJ3T4EVVBbNuQwPiGMV8vi1DcyoV6kNkySxd rBDOMSfYVULtn712bhM8/aRE/0qYOE+cdlQXeq6DRMO0bsBiy97lLJ9g+Cb6vhw+KVqL TkISzQ7kLOCaxWxtaECRc5m5aE7dPG4ngygu5Ikxdtj3Pm5eXMvUZdNCURTBxQzjiI66 N+Zg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="uRC+/DsV"; 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 d75a77b69052e-47ae9cf1bc3si10273761cf.638.2025.04.17.17.00.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:00:37 -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="uRC+/DsV"; 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 1u5Z8M-0007D5-8i; Thu, 17 Apr 2025 19:59:06 -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 1u5Z8K-0007BZ-Ef for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:04 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z8I-0003zM-4d for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:04 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-39c266c1389so981902f8f.1 for ; Thu, 17 Apr 2025 16:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934340; x=1745539140; 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=Q1BCsGCYDAReQc5VOE8gGZJI4mqG04gHq5Y6jpZDaC4=; b=uRC+/DsV7tbpXnAKDE2x41GqefzqPl4ARvYG4g/7xzZDWQij1hV90ryYOlOnnrQEAD j398wwUwcVMtjEkhsHSFZBj7sfAl6uqr2/3+TreWxjnlYzCn/+pOjzRzwjSkg8KWjdML 8RgcSj3IvnmgcjQ+Xh4wXTVvspykrIpl1Pob1LEPPmnjBU2+6K7j/Ci74+PPM0ETP/XP SqDCDyvpNWVfQPJj9tDIRYejHoxyHzLuMkbrdV8EI5zvAHP7QWeAj0xp42Yn0APEJW9T d875Qi5CSq8RDjRb78o6BYn354d94F/RBN8ACF3jbPAl74FQWo78iM/oBkSGHnTTuBGr hdgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934340; x=1745539140; 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=Q1BCsGCYDAReQc5VOE8gGZJI4mqG04gHq5Y6jpZDaC4=; b=pEzkwojPuggxF3FWoG7cpRfVill2YhxgxruJgUtXX/M2Aml+yJ1tCoj4+EAbfnBEAA w0tTxtsd+suUerkO/oLUy3O4Ne60tVP0G/nKz59KKnr8lEQqRMF2W19oBxBnLvTSCn0o AlGnjE7Ay5WJ/KSTe/yDnYentJxcRNanXJ8I2Z8rraYJc7CMRuPE9tzu4tUzY67HO3ZY gkdcHrhs+1qzI38vjx29LQEGN5M7YbERvqbMxtEgZHHkHwTIH0thQ0CFobzEHVnM33QP nJqZXwa6MK3OT6eDKIZ4SEIao/I6CmGDlhTV+9+D4ykzhcAMg0JE7RwxgKLZW63FDwVQ mINQ== X-Gm-Message-State: AOJu0YxVG3A0szVGYSRFsgULAKtioo5cVoVMbIBSLvpXe2Z9KUPmBCqb DXrWbRHyw98x7TjT2kKYzrLdK9BWboeHKeIehmAKpjxd7PFVvBYFFM4JKw9r0xzhClpFkbVa47b U X-Gm-Gg: ASbGnctdzg4rHjuB9UY9nODit+H55Z7gbQJNfkAlo4mMJWpUi2oVs+mFWLGaOorEIwB VUTSL8S/z05ZC6qgeSbFXZL14OrlyBu/60PUiT2ASwW5KjbCydqnlIEKpo6/YVu2Yv9JroxT985 9WUG0wM5SEh5CxHs/u8yMoen2PTCqrrbzd6af9yGzXGqFbvSJPGXHgV8v6gwDKfRaELX3zWLQrX 2cb8Ii9n8cRQFHPkuA26y8EnpYOy4Jsrkfv74ZENPypz5k1gFGABEmMJpZ12U+EhnLjZAbKWWe+ Mo2Gq3NekNc7iqBx9Xjdys7JaU1cQ3Y8woe2NWYfnWWuUzJpvgjFeTe6fJstClfnReeNGxn6SPZ 1ksyrNFCAe2N2w/f7SYZRN1t/I4wucLA= X-Received: by 2002:a05:6000:1ac9:b0:391:253b:405d with SMTP id ffacd0b85a97d-39efbac60femr501344f8f.41.1744934340449; Thu, 17 Apr 2025 16:59:00 -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-39efa49312fsm1045843f8f.70.2025.04.17.16.58.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:58:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 08/11] hw/arm/msf2: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:11 +0200 Message-ID: <20250417235814.98677-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/msf2-som.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 29c76c68605..6ce47eaa27a 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -96,16 +96,25 @@ static void emcraft_sf2_s2s010_init(MachineState *machine) 0, soc->envm_size); } -static void emcraft_sf2_machine_init(MachineClass *mc) +static void emcraft_sf2_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-m3"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "SmartFusion2 SOM kit from Emcraft (M2S010)"; mc->init = emcraft_sf2_s2s010_init; mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) +static const TypeInfo msf2_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("emcraft-sf2"), + .parent = TYPE_MACHINE, + .class_init = emcraft_sf2_machine_class_init, + }, +}; + +DEFINE_TYPES(msf2_machine_types) From patchwork Thu Apr 17 23:58:12 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: 882102 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573160wrs; Thu, 17 Apr 2025 17:00:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWYdpuIbY65NcsouHVGHpo/vbhk2q8mOqYD4RSMOiTTHdgEoMr3F4rtRzJPnijzjLGZlX6P8Q==@linaro.org X-Google-Smtp-Source: AGHT+IHudiw7JEB5R0hz/vP5+CoO7uSkyTZUIZGW/2VbpGSI4h2/86rfwogzcG2Cx34sJl6Vs8tI X-Received: by 2002:a05:6122:8d2:b0:526:1dde:c5 with SMTP id 71dfb90a1353d-52925242315mr1082644e0c.0.1744934447736; Thu, 17 Apr 2025 17:00:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934447; cv=none; d=google.com; s=arc-20240605; b=i93k9prsjUFHyZ26wkiEQyhcXTQHpFjJbawzRI0PMUITcd/LVsJEb8lUrcako+X6o6 JglMZ+D3lsQfzJNxVx60dhpFrGidxMeXmU5swgmSwjeJylOtttv/gjnrnKylZzw/9CSh 8C80Uask1TsgGIATYQCG2ZhgFfTDUEZv+yRvzIml02tqUKDApoNxusf7f4XTtbw+sAYf hb03+6CPCEKJf1yeipaeGxSnUMPiUf0xOP/mDulSVPmv2q2yP4bSt3mT5GMSrFRgrWTR 4TyCZE7Dpojuvm0x5xKn9encK7XgPDn59wpEsw36Y+IyObgt2IloQPXDLido2p4itm1w BnUg== 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=yYW2b9J9rpRFJ7QVGZ2mZ7NVt+Xm7Wy9C2Beg149RFE=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=Jt8lH3MVeuesdaZivy9KnPud4k1vwslnlWKykjyhpbaf9nMVsGp9lGJL6JxSYIHJuQ io11b3W/GMINCypcTo/DePErzChB22rjRYFfYUcPk+YtUfG3+mH5s3fGb4/NSjeCazWs cZx8VZCmxAsm2gUxnVmH3HpOUQCI38B8I4doyr0cfHYzwy5ltg+6A6TafvEN3vB7vfDm 7ynXvKksTRMPEQ+3jKGthA9r0gqLsyjEPGxIW2VMHkw2Jkp49re/Nz/aSOnBJWOHxIAI c3VM3gviWmZHvqtnpE+YfDIPstZ7qJI93OyJ0epaVnvexri4Y5pUCofRXKOVEm6a4f5a e4Eg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Gwv5TRxm; 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 d75a77b69052e-47ae9cd2e20si9446691cf.482.2025.04.17.17.00.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:00:47 -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=Gwv5TRxm; 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 1u5Z8R-0007Fm-6Y; Thu, 17 Apr 2025 19:59:11 -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 1u5Z8Q-0007FO-BP for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:10 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z8O-00041z-3Q for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:10 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so10226125e9.0 for ; Thu, 17 Apr 2025 16:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934346; x=1745539146; 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=yYW2b9J9rpRFJ7QVGZ2mZ7NVt+Xm7Wy9C2Beg149RFE=; b=Gwv5TRxm12t5Dg9LE9AnVS0VhVvj0SimlvsP37r1Fgjn9Ce1az2xyoECgV2aiu4TXp KvpM7Lpjk3uyjbnCk2n7RSBWI+Rzea5yG1yeGE/HyOnKBCWU9tGIF8Tbz3P2Bdl/FCyk GCeL2I2xzgVGAFesX9zh7ZI8fmeM23HJQppBCLpLwIcI5+p9GQ9SKG5VGijYHW+fc6dB Fm90vGlNM1Gmq7A/njg17S/z3W50ccByINopmBHa7+dIgY6/Bbm8VsCkMEZ/iEZFFBU6 L+EvLR/4RGnuJFao6lMzqtAxy4wScXjIw1LwDMDKdZu7obXLWT3zEJgN5zx7AYIVzMLR o30w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934346; x=1745539146; 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=yYW2b9J9rpRFJ7QVGZ2mZ7NVt+Xm7Wy9C2Beg149RFE=; b=nA0xNWngWk4rTk+bNst0vzajik7wlF1OikVFC9eqyHR/hewJJWfoipJ1Yq0FtpqwSm SLB2ZQjjmhsjcCLE8wBE+oo/CBbfBYNr64O4LcK+U0EZHZlgDln8XPEs5UNfxwBwOz/Z 5f3JCi5+HnuwobdjqO+c2uk+k0FWeSowNdUbTowd8KAeoW93tnKh/q3Bd/RnP4hLMF6w KVEWIrHB3IPIE7/d0EN2/NMH0su9Z2FWbBGWDvnr3iEIAFZ5bsMz3Ri7+K/tl/sotNm0 uNGTxxhmg0IpkApugOtYIsI/FciZG0UmNmjsAZy+md8/j4UYqJF5zG7F7hbOeoCLghZH 1wZg== X-Gm-Message-State: AOJu0YxCCcXHs4aC0vL6Jt8aw0yt5kj/aY2j6wg1LcRTE8RWnpAIEV4T 1gmbQBdF9p3+xjQDICb5xcPE9p60UabSMAbdaLyzqWY1G9VP2RhWwTX9Slr5Ibeb/plM883czUF l X-Gm-Gg: ASbGncubsSTAQdQ2M21WnJQDWlbUPZ0Kcu8TkkOD/+B/oapkVLLWqxaWNQeQ5RhNYB4 wPd93RAkmCjSNSkwRvXVSjx46IvCYbYtvor931HoGjmcM7F+HShCsFVHScLIy2p95koC7wL1VNK DWrlZR7zbTs3gxBbx5bXESe41YzjIf+4Ps+UDQOcvdzRCoEYUzw6mru5/yJLTO6AESry9WauS/O nGgni5KhB8WDqYTKSGTVH9c+IgEkl8alfSWJbLkqjWa0b+C7VKIE5OOg+0f6CH6MlIsRhb0LKxN RuVLtIl8PERuTfaxmYpQ0M+ijTJ7yoGnNz9d4WzySXXZlphOSuDIUiU0xwEaUOOgkooj1V9OBTR UkUcS2EH87wNdfteNAzoe X-Received: by 2002:a05:6000:400d:b0:39c:1f19:f0c3 with SMTP id ffacd0b85a97d-39efbad3dffmr512039f8f.46.1744934346291; Thu, 17 Apr 2025 16:59:06 -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-39efa43c018sm1058365f8f.43.2025.04.17.16.59.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:59:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 09/11] hw/arm/musicpal: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:12 +0200 Message-ID: <20250417235814.98677-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/musicpal.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 48a32c24079..f7c488cd1d6 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1334,8 +1334,10 @@ static void musicpal_init(MachineState *machine) arm_load_kernel(cpu, machine, &musicpal_binfo); } -static void musicpal_machine_init(MachineClass *mc) +static void musicpal_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)"; mc->init = musicpal_init; mc->ignore_memory_transaction_failures = true; @@ -1346,8 +1348,6 @@ static void musicpal_machine_init(MachineClass *mc) machine_add_audiodev_property(mc); } -DEFINE_MACHINE("musicpal", musicpal_machine_init) - static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -1375,3 +1375,13 @@ static void musicpal_register_types(void) } type_init(musicpal_register_types) + +static const TypeInfo musicpal_types[] = { + { + .name = MACHINE_TYPE_NAME("musicpal"), + .parent = TYPE_MACHINE, + .class_init = musicpal_machine_class_init, + }, +}; + +DEFINE_TYPES(musicpal_types) From patchwork Thu Apr 17 23:58:13 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: 881878 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp572602wrs; Thu, 17 Apr 2025 16:59:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUHZ1mQC9aA4/L4RNjGH3Pfa4TkB3PZMts/EniVr9BEzW+Mr9Kmyx+w6gmwACCd/Rp0li0ZOg==@linaro.org X-Google-Smtp-Source: AGHT+IE2lO2HRdOZRhUhvQWhqwY6han8dtzvl2Kv87lHurJrHVRfbhtH+6m7lz4MAOGijTZKXy00 X-Received: by 2002:a05:6214:4004:b0:6d8:9d81:2107 with SMTP id 6a1803df08f44-6f2c457022cmr12925436d6.20.1744934366357; Thu, 17 Apr 2025 16:59:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934366; cv=none; d=google.com; s=arc-20240605; b=BDvrRqLCtZ2Hw/5Q1tBDK/cJDXmYMiAFc/7ut3U1t24789h6QyMJGayhU/gTdi+AVb EA9922i4FJszayZ5CSkoyUJ566cjsWBKoZRmYHXa+fIndLxZaVfpyv+8sM94f0T+qbFG a/m3e0/56LDkOhAce69sOOE5pcPziAny9iFq+eMQGcSTOw9Bm7729gixpEhJAjSpl8LZ lyAPU5kkpES3vImZ+PzYjpjgNtsKp2BtgvWnTZ0Z0yKkaT//BzWiPqaHXfZ/30JDr2cD aG/S0VcvjdcaA05oIElDrDPrNsEoBL4T0cpTyDzS0cK8GOF45l9vVpCLHPRZVvzxmwj/ Md3Q== 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=6spRcSY1vluyMm8JkI6J8jm+JdzV06eHRFB0YKd4AUg=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=LQpEe650giG/ZgQVlT0l7wgr0/dlz0ERw3nODBwyUZEvMS6mDh+xNR+ZdnkYvYSgsA 1MYdHcJJK9rwRjINpGJySqTfndpMFngCH3kTTm9RkOIrLx+MksDEuBI4JTbpJcgvqpwk tLAuSYocmLKN49XxF0MAR6NEcTJoJI8oCuZprpSPK+qW6RwN50J2crqBI3MobwATD/os a/s+Frbe8HcCKAutz/Ad8vJEqWg/vDLrFAewE5s/U2CHT/ArGvi7r6+2NGnruV2v4hig WPTik3eXzK/FNyQUjJluwiReC4j+FYBX5+w06/1iVPefUufD1BPRdi7PhVcyhniD1lim Oxzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d33UQDQU; 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 6a1803df08f44-6f2c2c25b6esi9419666d6.395.2025.04.17.16.59.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 16:59:26 -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=d33UQDQU; 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 1u5Z8a-0007TC-4u; Thu, 17 Apr 2025 19:59:20 -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 1u5Z8V-0007Me-BA for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:15 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z8T-00042o-2V for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:14 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso10390545e9.0 for ; Thu, 17 Apr 2025 16:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934351; x=1745539151; 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=6spRcSY1vluyMm8JkI6J8jm+JdzV06eHRFB0YKd4AUg=; b=d33UQDQU0v1l+Saya3wMYH1Mlf6YsXqvVdHFI6Ls3w6OGSM1c+JA4nckl0r7vx/jn4 Df0kAQg7oQKop89NoYXVGY50XQEIoQnKHWzW1ap7E4LPhqAeWTRhOrgQrX0m7xFX4ZFO hf1tKrltAX/Nk8Kd8eS39HBRBvXeBv7ADXjEyDfCKFvPIa1apUiUlNAA3d9cNicwVlyT qY+3sXakWOEvZtS4rYnJxfbdKQt3lPfxCbILcrEX7MYNyV2IaKXvOu+RtOxrUgIBf5gM k1oboIZjsRWaN/8ZyXprW5gBHIoDoBzMTKSvpyYLbUhP9ZhtzDiU8+NAgGnAAxwAMPzk joVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934351; x=1745539151; 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=6spRcSY1vluyMm8JkI6J8jm+JdzV06eHRFB0YKd4AUg=; b=cW2WCDNioZq7lDW61jVhdZrbr1NQlZV9ed+6dkauHExMzoyKNxMZrMRr4vIVubfaqd Ch+mn4qo0pRCchu+6/7ECOBA0WEyZydzxMXkin2qW5+kFEguYauhjmXF9hNFpIHdZcUA hrpqA/jLYGfgJdx4ult98wEEanACiiWDHJ/nHdtCKvpbhE8XPikGH/rdlrUxmGJp0hVk Fs1upuqiy62xFg1aJSGe1/j4LKGR1UpJVb4ZnEu8jYAwkC2pL5CvC5AyA0uqYrT6R0Wj hThT3MVEMq49jHxdFw2/O3AUCCv9Q5cNuHZxLFMDuS8Abk9yncJaJ7jlKknvFve8wSm+ XCqg== X-Gm-Message-State: AOJu0YzDiUCkIIO2JnCKlzZGCIZtitPH5VsWi8TrPpuXtQfg3KiQnWo2 ADFRE76lZCTtfOXFT/pn4aIQ8lQLkGIjORy+SXerIB+WuFYK7qxyNBj4Dbf9b5lx2J7R9SJzk6f 2 X-Gm-Gg: ASbGnctHL/UYgZNYLyw3PE5/DBgbHQYr7Uk7scyGrPMHQ8hDj8YvGhyVrB5dBzLZJ4U 5zo36bD1oM1SyvDbSQlLmANKcQ5TKzNwr8cr7e265/YpozMSToHVN1Vn4aWCtY+MGtML+o/TW+T l1bhjFqw5lWSpzR8r48H/ydvR2LyamWr2/HNJX80JSVcP9uSITl2RsfhMETf6zzfWpv7Ka4U77a 7i/yTRGE+xbH9+E4JPj2mpGCqoVUo5qPJbZiAo6Q08NF0JtA6Fyvqmn+OKZi0UxE2nSHnWKe5yj PSf/WdX5Pn1YD3BZdfP5crpyqW0xu0Ns/yxZwJfjcfbGnPkz3eHpjQDmzKz7jfMvhY+l2zgv++f QdQ6ffcd/11NiRpivzTIG X-Received: by 2002:a05:600c:4688:b0:434:fa55:eb56 with SMTP id 5b1f17b1804b1-4406ab7fa86mr4705495e9.7.1744934351390; Thu, 17 Apr 2025 16:59:11 -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-39efa493145sm1047120f8f.71.2025.04.17.16.59.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:59:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 10/11] hw/arm/orangepi: Define machine as generic QOM type Date: Fri, 18 Apr 2025 01:58:13 +0200 Message-ID: <20250417235814.98677-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/orangepi.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index e0956880d11..6821033bfd7 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -103,12 +103,13 @@ static void orangepi_init(MachineState *machine) arm_load_kernel(&h3->cpus[0], machine, &orangepi_binfo); } -static void orangepi_machine_init(MachineClass *mc) +static void orangepi_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-a7"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Orange Pi PC (Cortex-A7)"; mc->init = orangepi_init; @@ -124,4 +125,12 @@ static void orangepi_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("orangepi-pc", orangepi_machine_init) +static const TypeInfo orangepi_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("orangepi-pc"), + .parent = TYPE_MACHINE, + .class_init = orangepi_machine_class_init, + }, +}; + +DEFINE_TYPES(orangepi_machine_types) From patchwork Thu Apr 17 23:58:14 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: 882121 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp573786wrs; Thu, 17 Apr 2025 17:01:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWazUjIgmyBSJd9VmLeOh6WEL+7+NkzkoqJd9ZlvxUmer/OfIdZSrUFVBG+Rr1auw+jqrPw4A==@linaro.org X-Google-Smtp-Source: AGHT+IFY6ZEw7P1/v0QzL1ARW8nBCpmik3N2OKCMJU6tdB/Vbxut3PHvCHgRCQMph//VCxdj5l6t X-Received: by 2002:a05:6102:3170:b0:4c2:ff6c:6043 with SMTP id ada2fe7eead31-4cb7d9a626emr2119673137.0.1744934519750; Thu, 17 Apr 2025 17:01:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744934519; cv=none; d=google.com; s=arc-20240605; b=Axy4xT9YNS3TfegA75YG3TlO9kBrkUgFY037+VRtRIkPALX6IZKNwnz+vz9qCoDShV A77Xva20K+rLQYT7e2E7Rg5Ewr9wPGYEi+GwAJEf2etBwlkIz9OUB0MRL6DsxpArxkOD 6KklLItEX3h4mqFTndYBdPpd/eIoGFuPg1SezTCLNKAhU5kgj/YiQ7Wc130ZdQDoyq8Z Zk4s0mMqzk+u6UMdxpEYLK2cIRBwlB+POO+a6hzbnTvz7hpsGGS9F9Kr4GD05dPzhizi bweB51XQFvJxSluMbzhSCkUtCC7FsU6BF+BPKRAtq9GtlsIOfKnV4mhfQjRdI6ixK1M8 tQow== 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=PYqZLGf8zmbZFL30Ike2RIyikST1A7pLxDDWpbB2TD0=; fh=85A14eJQxmox6rRllN7x+op8M8OdlWn4Uar9szblyk8=; b=YVL2leWiDnkaxZI/SLTJstF+qyStkZvj2JZsjtFFJEL3uAbK74kdI8EhIoRN307TnZ ZO6rML3Ihg3JfVYcqm340tXAfOnam+MfDZcWnY4XTWCrGg61LySpojQAGQeKkNfk705D eKickC30wTGlY/8rNuV9pPbXuDbXP+ri4SvMYqE+pz3pQ7YFjqQuINd5sQ2q2wfTEqK+ N8w32r9hwCj+lfcgxSquitj31znPDVwwaqYV1CGA2wGUa0kIBLKEtRJw7i4/pqAz+/4S i7rma/JbvvalNI2qzH1jxNzIcPqqHPtK7KTLhrwVqQjrlx3xWxBUyOAd4macS+csSMdS pnLw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SaKp7Ejg; 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-4cb7dd3ccf8si422337137.59.2025.04.17.17.01.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Apr 2025 17:01:59 -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=SaKp7Ejg; 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 1u5Z8r-0007jM-RS; Thu, 17 Apr 2025 19:59:38 -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 1u5Z8b-0007Wu-GB for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:23 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u5Z8Y-00043y-Hj for qemu-devel@nongnu.org; Thu, 17 Apr 2025 19:59:21 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so9672565e9.1 for ; Thu, 17 Apr 2025 16:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744934356; x=1745539156; 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=PYqZLGf8zmbZFL30Ike2RIyikST1A7pLxDDWpbB2TD0=; b=SaKp7EjgfIqzFtkuNxD4GGT/ezwJwqluK5E621OGUovQ9fmgQH3YHb6U2kP3VEgp37 O+MibXr86Dw0cUU6oTZfobPECTsVTm8OftyhJCvqBRgQyv26DVCs59NGYd/fkRczWtR1 qCGajpb6y2+bedcxWTMda73UuvVPSvCxPMn5Inl69QKXwup8h1DGvHxuHgdoY6uUC+tH otc4LNxdm56xrBsUPu2F5yKd2u4C3/uQAQUEpaZMMtvNT6e12vOL4Q7PVs4lkdCWpEkM mZz6UUXrZGehZvgA1RMKZPBoFZieqTpfKH4WxIzoy2krBJY+eRyN51PdWZOUu8bjiOzu LyBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744934356; x=1745539156; 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=PYqZLGf8zmbZFL30Ike2RIyikST1A7pLxDDWpbB2TD0=; b=MFeCOemOxcrOCVAoEoxmm5ZpiwrDhpYBWp+C2d+3wxvzrQv21/nhV4ZZ3Scc4YQBZg tc+Sfq1zXT9yKlPRjhMmqysoL7Dnk9H9imsRByZOFza84+pyTE/xo9IrQjefkqzOYJfG OuhcveiwkFCOTL3w7TOJVmxSlT3fbGY3aef4rR9JpJ8lEuLMFyDHEvPkUFl1l1zqMAwy UrkE1XMdBtXjv1lKEsemnve9+dx/Ob73C3EJjOED13msVzdmRSfa7xtYVOwn7nGlPg3X YYlOn5hLlxTvBv67+MPbfB+P5HucMzbZUPeHhvVS0p/mH/aEVHfmr5TkSEwVd6zsWHte VaPQ== X-Gm-Message-State: AOJu0YwTz1xje2i56NkEegsWaedWsfS87JQHOzxe+1qiTqojI8EftiXT tB0K3pybypj3fwes4SD6vUh+seRaLb4yW+LkDZTzj5SCPVB7yh5ODFWErVZTDPB7/ewXugOF6sn G X-Gm-Gg: ASbGncvvBfvy8y/lJxovftQ9vWVi/8l++lFYcjqkH49YWzqdE3xlckR1EfTBNQfeJyj BU268GF7FvsIHDVfdKAUbFKig7tKbyWuuoxRKIXwSmudjxvljtsSJLEKQL6PfwPVPxU7V7vsGJK G2Sdibr28l0xqyZUo19Kn98PhyRGhhk9fDSsZsKrx4eCxl2yJUL/ToHjHuhmyNW9wWEAo95sUNz gnNoE//icjmtWtZVLMAveo4uj1HT5BwnW4RPCIyJZNeKvjqe/w0TvKFpjbwC7HStHVKPi7+zSkS iFUo6xQGJUIW18kK5bMBckv66+E5w9//CS/FvDptO6fgThqYaJFUijuvgFUM+PnGNN9RewVu5GR p40whffGZc+f0MBNPyP0c X-Received: by 2002:a05:600c:3107:b0:43d:24d:bbe2 with SMTP id 5b1f17b1804b1-4406ac1ff5bmr3586335e9.28.1744934356424; Thu, 17 Apr 2025 16:59:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d6dfe4esm808665e9.33.2025.04.17.16.59.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 17 Apr 2025 16:59:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrey Smirnov , Antony Pavlov , Zhao Liu , Beniamino Galvani , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Eduardo Habkost , Niek Linnenbank , qemu-arm@nongnu.org, Jean-Christophe Dubois , Felipe Balbi , Bernhard Beschow , Strahinja Jankovic , Jan Kiszka , Alistair Francis , Pierrick Bouvier , Subbaraya Sundeep , Alexandre Iooss , Peter Maydell , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 11/11] hw/arm/stm32: Define machines as generic QOM types Date: Fri, 18 Apr 2025 01:58:14 +0200 Message-ID: <20250417235814.98677-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250417235814.98677-1-philmd@linaro.org> References: <20250417235814.98677-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 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, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While DEFINE_MACHINE() is a succinct macro, it doesn't allow registering QOM interfaces to the defined machine. Convert to the generic DEFINE_TYPES() in preparation to register interfaces. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/netduino2.c | 13 +++++++++++-- hw/arm/netduinoplus2.c | 13 +++++++++++-- hw/arm/olimex-stm32-h405.c | 13 +++++++++++-- hw/arm/stm32vldiscovery.c | 13 +++++++++++-- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index df793c77fe1..52c30055d44 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -52,12 +52,13 @@ static void netduino2_init(MachineState *machine) 0, FLASH_SIZE); } -static void netduino2_machine_init(MachineClass *mc) +static void netduino2_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-m3"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Netduino 2 Machine (Cortex-M3)"; mc->init = netduino2_init; @@ -65,4 +66,12 @@ static void netduino2_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; } -DEFINE_MACHINE("netduino2", netduino2_machine_init) +static const TypeInfo netduino_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("netduino2"), + .parent = TYPE_MACHINE, + .class_init = netduino2_machine_class_init, + }, +}; + +DEFINE_TYPES(netduino_machine_types) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 81b6334cf72..2735d3a0e2b 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -53,16 +53,25 @@ static void netduinoplus2_init(MachineState *machine) 0, FLASH_SIZE); } -static void netduinoplus2_machine_init(MachineClass *mc) +static void netduinoplus2_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-m4"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Netduino Plus 2 Machine (Cortex-M4)"; mc->init = netduinoplus2_init; mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init) +static const TypeInfo netduino_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("netduinoplus2"), + .parent = TYPE_MACHINE, + .class_init = netduinoplus2_machine_class_init, + }, +}; + +DEFINE_TYPES(netduino_machine_types) diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 1f15620f9fd..795218c93cf 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -56,12 +56,13 @@ static void olimex_stm32_h405_init(MachineState *machine) 0, FLASH_SIZE); } -static void olimex_stm32_h405_machine_init(MachineClass *mc) +static void olimex_stm32_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-m4"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Olimex STM32-H405 (Cortex-M4)"; mc->init = olimex_stm32_h405_init; @@ -71,4 +72,12 @@ static void olimex_stm32_h405_machine_init(MachineClass *mc) mc->default_ram_size = 0; } -DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init) +static const TypeInfo olimex_stm32_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("olimex-stm32-h405"), + .parent = TYPE_MACHINE, + .class_init = olimex_stm32_machine_class_init, + }, +}; + +DEFINE_TYPES(olimex_stm32_machine_types) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index e6c1f5b8d7d..3a9728ca719 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -56,16 +56,25 @@ static void stm32vldiscovery_init(MachineState *machine) 0, FLASH_SIZE); } -static void stm32vldiscovery_machine_init(MachineClass *mc) +static void stm32vldiscovery_machine_class_init(ObjectClass *oc, void *data) { static const char * const valid_cpu_types[] = { ARM_CPU_TYPE_NAME("cortex-m3"), NULL }; + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "ST STM32VLDISCOVERY (Cortex-M3)"; mc->init = stm32vldiscovery_init; mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init) +static const TypeInfo stm32vldiscovery_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("stm32vldiscovery"), + .parent = TYPE_MACHINE, + .class_init = stm32vldiscovery_machine_class_init, + }, +}; + +DEFINE_TYPES(stm32vldiscovery_machine_types)