[Qemu-devel] [patch 1/2] machine struct - use C99 initializers

[Jes Sorensen]

Hi,

Here's an updated version to my machine struct patch. I've split it in
two so it is easier to validiate and track.

This patch simply converts all the machine structs to use C99 style
initializers. There is no actual code change in this.

Next I will follow up with the one that does the conversion of max_cpus.

Cheers,
Jes

Modify all the machine struct declarations to use C99 initializers.
This patch has no functional changes.

Signed-off-by: Jes Sorensen <address@hidden>

---
 hw/an5206.c        |    8 ++++----
 hw/dummy_m68k.c    |    6 +++---
 hw/etraxfs.c       |    8 ++++----
 hw/gumstix.c       |   16 ++++++++--------
 hw/integratorcp.c  |    8 ++++----
 hw/mainstone.c     |   10 +++++-----
 hw/mcf5208.c       |    8 ++++----
 hw/musicpal.c      |    8 ++++----
 hw/nseries.c       |   16 ++++++++--------
 hw/palm.c          |    8 ++++----
 hw/ppc405_boards.c |    8 ++++----
 hw/ppc_chrp.c      |    8 ++++----
 hw/ppc_oldworld.c  |    8 ++++----
 hw/ppc_prep.c      |    8 ++++----
 hw/r2d.c           |    8 ++++----
 hw/shix.c          |    8 ++++----
 hw/spitz.c         |   32 ++++++++++++++++----------------
 hw/stellaris.c     |   16 ++++++++--------
 hw/tosa.c          |    8 ++++----
 19 files changed, 100 insertions(+), 100 deletions(-)

Index: qemu/hw/an5206.c
===================================================================
--- qemu.orig/hw/an5206.c
+++ qemu/hw/an5206.c
@@ -88,8 +88,8 @@ static void an5206_init(ram_addr_t ram_s
 }
 
 QEMUMachine an5206_machine = {
-    "an5206",
-    "Arnewsh 5206",
-    an5206_init,
-    512,
+    .name = "an5206",
+    .desc = "Arnewsh 5206",
+    .init = an5206_init,
+    .ram_require = 512,
 };
Index: qemu/hw/dummy_m68k.c
===================================================================
--- qemu.orig/hw/dummy_m68k.c
+++ qemu/hw/dummy_m68k.c
@@ -63,7 +63,7 @@ static void dummy_m68k_init(ram_addr_t r
 }
 
 QEMUMachine dummy_m68k_machine = {
-    "dummy",
-    "Dummy board",
-    dummy_m68k_init,
+    .name = "dummy",
+    .desc = "Dummy board",
+    .init = dummy_m68k_init,
 };
Index: qemu/hw/etraxfs.c
===================================================================
--- qemu.orig/hw/etraxfs.c
+++ qemu/hw/etraxfs.c
@@ -141,8 +141,8 @@ void bareetraxfs_init (ram_addr_t ram_si
 }
 
 QEMUMachine bareetraxfs_machine = {
-    "bareetraxfs",
-    "Bare ETRAX FS board",
-    bareetraxfs_init,
-    0x8000000,
+    .name = "bareetraxfs",
+    .desc = "Bare ETRAX FS board",
+    .init = bareetraxfs_init,
+    .ram_require = 0x8000000,
 };
Index: qemu/hw/gumstix.c
===================================================================
--- qemu.orig/hw/gumstix.c
+++ qemu/hw/gumstix.c
@@ -122,15 +122,15 @@ static void verdex_init(ram_addr_t ram_s
 }
 
 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,
 };
Index: qemu/hw/integratorcp.c
===================================================================
--- qemu.orig/hw/integratorcp.c
+++ qemu/hw/integratorcp.c
@@ -540,8 +540,8 @@ static void integratorcp_init(ram_addr_t
 }
 
 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,
 };
Index: qemu/hw/mainstone.c
===================================================================
--- qemu.orig/hw/mainstone.c
+++ qemu/hw/mainstone.c
@@ -144,9 +144,9 @@ static void mainstone_init(ram_addr_t ra
 }
 
 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,
 };
