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>

1 files changed, 8 insertions, 10 deletions

diff --git a/vl.c b/vl.c
index 99b6fc0050..e65d0b373d 100644
--- a/vl.c
+++ b/vl.c
@@ -4425,16 +4425,14 @@ int main(int argc, char **argv, char **envp)
 
     qdev_machine_init();
 
-    current_machine->init_args = (QEMUMachineInitArgs) {
-        .machine = machine_class,
-        .ram_size = ram_size,
-        .boot_order = boot_order,
-        .kernel_filename = kernel_filename,
-        .kernel_cmdline = kernel_cmdline,
-        .initrd_filename = initrd_filename,
-        .cpu_model = cpu_model };
-
-    machine_class->init(&current_machine->init_args);
+    current_machine->ram_size = ram_size;
+    current_machine->boot_order = boot_order;
+    current_machine->kernel_filename = kernel_filename;
+    current_machine->kernel_cmdline = kernel_cmdline;
+    current_machine->initrd_filename = initrd_filename;
+    current_machine->cpu_model = cpu_model;
+
+    machine_class->init(current_machine);
 
     audio_init();