diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c
index 3cb0cf0139028b867b2ac268c2671d862f7a6cd7..d277ef1bde54d882d6749e9dd25238008f703af5 100644
--- a/src/qemu/qemu_qapi.c
+++ b/src/qemu/qemu_qapi.c
@@ -76,7 +76,7 @@ virQEMUQAPISchemaTraverse(const char *baseName,
     virJSONValuePtr base;
     const char *metatype;
 
-    do {
+    while (1) {
         if (!(base = virHashLookup(schema, baseName)))
             return NULL;
 
@@ -114,7 +114,7 @@ virQEMUQAPISchemaTraverse(const char *baseName,
         }
 
         query++;
-    } while (*query);
+    }
 
     return base;
 }