]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/sstabellini/xen-140507-2' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 7 May 2014 17:12:14 +0000 (18:12 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 7 May 2014 17:12:14 +0000 (18:12 +0100)
commit5894145a26afd29c077452f7e93981b797c912a5
treeeb6e51da96686770561777d80095828da3c1e81e
parentb18a990c3d5cb8f8dfe1a5e5b36c67857ce1cf86
parentf31352041bdde436c3f6d07e1525a42e48dec215
Merge remote-tracking branch 'remotes/sstabellini/xen-140507-2' into staging

* remotes/sstabellini/xen-140507-2:
  xen_disk: add discard support
  pass an inclusive address range to xc_domain_pin_memory_cacheattr
  xen: factor out common functions
  xen: move Xen HVM files under hw/i386/xen
  xen: move Xen PV machine files to hw/xenpv
  qemu-xen: free all the pirqs for msi/msix when driver unload
  exec: Limit translation limiting in address_space_translate to xen

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