From 407bc4bf9027f7ac4333e47cd900d773b99a23e3 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrangé" 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/qapi/qmp/json-writer.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 include/qapi/qmp/json-writer.h (limited to 'include/qapi/qmp/json-writer.h') diff --git a/include/qapi/qmp/json-writer.h b/include/qapi/qmp/json-writer.h deleted file mode 100644 index b70ba64077..0000000000 --- a/include/qapi/qmp/json-writer.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * JSON Writer - * - * Copyright (c) 2020 Red Hat Inc. - * - * Authors: - * Markus Armbruster - * - * 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 JSON_WRITER_H -#define JSON_WRITER_H - -JSONWriter *json_writer_new(bool pretty); -const char *json_writer_get(JSONWriter *); -GString *json_writer_get_and_free(JSONWriter *); -void json_writer_free(JSONWriter *); - -G_DEFINE_AUTOPTR_CLEANUP_FUNC(JSONWriter, json_writer_free) - -void json_writer_start_object(JSONWriter *, const char *name); -void json_writer_end_object(JSONWriter *); -void json_writer_start_array(JSONWriter *, const char *name); -void json_writer_end_array(JSONWriter *); -void json_writer_bool(JSONWriter *, const char *name, bool val); -void json_writer_null(JSONWriter *, const char *name); -void json_writer_int64(JSONWriter *, const char *name, int64_t val); -void json_writer_uint64(JSONWriter *, const char *name, uint64_t val); -void json_writer_double(JSONWriter *, const char *name, double val); -void json_writer_str(JSONWriter *, const char *name, const char *str); - -#endif -- cgit 1.4.1