Commit 958db90c authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Andreas Färber
Browse files

machine: Remove QEMUMachine indirection from MachineClass 



No need to go through qemu_machine field. Use
MachineClass fields directly.

Signed-off-by: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f1e29879

device-hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ DriveInfo *add_init_drive(const char *optstr) 
        return NULL;



    mc = MACHINE_GET_CLASS(current_machine);

    dinfo = drive_init(opts, mc->qemu_machine->block_default_type);

    dinfo = drive_init(opts, mc->block_default_type);

    if (!dinfo) {

        qemu_opts_del(opts);

        return NULL;

hw/ppc/spapr.c

+11 −39
Original line number Diff line number Diff line
@@ -1419,19 +1419,6 @@ static int spapr_kvm_type(const char *vm_type) 
    exit(1);

}



static QEMUMachine spapr_machine = {

    .name = "pseries",

    .desc = "pSeries Logical Partition (PAPR compliant)",

    .is_default = 1,

    .init = ppc_spapr_init,

    .reset = ppc_spapr_reset,

    .block_default_type = IF_SCSI,

    .max_cpus = MAX_CPUS,

    .no_parallel = 1,

    .default_boot_order = NULL,

    .kvm_type = spapr_kvm_type,

};



/*

 * Implementation of an interface to adjust firmware patch

 * for the bootindex property handling.
@@ -1493,31 +1480,17 @@ 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;



    mc->name = "pseries";

    mc->desc = "pSeries Logical Partition (PAPR compliant)";

    mc->is_default = 1;

    mc->init = ppc_spapr_init;

    mc->reset = ppc_spapr_reset;

    mc->block_default_type = IF_SCSI;

    mc->max_cpus = MAX_CPUS;

    mc->no_parallel = 1;

    mc->default_boot_order = NULL;

    mc->kvm_type = spapr_kvm_type;



    fwc->get_dev_path = spapr_get_fw_dev_path;

}
@@ -1526,7 +1499,6 @@ static const TypeInfo spapr_machine_info = { 
    .name          = TYPE_SPAPR_MACHINE,

    .parent        = TYPE_MACHINE,

    .class_init    = spapr_machine_class_init,

    .class_data    = &spapr_machine,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_FW_PATH_PROVIDER },

        { }

include/hw/boards.h

+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ struct MachineClass { 
    ObjectClass parent_class;

    /*< public >*/



    QEMUMachine *qemu_machine;



    const char *name;

    const char *alias;

    const char *desc;

