Commit ab9125c0 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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



Xen 2016/11/08

# gpg: Signature made Tue 08 Nov 2016 07:48:12 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-20161108-tag:
  xen: Fix xenpv machine initialisation

Message-id: alpine.DEB.2.10.1611081150170.3491@sstabellini-ThinkPad-X260
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents c36ed06e 804ba7c1

xen-common.c

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



#include "qemu/osdep.h"

#include "hw/i386/pc.h"

#include "hw/xen/xen_backend.h"

#include "qmp-commands.h"

#include "sysemu/char.h"
@@ -115,11 +114,6 @@ 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");

xen-hvm.c

+4 −0
Original line number Diff line number Diff line
@@ -1316,6 +1316,10 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) 
    }

    xen_be_register_common();

    xen_read_physmap(state);



    /* Disable ACPI build because Xen handles it */

    pcms->acpi_build_enabled = false;



    return;



err: