aboutsummaryrefslogtreecommitdiff
path: root/include/hw/boards.h
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2014-03-05 19:30:47 +0200
committerAndreas Färber <afaerber@suse.de>2014-03-12 20:13:02 +0100
commit0056ae24bc36798fdd96d0b31e217e9f73896736 (patch)
treee96c46ebcc19086f0b115f3da263d18a8f32dc2e /include/hw/boards.h
parent261747f176f6f2d88f8268aaebfdd1a1afe887e2 (diff)
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>
Diffstat (limited to 'include/hw/boards.h')
-rw-r--r--include/hw/boards.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h
index f9c035f33f..6b17397e8d 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -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