[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/17] virtio-pci: Pass local error object pointer t
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH 07/17] virtio-pci: Pass local error object pointer to error_append_hint() |
Date: |
Tue, 17 Sep 2019 12:21:15 +0200 |
User-agent: |
StGit/unknown-version |
Ensure that hints are added even if errp is &error_fatal or &error_abort.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/virtio/virtio-pci.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index c6b47a9c7385..1e58822ba186 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1543,9 +1543,12 @@ static void virtio_pci_device_plugged(DeviceState *d,
Error **errp)
virtio_pci_disable_modern(proxy);
if (!legacy) {
- error_setg(errp, "Device doesn't support modern mode, and legacy"
+ Error *local_err = NULL;
+
+ error_setg(&local_err, "Device doesn't support modern mode, and
legacy"
" mode is disabled");
- error_append_hint(errp, "Set disable-legacy to off\n");
+ error_append_hint(&local_err, "Set disable-legacy to off\n");
+ error_propagate(errp, local_err);
return;
}
@@ -1737,10 +1740,13 @@ static void virtio_pci_realize(PCIDevice *pci_dev,
Error **errp)
}
if (!virtio_pci_modern(proxy) && !virtio_pci_legacy(proxy)) {
- error_setg(errp, "device cannot work as neither modern nor legacy mode"
+ Error *local_err = NULL;
+
+ error_setg(&local_err, "device cannot work as neither modern nor
legacy mode"
" is enabled");
- error_append_hint(errp, "Set either disable-modern or disable-legacy"
+ error_append_hint(&local_err, "Set either disable-modern or
disable-legacy"
" to off\n");
+ error_propagate(errp, local_err);
return;
}
- Re: [Qemu-devel] [PATCH 02/17] block: Pass local error object pointer to error_append_hint(), (continued)
[Qemu-devel] [PATCH 03/17] char/spice: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
[Qemu-devel] [PATCH 04/17] ppc: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
[Qemu-devel] [PATCH 05/17] arm: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
[Qemu-devel] [PATCH 06/17] vfio: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
[Qemu-devel] [PATCH 07/17] virtio-pci: Pass local error object pointer to error_append_hint(),
Greg Kurz <=
[Qemu-devel] [PATCH 08/17] pcie_root_port: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
[Qemu-devel] [PATCH 09/17] hw/rdma: Fix missing conversion to rdma_error_report(), Greg Kurz, 2019/09/17
[Qemu-devel] [PATCH 10/17] s390x/css: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17