Merge remote-tracking branch 'kraxel/usb.33' into staging

[qemu.git] / scripts / qapi.py

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 56af2329bb4a4db772a3930e9c6a33d7a1e75211..6e05469e6d1be7942cf6637728444dcb85b0ee47 100644 (file)
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -200,4 +200,7 @@ def basename(filename):
     return filename.split("/")[-1]
 
 def guardname(filename):
-    return filename.replace("/", "_").replace("-", "_").split(".")[0].upper()
+    guard = basename(filename).rsplit(".", 1)[0]
+    for substr in [".", " ", "-"]:
+        guard = guard.replace(substr, "_")
+    return guard.upper() + '_H'