aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-05-04 18:49:17 +0200
committerAmit Shah <amit.shah@redhat.com>2016-05-23 14:16:09 +0530
commit17b74b98676aee5bc470b173b1e528d2fce2cf18 (patch)
tree169cb6088b47644ab33817b2489b0227f7105207 /include
parent65603e2fc18b48e6e55a3dd693669413141694ec (diff)
migration: Move qjson.[ch] to migration/
Type QJSON lets you build JSON text. Its interface mirrors (a subset of) abstract JSON syntax. QAPI output visitors also produce JSON text. They assert their preconditions and invariants, and therefore abort on incorrect use. Contrastingly, QJSON does *not* detect incorrect use. It happily produces invalid JSON then. This is what migration wants. QJSON was designed for migration, and migration is its only user. Move it to migration/ for proper coverage by MAINTAINERS, and to deter accidental use outside migration. [Pointed out by Eric: QJSON was added in commits 0457d07..b174257 -- Amit] Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <1462380558-2030-2-git-send-email-armbru@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/migration/qjson.h (renamed from include/qjson.h)0
-rw-r--r--include/migration/vmstate.h2
2 files changed, 1 insertions, 1 deletions
diff --git a/include/qjson.h b/include/migration/qjson.h
index 7c54fdf0ac..7c54fdf0ac 100644
--- a/include/qjson.h
+++ b/include/migration/qjson.h
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 84ee355ceb..30ecc441de 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -29,7 +29,7 @@
#ifndef CONFIG_USER_ONLY
#include <migration/qemu-file.h>
#endif
-#include <qjson.h>
+#include "migration/qjson.h"
typedef void SaveStateHandler(QEMUFile *f, void *opaque);
typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);