Commit 0bd1909d authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

machine: Replace has_dynamic_sysbus with list of allowed devices 



The existing has_dynamic_sysbus flag makes the machine accept
every user-creatable sysbus device type on the command-line.
Replace it with a list of allowed device types, so machines can
easily accept some sysbus devices while rejecting others.

To keep exactly the same behavior as before, the existing
has_dynamic_sysbus=true assignments are replaced with a
TYPE_SYS_BUS_DEVICE entry on the allowed list.  Other patches
will replace the TYPE_SYS_BUS_DEVICE entries with more specific
lists of devices.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: qemu-arm@nongnu.org
Cc: qemu-ppc@nongnu.org
Cc: xen-devel@lists.xenproject.org
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20171125151610.20547-2-ehabkost@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 2d19c656

hw/arm/virt.c

+2 −1
Original line number Diff line number Diff line
@@ -1591,7 +1591,8 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) 
     * configuration of the particular instance.

     */

    mc->max_cpus = 255;

    mc->has_dynamic_sysbus = true;

    /*TODO: allow only sysbus devices that really work with this machine */

    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SYS_BUS_DEVICE);

    mc->block_default_type = IF_VIRTIO;

    mc->no_cdrom = 1;

    mc->pci_allow_0_address = true;

hw/core/machine.c

+29 −14
Original line number Diff line number Diff line
@@ -334,29 +334,44 @@ static bool machine_get_enforce_config_section(Object *obj, Error **errp) 
    return ms->enforce_config_section;

}



static void error_on_sysbus_device(SysBusDevice *sbdev, void *opaque)

void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type)

{

    strList *item = g_new0(strList, 1);



    item->value = g_strdup(type);

    item->next = mc->allowed_dynamic_sysbus_devices;

    mc->allowed_dynamic_sysbus_devices = item;

}



static void validate_sysbus_device(SysBusDevice *sbdev, void *opaque)

{

    MachineState *machine = opaque;

    MachineClass *mc = MACHINE_GET_CLASS(machine);

    bool allowed = false;

    strList *wl;



    for (wl = mc->allowed_dynamic_sysbus_devices;

         !allowed && wl;

         wl = wl->next) {

        allowed |= !!object_dynamic_cast(OBJECT(sbdev), wl->value);

    }



    if (!allowed) {

        error_report("Option '-device %s' cannot be handled by this machine",

                     object_class_get_name(object_get_class(OBJECT(sbdev))));

        exit(1);

    }

}



static void machine_init_notify(Notifier *notifier, void *data)

{

    Object *machine = qdev_get_machine();

    ObjectClass *oc = object_get_class(machine);

    MachineClass *mc = MACHINE_CLASS(oc);



    if (mc->has_dynamic_sysbus) {

        /* Our machine can handle dynamic sysbus devices, we're all good */

        return;

    }

    MachineState *machine = MACHINE(qdev_get_machine());



    /*

     * Loop through all dynamically created devices and check whether there

     * are sysbus devices among them. If there are, error out.

     * Loop through all dynamically created sysbus devices and check if they are

     * all allowed.  If a device is not allowed, error out.

     */

    foreach_dynamic_sysbus_device(error_on_sysbus_device, NULL);

    foreach_dynamic_sysbus_device(validate_sysbus_device, machine);

}



HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine)

hw/i386/pc_q35.c

+2 −1
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

    m->no_floppy = 1;

    m->has_dynamic_sysbus = true;

    /*TODO: allow only sysbus devices that really work with this machine */

    machine_class_allow_dynamic_sysbus_dev(m, TYPE_SYS_BUS_DEVICE);

    m->max_cpus = 288;

}

hw/ppc/e500plat.c

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "hw/boards.h"

#include "sysemu/device_tree.h"

#include "sysemu/kvm.h"

#include "hw/sysbus.h"

#include "hw/pci/pci.h"

#include "hw/ppc/openpic.h"

#include "kvm_ppc.h"
@@ -63,7 +64,8 @@ static void e500plat_machine_init(MachineClass *mc) 
    mc->desc = "generic paravirt e500 platform";

    mc->init = e500plat_init;

    mc->max_cpus = 32;

    mc->has_dynamic_sysbus = true;

    /*TODO: allow only sysbus devices that really work with this machine */

    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SYS_BUS_DEVICE);

    mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");

}

hw/ppc/spapr.c

+2 −1
Original line number Diff line number Diff line
@@ -3843,7 +3843,8 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
    mc->default_boot_order = "";

    mc->default_ram_size = 512 * M_BYTE;

    mc->kvm_type = spapr_kvm_type;

    mc->has_dynamic_sysbus = true;

    /*TODO: allow only sysbus devices that really work with this machine */

    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SYS_BUS_DEVICE);

    mc->pci_allow_0_address = true;

    mc->get_hotplug_handler = spapr_get_hotplug_handler;

    hc->pre_plug = spapr_machine_device_pre_plug;