Commit 17e89077 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

acpi: add acpi=OnOffAuto machine property to x86 and arm virt 



Remove the global acpi_enabled bool and replace it with an
acpi OnOffAuto machine property.

qemu throws an error now if you use -no-acpi while the machine
type you are using doesn't support acpi in the first place.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-Id: <20200320100136.11717-1-kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 9d283f85

hw/arm/virt-acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ void virt_acpi_setup(VirtMachineState *vms) 
        return;

    }



    if (!acpi_enabled) {

    if (!virt_is_acpi_enabled(vms)) {

        trace_virt_acpi_setup();

        return;

    }

hw/arm/virt.c

+34 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include "kvm_arm.h"

#include "hw/firmware/smbios.h"

#include "qapi/visitor.h"

#include "qapi/qapi-visit-common.h"

#include "standard-headers/linux/input.h"

#include "hw/arm/smmuv3.h"

#include "hw/acpi/acpi.h"
@@ -1844,7 +1845,7 @@ static void machvirt_init(MachineState *machine) 


    create_pcie(vms);



    if (has_ged && aarch64 && firmware_loaded && acpi_enabled) {

    if (has_ged && aarch64 && firmware_loaded && virt_is_acpi_enabled(vms)) {

        vms->acpi_dev = create_acpi_ged(vms);

    } else {

        create_gpio(vms);
@@ -1934,6 +1935,31 @@ static void virt_set_its(Object *obj, bool value, Error **errp) 
    vms->its = value;

}



bool virt_is_acpi_enabled(VirtMachineState *vms)

{

    if (vms->acpi == ON_OFF_AUTO_OFF) {

        return false;

    }

    return true;

}



static void virt_get_acpi(Object *obj, Visitor *v, const char *name,

                          void *opaque, Error **errp)

{

    VirtMachineState *vms = VIRT_MACHINE(obj);

    OnOffAuto acpi = vms->acpi;



    visit_type_OnOffAuto(v, name, &acpi, errp);

}



static void virt_set_acpi(Object *obj, Visitor *v, const char *name,

                          void *opaque, Error **errp)

{

    VirtMachineState *vms = VIRT_MACHINE(obj);



    visit_type_OnOffAuto(v, name, &vms->acpi, errp);

}



static char *virt_get_gic_version(Object *obj, Error **errp)

{

    VirtMachineState *vms = VIRT_MACHINE(obj);
@@ -2113,7 +2139,7 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, 
    if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) {

        VirtMachineState *vms = VIRT_MACHINE(machine);



        if (!vms->bootinfo.firmware_loaded || !acpi_enabled) {

        if (!vms->bootinfo.firmware_loaded || !virt_is_acpi_enabled(vms)) {

            return HOTPLUG_HANDLER(machine);

        }

    }
@@ -2184,6 +2210,12 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) 
    mc->numa_mem_supported = true;

    mc->auto_enable_numa_with_memhp = true;

    mc->default_ram_id = "mach-virt.ram";



    object_class_property_add(oc, "acpi", "OnOffAuto",

        virt_get_acpi, virt_set_acpi,

        NULL, NULL, &error_abort);

    object_class_property_set_description(oc, "acpi",

        "Enable ACPI", &error_abort);

}



static void virt_instance_init(Object *obj)

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -3024,7 +3024,7 @@ void acpi_setup(void) 
        return;

    }



    if (!acpi_enabled) {

    if (!x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {

        ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n");

        return;

    }

hw/i386/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, 
     * but pcms->acpi_dev is still created. Check !acpi_enabled in

     * addition to cover this case.

     */

    if (!pcms->acpi_dev || !acpi_enabled) {

    if (!pcms->acpi_dev || !x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {

        error_setg(errp,

                   "memory hotplug is not enabled: missing acpi device or acpi disabled");

        return;
@@ -1351,7 +1351,7 @@ static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, 
     * but pcms->acpi_dev is still created. Check !acpi_enabled in

     * addition to cover this case.

     */

    if (!pcms->acpi_dev || !acpi_enabled) {

    if (!pcms->acpi_dev || !x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {

        error_setg(&local_err,

                   "memory hotplug is not enabled: missing acpi device or acpi disabled");

        goto out;

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void pc_init1(MachineState *machine, 
        pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");

    }



    if (pcmc->pci_enabled && acpi_enabled) {

    if (pcmc->pci_enabled && x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {

        DeviceState *piix4_pm;



        smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);