Commit 021746c1 authored by Wei Liu's avatar Wei Liu Committed by Stefano Stabellini
Browse files

PCMachineState: introduce acpi_build_enabled field 



Introduce this field to control whether ACPI build is enabled by a
particular machine or accelerator.

It defaults to true if the machine itself supports ACPI build. Xen
accelerator will disable it because Xen is in charge of building ACPI
tables for the guest.

Signed-off-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Reviewed-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Tested-by: default avatarSander Eikelenboom <linux@eikelenboom.it>
parent b5863634

hw/i386/acpi-build.c

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

    }



    if (!pcmc->has_acpi_build) {

    if (!pcms->acpi_build_enabled) {

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

        return;

    }

hw/i386/pc.c

+2 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,8 @@ static void pc_machine_initfn(Object *obj) 
    pcms->vmport = ON_OFF_AUTO_AUTO;

    /* nvdimm is disabled on default. */

    pcms->acpi_nvdimm_state.is_enabled = false;

    /* acpi build is enabled by default if machine supports it */

    pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;

}



static void pc_machine_reset(void)

include/hw/i386/pc.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ struct PCMachineState { 


    AcpiNVDIMMState acpi_nvdimm_state;



    bool acpi_build_enabled;



    /* RAM information (sizes, addresses, configuration): */

    ram_addr_t below_4g_mem_size, above_4g_mem_size;

xen-common.c

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include "qemu/osdep.h"

#include "hw/i386/pc.h"

#include "hw/xen/xen_backend.h"

#include "qmp-commands.h"

#include "sysemu/char.h"
@@ -114,6 +115,11 @@ static void xen_change_state_handler(void *opaque, int running, 


static int xen_init(MachineState *ms)

{

    PCMachineState *pcms = PC_MACHINE(ms);



    /* Disable ACPI build because Xen handles it */

    pcms->acpi_build_enabled = false;



    xen_xc = xc_interface_open(0, 0, 0);

    if (xen_xc == NULL) {

        xen_pv_printf(NULL, 0, "can't open xen interface\n");