fcb2cd928f
the QOMification of accelerators, a fix for -kernel support on x86, and one for a recently-introduced virtio-scsi optimization. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJUNo9yAAoJEBRUblpOawnXQDkH/1M5DxmVwUv+SZtHEdpsT7Eq UGjRzfYXsYP/WkEqxVzYJmN0HJn9z8uJZin/dqwDPQLjCy8gf/xuaNCfoZqMuxHw iNaTgKpi9Uy0G0VWxjlZpRu8f5JjqHbJEP6aTT0hooBHaqQoBSm1fQh/pnCUvnpB qDQeHcOjrzIMkQJ3Ji8z2s+CapHaiIa63hJqRJztS5vbonPjngjj87dA54eIqDtQ RwXy58y+C8YMKqfpOG6lA+RxogESyyCfDBVUA1wwRDad1mOFKUMtEd4jAL39HUgR qINSKybG12V2bx8E+vNbaKB+68+NLdxcyR39JR2aun+a8yw+yDcF5BBiMXlqV0U= =4bqy -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging Four changes here. Polling for reconnection of character devices, the QOMification of accelerators, a fix for -kernel support on x86, and one for a recently-introduced virtio-scsi optimization. # gpg: Signature made Thu 09 Oct 2014 14:36:50 BST using RSA key ID 4E6B09D7 # gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>" # gpg: aka "Paolo Bonzini <bonzini@gnu.org>" * remotes/bonzini/tags/for-upstream: (28 commits) qemu-char: Fix reconnect socket error reporting qemu-sockets: Add error to non-blocking connect handler qemu-error: Add error_vreport() virtio-scsi: fix use-after-free of VirtIOSCSIReq linuxboot: compute initrd loading address kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct accel: Create accel object when initializing machine accel: Pass MachineState object to accel init functions accel: Rename 'init' method to 'init_machine' accel: Move accel init/allowed code to separate function accel: Remove tcg_available() function accel: Move qtest accel registration to qtest.c accel: Move Xen registration code to xen-common.c accel: Move KVM accel registration to kvm-all.c accel: Report unknown accelerator as "not found" instead of "does not exist" accel: Make AccelClass.available() optional accel: Use QOM classes for accel types accel: Move accel name lookup to separate function accel: Simplify configure_accelerator() using AccelType *acc variable accel: Create AccelType typedef ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
141 lines
3.6 KiB
C
141 lines
3.6 KiB
C
/* Declarations for use by board files for creating devices. */
|
|
|
|
#ifndef HW_BOARDS_H
|
|
#define HW_BOARDS_H
|
|
|
|
#include "qemu/typedefs.h"
|
|
#include "sysemu/blockdev.h"
|
|
#include "sysemu/accel.h"
|
|
#include "hw/qdev.h"
|
|
#include "qom/object.h"
|
|
|
|
|
|
typedef void QEMUMachineInitFunc(MachineState *ms);
|
|
|
|
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 units_per_default_bus;
|
|
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;
|
|
const char *hw_version;
|
|
};
|
|
|
|
void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,
|
|
const char *name,
|
|
uint64_t ram_size);
|
|
|
|
int qemu_register_machine(QEMUMachine *m);
|
|
|
|
#define TYPE_MACHINE_SUFFIX "-machine"
|
|
#define TYPE_MACHINE "machine"
|
|
#undef MACHINE /* BSD defines it and QEMU does not use it */
|
|
#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)
|
|
|
|
MachineClass *find_default_machine(void);
|
|
extern MachineState *current_machine;
|
|
|
|
/**
|
|
* MachineClass:
|
|
* @qemu_machine: #QEMUMachine
|
|
* @get_hotplug_handler: this function is called during bus-less
|
|
* device hotplug. If defined it returns pointer to an instance
|
|
* of HotplugHandler object, which handles hotplug operation
|
|
* for a given @dev. It may return NULL if @dev doesn't require
|
|
* any actions to be performed by hotplug handler.
|
|
*/
|
|
struct MachineClass {
|
|
/*< private >*/
|
|
ObjectClass parent_class;
|
|
/*< public >*/
|
|
|
|
const char *name;
|
|
const char *alias;
|
|
const char *desc;
|
|
|
|
void (*init)(MachineState *state);
|
|
void (*reset)(void);
|
|
void (*hot_add_cpu)(const int64_t id, Error **errp);
|
|
int (*kvm_type)(const char *arg);
|
|
|
|
BlockInterfaceType block_default_type;
|
|
int units_per_default_bus;
|
|
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;
|
|
const char *hw_version;
|
|
|
|
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
|
|
DeviceState *dev);
|
|
};
|
|
|
|
/**
|
|
* MachineState:
|
|
*/
|
|
struct MachineState {
|
|
/*< private >*/
|
|
Object parent_obj;
|
|
/*< public >*/
|
|
|
|
char *accel;
|
|
bool kernel_irqchip;
|
|
int kvm_shadow_mem;
|
|
char *dtb;
|
|
char *dumpdtb;
|
|
int phandle_start;
|
|
char *dt_compatible;
|
|
bool dump_guest_core;
|
|
bool mem_merge;
|
|
bool usb;
|
|
char *firmware;
|
|
bool iommu;
|
|
|
|
ram_addr_t ram_size;
|
|
ram_addr_t maxram_size;
|
|
uint64_t ram_slots;
|
|
const char *boot_order;
|
|
char *kernel_filename;
|
|
char *kernel_cmdline;
|
|
char *initrd_filename;
|
|
const char *cpu_model;
|
|
AccelState *accelerator;
|
|
};
|
|
|
|
#endif
|