From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 30 Oct 2014 20:28:09 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/sstabellini/xen-2014-10-30' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ee29498e4f0f3eff90eeeb7f5fa1703abedd2fb6;p=qemu.git

Merge remote-tracking branch 'remotes/sstabellini/xen-2014-10-30' into staging

* remotes/sstabellini/xen-2014-10-30:
  fix off-by-one error in pci_piix3_xen_ide_unplug
  xen-hvm.c: Add support for Xen access to vmport

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

ee29498e4f0f3eff90eeeb7f5fa1703abedd2fb6