Index: qemu/hw/mcf5208.c
===================================================================
--- qemu.orig/hw/mcf5208.c
+++ qemu/hw/mcf5208.c
@@ -305,8 +305,8 @@ static void mcf5208evb_init(ram_addr_t r
 }
 
 QEMUMachine mcf5208evb_machine = {
-    "mcf5208evb",
-    "MCF5206EVB",
-    mcf5208evb_init,
-    16384,
+    .name = "mcf5208evb",
+    .desc = "MCF5206EVB",
+    .init = mcf5208evb_init,
+    .ram_require = 16384,
 };
Index: qemu/hw/musicpal.c
===================================================================
--- qemu.orig/hw/musicpal.c
+++ qemu/hw/musicpal.c
@@ -1509,8 +1509,8 @@ static void musicpal_init(ram_addr_t ram
 }
 
 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,
 };
Index: qemu/hw/nseries.c
===================================================================
--- qemu.orig/hw/nseries.c
+++ qemu/hw/nseries.c
@@ -1404,15 +1404,15 @@ static void n810_init(ram_addr_t ram_siz
 }
 
 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,
 };
Index: qemu/hw/palm.c
===================================================================
--- qemu.orig/hw/palm.c
+++ qemu/hw/palm.c
@@ -282,8 +282,8 @@ static void palmte_init(ram_addr_t ram_s
 }
 
 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,
 };
Index: qemu/hw/ppc405_boards.c
===================================================================
--- qemu.orig/hw/ppc405_boards.c
+++ qemu/hw/ppc405_boards.c
@@ -357,10 +357,10 @@ static void ref405ep_init (ram_addr_t ra
 }
 
 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,
 };
 
 /*****************************************************************************/
Index: qemu/hw/ppc_chrp.c
===================================================================
--- qemu.orig/hw/ppc_chrp.c
+++ qemu/hw/ppc_chrp.c
@@ -331,8 +331,8 @@ static void ppc_core99_init (ram_addr_t 
 }
 
 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,
 };
Index: qemu/hw/ppc_oldworld.c
===================================================================
--- qemu.orig/hw/ppc_oldworld.c
+++ qemu/hw/ppc_oldworld.c
@@ -366,8 +366,8 @@ static void ppc_heathrow_init (ram_addr_
 }
 
 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,
 };
Index: qemu/hw/ppc_prep.c
===================================================================
--- qemu.orig/hw/ppc_prep.c
+++ qemu/hw/ppc_prep.c
@@ -760,8 +760,8 @@ static void ppc_prep_init (ram_addr_t ra
 }
 
 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,
 };
Index: qemu/hw/r2d.c
===================================================================
--- qemu.orig/hw/r2d.c
+++ qemu/hw/r2d.c
@@ -164,8 +164,8 @@ static void r2d_init(ram_addr_t 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,
 };
Index: qemu/hw/shix.c
===================================================================
--- qemu.orig/hw/shix.c
+++ qemu/hw/shix.c
@@ -108,8 +108,8 @@ static void shix_init(ram_addr_t ram_siz
 }
 
 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,
 };
Index: qemu/hw/spitz.c
===================================================================
--- qemu.orig/hw/spitz.c
+++ qemu/hw/spitz.c
@@ -1010,29 +1010,29 @@ static void terrier_init(ram_addr_t ram_
 }
 
 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,
 };
Index: qemu/hw/stellaris.c
===================================================================
--- qemu.orig/hw/stellaris.c
+++ qemu/hw/stellaris.c
@@ -1413,15 +1413,15 @@ static void lm3s6965evb_init(ram_addr_t 
 }
 
 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,
 };
Index: qemu/hw/tosa.c
===================================================================
--- qemu.orig/hw/tosa.c
+++ qemu/hw/tosa.c
@@ -119,8 +119,8 @@ static void tosa_init(ram_addr_t ram_siz
 }
 
 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,
 };