From patchwork Fri Apr 22 16:52:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564897 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp702741map; Fri, 22 Apr 2022 10:54:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzA7zfjJ7+CTLr1Y0NR2UF+oYaSw13LqqN9+eNgLr/3FzZKW0FcvJz8nE8enjqOctCP9yq4 X-Received: by 2002:ac8:7dd6:0:b0:2f1:f3af:4b2a with SMTP id c22-20020ac87dd6000000b002f1f3af4b2amr4149686qte.175.1650650092790; Fri, 22 Apr 2022 10:54:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650650092; cv=none; d=google.com; s=arc-20160816; b=FXyzHSevtyqD6nihzAhVvn8ZjwVvbC6hudso8MvcKWnYiF/tOz5sAQZSRf72yfJ4NH mUFmGuG4ssUKFi0r1AuVID5bJUVZpgOpI0OGHjq63hWB9swkoUxNABjUg59XdfHGoC39 sTnHmshxWffm3nC1QMudIS6AQoPlxoPRHbyGLXwTiS39wvXpSZePM/rBUSV5BL9K0jdl mUED8+pDcFn6biiCseMUFc7k4Cw/TI+ZOTmtEz2HlFEWZIcyMx7+995/aEiuEVTBGMO3 Tu0ZW/8QtT9b5hQ6wQZHM3hkjePBA6uIbPtOVd1AlVfhVwQ+hpn7es+qXgOLHGsTp+wr Y3SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=XkXB1ypOZ++skoQkKVtL7/x09Njvxh9gdGNburiKDjs=; b=B/ftfkPScMxsFaB9GGe0BhRGOFoxM44FzapOTTWg4yf9iY6OJgo0XueposVgEECVIQ 7KPULCKLBTkh7FTxMtBusK4ozK9O7JN2F3mjDuBC/uiRDVxMOOZd+XwIwJjtZkreqtRy B8Ix16kKcmwjBL1+l+4dKqBqlabdUXmhDq72boiAiXT1VxE9PnvmkkpMkKe+U0pr5JRB p1kSFHIcwL2quZDdJzS7kSKmtKxsnEMTPrqfBrNRi/nMlC2ZXmqc9pwqy3pFDpoHyrJ4 Mf4uBSZh6/SmXAf909cmjwi+0L34CJA461MPuNxwlWQLq3vIAr+6XaDHFRBYSxOJyM8f ESiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YHJKPpMX; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y20-20020a05622a121400b002f33c07f082si2561932qtx.134.2022.04.22.10.54.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 10:54:52 -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=YHJKPpMX; 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 Received: from localhost ([::1]:43282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhxUa-0008W8-CL for patch@linaro.org; Fri, 22 Apr 2022 13:54:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhwbE-0000n2-Aq for qemu-devel@nongnu.org; Fri, 22 Apr 2022 12:57:40 -0400 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]:33514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhwbB-00084p-7z for qemu-devel@nongnu.org; Fri, 22 Apr 2022 12:57:39 -0400 Received: by mail-il1-x132.google.com with SMTP id b5so5441773ile.0 for ; Fri, 22 Apr 2022 09:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XkXB1ypOZ++skoQkKVtL7/x09Njvxh9gdGNburiKDjs=; b=YHJKPpMX1fX2pTj9Wwgb6YesQ6sB6yMeUD2LGidkM4q8dxnSAeeWb3UDZ7YpG9+iwb tbX5+LtdhqlBVaWafzg60lSo371lBPllNnFYHyNBwNQbH9VexWDXWapPPe+jZLibLuHN WktZF0lbdQ1H7mfWR/LQN3GXN9OcVTCpQSNNQTPggGbxS2mL3Qpw/yEqTYrKltComdP8 yEBDjE37mIltwkUscnVE3F2SFlzIy5+79uF7vOUVLcrsgfDMxdv4py6wRwUhdJ3nO96k aDRzuhzdjUQ66zJpdvfSEGepCRmdb2Nzym0cRMPZuV5K9yYptYqjl+aHtK1R1BxwpDJY IOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XkXB1ypOZ++skoQkKVtL7/x09Njvxh9gdGNburiKDjs=; b=4TKzDj7o/HH1aWDHnXw6Q6/DeofeUeGN/sV9maWCehIjl555vui7yU8ymHyLejQswO 6Ib9JZXC8wiGIoKIngXoOhlXwTbq/RFoNVA6qZOYizRGKP6rn9x5UDtBUFYd5jCpUdb1 9+XX9Wb3TGKgboAiGGZ1KVPM+Cy6kaXH2ZaUXXjx2n2GNRqnzgnvVkwXE/7d5+vDT1+O iy4gMUm2jWUXDL2IHnIBZBvmRGOr7eRc4bLGpGqUKyLlrli2qPkgBcpxfZq+BoxpxFLa UuPR85zC+tUxxJbmINw1GIEzGQgEYymrQixAperAGXuS46F6v07OxoIzx3ro+ot1nM1n MZiA== X-Gm-Message-State: AOAM533CuvVIiQdEcSmy6fru+hisb7POIsPe2xAWEtXppSaZTBvF0EJZ 791JoIV+JpdJkICnHMpKKdYzBlQ9NrDFI2QZ X-Received: by 2002:a05:6e02:1809:b0:2cc:507a:acfa with SMTP id a9-20020a056e02180900b002cc507aacfamr2475928ilv.114.1650646656242; Fri, 22 Apr 2022 09:57:36 -0700 (PDT) Received: from stoup.. ([2607:fb90:27d0:b0f2:934d:3e2:9f8c:dd1]) by smtp.gmail.com with ESMTPSA id n23-20020a6b8b17000000b00649a2634725sm816380iod.17.2022.04.22.09.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 09:57:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v8 64/68] hw/nios2: Introduce Nios2MachineState Date: Fri, 22 Apr 2022 09:52:34 -0700 Message-Id: <20220422165238.1971496-65-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220422165238.1971496-1-richard.henderson@linaro.org> References: <20220422165238.1971496-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::132; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x132.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We want to move data from the heap into Nios2MachineState, which is not possible with DEFINE_MACHINE. Reviewed-by: Mark Cave-Ayland Signed-off-by: Richard Henderson Message-Id: <20220421151735.31996-61-richard.henderson@linaro.org> --- hw/nios2/10m50_devboard.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c index 3d1205b8bd..bdc3ffd50d 100644 --- a/hw/nios2/10m50_devboard.c +++ b/hw/nios2/10m50_devboard.c @@ -36,6 +36,13 @@ #include "boot.h" +struct Nios2MachineState { + MachineState parent_obj; +}; + +#define TYPE_NIOS2_MACHINE MACHINE_TYPE_NAME("10m50-ghrd") +OBJECT_DECLARE_TYPE(Nios2MachineState, MachineClass, NIOS2_MACHINE) + #define BINARY_DEVICE_TREE_FILE "10m50-devboard.dtb" static void nios2_10m50_ghrd_init(MachineState *machine) @@ -105,11 +112,24 @@ static void nios2_10m50_ghrd_init(MachineState *machine) BINARY_DEVICE_TREE_FILE, NULL); } -static void nios2_10m50_ghrd_machine_init(struct MachineClass *mc) +static void nios2_10m50_ghrd_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Altera 10M50 GHRD Nios II design"; mc->init = nios2_10m50_ghrd_init; mc->is_default = true; } -DEFINE_MACHINE("10m50-ghrd", nios2_10m50_ghrd_machine_init); +static const TypeInfo nios2_10m50_ghrd_type_info = { + .name = TYPE_NIOS2_MACHINE, + .parent = TYPE_MACHINE, + .instance_size = sizeof(Nios2MachineState), + .class_init = nios2_10m50_ghrd_class_init, +}; + +static void nios2_10m50_ghrd_type_init(void) +{ + type_register_static(&nios2_10m50_ghrd_type_info); +} +type_init(nios2_10m50_ghrd_type_init);