qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Yunqiang Su <ysu@wavecomp.com>,
	Aurelien Jarno <aurelien@aurel32.net>,
	qemu-devel@nongnu.org
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 3/7] hw/mips/malta: Rename 'malta' machine as 'malta-virt'
Date: Tue, 30 Jun 2020 10:13:18 +0200	[thread overview]
Message-ID: <20200630081322.19146-4-f4bug@amsat.org> (raw)
In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org>

We want to model the real physical Malta board. The current model
does not have the physical restrictions real hardware have.
Rename the current machine as 'malta-virt'. To not disrupt command
line users, keep the 'malta' machine name as an alias.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/mips/malta.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 66172f0c82..f8fc567532 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1439,8 +1439,16 @@ static void malta_machine_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
 
-    mc->desc = "MIPS Malta Core LV";
     mc->init = mips_malta_init;
+    mc->default_ram_id = "mips_malta.ram";
+}
+
+static void malta_machine_virt_class_init(ObjectClass *oc, void *data)
+{
+    MachineClass *mc = MACHINE_CLASS(oc);
+
+    mc->desc = "MIPS Malta Core LV (no physical limitations)";
+    mc->alias = "malta";
     mc->block_default_type = IF_IDE;
     mc->max_cpus = 16;
     mc->is_default = true;
@@ -1449,13 +1457,13 @@ static void malta_machine_class_init(ObjectClass *oc, void *data)
 #else
     mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
 #endif
-    mc->default_ram_id = "mips_malta.ram";
 }
 
 static const TypeInfo malta_machine_types[] = {
     {
-        .name          = MACHINE_TYPE_NAME("malta"),
+        .name          = MACHINE_TYPE_NAME("malta-virt"),
         .parent        = TYPE_MALTA_MACHINE,
+        .class_init    = malta_machine_virt_class_init,
     }, {
         .name          = TYPE_MALTA_MACHINE,
         .parent        = TYPE_MACHINE,
-- 
2.21.3



  parent reply	other threads:[~2020-06-30  8:15 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-30  8:13 [PATCH 0/7] hw/mips/malta: Rework to allow more than 2GB of RAM on 64-bit Philippe Mathieu-Daudé
2020-06-30  8:13 ` [PATCH 1/7] hw/mips/malta: Trivial code movement Philippe Mathieu-Daudé
2020-06-30  8:13 ` [PATCH 2/7] hw/mips/malta: Register the machine as a TypeInfo Philippe Mathieu-Daudé
2020-06-30  8:13 ` Philippe Mathieu-Daudé [this message]
2020-06-30  8:13 ` [PATCH 4/7] hw/mips/malta: Introduce MaltaMachineClass::max_ramsize Philippe Mathieu-Daudé
2020-06-30  8:13 ` [PATCH 5/7] hw/mips/malta: Introduce the 'malta-phys' machine Philippe Mathieu-Daudé
2020-06-30  8:54   ` Philippe Mathieu-Daudé
2020-06-30  8:13 ` [PATCH 6/7] hw/mips/malta: Verify malta-phys machine uses correct DIMM sizes Philippe Mathieu-Daudé
2020-06-30  8:13 ` [PATCH 7/7] hw/mips/malta: Allow more than 2GB on 64-bit malta-virt Philippe Mathieu-Daudé
2020-06-30 10:48 ` [PATCH 0/7] hw/mips/malta: Rework to allow more than 2GB of RAM on 64-bit Aleksandar Markovic
2020-06-30 10:52   ` Philippe Mathieu-Daudé
2020-06-30 10:53     ` Philippe Mathieu-Daudé
2020-06-30 11:01       ` Aleksandar Markovic
2020-06-30 11:04         ` Philippe Mathieu-Daudé
2020-06-30 11:17           ` Aleksandar Markovic
2020-06-30 11:34             ` Philippe Mathieu-Daudé
2020-06-30 11:55               ` Aleksandar Markovic
2020-06-30 11:59                 ` Philippe Mathieu-Daudé
2020-06-30 12:07                   ` Aleksandar Markovic
2020-06-30 13:36             ` Thomas Huth
2020-06-30 13:45               ` Philippe Mathieu-Daudé
2020-06-30 10:54     ` Aleksandar Markovic
2020-06-30 10:58       ` Philippe Mathieu-Daudé
2020-06-30 11:05         ` Aleksandar Markovic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200630081322.19146-4-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=aleksandar.qemu.devel@gmail.com \
    --cc=aleksandar.rikalo@syrmia.com \
    --cc=aurelien@aurel32.net \
    --cc=imammedo@redhat.com \
    --cc=jiaxun.yang@flygoat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=ysu@wavecomp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).