From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M7CyC-0005XQ-1Z for qemu-devel@nongnu.org; Thu, 21 May 2009 14:26:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M7Cy6-0005WC-2X for qemu-devel@nongnu.org; Thu, 21 May 2009 14:26:18 -0400 Received: from [199.232.76.173] (port=49348 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M7Cy5-0005W2-QL for qemu-devel@nongnu.org; Thu, 21 May 2009 14:26:13 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:51209) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M7Cy5-0004r5-9q for qemu-devel@nongnu.org; Thu, 21 May 2009 14:26:13 -0400 Message-ID: <4A159CBE.9020606@mail.berlios.de> Date: Thu, 21 May 2009 20:26:06 +0200 From: Stefan Weil MIME-Version: 1.0 Subject: [Qemu-devel] [PATCH] Add new function qemu_register_machines Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Anthony Liguori Add new function qemu_register_machines. The patch removes the unused prototype register_machines and adds a new function which makes registration of more than one machine a little easier. The new function is applied to the machines in hw/spitz.c (where a static keyword for akitapda_machine was missing), but it can also be applied to several other QEMU source files. Signed-off-by: Stefan Weil --- hw/boards.h | 2 +- hw/spitz.c | 48 ++++++++++++++++++++++-------------------------- vl.c | 9 +++++++++ 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/hw/boards.h b/hw/boards.h index 3144017..f0e6932 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -20,7 +20,7 @@ typedef struct QEMUMachine { } QEMUMachine; int qemu_register_machine(QEMUMachine *m); -void register_machines(void); +int qemu_register_machines(QEMUMachine *machine, size_t number); extern QEMUMachine *current_machine; diff --git a/hw/spitz.c b/hw/spitz.c index dd16780..dd3a57e 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -1044,36 +1044,32 @@ static void terrier_init(ram_addr_t ram_size, kernel_cmdline, initrd_filename, cpu_model, terrier, 0x33f); } -QEMUMachine akitapda_machine = { - .name = "akita", - .desc = "Akita PDA (PXA270)", - .init = akita_init, -}; - -static QEMUMachine spitzpda_machine = { - .name = "spitz", - .desc = "Spitz PDA (PXA270)", - .init = spitz_init, -}; - -static QEMUMachine borzoipda_machine = { - .name = "borzoi", - .desc = "Borzoi PDA (PXA270)", - .init = borzoi_init, -}; - -static QEMUMachine terrierpda_machine = { - .name = "terrier", - .desc = "Terrier PDA (PXA270)", - .init = terrier_init, +static QEMUMachine spitz_machines[] = { + { + .name = "akita", + .desc = "Akita PDA (PXA270)", + .init = akita_init, + }, + { + .name = "spitz", + .desc = "Spitz PDA (PXA270)", + .init = spitz_init, + }, + { + .name = "borzoi", + .desc = "Borzoi PDA (PXA270)", + .init = borzoi_init, + }, + { + .name = "terrier", + .desc = "Terrier PDA (PXA270)", + .init = terrier_init, + } }; static void spitz_machine_init(void) { - qemu_register_machine(&akitapda_machine); - qemu_register_machine(&spitzpda_machine); - qemu_register_machine(&borzoipda_machine); - qemu_register_machine(&terrierpda_machine); + qemu_register_machines(spitz_machines, ARRAY_SIZE(spitz_machines)); } machine_init(spitz_machine_init); diff --git a/vl.c b/vl.c index 68c8514..d07a1b6 100644 --- a/vl.c +++ b/vl.c @@ -3488,6 +3488,15 @@ int qemu_register_machine(QEMUMachine *m) return 0; } +int qemu_register_machines(QEMUMachine *machine, size_t number) +{ + size_t i; + for (i = 0; i < number; i++) { + qemu_register_machine(&machine[i]); + } + return 0; +} + static QEMUMachine *find_machine(const char *name) { QEMUMachine *m; -- 1.5.6.5