From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D544C433E1 for ; Tue, 30 Jun 2020 19:59:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3883B206A1 for ; Tue, 30 Jun 2020 19:59:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="st2f5jHz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3883B206A1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqMPX-0002Np-Ge for qemu-devel@archiver.kernel.org; Tue, 30 Jun 2020 15:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqMNn-0008AM-M8; Tue, 30 Jun 2020 15:57:31 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqMNm-00044i-AK; Tue, 30 Jun 2020 15:57:31 -0400 Received: by mail-wr1-x443.google.com with SMTP id j4so18891574wrp.10; Tue, 30 Jun 2020 12:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2da/4yJ3T3tR57ruAg59KszQSssdYRjB2tAYUevjx6c=; b=st2f5jHzkDXtLpQRrsqw/Nr0au22+Hdqty+Sj1rUZUlkByIlm5UxySsRXE4QecpDl1 3yC6nkdPB0yxtjsKgLjPoM9rWEtR2RYXHA4pkb402QDvruf0kBjITYP8VMDcqAMdP/sT /N+lZPWOXm5IOeN73Zq7eSb5UC8xKSoGvsW/8jCGi2tkWpWPQCWjX/ayc7Fsts0YwnVZ wwCwwlS/Ld8LnMNZ7FbbEr+QmeNKgUQV+Zj3sJVerCcjOOnrczYDxVdxgvQk2dkCg75e xVBLnXNmch0synTEGYkp3y8wUsWrf3SfaHNHxtLGKyj53ic7wIBQJZJUaP0E855BAg7j KxWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2da/4yJ3T3tR57ruAg59KszQSssdYRjB2tAYUevjx6c=; b=HJFff45MUg8yVTRchZp2fkkHbpcckFGX2+jod35naTesP+gkQKE0ZaraAIA9HewWhd 87bGTzSZPO7icakhYwSTu0DB9TU2E5Q0BCNMWv89nVYJKZNcodCIwKfsbWUD7sVTdf0E hM/LRg1avg5RpEy+Fmei/+6PfnaKYCEcdXJytkOQ+iHMQZ5oPfJ3O9ghnhtPv795Q/TL j2eUGcNyp5pxHc7+MNidKlozzlteI1ZpTuWwh5RTlwy2GMorvQ+srM9b49lVmxhxZ9Jj qP/hFk6hCdyVMpAfwK/SLMISpXGpVH7XjRFTDmn8pujrBRYwMG4JF9XznIt/3l9hDdHx 12tg== X-Gm-Message-State: AOAM53325eS4zY4KOd04vzUyHoE9wsR4hruGw8W7UGh+Cli+7ZGwk6Io 9fxy0gQkXVzbYLHehW+SQCBPnVHPts0= X-Google-Smtp-Source: ABdhPJyQzCZFXnMGjlUTPWJ4NXnTAWmt4OquinCnriFMwmLd/IVcN2uWfkcnNko4rReRPbO2FBOAjQ== X-Received: by 2002:a5d:68cc:: with SMTP id p12mr22903305wrw.111.1593547047790; Tue, 30 Jun 2020 12:57:27 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id k11sm5172979wrd.23.2020.06.30.12.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 12:57:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Yunqiang Su , Aurelien Jarno Subject: [PATCH v3 2/5] hw/mips/malta: Register the machine as a TypeInfo Date: Tue, 30 Jun 2020 21:57:20 +0200 Message-Id: <20200630195723.1359-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630195723.1359-1-f4bug@amsat.org> References: <20200630195723.1359-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aleksandar Rikalo , qemu-trivial@nongnu.org, Laurent Vivier , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want to add more machines. First convert from the old DEFINE_MACHINE() API to the more recent DEFINE_TYPES(TypeInfo[]) one. Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/malta.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 5b371c1e34..2c363fe099 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -70,6 +70,8 @@ #define MAX_IDE_BUS 2 +#define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta-base") + typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */ @@ -1433,10 +1435,19 @@ static void mips_malta_register_types(void) type_init(mips_malta_register_types) -static void mips_malta_machine_init(MachineClass *mc) +static void malta_machine_common_class_init(ObjectClass *oc, void *data) { - mc->desc = "MIPS Malta Core LV"; + MachineClass *mc = MACHINE_CLASS(oc); + mc->init = mips_malta_init; + mc->default_ram_id = "mips_malta.ram"; +} + +static void malta_machine_default_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->desc = "MIPS Malta Core LV"; mc->block_default_type = IF_IDE; mc->max_cpus = 16; mc->is_default = true; @@ -1445,7 +1456,20 @@ static void mips_malta_machine_init(MachineClass *mc) #else mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); #endif - mc->default_ram_id = "mips_malta.ram"; } -DEFINE_MACHINE("malta", mips_malta_machine_init) +static const TypeInfo malta_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("malta"), + .parent = TYPE_MALTA_MACHINE, + .class_init = malta_machine_default_class_init, + }, + { + .name = TYPE_MALTA_MACHINE, + .parent = TYPE_MACHINE, + .class_init = malta_machine_common_class_init, + .abstract = true, + } +}; + +DEFINE_TYPES(malta_machine_types) -- 2.21.3