From eec2743ec20ac1fbf512bd5a88eea3ddc631997d Mon Sep 17 00:00:00 2001
From: ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 13 Aug 2008 13:01:28 +0000
Subject: [PATCH] Allow diskless operation for all mips platforms.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5001 c046a42c-6fe2-441c-8c8c-71466251a162
---
hw/mips_jazz.c | 18 ++++++++++--------
hw/mips_malta.c | 9 +++++----
hw/mips_mipssim.c | 9 +++++----
hw/mips_r4k.c | 9 +++++----
4 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 52cf47b84d..b332a4598e 100644
--- 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 a19a69f56a..a64e225425 100644
--- 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 d04c660b41..01f4c1b6b2 100644
--- 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 a9d42eadcb..b1551b9827 100644
--- 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,
};
--
2.30.2