This code should now build the x86_x64-softmmu part 2.

qemu/qobject/qbool.c

@@ -18,8 +18,8 @@
 static void qbool_destroy_obj(QObject *obj);
 
 static const QType qbool_type = {
-    .code = QTYPE_QBOOL,
-    .destroy = qbool_destroy_obj,
+    QTYPE_QBOOL,
+    qbool_destroy_obj,
 };
 
 /**

qemu/qobject/qdict.c

@@ -22,8 +22,8 @@
 static void qdict_destroy_obj(QObject *obj);
 
 static const QType qdict_type = {
-    .code = QTYPE_QDICT,
-    .destroy = qdict_destroy_obj,
+    QTYPE_QDICT,
+    qdict_destroy_obj,
 };
 
 /**
@@ -213,7 +213,7 @@ double qdict_get_double(const QDict *qdict, const char *key)
     case QTYPE_QFLOAT:
         return qfloat_get_double(qobject_to_qfloat(obj));
     case QTYPE_QINT:
-        return qint_get_int(qobject_to_qint(obj));
+        return (double)qint_get_int(qobject_to_qint(obj));
     default:
         abort();
     }
@@ -662,7 +662,7 @@ void qdict_array_split(QDict *src, QList **dst)
             qdict_del(src, indexstr);
         }
 
-        qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
+        qlist_append_obj(*dst, (subqobj!=NULL) ? subqobj : QOBJECT(subqdict));
     }
 }
 

qemu/qobject/qfloat.c

@@ -18,8 +18,8 @@
 static void qfloat_destroy_obj(QObject *obj);
 
 static const QType qfloat_type = {
-    .code = QTYPE_QFLOAT,
-    .destroy = qfloat_destroy_obj,
+    QTYPE_QFLOAT,
+    qfloat_destroy_obj,
 };
 
 /**

qemu/qobject/qint.c

@@ -17,8 +17,8 @@
 static void qint_destroy_obj(QObject *obj);
 
 static const QType qint_type = {
-    .code = QTYPE_QINT,
-    .destroy = qint_destroy_obj,
+    QTYPE_QINT,
+    qint_destroy_obj,
 };
 
 /**

qemu/qobject/qlist.c

@@ -18,8 +18,8 @@
 static void qlist_destroy_obj(QObject *obj);
 
 static const QType qlist_type = {
-    .code = QTYPE_QLIST,
-    .destroy = qlist_destroy_obj,
+    QTYPE_QLIST,
+    qlist_destroy_obj,
 };
  
 /**

qemu/qobject/qstring.c

@@ -17,8 +17,8 @@
 static void qstring_destroy_obj(QObject *obj);
 
 static const QType qstring_type = {
-    .code = QTYPE_QSTRING,
-    .destroy = qstring_destroy_obj,
+    QTYPE_QSTRING,
+    qstring_destroy_obj,
 };
 
 /**