From nobody Fri Dec 19 14:31:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593528838; cv=none; d=zohomail.com; s=zohoarc; b=I28jtwBnWNSOsn/RTCnWJ61QWXwCx/rClhbJyQyb3KiMzBkJqElwnrjDPb7Sf8mAnVbmNIo9bbFGHapVujOP6inMle7rXmuVwJb322ipDq+h9SJslkX2IikpLSygRQZPhHSLiCV5w9tY1b/POXBqrSuwX95+Yc5ce5V+qhwh4Sg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593528838; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2da/4yJ3T3tR57ruAg59KszQSssdYRjB2tAYUevjx6c=; b=lTJNI0F+mqdrboM3CbWTMvG2cwFaWVBqdpB0YZa1yJbOEK1xNDq5GR1d3JzBRXQvs/H4PE0V0Oq+4Ed2ZNxVy0hOHoFHqY+jsDocIzQCF28PqYQ2XKeenAQCfKaIF/md3RHWfFglz+fhEwIdXIVCLVZ4UFvgQirpBHUgZ7g7Y8s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593528838025998.1428564784873; Tue, 30 Jun 2020 07:53:58 -0700 (PDT) Received: from localhost ([::1]:33008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHe0-0002hu-CU for importer@patchew.org; Tue, 30 Jun 2020 10:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHcp-0000Nx-WC for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:44 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:41919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqHco-0002TU-52 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 10:52:43 -0400 Received: by mail-ej1-x643.google.com with SMTP id dp18so20955949ejc.8 for ; Tue, 30 Jun 2020 07:52:41 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p9sm2144569ejd.50.2020.06.30.07.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 07:52:40 -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=BzrqMhyfyWJmJYb6+hLmV4UlnhaVaMRNqER4QghTe3FZ7e9Np6XMWC2WoW0lLNWeSB toKe2sx8h15wmDFnQMDZkj5JntKSzxpHgxbfL8q0BaAnNw8/qGMG3JQwW42jgKMAaKUw QzJvqP6YjVnGfds2/12XqovfegXzLJP8jNnC8PTiItK/nqL4d6t49+mxZYpUQRzPDHMO WLhUhu5ixupvvUdJktuoJEWeMTHQnIWy9yDF6uQ5RwSbjQ4F3h1sUrHPTxgZoo4OxYnE 6mecL7utyT3XWxfYuzoy5jht6kOKWWmR5HzskHqhes5LZ/hqYe70YEq9bVOqzPDktxfs EN5A== 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=DqDtFR4mVGi0CWqefq6GX/Rd3ew6k8kM5ubpEFOScCWGzwBvOUOnsoSn3xq7y4xaZi fhEUZHirQLffqhbGEVeF9VPQRLe+LaO+VmyKLe505yED0Nwcuzub1L3mLksfS4V/Ho+v hLYq9aAb5xB8QVNyokIx+Tai0WbHImKfPc5Dl5XsR7ZsS6BQxR5lM5gfAGQcE33Mg3Cr aqkqHZRc5LO46tjYA8jaqr6oAlZpOxPLnOFTkxXy5Kf5kGm1Re+TAT1bbvAx6CplzSbd 5NzwY8B21s8I1e3DiE1K2ULqVb5weq96duACVcUkrld5SKY+5C3m5igVxHoR+bz7n4T9 Zu3A== X-Gm-Message-State: AOAM531eGKQ2xjuwNWwz7psAHLVsQLQR9Dl/PPNuR2rcBX73KaVl45U6 7KuVCUQCQ4s2YK1oEA+gBvI= X-Google-Smtp-Source: ABdhPJxNkjSwEEXJY1xkSwZuBCZjf9MjJ5eLKqJJ4M358aSBGYn241bkEzH5hf+ZAPQwY8vwguIUEA== X-Received: by 2002:a17:907:7294:: with SMTP id dt20mr18194278ejc.355.1593528760882; Tue, 30 Jun 2020 07:52:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Aurelien Jarno , Yunqiang Su , qemu-devel@nongnu.org Subject: [PATCH v2 2/6] hw/mips/malta: Register the machine as a TypeInfo Date: Tue, 30 Jun 2020 16:52:32 +0200 Message-Id: <20200630145236.27529-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630145236.27529-1-f4bug@amsat.org> References: <20200630145236.27529-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: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::643; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x643.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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9 --- 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 @@ =20 #define MAX_IDE_BUS 2 =20 +#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) =20 type_init(mips_malta_register_types) =20 -static void mips_malta_machine_init(MachineClass *mc) +static void malta_machine_common_class_init(ObjectClass *oc, void *data) { - mc->desc =3D "MIPS Malta Core LV"; + MachineClass *mc =3D MACHINE_CLASS(oc); + mc->init =3D mips_malta_init; + mc->default_ram_id =3D "mips_malta.ram"; +} + +static void malta_machine_default_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "MIPS Malta Core LV"; mc->block_default_type =3D IF_IDE; mc->max_cpus =3D 16; mc->is_default =3D true; @@ -1445,7 +1456,20 @@ static void mips_malta_machine_init(MachineClass *mc) #else mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); #endif - mc->default_ram_id =3D "mips_malta.ram"; } =20 -DEFINE_MACHINE("malta", mips_malta_machine_init) +static const TypeInfo malta_machine_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("malta"), + .parent =3D TYPE_MALTA_MACHINE, + .class_init =3D malta_machine_default_class_init, + }, + { + .name =3D TYPE_MALTA_MACHINE, + .parent =3D TYPE_MACHINE, + .class_init =3D malta_machine_common_class_init, + .abstract =3D true, + } +}; + +DEFINE_TYPES(malta_machine_types) --=20 2.21.3