From: Peter Maydell Date: Thu, 21 Jan 2016 17:21:08 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160121' into staging X-Git-Tag: v2.6.0-rc0~208 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b0571dd246871f18b7d64b5279511e91e2a7bf6;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160121' into staging 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 " * 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 --- 0b0571dd246871f18b7d64b5279511e91e2a7bf6