Commit 00b4fbe2 authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

machine: Copy QEMUMachine's fields to MachineClass 



In order to eliminate the QEMUMachine indirection,
add its fields directly to MachineClass.
Do not yet remove qemu_machine field because it is
still in use by sPAPR.

Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
[AF: Copied fields for sPAPR, too]
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 9e1d668b

hw/ppc/spapr.c

+24 −0
Original line number Diff line number Diff line
@@ -1493,8 +1493,32 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
{

    MachineClass *mc = MACHINE_CLASS(oc);

    FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);

    QEMUMachine *qm = data;



    mc->qemu_machine = data;



    mc->name = qm->name;

    mc->alias = qm->alias;

    mc->desc = qm->desc;

    mc->init = qm->init;

    mc->reset = qm->reset;

    mc->hot_add_cpu = qm->hot_add_cpu;

    mc->kvm_type = qm->kvm_type;

    mc->block_default_type = qm->block_default_type;

    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->is_default = qm->is_default;

    mc->default_machine_opts = qm->default_machine_opts;

    mc->default_boot_order = qm->default_boot_order;

    mc->compat_props = qm->compat_props;

    mc->hw_version = qm->hw_version;



    fwc->get_dev_path = spapr_get_fw_dev_path;

}

include/hw/boards.h

+24 −0
Original line number Diff line number Diff line
@@ -77,6 +77,30 @@ struct MachineClass { 
    /*< public >*/



    QEMUMachine *qemu_machine;



    const char *name;

    const char *alias;

    const char *desc;



    void (*init)(QEMUMachineInitArgs *args);

    void (*reset)(void);

    void (*hot_add_cpu)(const int64_t id, Error **errp);

    int (*kvm_type)(const char *arg);



    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;

    const char *hw_version;

};



/**

vl.c

+23 −0
Original line number Diff line number Diff line
@@ -1588,8 +1588,31 @@ MachineState *current_machine; 
static void machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);

    QEMUMachine *qm = data;



    mc->qemu_machine = data;



    mc->name = qm->name;

    mc->alias = qm->alias;

    mc->desc = qm->desc;

    mc->init = qm->init;

    mc->reset = qm->reset;

    mc->hot_add_cpu = qm->hot_add_cpu;

    mc->kvm_type = qm->kvm_type;

    mc->block_default_type = qm->block_default_type;

    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->is_default = qm->is_default;

    mc->default_machine_opts = qm->default_machine_opts;

    mc->default_boot_order = qm->default_boot_order;

    mc->compat_props = qm->compat_props;

    mc->hw_version = qm->hw_version;

}



int qemu_register_machine(QEMUMachine *m)