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:
parent
00b4fbe274
commit
aaa663916d
|
@ -7,8 +7,10 @@
|
||||||
#include "hw/qdev.h"
|
#include "hw/qdev.h"
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
|
|
||||||
|
typedef struct MachineClass MachineClass;
|
||||||
|
|
||||||
typedef struct QEMUMachineInitArgs {
|
typedef struct QEMUMachineInitArgs {
|
||||||
const QEMUMachine *machine;
|
const MachineClass *machine;
|
||||||
ram_addr_t ram_size;
|
ram_addr_t ram_size;
|
||||||
const char *boot_order;
|
const char *boot_order;
|
||||||
const char *kernel_filename;
|
const char *kernel_filename;
|
||||||
|
@ -62,7 +64,6 @@ int qemu_register_machine(QEMUMachine *m);
|
||||||
OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE)
|
OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE)
|
||||||
|
|
||||||
typedef struct MachineState MachineState;
|
typedef struct MachineState MachineState;
|
||||||
typedef struct MachineClass MachineClass;
|
|
||||||
|
|
||||||
MachineClass *find_default_machine(void);
|
MachineClass *find_default_machine(void);
|
||||||
extern MachineState *current_machine;
|
extern MachineState *current_machine;
|
||||||
|
|
2
vl.c
2
vl.c
|
@ -4430,7 +4430,7 @@ int main(int argc, char **argv, char **envp)
|
||||||
qdev_machine_init();
|
qdev_machine_init();
|
||||||
|
|
||||||
current_machine->init_args = (QEMUMachineInitArgs) {
|
current_machine->init_args = (QEMUMachineInitArgs) {
|
||||||
.machine = machine,
|
.machine = machine_class,
|
||||||
.ram_size = ram_size,
|
.ram_size = ram_size,
|
||||||
.boot_order = boot_order,
|
.boot_order = boot_order,
|
||||||
.kernel_filename = kernel_filename,
|
.kernel_filename = kernel_filename,
|
||||||
|
|
Loading…
Reference in New Issue