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/sysemu | |
| 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/sysemu')
| -rw-r--r-- | include/sysemu/kvm.h | 1 | ||||
| -rw-r--r-- | include/sysemu/qemumachine.h | 16 | ||||
| -rw-r--r-- | include/sysemu/qtest.h | 1 |
3 files changed, 0 insertions, 18 deletions
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index ed01998aa8..0bee1e8996 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -18,7 +18,6 @@ #include "config-host.h" #include "qemu/queue.h" #include "qom/cpu.h" -#include "sysemu/qemumachine.h" #ifdef CONFIG_KVM #include <linux/kvm.h> diff --git a/include/sysemu/qemumachine.h b/include/sysemu/qemumachine.h deleted file mode 100644 index 4cefd56b67..0000000000 --- a/include/sysemu/qemumachine.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * QEMU Machine typedef - * - * Copyright Alexander Graf <agraf@suse.de> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef QEMUMACHINE_H -#define QEMUMACHINE_H - -typedef struct QEMUMachine QEMUMachine; - -#endif /* !QEMUMACHINE_H */ diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index e62281d4bf..224131f298 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -16,7 +16,6 @@ #include "qemu-common.h" #include "qapi/error.h" -#include "sysemu/qemumachine.h" extern bool qtest_allowed; |