This code should now build the x86_x64-softmmu part 2.
This commit is contained in:
@ -114,7 +114,7 @@ void visit_type_uint8(Visitor *v, uint8_t *obj, const char *name, Error **errp)
|
||||
"uint8_t");
|
||||
return;
|
||||
}
|
||||
*obj = value;
|
||||
*obj = (uint8_t)value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -132,7 +132,7 @@ void visit_type_uint16(Visitor *v, uint16_t *obj, const char *name, Error **errp
|
||||
"uint16_t");
|
||||
return;
|
||||
}
|
||||
*obj = value;
|
||||
*obj = (uint16_t)value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -150,7 +150,7 @@ void visit_type_uint32(Visitor *v, uint32_t *obj, const char *name, Error **errp
|
||||
"uint32_t");
|
||||
return;
|
||||
}
|
||||
*obj = value;
|
||||
*obj = (uint32_t)value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -181,7 +181,7 @@ void visit_type_int8(Visitor *v, int8_t *obj, const char *name, Error **errp)
|
||||
"int8_t");
|
||||
return;
|
||||
}
|
||||
*obj = value;
|
||||
*obj = (int8_t)value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -199,7 +199,7 @@ void visit_type_int16(Visitor *v, int16_t *obj, const char *name, Error **errp)
|
||||
"int16_t");
|
||||
return;
|
||||
}
|
||||
*obj = value;
|
||||
*obj = (int16_t)value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -217,7 +217,7 @@ void visit_type_int32(Visitor *v, int32_t *obj, const char *name, Error **errp)
|
||||
"int32_t");
|
||||
return;
|
||||
}
|
||||
*obj = value;
|
||||
*obj = (int32_t)value;
|
||||
}
|
||||
}
|
||||
|
||||
@ -309,5 +309,5 @@ void input_type_enum(Visitor *v, int *obj, const char *strings[],
|
||||
}
|
||||
|
||||
g_free(enum_str);
|
||||
*obj = value;
|
||||
*obj = (int)value;
|
||||
}
|
||||
|
@ -104,7 +104,7 @@ static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp)
|
||||
if (top_ht) {
|
||||
if (g_hash_table_size(top_ht)) {
|
||||
const char *key;
|
||||
g_hash_table_find(top_ht, always_true, &key);
|
||||
g_hash_table_find(top_ht, always_true, (gpointer)&key);
|
||||
error_set(errp, QERR_QMP_EXTRA_MEMBER, key);
|
||||
}
|
||||
g_hash_table_unref(top_ht);
|
||||
@ -280,7 +280,7 @@ static void qmp_input_type_number(Visitor *v, double *obj, const char *name,
|
||||
}
|
||||
|
||||
if (qobject_type(qobj) == QTYPE_QINT) {
|
||||
*obj = qint_get_int(qobject_to_qint(qobj));
|
||||
*obj = (double)qint_get_int(qobject_to_qint(qobj));
|
||||
} else {
|
||||
*obj = qfloat_get_double(qobject_to_qfloat(qobj));
|
||||
}
|
||||
|
@ -16,6 +16,7 @@
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/range.h"
|
||||
#include <stdlib.h> // strtoll
|
||||
|
||||
|
||||
struct StringInputVisitor
|
||||
@ -148,7 +149,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (siv->cur < r->begin || siv->cur >= r->end) {
|
||||
if ((uint64_t)siv->cur < r->begin || (uint64_t)siv->cur >= r->end) {
|
||||
siv->cur_range = g_list_next(siv->cur_range);
|
||||
if (!siv->cur_range) {
|
||||
return NULL;
|
||||
|
Reference in New Issue
Block a user