target-arm: Clean up handling of ARMv8 optional feature bits

[qemu.git] / qemu-char.c

diff --git a/qemu-char.c b/qemu-char.c
index 5a7975f39390c08661f1e54f764f715ff1fe0c58..17b476edf06cfaab0e8ed9a497c846ff7b90b690 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3798,7 +3798,13 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
         break;
     }
 
-    if (chr == NULL && !error_is_set(errp)) {
+    /*
+     * Character backend open hasn't been fully converted to the Error
+     * API.  Some opens fail without setting an error.  Set a generic
+     * error then.
+     * TODO full conversion to Error API
+     */
+    if (chr == NULL && errp && !*errp) {
         error_setg(errp, "Failed to create chardev");
     }
     if (chr) {