diff options
author | Marcel Apfelbaum <marcel.a@redhat.com> | 2014-05-07 17:42:57 +0300 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2014-05-28 17:35:01 +0200 |
commit | 3ef9622182e598392855931e7a0437d3855cef5e (patch) | |
tree | 87765046f480836eb65ecbcd293cade13518c62f /hw/alpha/dp264.c | |
parent | 0380aef323154205a7d838fb9953423621290d41 (diff) | |
download | hqemu-3ef9622182e598392855931e7a0437d3855cef5e.zip hqemu-3ef9622182e598392855931e7a0437d3855cef5e.tar.gz |
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/alpha/dp264.c')
-rw-r--r-- | hw/alpha/dp264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 1351ba5..b178a03 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -43,13 +43,13 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num) return (slot + 1) * 4 + irq_num; } -static void clipper_init(QEMUMachineInitArgs *args) +static void clipper_init(MachineState *machine) { - ram_addr_t ram_size = args->ram_size; - 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; + ram_addr_t ram_size = machine->ram_size; + const char *cpu_model = machine->cpu_model; + const char *kernel_filename = machine->kernel_filename; + const char *kernel_cmdline = machine->kernel_cmdline; + const char *initrd_filename = machine->initrd_filename; AlphaCPU *cpus[4]; PCIBus *pci_bus; ISABus *isa_bus; |