[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qapi/string-putput-visitor: fix bugs
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH] qapi/string-putput-visitor: fix bugs |
Date: |
Wed, 18 Jun 2014 18:37:18 +0300 |
in human mode, we are creating the string:
16-31 (16-31)
instead of
16-17 (10-1f)
because we forgot to pass 'true' as the human parameter on one of the
two calls to format_string.
Also, this is a worsening of quality; previously we would produce
16 (0x10)
to make it obvious which number was hex.
Fix these issues.
Reported-by: Eric Blake <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
qapi/string-output-visitor.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 8735b00..e9aca3b 100644
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -98,7 +98,7 @@ static void format_string(StringOutputVisitor *sov, Range *r,
bool next,
{
if (r->end - r->begin > 1) {
if (human) {
- g_string_append_printf(sov->string, "%" PRIx64 "-%" PRIx64,
+ g_string_append_printf(sov->string, "0x%" PRIx64 "-%" PRIx64,
r->begin, r->end - 1);
} else {
@@ -107,7 +107,7 @@ static void format_string(StringOutputVisitor *sov, Range
*r, bool next,
}
} else {
if (human) {
- g_string_append_printf(sov->string, "%" PRIx64, r->begin);
+ g_string_append_printf(sov->string, "0x%" PRIx64, r->begin);
} else {
g_string_append_printf(sov->string, "%" PRId64, r->begin);
}
@@ -186,7 +186,7 @@ static void print_type_int(Visitor *v, int64_t *obj, const
char *name,
g_string_append(sov->string, " (");
while (l) {
Range *r = l->data;
- format_string(sov, r, l->next != NULL, false);
+ format_string(sov, r, l->next != NULL, true);
l = l->next;
}
g_string_append(sov->string, ")");
--
MST
- [Qemu-devel] [PATCH] qapi/string-putput-visitor: fix bugs,
Michael S. Tsirkin <=