diff options
| author | Andreas Färber <afaerber@suse.de> | 2014-03-13 03:29:51 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 03:49:48 +0100 |
| commit | 602a3921ffd62a08c29750d123e0d5d96acc84ee (patch) | |
| tree | 241425b3a8a9278426b481760ef2f52ee13c1fae /include/hw | |
| parent | 2c3445bb850fbfb4481e9487d8852f10e8c74e4c (diff) | |
Revert "KVM: Split QEMUMachine typedef into separate header"
This reverts commit 9c06a1f79f959fffd09bfb7efc3d76051a6cd2da.
The new header sysemu/qemumachine.h is undesired.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/boards.h | 3 | ||||
| -rw-r--r-- | include/hw/xen/xen.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index c2096e6ba2..89eb6651e2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -4,9 +4,10 @@ #define HW_BOARDS_H #include "sysemu/blockdev.h" -#include "sysemu/qemumachine.h" #include "hw/qdev.h" +typedef struct QEMUMachine QEMUMachine; + typedef struct QEMUMachineInitArgs { const QEMUMachine *machine; ram_addr_t ram_size; diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index e1818213b2..9d549fc83d 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -10,7 +10,6 @@ #include "hw/irq.h" #include "qemu-common.h" -#include "sysemu/qemumachine.h" /* xen-machine.c */ enum xen_mode { |