Commit aaa66391 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs 



QEMUMachine's fields are already in MachineClass. We can safely
make the switch because we copy them in machine_class_init() and
spapr_machine_class_init().

Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 00b4fbe2

include/hw/boards.h

+3 −2
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ 
#include "hw/qdev.h"

#include "qom/object.h"



typedef struct MachineClass MachineClass;



typedef struct QEMUMachineInitArgs {

    const QEMUMachine *machine;

    const MachineClass *machine;

    ram_addr_t ram_size;

    const char *boot_order;

    const char *kernel_filename;
@@ -62,7 +64,6 @@ int qemu_register_machine(QEMUMachine *m); 
    OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE)



typedef struct MachineState MachineState;

typedef struct MachineClass MachineClass;



MachineClass *find_default_machine(void);

extern MachineState *current_machine;

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -4430,7 +4430,7 @@ int main(int argc, char **argv, char **envp) 
    qdev_machine_init();



    current_machine->init_args = (QEMUMachineInitArgs) {

        .machine = machine,

        .machine = machine_class,

        .ram_size = ram_size,

        .boot_order = boot_order,

        .kernel_filename = kernel_filename,