diff options
| author | Cao jin <caoj.fnst@cn.fujitsu.com> | 2016-01-17 20:13:13 +0800 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2016-01-21 16:45:41 +0000 |
| commit | 5226bb59f703963914e446557a2eea4a82eaf462 (patch) | |
| tree | db3e5e299b50e9a2cdcdbbee6b48e8bbd0318be2 /hw | |
| parent | 376ba75f88681b468caf4f6bcf27cf8a4b17a6d0 (diff) | |
| download | qemu-5226bb59f703963914e446557a2eea4a82eaf462.tar.gz qemu-5226bb59f703963914e446557a2eea4a82eaf462.tar.bz2 qemu-5226bb59f703963914e446557a2eea4a82eaf462.zip | |
Add Error **errp for xen_pt_setup_vga()
To catch the error message. Also modify the caller
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xen/xen_pt.c | 7 | ||||
| -rw-r--r-- | hw/xen/xen_pt.h | 3 | ||||
| -rw-r--r-- | hw/xen/xen_pt_graphics.c | 11 |
3 files changed, 13 insertions, 8 deletions
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 53b5bca702..07bfcecb63 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -808,8 +808,11 @@ static int xen_pt_initfn(PCIDevice *d) return -1; } - if (xen_pt_setup_vga(s, &s->real_device) < 0) { - XEN_PT_ERR(d, "Setup VGA BIOS of passthrough GFX failed!\n"); + xen_pt_setup_vga(s, &s->real_device, &err); + if (err) { + error_append_hint(&err, "Setup VGA BIOS of passthrough" + " GFX failed"); + error_report_err(err); xen_host_pci_device_put(&s->real_device); return -1; } diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 37497119f5..26f74f8eae 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -330,5 +330,6 @@ static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev) } int xen_pt_register_vga_regions(XenHostPCIDevice *dev); int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev); -int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev); +void xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev, + Error **errp); #endif /* !XEN_PT_H */ diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index df6069bf63..e7a7c7e263 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -161,7 +161,8 @@ struct pci_data { uint16_t reserved; } __attribute__((packed)); -int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) +void xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev, + Error **errp) { unsigned char *bios = NULL; struct rom_header *rom; @@ -172,13 +173,14 @@ int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) struct pci_data *pd = NULL; if (!is_igd_vga_passthrough(dev)) { - return -1; + error_setg(errp, "Need to enable igd-passthrough"); + return; } bios = get_vgabios(s, &bios_size, dev); if (!bios) { - XEN_PT_ERR(&s->dev, "VGA: Can't getting VBIOS!\n"); - return -1; + error_setg(errp, "VGA: Can't get VBIOS"); + return; } /* Currently we fixed this address as a primary. */ @@ -203,7 +205,6 @@ int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) /* Currently we fixed this address as a primary for legacy BIOS. */ cpu_physical_memory_rw(0xc0000, bios, bios_size, 1); - return 0; } uint32_t igd_read_opregion(XenPCIPassthroughState *s) |