Commit eec2743ec20ac1fbf512bd5a88eea3ddc631997d
1 parent
2ba27c7f
Allow diskless operation for all mips platforms.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5001 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
4 changed files
with
25 additions
and
20 deletions
hw/mips_jazz.c
@@ -273,15 +273,17 @@ void mips_pica61_init (ram_addr_t ram_size, int vga_ram_size, | @@ -273,15 +273,17 @@ void mips_pica61_init (ram_addr_t ram_size, int vga_ram_size, | ||
273 | } | 273 | } |
274 | 274 | ||
275 | QEMUMachine mips_magnum_machine = { | 275 | QEMUMachine mips_magnum_machine = { |
276 | - "magnum", | ||
277 | - "MIPS Magnum", | ||
278 | - mips_magnum_init, | ||
279 | - MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, | 276 | + .name = "magnum", |
277 | + .desc = "MIPS Magnum", | ||
278 | + .init = mips_magnum_init, | ||
279 | + .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, | ||
280 | + .nodisk_ok = 1, | ||
280 | }; | 281 | }; |
281 | 282 | ||
282 | QEMUMachine mips_pica61_machine = { | 283 | QEMUMachine mips_pica61_machine = { |
283 | - "pica61", | ||
284 | - "Acer Pica 61", | ||
285 | - mips_pica61_init, | ||
286 | - MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, | 284 | + .name = "pica61", |
285 | + .desc = "Acer Pica 61", | ||
286 | + .init = mips_pica61_init, | ||
287 | + .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE, | ||
288 | + .nodisk_ok = 1, | ||
287 | }; | 289 | }; |
hw/mips_malta.c
@@ -946,8 +946,9 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size, | @@ -946,8 +946,9 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size, | ||
946 | } | 946 | } |
947 | 947 | ||
948 | QEMUMachine mips_malta_machine = { | 948 | QEMUMachine mips_malta_machine = { |
949 | - "malta", | ||
950 | - "MIPS Malta Core LV", | ||
951 | - mips_malta_init, | ||
952 | - VGA_RAM_SIZE + BIOS_SIZE, | 949 | + .name = "malta", |
950 | + .desc = "MIPS Malta Core LV", | ||
951 | + .init = mips_malta_init, | ||
952 | + .ram_require = VGA_RAM_SIZE + BIOS_SIZE, | ||
953 | + .nodisk_ok = 1, | ||
953 | }; | 954 | }; |
hw/mips_mipssim.c
@@ -191,8 +191,9 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size, | @@ -191,8 +191,9 @@ mips_mipssim_init (ram_addr_t ram_size, int vga_ram_size, | ||
191 | } | 191 | } |
192 | 192 | ||
193 | QEMUMachine mips_mipssim_machine = { | 193 | QEMUMachine mips_mipssim_machine = { |
194 | - "mipssim", | ||
195 | - "MIPS MIPSsim platform", | ||
196 | - mips_mipssim_init, | ||
197 | - BIOS_SIZE + VGA_RAM_SIZE /* unused */, | 194 | + .name = "mipssim", |
195 | + .desc = "MIPS MIPSsim platform", | ||
196 | + .init = mips_mipssim_init, | ||
197 | + .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */, | ||
198 | + .nodisk_ok = 1, | ||
198 | }; | 199 | }; |
hw/mips_r4k.c
@@ -283,8 +283,9 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size, | @@ -283,8 +283,9 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size, | ||
283 | } | 283 | } |
284 | 284 | ||
285 | QEMUMachine mips_machine = { | 285 | QEMUMachine mips_machine = { |
286 | - "mips", | ||
287 | - "mips r4k platform", | ||
288 | - mips_r4k_init, | ||
289 | - VGA_RAM_SIZE + BIOS_SIZE, | 286 | + .name = "mips", |
287 | + .desc = "mips r4k platform", | ||
288 | + .init = mips_r4k_init, | ||
289 | + .ram_require = VGA_RAM_SIZE + BIOS_SIZE, | ||
290 | + .nodisk_ok = 1, | ||
290 | }; | 291 | }; |