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=-3.8 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 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 2C6F3C2BA83 for ; Fri, 7 Feb 2020 16:23:12 +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 E8F2520720 for ; Fri, 7 Feb 2020 16:23:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DjMLYs2H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8F2520720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j06PP-0004m2-5n for qemu-devel@archiver.kernel.org; Fri, 07 Feb 2020 11:23:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54255) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j06NC-0001Br-JD for qemu-devel@nongnu.org; Fri, 07 Feb 2020 11:20:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j06NB-0003TU-BZ for qemu-devel@nongnu.org; Fri, 07 Feb 2020 11:20:54 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59712 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j06NB-0003RX-7N for qemu-devel@nongnu.org; Fri, 07 Feb 2020 11:20:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581092452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DeJwD+5oSTfpziNL0l7YGkVnz0HH2iOXbi7RNEBKA7w=; b=DjMLYs2HToPZSRMIcAc1FQpdKfsPUXUxnB1EydiXY4d5zdAAY4RNAP6E8nmxuTIZd6uS5B CtU/7//QQZbl6coWDw5v7t9wu5PmhnK0ijIw9hmybu58uJkZ0SSOVOXVtuwDhlQWZgSPEn /3KT3EjuVshpRDcv4CjQPWTwybNqjlg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-EutTKxFLNuK3g1U6U3jTIA-1; Fri, 07 Feb 2020 11:20:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2183B10CE784; Fri, 7 Feb 2020 16:20:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-88.brq.redhat.com [10.40.204.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CCBB7790EB; Fri, 7 Feb 2020 16:20:25 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 1/3] hw: Do not initialize MachineClass::is_default to 0 Date: Fri, 7 Feb 2020 17:19:46 +0100 Message-Id: <20200207161948.15972-2-philmd@redhat.com> In-Reply-To: <20200207161948.15972-1-philmd@redhat.com> References: <20200207161948.15972-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: EutTKxFLNuK3g1U6U3jTIA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Chris Wulff , Sagar Karandikar , "Michael S. Tsirkin" , Anthony Green , Mark Cave-Ayland , Alistair Francis , "Edgar E. Iglesias" , Guan Xuetao , Marek Vasut , Jia Liu , qemu-trivial@nongnu.org, Helge Deller , David Hildenbrand , Magnus Damm , Halil Pasic , Christian Borntraeger , Palmer Dabbelt , Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Eduardo Habkost , Richard Henderson , qemu-s390x@nongnu.org, Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Thomas Huth , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , Michael Walle , qemu-ppc@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The MachineClass is already zeroed on creation. Note: The code setting is_default=3D0 in hw/i386/pc_piix.c is different (related to compat options). When adding a new versioned machine, we want it to be the new default, so we have to mark the previous one as not default. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: new patch --- hw/lm32/lm32_boards.c | 1 - hw/lm32/milkymist.c | 1 - hw/m68k/q800.c | 1 - hw/microblaze/petalogix_ml605_mmu.c | 1 - hw/tricore/tricore_testboard.c | 1 - 5 files changed, 5 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index d1894adab8..156b050abc 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -302,7 +302,6 @@ static void lm32_uclinux_class_init(ObjectClass *oc, vo= id *data) =20 mc->desc =3D "lm32 platform for uClinux and u-boot by Theobroma System= s"; mc->init =3D lm32_uclinux_init; - mc->is_default =3D 0; mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 6d46134232..9fa5fd7050 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -214,7 +214,6 @@ static void milkymist_machine_init(MachineClass *mc) { mc->desc =3D "Milkymist One"; mc->init =3D milkymist_init; - mc->is_default =3D 0; mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 1e32363688..788b5d663f 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -441,7 +441,6 @@ static void q800_machine_class_init(ObjectClass *oc, vo= id *data) mc->init =3D q800_init; mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m68040"); mc->max_cpus =3D 1; - mc->is_default =3D 0; mc->block_default_type =3D IF_SCSI; } =20 diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 09486bc8bf..0a2640c40b 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -216,7 +216,6 @@ static void petalogix_ml605_machine_init(MachineClass *= mc) { mc->desc =3D "PetaLogix linux refdesign for xilinx ml605 little endian= "; mc->init =3D petalogix_ml605_init; - mc->is_default =3D 0; } =20 DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.= c index 20c9ccb3ce..8ec2b5bddd 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -105,7 +105,6 @@ static void ttb_machine_init(MachineClass *mc) { mc->desc =3D "a minimal TriCore board"; mc->init =3D tricoreboard_init; - mc->is_default =3D 0; mc->default_cpu_type =3D TRICORE_CPU_TYPE_NAME("tc1796"); } =20 --=20 2.21.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1j06NC-0001C8-P9 for mharc-qemu-riscv@gnu.org; Fri, 07 Feb 2020 11:20:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54221) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j06NA-00013R-7A for qemu-riscv@nongnu.org; Fri, 07 Feb 2020 11:20:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j06N9-0003Lt-54 for qemu-riscv@nongnu.org; Fri, 07 Feb 2020 11:20:52 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:54370 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j06N9-0003JY-1Z for qemu-riscv@nongnu.org; Fri, 07 Feb 2020 11:20:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581092450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DeJwD+5oSTfpziNL0l7YGkVnz0HH2iOXbi7RNEBKA7w=; b=UfiJR06kFqO3r5DF8InxONqUNUsvVP/O5Hh4Hdt8pQqzLvvGAGaQ/RyWVS0+8dR31oiBVV cQoFe0vbaG0eIpDxLus+8hz0Kbcf/7HbjOKOvTrsx5wIsHIBOaXsaJHAj5rNHs6EhXPP3A W/VkeXzxM4vcFEv5tfVXt3an5yHQerg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-EutTKxFLNuK3g1U6U3jTIA-1; Fri, 07 Feb 2020 11:20:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2183B10CE784; Fri, 7 Feb 2020 16:20:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-88.brq.redhat.com [10.40.204.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CCBB7790EB; Fri, 7 Feb 2020 16:20:25 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Guan Xuetao , qemu-ppc@nongnu.org, Sagar Karandikar , David Gibson , Christian Borntraeger , Paolo Bonzini , Bastian Koppelmann , Eduardo Habkost , Laurent Vivier , Anthony Green , Richard Henderson , Artyom Tarasenko , qemu-trivial@nongnu.org, Cornelia Huck , Aurelien Jarno , "Edgar E. Iglesias" , Mark Cave-Ayland , qemu-riscv@nongnu.org, "Michael S. Tsirkin" , Aleksandar Markovic , Marek Vasut , Palmer Dabbelt , Michael Walle , Halil Pasic , Marcel Apfelbaum , qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Magnus Damm , David Hildenbrand , Chris Wulff , Stafford Horne , Helge Deller , Alistair Francis , Jia Liu Subject: [PATCH v4 1/3] hw: Do not initialize MachineClass::is_default to 0 Date: Fri, 7 Feb 2020 17:19:46 +0100 Message-Id: <20200207161948.15972-2-philmd@redhat.com> In-Reply-To: <20200207161948.15972-1-philmd@redhat.com> References: <20200207161948.15972-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: EutTKxFLNuK3g1U6U3jTIA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Feb 2020 16:20:53 -0000 The MachineClass is already zeroed on creation. Note: The code setting is_default=3D0 in hw/i386/pc_piix.c is different (related to compat options). When adding a new versioned machine, we want it to be the new default, so we have to mark the previous one as not default. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v3: new patch --- hw/lm32/lm32_boards.c | 1 - hw/lm32/milkymist.c | 1 - hw/m68k/q800.c | 1 - hw/microblaze/petalogix_ml605_mmu.c | 1 - hw/tricore/tricore_testboard.c | 1 - 5 files changed, 5 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index d1894adab8..156b050abc 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -302,7 +302,6 @@ static void lm32_uclinux_class_init(ObjectClass *oc, vo= id *data) =20 mc->desc =3D "lm32 platform for uClinux and u-boot by Theobroma System= s"; mc->init =3D lm32_uclinux_init; - mc->is_default =3D 0; mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 6d46134232..9fa5fd7050 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -214,7 +214,6 @@ static void milkymist_machine_init(MachineClass *mc) { mc->desc =3D "Milkymist One"; mc->init =3D milkymist_init; - mc->is_default =3D 0; mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 1e32363688..788b5d663f 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -441,7 +441,6 @@ static void q800_machine_class_init(ObjectClass *oc, vo= id *data) mc->init =3D q800_init; mc->default_cpu_type =3D M68K_CPU_TYPE_NAME("m68040"); mc->max_cpus =3D 1; - mc->is_default =3D 0; mc->block_default_type =3D IF_SCSI; } =20 diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_= ml605_mmu.c index 09486bc8bf..0a2640c40b 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -216,7 +216,6 @@ static void petalogix_ml605_machine_init(MachineClass *= mc) { mc->desc =3D "PetaLogix linux refdesign for xilinx ml605 little endian= "; mc->init =3D petalogix_ml605_init; - mc->is_default =3D 0; } =20 DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.= c index 20c9ccb3ce..8ec2b5bddd 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -105,7 +105,6 @@ static void ttb_machine_init(MachineClass *mc) { mc->desc =3D "a minimal TriCore board"; mc->init =3D tricoreboard_init; - mc->is_default =3D 0; mc->default_cpu_type =3D TRICORE_CPU_TYPE_NAME("tc1796"); } =20 --=20 2.21.1