ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: Remove unused fields from QEMUMachine 

This removes the following fields from QEMUMachine: family, alias,
reset, hot_add_cpu, units_per_default_bus, no_serial, no_parallel,
use_virtcon, use_sclp, no_floppy, no_cdrom, default_display,
compat_props, and hw_version.

The only users of those fields were already converted to use QOM and
MachineClass directly, so they are not needed anymore.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-05-15 14:18:58 -03:00 committed by Michael S. Tsirkin
parent d644b11657
commit d48f4fa69e
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/hw/boards.h
View File

@ -19,31 +19,18 @@ typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp);
typedef int QEMUMachineGetKvmtypeFunc(const char *arg); typedef int QEMUMachineGetKvmtypeFunc(const char *arg);
struct QEMUMachine { struct QEMUMachine {
const char *family; /* NULL iff @name identifies a standalone machtype */
const char *name; const char *name;
const char *alias;
const char *desc; const char *desc;
QEMUMachineInitFunc *init; QEMUMachineInitFunc *init;
QEMUMachineResetFunc *reset;
QEMUMachineHotAddCPUFunc *hot_add_cpu;
QEMUMachineGetKvmtypeFunc *kvm_type; QEMUMachineGetKvmtypeFunc *kvm_type;
BlockInterfaceType block_default_type; BlockInterfaceType block_default_type;
int units_per_default_bus;
int max_cpus; int max_cpus;
unsigned int no_serial:1, unsigned int
no_parallel:1,
use_virtcon:1,
use_sclp:1,
no_floppy:1,
no_cdrom:1,
no_sdcard:1, no_sdcard:1,
has_dynamic_sysbus:1; has_dynamic_sysbus:1;
int is_default; int is_default;
const char *default_machine_opts; const char *default_machine_opts;
const char *default_boot_order; const char *default_boot_order;
const char *default_display;
GlobalProperty *compat_props;
const char *hw_version;
}; };
void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,

15
vl.c
View File

@ -1314,32 +1314,17 @@ static void machine_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
QEMUMachine *qm = data; QEMUMachine *qm = data;
mc->family = qm->family;
mc->name = qm->name; mc->name = qm->name;
mc->alias = qm->alias;
mc->desc = qm->desc; mc->desc = qm->desc;
mc->init = qm->init; mc->init = qm->init;
mc->reset = qm->reset;
mc->hot_add_cpu = qm->hot_add_cpu;
mc->kvm_type = qm->kvm_type; mc->kvm_type = qm->kvm_type;
mc->block_default_type = qm->block_default_type; mc->block_default_type = qm->block_default_type;
mc->units_per_default_bus = qm->units_per_default_bus;
mc->max_cpus = qm->max_cpus; mc->max_cpus = qm->max_cpus;
mc->no_serial = qm->no_serial;
mc->no_parallel = qm->no_parallel;
mc->use_virtcon = qm->use_virtcon;
mc->use_sclp = qm->use_sclp;
mc->no_floppy = qm->no_floppy;
mc->no_cdrom = qm->no_cdrom;
mc->no_sdcard = qm->no_sdcard; mc->no_sdcard = qm->no_sdcard;
mc->has_dynamic_sysbus = qm->has_dynamic_sysbus; mc->has_dynamic_sysbus = qm->has_dynamic_sysbus;
mc->is_default = qm->is_default; mc->is_default = qm->is_default;
mc->default_machine_opts = qm->default_machine_opts; mc->default_machine_opts = qm->default_machine_opts;
mc->default_boot_order = qm->default_boot_order; mc->default_boot_order = qm->default_boot_order;
mc->default_display = qm->default_display;
mc->compat_props = qm->compat_props;
mc->hw_version = qm->hw_version;
} }
int qemu_register_machine(QEMUMachine *m) int qemu_register_machine(QEMUMachine *m)