OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Xen 2016/11/08 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYIiv8AAoJEIlPj0hw4a6QT3gP/RvYaenyZ1imbrGl9RMGw0Ev
 1nej+tGhR1szBs19+P8X7cY8TeuaxVxeiGMhP3aZZ4VDOXJY0gSVzVk3wwMYfJBu
 DEwaHaWkIEqPpobY+Vs/KvKgE7wo8e8KSYwD27ngngJHSxqcGmrPzn7k1DaPrm9N
 fmo8yNngbcNBWxpcritJUX5PtnA0CNvV5kizq0KParNuc2B6f3Xt7N9ubsJNhAoe
 8e25SVZlfurSQSVnstOuh8xbKXIGl2IJuZcfPqNKxydjd1Ob+EfrofZaTIN57BpP
 UyyD5vOFj3BzXm1+mQIk5alJ0d3zKMaRpIAHwHkn5yhdZ2X6N7SAtHTZBnjuI55K
 xFHYZWe7HTJ2w/w/MzWMufmNOUGCCxGiR8uXfSXnP4/2ujz88xNqolzEjORbefU0
 deNePztu/h1lClGH1P7O/a7b15fxCLeqDLsKqWoMPjP0AmWQmTgIuOc/rb++yKID
 S11oZBTn9Tv1Uz3C1xD3RYsh0dwT91pkw1OI+oJaDOGjbLVuR1a9Zm8paBoM+zEh
 pdnohr4EkVZvGhd5bzzhvRKYSuYlxtWrYdt5in0k5UUSLvHj4CrfDF8DHJ/ySLuG
 h7JHb5dWnrKRqE4wH4Edy8ody1u4W1iECERTkpPCwteqgR8IHE3IF6jDYqV3D20b
 x0oH9LiF4SpHRtoGcOBl
 =2Fud
 -----END PGP SIGNATURE-----

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: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2016-11-21 15:29:55 +00:00
parent c36ed06e91 804ba7c10b
commit ab9125c021
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xen-common.c
View File

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

4
xen-hvm.c
View File

@ -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: