From: Anthony Liguori Date: Tue, 25 Jun 2013 19:14:00 +0000 (-0500) Subject: Merge remote-tracking branch 'sstabellini/xen-20130625' into staging X-Git-Tag: v1.6.0-rc0~180 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e5b86804ca34913cf5bec5c1240659645774a4e;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'sstabellini/xen-20130625' into staging # By Paul Durrant (2) and Stefano Stabellini (1) # Via Stefano Stabellini * sstabellini/xen-20130625: Move hardcoded initialization of xen-platform device. Allow use of pc machine type (accel=xen) for Xen HVM domains. Revert "xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional)" Message-id: alpine.DEB.2.02.1306251323220.4782@kaball.uk.xensource.com Signed-off-by: Anthony Liguori --- 1e5b86804ca34913cf5bec5c1240659645774a4e