aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hw/an5206.c8
-rw-r--r--hw/dummy_m68k.c6
-rw-r--r--hw/etraxfs.c8
-rw-r--r--hw/gumstix.c16
-rw-r--r--hw/integratorcp.c8
-rw-r--r--hw/mainstone.c10
-rw-r--r--hw/mcf5208.c8
-rw-r--r--hw/musicpal.c8
-rw-r--r--hw/nseries.c16
-rw-r--r--hw/palm.c8
-rw-r--r--hw/ppc405_boards.c8
-rw-r--r--hw/ppc_chrp.c8
-rw-r--r--hw/ppc_oldworld.c8
-rw-r--r--hw/ppc_prep.c8
-rw-r--r--hw/r2d.c8
-rw-r--r--hw/shix.c8
-rw-r--r--hw/spitz.c32
-rw-r--r--hw/stellaris.c16
-rw-r--r--hw/tosa.c8
19 files changed, 100 insertions, 100 deletions
diff --git a/hw/an5206.c b/hw/an5206.c
index 8dd4db3497..29812631e7 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -88,8 +88,8 @@ static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine an5206_machine = {
- "an5206",
- "Arnewsh 5206",
- an5206_init,
- 512,
+ .name = "an5206",
+ .desc = "Arnewsh 5206",
+ .init = an5206_init,
+ .ram_require = 512,
};
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 1641d56ade..fc06e9cc88 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -63,7 +63,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine dummy_m68k_machine = {
- "dummy",
- "Dummy board",
- dummy_m68k_init,
+ .name = "dummy",
+ .desc = "Dummy board",
+ .init = dummy_m68k_init,
};
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 1ec0fa006a..4d3f694eda 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -141,8 +141,8 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine bareetraxfs_machine = {
- "bareetraxfs",
- "Bare ETRAX FS board",
- bareetraxfs_init,
- 0x8000000,
+ .name = "bareetraxfs",
+ .desc = "Bare ETRAX FS board",
+ .init = bareetraxfs_init,
+ .ram_require = 0x8000000,
};
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 89bf684983..29cd69df24 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -122,15 +122,15 @@ static void verdex_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine connex_machine = {
- "connex",
- "Gumstix Connex (PXA255)",
- connex_init,
- (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
+ .name = "connex",
+ .desc = "Gumstix Connex (PXA255)",
+ .init = connex_init,
+ .ram_require = (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
};
QEMUMachine verdex_machine = {
- "verdex",
- "Gumstix Verdex (PXA270)",
- verdex_init,
- (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
+ .name = "verdex",
+ .desc = "Gumstix Verdex (PXA270)",
+ .init = verdex_init,
+ .ram_require = (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 4ac7c0c961..779d46b70e 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -540,8 +540,8 @@ static void integratorcp_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine integratorcp_machine = {
- "integratorcp",
- "ARM Integrator/CP (ARM926EJ-S)",
- integratorcp_init,
- 0x100000,
+ .name = "integratorcp",
+ .desc = "ARM Integrator/CP (ARM926EJ-S)",
+ .init = integratorcp_init,
+ .ram_require = 0x100000,
};
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 3de25d862f..52485cecd2 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -144,9 +144,9 @@ static void mainstone_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine mainstone2_machine = {
- "mainstone",
- "Mainstone II (PXA27x)",
- mainstone_init,
- (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
- PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
+ .name = "mainstone",
+ .desc = "Mainstone II (PXA27x)",
+ .init = mainstone_init,
+ .ram_require = (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
+ PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index dfb504b5ef..3e0a811751 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -305,8 +305,8 @@ static void mcf5208evb_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine mcf5208evb_machine = {
- "mcf5208evb",
- "MCF5206EVB",
- mcf5208evb_init,
- 16384,
+ .name = "mcf5208evb",
+ .desc = "MCF5206EVB",
+ .init = mcf5208evb_init,
+ .ram_require = 16384,
};
diff --git a/hw/musicpal.c b/hw/musicpal.c
index e4d8c89bef..ccea19fe24 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -1509,8 +1509,8 @@ static void musicpal_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine musicpal_machine = {
- "musicpal",
- "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
- musicpal_init,
- MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED
+ .name = "musicpal",
+ .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
+ .init = musicpal_init,
+ .ram_require = MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED,
};
diff --git a/hw/nseries.c b/hw/nseries.c
index 11e817ba08..ec56fad952 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1404,15 +1404,15 @@ static void n810_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine n800_machine = {
- "n800",
- "Nokia N800 tablet aka. RX-34 (OMAP2420)",
- n800_init,
- (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
+ .name = "n800",
+ .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
+ .init = n800_init,
+ .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
};
QEMUMachine n810_machine = {
- "n810",
- "Nokia N810 tablet aka. RX-44 (OMAP2420)",
- n810_init,
- (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
+ .name = "n810",
+ .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
+ .init = n810_init,
+ .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/palm.c b/hw/palm.c
index 9af0b13621..79ea3a77fc 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -282,8 +282,8 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine palmte_machine = {
- "cheetah",
- "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
- palmte_init,
- (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED,
+ .name = "cheetah",
+ .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
+ .init = palmte_init,
+ .ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 296e07132c..c7a69596c7 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -355,10 +355,10 @@ static void ref405ep_init (ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine ref405ep_machine = {
- "ref405ep",
- "ref405ep",
- ref405ep_init,
- (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED,
+ .name = "ref405ep",
+ .desc = "ref405ep",
+ .init = ref405ep_init,
+ .ram_require = (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED,
};
/*****************************************************************************/
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index a100896c28..140541f0b0 100644
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -331,8 +331,8 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine core99_machine = {
- "mac99",
- "Mac99 based PowerMAC",
- ppc_core99_init,
- BIOS_SIZE + VGA_RAM_SIZE,
+ .name = "mac99",
+ .desc = "Mac99 based PowerMAC",
+ .init = ppc_core99_init,
+ .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
};
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 85d3b2ce8c..15e8022488 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -366,8 +366,8 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine heathrow_machine = {
- "g3bw",
- "Heathrow based PowerMAC",
- ppc_heathrow_init,
- BIOS_SIZE + VGA_RAM_SIZE,
+ .name = "g3bw",
+ .desc = "Heathrow based PowerMAC",
+ .init = ppc_heathrow_init,
+ .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
};
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 3c35d1783e..a955909eea 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -758,8 +758,8 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine prep_machine = {
- "prep",
- "PowerPC PREP platform",
- ppc_prep_init,
- BIOS_SIZE + VGA_RAM_SIZE,
+ .name = "prep",
+ .desc = "PowerPC PREP platform",
+ .init = ppc_prep_init,
+ .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
};
diff --git a/hw/r2d.c b/hw/r2d.c
index a7607d113b..855aa414ff 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -164,8 +164,8 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine r2d_machine = {
- "r2d",
- "r2d-plus board",
- r2d_init,
- SDRAM_SIZE | RAMSIZE_FIXED
+ .name = "r2d",
+ .desc = "r2d-plus board",
+ .init = r2d_init,
+ .ram_require = SDRAM_SIZE | RAMSIZE_FIXED,
};
diff --git a/hw/shix.c b/hw/shix.c
index ff8afece3c..140efe90a5 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -108,8 +108,8 @@ static void shix_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine shix_machine = {
- "shix",
- "shix card",
- shix_init,
- (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED
+ .name = "shix",
+ .desc = "shix card",
+ .init = shix_init,
+ .ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
};
diff --git a/hw/spitz.c b/hw/spitz.c
index fef557ad17..fc7717460e 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -1010,29 +1010,29 @@ static void terrier_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine akitapda_machine = {
- "akita",
- "Akita PDA (PXA270)",
- akita_init,
- SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
+ .name = "akita",
+ .desc = "Akita PDA (PXA270)",
+ .init = akita_init,
+ .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
QEMUMachine spitzpda_machine = {
- "spitz",
- "Spitz PDA (PXA270)",
- spitz_init,
- SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
+ .name = "spitz",
+ .desc = "Spitz PDA (PXA270)",
+ .init = spitz_init,
+ .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
QEMUMachine borzoipda_machine = {
- "borzoi",
- "Borzoi PDA (PXA270)",
- borzoi_init,
- SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
+ .name = "borzoi",
+ .desc = "Borzoi PDA (PXA270)",
+ .init = borzoi_init,
+ .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
QEMUMachine terrierpda_machine = {
- "terrier",
- "Terrier PDA (PXA270)",
- terrier_init,
- SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
+ .name = "terrier",
+ .desc = "Terrier PDA (PXA270)",
+ .init = terrier_init,
+ .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 93f751171e..5948079e17 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1413,15 +1413,15 @@ static void lm3s6965evb_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine lm3s811evb_machine = {
- "lm3s811evb",
- "Stellaris LM3S811EVB",
- lm3s811evb_init,
- (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
+ .name = "lm3s811evb",
+ .desc = "Stellaris LM3S811EVB",
+ .init = lm3s811evb_init,
+ .ram_require = (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
};
QEMUMachine lm3s6965evb_machine = {
- "lm3s6965evb",
- "Stellaris LM3S6965EVB",
- lm3s6965evb_init,
- (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
+ .name = "lm3s6965evb",
+ .desc = "Stellaris LM3S6965EVB",
+ .init = lm3s6965evb_init,
+ .ram_require = (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
};
diff --git a/hw/tosa.c b/hw/tosa.c
index f67d67e199..75df52ec7d 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -119,8 +119,8 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size,
}
QEMUMachine tosapda_machine = {
- "tosa",
- "Tosa PDA (PXA255)",
- tosa_init,
- TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
+ .name = "tosa",
+ .desc = "Tosa PDA (PXA255)",
+ .init = tosa_init,
+ .ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-03 12:24:22 +0000