]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160121' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 21 Jan 2016 17:21:08 +0000 (17:21 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 21 Jan 2016 17:21:08 +0000 (17:21 +0000)
Xen 2016/01/21

# gpg: Signature made Thu 21 Jan 2016 16:58:50 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xen-20160121:
  Xen PCI passthru: convert to realize()
  Add Error **errp for xen_pt_config_init()
  Add Error **errp for xen_pt_setup_vga()
  Add Error **errp for xen_host_pci_device_get()
  Xen: use qemu_strtoul instead of strtol
  Change xen_host_pci_sysfs_path() to return void
  xen-pvdevice: convert to realize()
  xen-hvm: Clean up xen_ram_alloc() error handling
  xen-hvm: Clean up xen_hvm_init() error handling
  xenfb.c: avoid expensive loops when prod <= out_cons
  MAINTAINERS: update Xen files

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
MAINTAINERS
exec.c
hw/i386/pc_piix.c
hw/i386/pc_q35.c

diff --cc MAINTAINERS
Simple merge
diff --cc exec.c
Simple merge
Simple merge
Simple merge