diff options
| author | Peter Maydell | 2016-01-21 18:21:08 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-01-21 18:21:08 +0100 |
| commit | 0b0571dd246871f18b7d64b5279511e91e2a7bf6 (patch) | |
| tree | 5fe918d7f97873791ac23f8e3bae64483b3f0ec2 /hw/xen/xen-host-pci-device.h | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into st... (diff) | |
| parent | Xen PCI passthru: convert to realize() (diff) | |
| download | qemu-0b0571dd246871f18b7d64b5279511e91e2a7bf6.tar.gz qemu-0b0571dd246871f18b7d64b5279511e91e2a7bf6.tar.xz qemu-0b0571dd246871f18b7d64b5279511e91e2a7bf6.zip | |
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 <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>
Diffstat (limited to 'hw/xen/xen-host-pci-device.h')
| -rw-r--r-- | hw/xen/xen-host-pci-device.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h index 3d44e044ff..6acf36e13a 100644 --- a/hw/xen/xen-host-pci-device.h +++ b/hw/xen/xen-host-pci-device.h @@ -36,8 +36,9 @@ typedef struct XenHostPCIDevice { int config_fd; } XenHostPCIDevice; -int xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, - uint8_t bus, uint8_t dev, uint8_t func); +void xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, + uint8_t bus, uint8_t dev, uint8_t func, + Error **errp); void xen_host_pci_device_put(XenHostPCIDevice *pci_dev); bool xen_host_pci_device_closed(XenHostPCIDevice *d); |