be86c53c05
* 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>
109 lines
2.4 KiB
C
109 lines
2.4 KiB
C
/* Declarations for use by board files for creating devices. */
|
|
|
|
#ifndef HW_BOARDS_H
|
|
#define HW_BOARDS_H
|
|
|
|
#include "sysemu/blockdev.h"
|
|
#include "hw/qdev.h"
|
|
#include "qom/object.h"
|
|
|
|
typedef struct QEMUMachineInitArgs {
|
|
const QEMUMachine *machine;
|
|
ram_addr_t ram_size;
|
|
const char *boot_order;
|
|
const char *kernel_filename;
|
|
const char *kernel_cmdline;
|
|
const char *initrd_filename;
|
|
const char *cpu_model;
|
|
} QEMUMachineInitArgs;
|
|
|
|
typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args);
|
|
|
|
typedef void QEMUMachineResetFunc(void);
|
|
|
|
typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp);
|
|
|
|
typedef int QEMUMachineGetKvmtypeFunc(const char *arg);
|
|
|
|
struct QEMUMachine {
|
|
const char *name;
|
|
const char *alias;
|
|
const char *desc;
|
|
QEMUMachineInitFunc *init;
|
|
QEMUMachineResetFunc *reset;
|
|
QEMUMachineHotAddCPUFunc *hot_add_cpu;
|
|
QEMUMachineGetKvmtypeFunc *kvm_type;
|
|
BlockInterfaceType block_default_type;
|
|
int max_cpus;
|
|
unsigned int no_serial:1,
|
|
no_parallel:1,
|
|
use_virtcon:1,
|
|
use_sclp:1,
|
|
no_floppy:1,
|
|
no_cdrom:1,
|
|
no_sdcard:1;
|
|
int is_default;
|
|
const char *default_machine_opts;
|
|
const char *default_boot_order;
|
|
GlobalProperty *compat_props;
|
|
struct QEMUMachine *next;
|
|
const char *hw_version;
|
|
};
|
|
|
|
#define TYPE_MACHINE_SUFFIX "-machine"
|
|
int qemu_register_machine(QEMUMachine *m);
|
|
|
|
#define TYPE_MACHINE "machine"
|
|
#define MACHINE(obj) \
|
|
OBJECT_CHECK(MachineState, (obj), TYPE_MACHINE)
|
|
#define MACHINE_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(MachineClass, (obj), TYPE_MACHINE)
|
|
#define MACHINE_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE)
|
|
|
|
typedef struct MachineState MachineState;
|
|
typedef struct MachineClass MachineClass;
|
|
|
|
MachineClass *find_default_machine(void);
|
|
extern MachineState *current_machine;
|
|
|
|
/**
|
|
* MachineClass:
|
|
* @qemu_machine: #QEMUMachine
|
|
*/
|
|
struct MachineClass {
|
|
/*< private >*/
|
|
ObjectClass parent_class;
|
|
/*< public >*/
|
|
|
|
QEMUMachine *qemu_machine;
|
|
};
|
|
|
|
/**
|
|
* MachineState:
|
|
*/
|
|
struct MachineState {
|
|
/*< private >*/
|
|
Object parent_obj;
|
|
/*< public >*/
|
|
|
|
char *accel;
|
|
bool kernel_irqchip;
|
|
int kvm_shadow_mem;
|
|
char *kernel;
|
|
char *initrd;
|
|
char *append;
|
|
char *dtb;
|
|
char *dumpdtb;
|
|
int phandle_start;
|
|
char *dt_compatible;
|
|
bool dump_guest_core;
|
|
bool mem_merge;
|
|
bool usb;
|
|
char *firmware;
|
|
|
|
QEMUMachineInitArgs init_args;
|
|
};
|
|
|
|
#endif
|