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/qstring.h | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 include/qapi/qmp/qstring.h (limited to 'include/qapi/qmp/qstring.h') diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h deleted file mode 100644 index 318d815d6a..0000000000 --- a/include/qapi/qmp/qstring.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * QString Module - * - * Copyright (C) 2009 Red Hat Inc. - * - * Authors: - * Luiz Capitulino - * - * 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 QSTRING_H -#define QSTRING_H - -#include "qapi/qmp/qobject.h" - -struct QString { - struct QObjectBase_ base; - const char *string; -}; - -void qstring_unref(QString *q); - -G_DEFINE_AUTOPTR_CLEANUP_FUNC(QString, qstring_unref) - -QString *qstring_new(void); -QString *qstring_from_str(const char *str); -QString *qstring_from_substr(const char *str, size_t start, size_t end); -QString *qstring_from_gstring(GString *gstr); -const char *qstring_get_str(const QString *qstring); - -#endif /* QSTRING_H */ -- cgit 1.4.1