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/qlit.h | 55 ------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 include/qapi/qmp/qlit.h (limited to 'include/qapi/qmp/qlit.h') diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h deleted file mode 100644 index c0676d5daf..0000000000 --- a/include/qapi/qmp/qlit.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright IBM, Corp. 2009 - * Copyright (c) 2013, 2015, 2017 Red Hat Inc. - * - * Authors: - * Anthony Liguori - * Markus Armbruster - * Marc-André Lureau - * - * 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 QLIT_H -#define QLIT_H - -#include "qobject.h" - -typedef struct QLitDictEntry QLitDictEntry; -typedef struct QLitObject QLitObject; - -struct QLitObject { - QType type; - union { - bool qbool; - int64_t qnum; - const char *qstr; - QLitDictEntry *qdict; - QLitObject *qlist; - } value; -}; - -struct QLitDictEntry { - const char *key; - QLitObject value; -}; - -#define QLIT_QNULL \ - { .type = QTYPE_QNULL } -#define QLIT_QBOOL(val) \ - { .type = QTYPE_QBOOL, .value.qbool = (val) } -#define QLIT_QNUM(val) \ - { .type = QTYPE_QNUM, .value.qnum = (val) } -#define QLIT_QSTR(val) \ - { .type = QTYPE_QSTRING, .value.qstr = (val) } -#define QLIT_QDICT(val) \ - { .type = QTYPE_QDICT, .value.qdict = (val) } -#define QLIT_QLIST(val) \ - { .type = QTYPE_QLIST, .value.qlist = (val) } - -bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs); - -QObject *qobject_from_qlit(const QLitObject *qlit); - -#endif /* QLIT_H */ -- cgit 1.4.1