From 407bc4bf9027f7ac4333e47cd900d773b99a23e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 18 Nov 2024 16:12:34 +0100 Subject: qapi: Move include/qapi/qmp/ to include/qobject/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The general expectation is that header files should follow the same file/path naming scheme as the corresponding source file. There are various historical exceptions to this practice in QEMU, with one of the most notable being the include/qapi/qmp/ directory. Most of the headers there correspond to source files in qobject/. This patch corrects most of that inconsistency by creating include/qobject/ and moving the headers for qobject/ there. This also fixes MAINTAINERS for include/qapi/qmp/dispatch.h: scripts/get_maintainer.pl now reports "QAPI" instead of "No maintainers found". Signed-off-by: Daniel P. Berrangé Reviewed-by: Zhao Liu Acked-by: Halil Pasic #s390x Signed-off-by: Markus Armbruster Message-ID: <20241118151235.2665921-2-armbru@redhat.com> [Rebased] --- include/qobject/qjson.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 include/qobject/qjson.h (limited to 'include/qobject/qjson.h') diff --git a/include/qobject/qjson.h b/include/qobject/qjson.h new file mode 100644 index 0000000..7bd8d2d --- /dev/null +++ b/include/qobject/qjson.h @@ -0,0 +1,31 @@ +/* + * QObject JSON integration + * + * Copyright IBM, Corp. 2009 + * + * Authors: + * Anthony Liguori + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#ifndef QJSON_H +#define QJSON_H + +QObject *qobject_from_json(const char *string, Error **errp); + +QObject *qobject_from_vjsonf_nofail(const char *string, va_list ap) + G_GNUC_PRINTF(1, 0); +QObject *qobject_from_jsonf_nofail(const char *string, ...) + G_GNUC_PRINTF(1, 2); +QDict *qdict_from_vjsonf_nofail(const char *string, va_list ap) + G_GNUC_PRINTF(1, 0); +QDict *qdict_from_jsonf_nofail(const char *string, ...) + G_GNUC_PRINTF(1, 2); + +GString *qobject_to_json(const QObject *obj); +GString *qobject_to_json_pretty(const QObject *obj, bool pretty); + +#endif /* QJSON_H */ -- cgit v1.1