Allow diskless operation for all mips platforms.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5001 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 52cf47b84d7673419ae1f04bd9ade4c2f486bc16..b332a4598e2b2e4d499dbf450afc9b8ddde40cf1 100644 (file)
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -273,15 +273,17 @@ void mips_pica61_init (ram_addr_t ram_size, int vga_ram_size,
 }
 
 QEMUMachine mips_magnum_machine = {
-    "magnum",
-    "MIPS Magnum",
-    mips_magnum_init,
-    MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
+    .name = "magnum",
+    .desc = "MIPS Magnum",
+    .init = mips_magnum_init,
+    .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
+    .nodisk_ok = 1,
 };
 
 QEMUMachine mips_pica61_machine = {
-    "pica61",
-    "Acer Pica 61",
-    mips_pica61_init,
-    MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
+    .name = "pica61",
+    .desc = "Acer Pica 61",
+    .init = mips_pica61_init,
+    .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
+    .nodisk_ok = 1,
 };

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index a19a69f56a5c434fb210e7ee46d0785eb5b304bb..a64e225425629117f3c776c865c5c67e2fb7fc34 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -946,8 +946,9 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
 }
 
 QEMUMachine mips_malta_machine = {
-    "malta",
-    "MIPS Malta Core LV",
-    mips_malta_init,
-    VGA_RAM_SIZE + BIOS_SIZE,
+    .name = "malta",
+    .desc = "MIPS Malta Core LV",
+    .init = mips_malta_init,
+    .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
+    .nodisk_ok = 1,
 };

diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index d04c660b41304076cee3c795fa707cf8389d6e6a..01f4c1b6b2111c2fbd18e90bd5161ccbc3d78cbd 100644 (file)
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -191,8 +191,9 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size,
 }
 
 QEMUMachine mips_mipssim_machine = {
-    "mipssim",
-    "MIPS MIPSsim platform",
-    mips_mipssim_init,
-    BIOS_SIZE + VGA_RAM_SIZE /* unused */,
+    .name = "mipssim",
+    .desc = "MIPS MIPSsim platform",
+    .init = mips_mipssim_init,
+    .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
+    .nodisk_ok = 1,
 };

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index a9d42eadcb7c27b97fb99e51646789cf1b453ff8..b1551b9827bf5c39fe14f691f02caea16956e948 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -283,8 +283,9 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size,
 }
 
 QEMUMachine mips_machine = {
-    "mips",
-    "mips r4k platform",
-    mips_r4k_init,
-    VGA_RAM_SIZE + BIOS_SIZE,
+    .name = "mips",
+    .desc = "mips r4k platform",
+    .init = mips_r4k_init,
+    .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
+    .nodisk_ok = 1,
 };