falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Marcel Apfelbaum 2014-04-09 20:34:51 +03:00 committed by Andreas Färber
parent 00b4fbe274
commit aaa663916d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/hw/boards.h
View File

@ -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;

2
vl.c
View File

@ -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,