Commit 9226682a authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'sstabellini/tags/xen-20161102-tag' into staging 



Xen 2016/11/02

# gpg: Signature made Wed 02 Nov 2016 07:28:40 PM GMT
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg:                 aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* sstabellini/tags/xen-20161102-tag:
  PCMachineState: introduce acpi_build_enabled field
  hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()

Message-id: alpine.DEB.2.10.1611021227530.19454@sstabellini-ThinkPad-X260
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 199a5bde 021746c1

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -2960,7 +2960,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
@@ -2189,6 +2189,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)

hw/xen/xen_pvdev.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 */



#include "qemu/osdep.h"



#include "qemu/log.h"

#include "hw/xen/xen_backend.h"

#include "hw/xen/xen_pvdev.h"

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");