summaryrefslogtreecommitdiffstats
path: root/hw/z2.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2012-10-15 17:22:02 -0300
committerBlue Swirl <blauwirbel@gmail.com>2012-10-20 07:53:28 +0000
commit5f072e1f3075bd869e0ace9f2545a85992ac0084 (patch)
tree669400d97297f7e73bf3f0e4f35985b85b40fbaf /hw/z2.c
parenta96d8bea8e23473bd5b4b4111ba9187fcb976865 (diff)
downloadhqemu-5f072e1f3075bd869e0ace9f2545a85992ac0084.zip
hqemu-5f072e1f3075bd869e0ace9f2545a85992ac0084.tar.gz
create struct for machine initialization arguments
This should help us to: - More easily add or remove machine initialization arguments without having to change every single machine init function; - More easily make mechanical changes involving the machine init functions in the future; - Let machine initialization forward the init arguments to other functions more easily. This change was half-mechanical process: first the struct was added with the local ram_size, boot_device, kernel_*, initrd_*, and cpu_model local variable initialization to all functions. Then the compiler helped me locate the local variables that are unused, so they could be removed. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/z2.c')
-rw-r--r--hw/z2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/z2.c b/hw/z2.c
index 076fad2..f62b806 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -295,11 +295,12 @@ static TypeInfo aer915_info = {
.class_init = aer915_class_init,
};
-static void z2_init(ram_addr_t ram_size,
- const char *boot_device,
- const char *kernel_filename, const char *kernel_cmdline,
- const char *initrd_filename, const char *cpu_model)
+static void z2_init(QEMUMachineInitArgs *args)
{
+ const char *cpu_model = args->cpu_model;
+ const char *kernel_filename = args->kernel_filename;
+ const char *kernel_cmdline = args->kernel_cmdline;
+ const char *initrd_filename = args->initrd_filename;
MemoryRegion *address_space_mem = get_system_memory();
uint32_t sector_len = 0x10000;
PXA2xxState *mpu;
OpenPOWER on IntegriCloud