[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/10] qobject: Clean up around qtype_code
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 03/10] qobject: Clean up around qtype_code |
Date: |
Fri, 8 May 2015 09:34:04 -0400 |
From: Markus Armbruster <address@hidden>
QTYPE_NONE is a sentinel value. No QObject has this type code.
Document it properly.
Fix dump_qobject() to abort() on QTYPE_NONE, just like for any other
invalid type code.
Fix to_json() to abort() on all invalid type codes, not just
QTYPE_MAX.
Clean up Property member qtype's type: it's a qtype_code.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
block/qapi.c | 3 ---
include/hw/qdev-core.h | 2 +-
include/qapi/qmp/qobject.h | 2 +-
qobject/qjson.c | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index 063dd1b..18d2b95 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -523,9 +523,6 @@ static void dump_qobject(fprintf_function func_fprintf,
void *f,
QDECREF(value);
break;
}
- case QTYPE_NONE:
- break;
- case QTYPE_MAX:
default:
abort();
}
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 4e673f9..9a0ee30 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -226,7 +226,7 @@ struct Property {
PropertyInfo *info;
int offset;
uint8_t bitnr;
- uint8_t qtype;
+ qtype_code qtype;
int64_t defval;
int arrayoffset;
PropertyInfo *arrayinfo;
diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h
index d0bbc7c..0991296 100644
--- a/include/qapi/qmp/qobject.h
+++ b/include/qapi/qmp/qobject.h
@@ -36,7 +36,7 @@
#include <assert.h>
typedef enum {
- QTYPE_NONE,
+ QTYPE_NONE, /* sentinel value, no QObject has this type code */
QTYPE_QINT,
QTYPE_QSTRING,
QTYPE_QDICT,
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 12c576d..f2857c1 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -260,9 +260,8 @@ static void to_json(const QObject *obj, QString *str, int
pretty, int indent)
}
case QTYPE_QERROR:
/* XXX: should QError be emitted? */
- case QTYPE_NONE:
break;
- case QTYPE_MAX:
+ default:
abort();
}
}
--
1.9.3
- [Qemu-devel] [PULL 00/10] QMP queue, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 03/10] qobject: Clean up around qtype_code,
Luiz Capitulino <=
- [Qemu-devel] [PULL 02/10] QJSON: Use OBJECT_CHECK, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 05/10] json-parser: Accept 'null' in QMP, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 04/10] qobject: Add a special null QObject, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 07/10] scripts: qmp-shell: refactor helpers, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 06/10] MAINTAINERS: New maintainer for QMP and QAPI, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 01/10] monitor: add memory search commands s, sp, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 08/10] scripts: qmp-shell: Expand support for QMP expressions, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 09/10] scripts: qmp-shell: add transaction subshell, Luiz Capitulino, 2015/05/08
- [Qemu-devel] [PULL 10/10] scripts: qmp-shell: Add verbose flag, Luiz Capitulino, 2015/05/08
- Re: [Qemu-devel] [PULL 00/10] QMP queue, Peter Maydell, 2015/05/11