]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/sstabellini/xen-2014-10-30' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Oct 2014 20:28:09 +0000 (20:28 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Oct 2014 20:28:09 +0000 (20:28 +0000)
* 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>

Trivial merge