diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2024-11-18 16:12:34 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2025-02-10 15:33:16 +0100 |
| commit | 407bc4bf9027f7ac4333e47cd900d773b99a23e3 (patch) | |
| tree | 6f617801cce2d4715d586e15a2523488bdd68711 /include/qapi/qmp/qjson.h | |
| parent | 04d3d0e9f54d4c42759f3810aa135ce314d98dc4 (diff) | |
| download | focaccia-qemu-407bc4bf9027f7ac4333e47cd900d773b99a23e3.tar.gz focaccia-qemu-407bc4bf9027f7ac4333e47cd900d773b99a23e3.zip | |
qapi: Move include/qapi/qmp/ to include/qobject/
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é <berrange@redhat.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Acked-by: Halil Pasic <pasic@linux.ibm.com> #s390x Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-ID: <20241118151235.2665921-2-armbru@redhat.com> [Rebased]
Diffstat (limited to 'include/qapi/qmp/qjson.h')
| -rw-r--r-- | include/qapi/qmp/qjson.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h deleted file mode 100644 index 7bd8d2de1b..0000000000 --- a/include/qapi/qmp/qjson.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * QObject JSON integration - * - * Copyright IBM, Corp. 2009 - * - * Authors: - * Anthony Liguori <aliguori@us.ibm.com> - * - * 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 */ |