From c51622c4ce33deccd587eb04b4e7a532446ab394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 7 Mar 2018 17:14:53 -0500
Subject: [PATCH] qlit: rename compare_litqobj_to_qobj() to
 qlit_equal_qobject()

compare_litqobj_to_qobj() lacks a qlit_ prefix. Moreover, "compare"
suggests -1, 0, +1 for less than, equal and greater than. The
function actually returns non-zero for equal, zero for unequal.
Rename to qlit_equal_qobject().

Its return type will be cleaned up in the next patch.

Backports commit 60cc2eb7afd40b9cbaa35a5e0b54f365ac6e49f1 from qemu
---
 qemu/aarch64.h               | 1 +
 qemu/aarch64eb.h             | 1 +
 qemu/arm.h                   | 1 +
 qemu/armeb.h                 | 1 +
 qemu/header_gen.py           | 2 +-
 qemu/include/qapi/qmp/qlit.h | 2 +-
 qemu/m68k.h                  | 1 +
 qemu/mips.h                  | 1 +
 qemu/mips64.h                | 1 +
 qemu/mips64el.h              | 1 +
 qemu/mipsel.h                | 1 +
 qemu/powerpc.h               | 1 +
 qemu/qobject/qlit.c          | 6 +++---
 qemu/sparc.h                 | 1 +
 qemu/sparc64.h               | 1 +
 qemu/x86_64.h                | 1 +
 16 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index bc3daabc..7aec4caa 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_aarch64
 #define qlist_size_iter qlist_size_iter_aarch64
 #define qlist_type qlist_type_aarch64
+#define qlit_equal_qobject qlit_equal_qobject_aarch64
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_aarch64
 #define qobject_input_end_list qobject_input_end_list_aarch64
 #define qobject_input_end_struct qobject_input_end_struct_aarch64
diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h
index 1708493a..50577711 100644
--- a/qemu/aarch64eb.h
+++ b/qemu/aarch64eb.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_aarch64eb
 #define qlist_size_iter qlist_size_iter_aarch64eb
 #define qlist_type qlist_type_aarch64eb
+#define qlit_equal_qobject qlit_equal_qobject_aarch64eb
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_aarch64eb
 #define qobject_input_end_list qobject_input_end_list_aarch64eb
 #define qobject_input_end_struct qobject_input_end_struct_aarch64eb
diff --git a/qemu/arm.h b/qemu/arm.h
index a0f1a3be..155decda 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_arm
 #define qlist_size_iter qlist_size_iter_arm
 #define qlist_type qlist_type_arm
+#define qlit_equal_qobject qlit_equal_qobject_arm
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_arm
 #define qobject_input_end_list qobject_input_end_list_arm
 #define qobject_input_end_struct qobject_input_end_struct_arm
diff --git a/qemu/armeb.h b/qemu/armeb.h
index 28709639..2dd3eaed 100644
--- a/qemu/armeb.h
+++ b/qemu/armeb.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_armeb
 #define qlist_size_iter qlist_size_iter_armeb
 #define qlist_type qlist_type_armeb
