tree ee50b4b8b06e8f6cd9a3dd6fd3ddbd97bc81ad15
parent 4239e2dc018c0defdbad35d387051ca2b208889d
parent d4f9e806c20607cafe7bb0d9eba14ccb160390a1
author Peter Maydell <peter.maydell@linaro.org> 1414700889 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1414700889 +0000

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>