hw/boards: Convert current_machine to MachineState

In order to allow attaching machine options to a machine instance,
current_machine is converted into MachineState.
As a first step of deprecating QEMUMachine, some of the functions
were modified to return MachineClass.

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-03-05 19:30:47 +02:00 committed by Andreas Färber
parent 261747f176
commit 0056ae24bc
4 changed files with 53 additions and 36 deletions

View file

@ -53,9 +53,6 @@ struct QEMUMachine {
#define TYPE_MACHINE_SUFFIX "-machine"
int qemu_register_machine(QEMUMachine *m);
QEMUMachine *find_default_machine(void);
extern QEMUMachine *current_machine;
#define TYPE_MACHINE "machine"
#define MACHINE(obj) \
@ -68,6 +65,9 @@ extern QEMUMachine *current_machine;
typedef struct MachineState MachineState;
typedef struct MachineClass MachineClass;
MachineClass *find_default_machine(void);
extern MachineState *current_machine;
/**
* MachineClass:
* @qemu_machine: #QEMUMachine