+#define qlit_equal_qobject qlit_equal_qobject_armeb
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_armeb
 #define qobject_input_end_list qobject_input_end_list_armeb
 #define qobject_input_end_struct qobject_input_end_struct_armeb
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 19615ae3..a768cc74 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -230,7 +230,6 @@ symbols = (
     'commonNaNToFloat32',
     'commonNaNToFloat64',
     'commonNaNToFloatx80',
-    'compare_litqobj_to_qobj',
     'compute_abs_deadline',
     'cond_name',
     'configure_accelerator',
@@ -2819,6 +2818,7 @@ symbols = (
     'qlist_size',
     'qlist_size_iter',
     'qlist_type',
+    'qlit_equal_qobject',
     'qobject_input_end_implicit_struct',
     'qobject_input_end_list',
     'qobject_input_end_struct',
diff --git a/qemu/include/qapi/qmp/qlit.h b/qemu/include/qapi/qmp/qlit.h
index f1d6eed3..5a180477 100644
--- a/qemu/include/qapi/qmp/qlit.h
+++ b/qemu/include/qapi/qmp/qlit.h
@@ -44,6 +44,6 @@ struct QLitDictEntry {
 #define QLIT_QLIST(val) \
     { .type = QTYPE_QLIST, .value.qlist = (val) }
 
-int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs);
+int qlit_equal_qobject(QLitObject *lhs, QObject *rhs);
 
 #endif /* QLIT_H */
diff --git a/qemu/m68k.h b/qemu/m68k.h
index a44e5967..37be2e2d 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_m68k
 #define qlist_size_iter qlist_size_iter_m68k
 #define qlist_type qlist_type_m68k
+#define qlit_equal_qobject qlit_equal_qobject_m68k
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_m68k
 #define qobject_input_end_list qobject_input_end_list_m68k
 #define qobject_input_end_struct qobject_input_end_struct_m68k
diff --git a/qemu/mips.h b/qemu/mips.h
index b8f2a70a..67120c43 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_mips
 #define qlist_size_iter qlist_size_iter_mips
 #define qlist_type qlist_type_mips
+#define qlit_equal_qobject qlit_equal_qobject_mips
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mips
 #define qobject_input_end_list qobject_input_end_list_mips
 #define qobject_input_end_struct qobject_input_end_struct_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index e727e4ef..ffbd96ca 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_mips64
 #define qlist_size_iter qlist_size_iter_mips64
 #define qlist_type qlist_type_mips64
+#define qlit_equal_qobject qlit_equal_qobject_mips64
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mips64
 #define qobject_input_end_list qobject_input_end_list_mips64
 #define qobject_input_end_struct qobject_input_end_struct_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index da3c5e7b..f2b81489 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_mips64el
 #define qlist_size_iter qlist_size_iter_mips64el
 #define qlist_type qlist_type_mips64el
+#define qlit_equal_qobject qlit_equal_qobject_mips64el
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mips64el
 #define qobject_input_end_list qobject_input_end_list_mips64el
 #define qobject_input_end_struct qobject_input_end_struct_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index f4529b54..e149e959 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_mipsel
 #define qlist_size_iter qlist_size_iter_mipsel
 #define qlist_type qlist_type_mipsel
+#define qlit_equal_qobject qlit_equal_qobject_mipsel
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_mipsel
 #define qobject_input_end_list qobject_input_end_list_mipsel
 #define qobject_input_end_struct qobject_input_end_struct_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index 99d39bf8..2273f608 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_powerpc
 #define qlist_size_iter qlist_size_iter_powerpc
 #define qlist_type qlist_type_powerpc
+#define qlit_equal_qobject qlit_equal_qobject_powerpc
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_powerpc
 #define qobject_input_end_list qobject_input_end_list_powerpc
 #define qobject_input_end_struct qobject_input_end_struct_powerpc
diff --git a/qemu/qobject/qlit.c b/qemu/qobject/qlit.c
index 9128c383..89e7ed2c 100644
--- a/qemu/qobject/qlit.c
+++ b/qemu/qobject/qlit.c
@@ -42,10 +42,10 @@ static void compare_helper(QObject *obj, void *opaque)
     }
 
     helper->result =
-        compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);
+        qlit_equal_qobject(&helper->objs[helper->index++], obj);
 }
 
-int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs)
+int qlit_equal_qobject(QLitObject *lhs, QObject *rhs)
 {
     int64_t val;
 
@@ -67,7 +67,7 @@ int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs)
             QObject *obj = qdict_get(qobject_to_qdict(rhs),
                                      lhs->value.qdict[i].key);
 
-            if (!compare_litqobj_to_qobj(&lhs->value.qdict[i].value, obj)) {
+            if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) {
                 return 0;
             }
         }
diff --git a/qemu/sparc.h b/qemu/sparc.h
index 8f619ccd..abcf25c7 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_sparc
 #define qlist_size_iter qlist_size_iter_sparc
 #define qlist_type qlist_type_sparc
+#define qlit_equal_qobject qlit_equal_qobject_sparc
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_sparc
 #define qobject_input_end_list qobject_input_end_list_sparc
 #define qobject_input_end_struct qobject_input_end_struct_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index ecf31053..61459474 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_sparc64
 #define qlist_size_iter qlist_size_iter_sparc64
 #define qlist_type qlist_type_sparc64
+#define qlit_equal_qobject qlit_equal_qobject_sparc64
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_sparc64
 #define qobject_input_end_list qobject_input_end_list_sparc64
 #define qobject_input_end_struct qobject_input_end_struct_sparc64
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index aa16eea6..0b26c437 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -2812,6 +2812,7 @@
 #define qlist_size qlist_size_x86_64
 #define qlist_size_iter qlist_size_iter_x86_64
 #define qlist_type qlist_type_x86_64
+#define qlit_equal_qobject qlit_equal_qobject_x86_64
 #define qobject_input_end_implicit_struct qobject_input_end_implicit_struct_x86_64
 #define qobject_input_end_list qobject_input_end_list_x86_64
 #define qobject_input_end_struct qobject_input_end_struct_x86_64