qmp.c

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ void qmp_cpu_add(int64_t id, Error **errp) 
    MachineClass *mc;



    mc = MACHINE_GET_CLASS(current_machine);

    if (mc->qemu_machine->hot_add_cpu) {

        mc->qemu_machine->hot_add_cpu(id, errp);

    if (mc->hot_add_cpu) {

        mc->hot_add_cpu(id, errp);

    } else {

        error_setg(errp, "Not supported");

    }

vl.c

+36 −43
Original line number Diff line number Diff line
@@ -1590,8 +1590,6 @@ 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;
@@ -1639,12 +1637,12 @@ static MachineClass *find_machine(const char *name) 
    for (el = machines; el; el = el->next) {

        MachineClass *temp = el->data;



        if (!strcmp(temp->qemu_machine->name, name)) {

        if (!strcmp(temp->name, name)) {

            mc = temp;

            break;

        }

        if (temp->qemu_machine->alias &&

            !strcmp(temp->qemu_machine->alias, name)) {

        if (temp->alias &&

            !strcmp(temp->alias, name)) {

            mc = temp;

            break;

        }
@@ -1662,7 +1660,7 @@ MachineClass *find_default_machine(void) 
    for (el = machines; el; el = el->next) {

        MachineClass *temp = el->data;



        if (temp->qemu_machine->is_default) {

        if (temp->is_default) {

            mc = temp;

            break;

        }
@@ -1676,27 +1674,25 @@ MachineInfoList *qmp_query_machines(Error **errp) 
{

    GSList *el, *machines = object_class_get_list(TYPE_MACHINE, false);

    MachineInfoList *mach_list = NULL;

    QEMUMachine *m;



    for (el = machines; el; el = el->next) {

        MachineClass *mc = el->data;

        MachineInfoList *entry;

        MachineInfo *info;



        m = mc->qemu_machine;

        info = g_malloc0(sizeof(*info));

        if (m->is_default) {

        if (mc->is_default) {

            info->has_is_default = true;

            info->is_default = true;

        }



        if (m->alias) {

        if (mc->alias) {

            info->has_alias = true;

            info->alias = g_strdup(m->alias);

            info->alias = g_strdup(mc->alias);

        }



        info->name = g_strdup(m->name);

        info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;

        info->name = g_strdup(mc->name);

        info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;



        entry = g_malloc0(sizeof(*entry));

        entry->value = info;
@@ -1902,8 +1898,8 @@ void qemu_system_reset(bool report) 


    mc = current_machine ? MACHINE_GET_CLASS(current_machine) : NULL;



    if (mc && mc->qemu_machine->reset) {

        mc->qemu_machine->reset();

    if (mc && mc->reset) {

        mc->reset();

    } else {

        qemu_devices_reset();

    }
@@ -2712,12 +2708,11 @@ static MachineClass *machine_parse(const char *name) 
        printf("Supported machines are:\n");

        for (el = machines; el; el = el->next) {

            MachineClass *mc = el->data;

            QEMUMachine *m = mc->qemu_machine;

            if (m->alias) {

                printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);

            if (mc->alias) {

                printf("%-20s %s (alias of %s)\n", mc->alias, mc->desc, mc->name);

            }

            printf("%-20s %s%s\n", m->name, m->desc,

                   m->is_default ? " (default)" : "");

            printf("%-20s %s%s\n", mc->name, mc->desc,

                   mc->is_default ? " (default)" : "");

        }

    }
@@ -2971,7 +2966,6 @@ int main(int argc, char **argv, char **envp) 
    const char *optarg;

    const char *loadvm = NULL;

    MachineClass *machine_class;

    QEMUMachine *machine;

    const char *cpu_model;

    const char *vga_model = NULL;

    const char *qtest_chrdev = NULL;
@@ -3999,9 +3993,8 @@ int main(int argc, char **argv, char **envp) 
    object_property_add_child(object_get_root(), "machine",

                              OBJECT(current_machine), &error_abort);



    machine = machine_class->qemu_machine;

    if (machine->hw_version) {

        qemu_set_version(machine->hw_version);

    if (machine_class->hw_version) {

        qemu_set_version(machine_class->hw_version);

    }



    if (qemu_opts_foreach(qemu_find_opts("object"),
@@ -4061,11 +4054,11 @@ int main(int argc, char **argv, char **envp) 


    smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL));



    machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */

    if (smp_cpus > machine->max_cpus) {

    machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */

    if (smp_cpus > machine_class->max_cpus) {

        fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "

                "supported by machine `%s' (%d)\n", smp_cpus,  machine->name,

                machine->max_cpus);

                "supported by machine `%s' (%d)\n", smp_cpus,

                machine_class->name, machine_class->max_cpus);

        exit(1);

    }
@@ -4073,9 +4066,9 @@ int main(int argc, char **argv, char **envp) 
     * Get the default machine options from the machine if it is not already

     * specified either by the configuration file or by the command line.

     */

    if (machine->default_machine_opts) {

    if (machine_class->default_machine_opts) {

        qemu_opts_set_defaults(qemu_find_opts("machine"),

                               machine->default_machine_opts, 0);

                               machine_class->default_machine_opts, 0);

    }



    qemu_opts_foreach(qemu_find_opts("device"), default_driver_check, NULL, 0);
@@ -4084,25 +4077,25 @@ int main(int argc, char **argv, char **envp) 
    if (!vga_model && !default_vga) {

        vga_interface_type = VGA_DEVICE;

    }

    if (!has_defaults || machine->no_serial) {

    if (!has_defaults || machine_class->no_serial) {

        default_serial = 0;

    }

    if (!has_defaults || machine->no_parallel) {

    if (!has_defaults || machine_class->no_parallel) {

        default_parallel = 0;

    }

    if (!has_defaults || !machine->use_virtcon) {

    if (!has_defaults || !machine_class->use_virtcon) {

        default_virtcon = 0;

    }

    if (!has_defaults || !machine->use_sclp) {

    if (!has_defaults || !machine_class->use_sclp) {

        default_sclp = 0;

    }

    if (!has_defaults || machine->no_floppy) {

    if (!has_defaults || machine_class->no_floppy) {

        default_floppy = 0;

    }

    if (!has_defaults || machine->no_cdrom) {

    if (!has_defaults || machine_class->no_cdrom) {

        default_cdrom = 0;

    }

    if (!has_defaults || machine->no_sdcard) {

    if (!has_defaults || machine_class->no_sdcard) {

        default_sdcard = 0;

    }

    if (!has_defaults) {
@@ -4240,7 +4233,7 @@ int main(int argc, char **argv, char **envp) 
    kernel_cmdline = qemu_opt_get(machine_opts, "append");

    bios_name = qemu_opt_get(machine_opts, "firmware");



    boot_order = machine->default_boot_order;

    boot_order = machine_class->default_boot_order;

    opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);

    if (opts) {

        char *normal_boot_order;
@@ -4334,11 +4327,11 @@ int main(int argc, char **argv, char **envp) 
    if (snapshot)

        qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot, NULL, 0);

    if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,

                          &machine->block_default_type, 1) != 0) {

                          &machine_class->block_default_type, 1) != 0) {

        exit(1);

    }



    default_drive(default_cdrom, snapshot, machine->block_default_type, 2,

    default_drive(default_cdrom, snapshot, machine_class->block_default_type, 2,

                  CDROM_OPTS);

    default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);

    default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
@@ -4422,8 +4415,8 @@ int main(int argc, char **argv, char **envp) 
            exit (i == 1 ? 1 : 0);

    }



    if (machine->compat_props) {

        qdev_prop_register_global_list(machine->compat_props);

    if (machine_class->compat_props) {

        qdev_prop_register_global_list(machine_class->compat_props);

    }

    qemu_add_globals();
@@ -4438,7 +4431,7 @@ int main(int argc, char **argv, char **envp) 
        .initrd_filename = initrd_filename,

        .cpu_model = cpu_model };



    machine->init(&current_machine->init_args);

    machine_class->init(&current_machine->init_args);



    audio_init();