aboutsummaryrefslogtreecommitdiff
path: root/hw/arm/gumstix.c
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2014-05-07 17:42:57 +0300
committerAndreas Färber <afaerber@suse.de>2014-05-28 17:35:01 +0200
commit3ef9622182e598392855931e7a0437d3855cef5e (patch)
tree87765046f480836eb65ecbcd293cade13518c62f /hw/arm/gumstix.c
parent0380aef323154205a7d838fb9953423621290d41 (diff)
downloadqemu-3ef9622182e598392855931e7a0437d3855cef5e.zip
qemu-3ef9622182e598392855931e7a0437d3855cef5e.tar.gz
qemu-3ef9622182e598392855931e7a0437d3855cef5e.tar.bz2
machine: Conversion of QEMUMachineInitArgs to MachineState
Total removal of QEMUMachineInitArgs struct. QEMUMachineInitArgs's fields are copied into MachineState. Removed duplicated fields from MachineState. All the other changes are only mechanical refactoring, no semantic changes. Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> (s390) Reviewed-by: Michael S. Tsirkin <mst@redhat.com> (PC) [AF: Renamed ms -> machine, use MACHINE_GET_CLASS()] Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/arm/gumstix.c')
-rw-r--r--hw/arm/gumstix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index aeea172..3f8465e 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -46,7 +46,7 @@
static const int sector_len = 128 * 1024;
-static void connex_init(QEMUMachineInitArgs *args)
+static void connex_init(MachineState *machine)
{
PXA2xxState *cpu;
DriveInfo *dinfo;
@@ -83,9 +83,9 @@ static void connex_init(QEMUMachineInitArgs *args)
qdev_get_gpio_in(cpu->gpio, 36));
}
-static void verdex_init(QEMUMachineInitArgs *args)
+static void verdex_init(MachineState *machine)
{
- const char *cpu_model = args->cpu_model;
+ const char *cpu_model = machine->cpu_model;
PXA2xxState *cpu;
DriveInfo *dinfo;
int be;