From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 13 Jan 2015 18:32:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-13' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3a7f560fa612610822727f7647ed6bc10bccd6ec;p=qemu.git

Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-13' into staging

* remotes/sstabellini/xen-2015-01-13:
  xen-hvm: increase maxmem before calling xc_domain_populate_physmap
  xen-pt: Fix PCI devices re-attach failed

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

3a7f560fa612610822727f7647ed6bc10bccd6ec