aboutsummaryrefslogtreecommitdiff
path: root/hw/sh4/shix.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/sh4/shix.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/sh4/shix.c')
-rw-r--r--hw/sh4/shix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 904a966..7c152b4 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -39,9 +39,9 @@
#define BIOS_FILENAME "shix_bios.bin"
#define BIOS_ADDRESS 0xA0000000
-static void shix_init(QEMUMachineInitArgs *args)
+static void shix_init(MachineState *machine)
{
- const char *cpu_model = args->cpu_model;
+ const char *cpu_model = machine->cpu_model;
int ret;
SuperHCPU *cpu;
struct SH7750State *s;