[Qemu-devel] [PATCH 14/17] ccid-card-emul: Pass local error object pointer to error_append_hint()

[Greg Kurz]

Ensure that hints are added even if errp is &error_fatal or &error_abort.

Signed-off-by: Greg Kurz <address@hidden>
---
 hw/usb/ccid-card-emulated.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 291e41db8a1e..3bc397341090 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -511,10 +511,13 @@ static void emulated_realize(CCIDCardState *base, Error 
**errp)
     }
 
     if (card->backend == 0) {
-        error_setg(errp, "backend must be one of:");
+        Error *local_err = NULL;
+
+        error_setg(&local_err, "backend must be one of:");
         for (ptable = backend_enum_table; ptable->name != NULL; ++ptable) {
-            error_append_hint(errp, "%s\n", ptable->name);
+            error_append_hint(&local_err, "%s\n", ptable->name);
         }
+        error_propagate(errp, local_err);
         goto out2;
     }