mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
PowerPC queue for 2.0-rc0
* QEMUMachine include cleanup * SLOF update * XICS reset fix * sPAPR PCI host bridge refactorings -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJTIR0LAAoJEPou0S0+fgE/4rMP/ReyYRPSXFFu2PXt2werCYcA P5Agynib/O5LXTBgZCOSkTrRYBE2+5bq3Zp3iQe7gkLrpbRjHJLulwBpFW3rlVQO 5IWxMoFC1eW+PE9k+V0hRdTFXMfVxvvHam3g77XVGb4lm/thwHkQ2RYa7z1V4zCP hbj/gVdZA7pzXQZfLnOU6illaVCBjYeajEle5sagLlN+DANFSm3G/BdYWPTtxKxq MLiMEdaZJkBG/NG3zocyuCsWeF+oLyh8fB4IQUjORq7x8v749DgprQjFUy3YMrB5 Ph5CQXyVyyiZSXmfbdINMpQPxdPaVm2rtBD9ol7p+mXtc6UOS3uzbFQ75XXiG401 crqDpc74iXYpxmwtSs9FwD8TFqh5n8NFGEN8U3MOkhcNQ3zdjnlbVRMG1aqFIUne SbQeWC5Qg3MI7UruStq9n3l/3SL3KJSRRrT11ndO/4UoHT6PZfBKQ4eCD8XiHmPu /p0ahfnl8/UvMyTWVJhBvLt5G6+v8aumKJR/47jhrPnqLFCk4yUDbCdT5a5KSDjt ZauyfGlIQcORXKRbVw+DRgSQjeGLoQJMtOVqDXnKwS8j8cuhF2JebBCVTPHHjC72 UTRYk5/tLjcZCLD7Vscpd4uRiuz69xJu/MCvwqUwSZ3TssuoW3Vl0/giLyajMxTU RLn0uLaFguDX+DoSNIAy =icAj -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging PowerPC queue for 2.0-rc0 * QEMUMachine include cleanup * SLOF update * XICS reset fix * sPAPR PCI host bridge refactorings # gpg: Signature made Thu 13 Mar 2014 02:50:51 GMT using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * remotes/afaerber/tags/ppc-for-2.0: spapr-pci: Convert fprintf() to error_report() spapr-pci: Convert to QOM realize xics-kvm: Fix reset function pseries: Update SLOF firmware image to qemu-slof-20140304 Move QEMUMachine typedef to qemu/typedefs.h Revert "KVM: Split QEMUMachine typedef into separate header" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
be86c53c05
12 changed files with 39 additions and 50 deletions
|
@ -4,7 +4,6 @@
|
|||
#define HW_BOARDS_H
|
||||
|
||||
#include "sysemu/blockdev.h"
|
||||
#include "sysemu/qemumachine.h"
|
||||
#include "hw/qdev.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
#include "hw/irq.h"
|
||||
#include "qemu-common.h"
|
||||
#include "sysemu/qemumachine.h"
|
||||
|
||||
/* xen-machine.c */
|
||||
enum xen_mode {
|
||||
|
|
|
@ -30,6 +30,7 @@ typedef struct MemoryListener MemoryListener;
|
|||
|
||||
typedef struct MemoryMappingList MemoryMappingList;
|
||||
|
||||
typedef struct QEMUMachine QEMUMachine;
|
||||
typedef struct NICInfo NICInfo;
|
||||
typedef struct HCIInfo HCIInfo;
|
||||
typedef struct AudioState AudioState;
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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 */
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
#include "qemu-common.h"
|
||||
#include "qapi/error.h"
|
||||
#include "sysemu/qemumachine.h"
|
||||
|
||||
extern bool qtest_allowed;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue