system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-22 19:04:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "KVM: Split QEMUMachine typedef into separate header"

Browse source 
This reverts commit 9c06a1f79f.
The new header sysemu/qemumachine.h is undesired.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2014-03-13 03:29:51 +01:00
parent 2c3445bb85
commit 602a3921ff
6 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/hw/boards.h
View file

@ -4,9 +4,10 @@
#define HW_BOARDS_H #define HW_BOARDS_H
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/qemumachine.h"
#include "hw/qdev.h" #include "hw/qdev.h"
typedef struct QEMUMachine QEMUMachine;
typedef struct QEMUMachineInitArgs { typedef struct QEMUMachineInitArgs {
const QEMUMachine *machine; const QEMUMachine *machine;
ram_addr_t ram_size; ram_addr_t ram_size;

1
include/hw/xen/xen.h
View file

@ -10,7 +10,6 @@
#include "hw/irq.h" #include "hw/irq.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "sysemu/qemumachine.h"
/* xen-machine.c */ /* xen-machine.c */
enum xen_mode { enum xen_mode {

1
include/sysemu/kvm.h
View file

@ -18,7 +18,6 @@
#include "config-host.h" #include "config-host.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qom/cpu.h" #include "qom/cpu.h"
#include "sysemu/qemumachine.h"
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
#include <linux/kvm.h> #include <linux/kvm.h>

16
include/sysemu/qemumachine.h
View file

@ -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 */

1
include/sysemu/qtest.h
View file

@ -16,7 +16,6 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "sysemu/qemumachine.h"
extern bool qtest_allowed; extern bool qtest_allowed;

1
kvm-stub.c
View file

@ -14,7 +14,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "cpu.h" #include "cpu.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/qemumachine.h"
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#include "hw/pci/msi.h" #include "hw/pci/msi.h"