[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/11] Add Error **errp for xen_pt_setup_vga()
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 09/11] Add Error **errp for xen_pt_setup_vga() |
Date: |
Thu, 21 Jan 2016 17:01:28 +0000 |
From: Cao jin <address@hidden>
To catch the error message. Also modify the caller
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
---
hw/xen/xen_pt.c | 7 +++++--
hw/xen/xen_pt.h | 3 ++-
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 53b5bca..07bfcec 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 3749711..26f74f8 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 df6069b..e7a7c7e 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)
--
1.7.10.4
- [Qemu-devel] [PULL 0/11] xen-20160121, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 07/11] Xen: use qemu_strtoul instead of strtol, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 04/11] xen-hvm: Clean up xen_ram_alloc() error handling, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 10/11] Add Error **errp for xen_pt_config_init(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 03/11] xen-hvm: Clean up xen_hvm_init() error handling, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 05/11] xen-pvdevice: convert to realize(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 01/11] MAINTAINERS: update Xen files, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 06/11] Change xen_host_pci_sysfs_path() to return void, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 08/11] Add Error **errp for xen_host_pci_device_get(), Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 09/11] Add Error **errp for xen_pt_setup_vga(),
Stefano Stabellini <=
- [Qemu-devel] [PULL 02/11] xenfb.c: avoid expensive loops when prod <= out_cons, Stefano Stabellini, 2016/01/21
- [Qemu-devel] [PULL 11/11] Xen PCI passthru: convert to realize(), Stefano Stabellini, 2016/01/21
- Re: [Qemu-devel] [PULL 0/11] xen-20160121, Peter Maydell, 2016/01/21