From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2D19C3DA6E for ; Mon, 8 Jan 2024 18:27:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMuIN-0002tF-SB; Mon, 08 Jan 2024 13:24:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMuIL-0002sz-9V for qemu-devel@nongnu.org; Mon, 08 Jan 2024 13:24:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMuII-0002gs-IY for qemu-devel@nongnu.org; Mon, 08 Jan 2024 13:24:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704738252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XWckCtCJf6O8T7CcE0XSnUICYhxc7Z6euxnyRpaukmY=; b=C13F1OPSvLhirOOu2mQvKHaLXKPTil8fFS+p1epZyHuCgUpTf3EQWImbrhp/YcbzDat2s9 G9Phwed8UKsYGORcGQOGJZ9tQPVmvBiqsnWiYb75YEUQeX3TNxlU1lCNJwni1ZtdEz1sTR gR5eQN33nFbjKSDPwNaqYAhGHLnQTRA= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-Qw2eW9ehNDqqYJfbAE5W0Q-1; Mon, 08 Jan 2024 13:24:09 -0500 X-MC-Unique: Qw2eW9ehNDqqYJfbAE5W0Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D8A1229AB3E1; Mon, 8 Jan 2024 18:24:08 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE4F53C2E; Mon, 8 Jan 2024 18:24:07 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/ Date: Mon, 8 Jan 2024 18:23:37 +0000 Message-ID: <20240108182405.1135436-2-berrange@redhat.com> In-Reply-To: <20240108182405.1135436-1-berrange@redhat.com> References: <20240108182405.1135436-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 that inconsistency by creating include/qobject/. The only outlier is include/qapi/qmp/dispatch.h which gets renamed to include/qapi/qmp-registry.h. To allow the code to continue to build, symlinks are temporarily added in $QEMU/qapi/qmp/ to point to the new location. They will be removed in a later commit. Signed-off-by: Daniel P. Berrangé --- MAINTAINERS | 5 +---- include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0 include/{qapi/qmp => qobject}/json-parser.h | 0 include/{qapi/qmp => qobject}/json-writer.h | 0 include/{qapi/qmp => qobject}/qbool.h | 0 include/{qapi/qmp => qobject}/qdict.h | 0 include/{qapi/qmp => qobject}/qerror.h | 0 include/{qapi/qmp => qobject}/qjson.h | 0 include/{qapi/qmp => qobject}/qlist.h | 0 include/{qapi/qmp => qobject}/qlit.h | 0 include/{qapi/qmp => qobject}/qnull.h | 0 include/{qapi/qmp => qobject}/qnum.h | 0 include/{qapi/qmp => qobject}/qobject.h | 0 include/{qapi/qmp => qobject}/qstring.h | 0 qapi/qmp/dispatch.h | 1 + qapi/qmp/json-parser.h | 1 + qapi/qmp/json-writer.h | 1 + qapi/qmp/qbool.h | 1 + qapi/qmp/qdict.h | 1 + qapi/qmp/qerror.h | 1 + qapi/qmp/qjson.h | 1 + qapi/qmp/qlist.h | 1 + qapi/qmp/qlit.h | 1 + qapi/qmp/qnull.h | 1 + qapi/qmp/qnum.h | 1 + qapi/qmp/qobject.h | 1 + qapi/qmp/qstring.h | 1 + 27 files changed, 14 insertions(+), 4 deletions(-) rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (100%) rename include/{qapi/qmp => qobject}/json-parser.h (100%) rename include/{qapi/qmp => qobject}/json-writer.h (100%) rename include/{qapi/qmp => qobject}/qbool.h (100%) rename include/{qapi/qmp => qobject}/qdict.h (100%) rename include/{qapi/qmp => qobject}/qerror.h (100%) rename include/{qapi/qmp => qobject}/qjson.h (100%) rename include/{qapi/qmp => qobject}/qlist.h (100%) rename include/{qapi/qmp => qobject}/qlit.h (100%) rename include/{qapi/qmp => qobject}/qnull.h (100%) rename include/{qapi/qmp => qobject}/qnum.h (100%) rename include/{qapi/qmp => qobject}/qobject.h (100%) rename include/{qapi/qmp => qobject}/qstring.h (100%) create mode 120000 qapi/qmp/dispatch.h create mode 120000 qapi/qmp/json-parser.h create mode 120000 qapi/qmp/json-writer.h create mode 120000 qapi/qmp/qbool.h create mode 120000 qapi/qmp/qdict.h create mode 120000 qapi/qmp/qerror.h create mode 120000 qapi/qmp/qjson.h create mode 120000 qapi/qmp/qlist.h create mode 120000 qapi/qmp/qlit.h create mode 120000 qapi/qmp/qnull.h create mode 120000 qapi/qmp/qnum.h create mode 120000 qapi/qmp/qobject.h create mode 120000 qapi/qmp/qstring.h diff --git a/MAINTAINERS b/MAINTAINERS index 395f26ba86..d72e040a9a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3154,8 +3154,6 @@ S: Supported F: qapi/ X: qapi/*.json F: include/qapi/ -X: include/qapi/qmp/ -F: include/qapi/qmp/dispatch.h F: tests/qapi-schema/ F: tests/unit/test-*-visitor.c F: tests/unit/test-qapi-*.c @@ -3178,8 +3176,7 @@ QObject M: Markus Armbruster S: Supported F: qobject/ -F: include/qapi/qmp/ -X: include/qapi/qmp/dispatch.h +F: include/qobject/ F: scripts/coccinelle/qobject.cocci F: tests/unit/check-qdict.c F: tests/unit/check-qjson.c diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp-registry.h similarity index 100% rename from include/qapi/qmp/dispatch.h rename to include/qapi/qmp-registry.h diff --git a/include/qapi/qmp/json-parser.h b/include/qobject/json-parser.h similarity index 100% rename from include/qapi/qmp/json-parser.h rename to include/qobject/json-parser.h diff --git a/include/qapi/qmp/json-writer.h b/include/qobject/json-writer.h similarity index 100% rename from include/qapi/qmp/json-writer.h rename to include/qobject/json-writer.h diff --git a/include/qapi/qmp/qbool.h b/include/qobject/qbool.h similarity index 100% rename from include/qapi/qmp/qbool.h rename to include/qobject/qbool.h diff --git a/include/qapi/qmp/qdict.h b/include/qobject/qdict.h similarity index 100% rename from include/qapi/qmp/qdict.h rename to include/qobject/qdict.h diff --git a/include/qapi/qmp/qerror.h b/include/qobject/qerror.h similarity index 100% rename from include/qapi/qmp/qerror.h rename to include/qobject/qerror.h diff --git a/include/qapi/qmp/qjson.h b/include/qobject/qjson.h similarity index 100% rename from include/qapi/qmp/qjson.h rename to include/qobject/qjson.h diff --git a/include/qapi/qmp/qlist.h b/include/qobject/qlist.h similarity index 100% rename from include/qapi/qmp/qlist.h rename to include/qobject/qlist.h diff --git a/include/qapi/qmp/qlit.h b/include/qobject/qlit.h similarity index 100% rename from include/qapi/qmp/qlit.h rename to include/qobject/qlit.h diff --git a/include/qapi/qmp/qnull.h b/include/qobject/qnull.h similarity index 100% rename from include/qapi/qmp/qnull.h rename to include/qobject/qnull.h diff --git a/include/qapi/qmp/qnum.h b/include/qobject/qnum.h similarity index 100% rename from include/qapi/qmp/qnum.h rename to include/qobject/qnum.h diff --git a/include/qapi/qmp/qobject.h b/include/qobject/qobject.h similarity index 100% rename from include/qapi/qmp/qobject.h rename to include/qobject/qobject.h diff --git a/include/qapi/qmp/qstring.h b/include/qobject/qstring.h similarity index 100% rename from include/qapi/qmp/qstring.h rename to include/qobject/qstring.h diff --git a/qapi/qmp/dispatch.h b/qapi/qmp/dispatch.h new file mode 120000 index 0000000000..ffedc3971d --- /dev/null +++ b/qapi/qmp/dispatch.h @@ -0,0 +1 @@ +../../include/qapi/qmp-registry.h \ No newline at end of file diff --git a/qapi/qmp/json-parser.h b/qapi/qmp/json-parser.h new file mode 120000 index 0000000000..059cb73fa8 --- /dev/null +++ b/qapi/qmp/json-parser.h @@ -0,0 +1 @@ +../../include/qobject/json-parser.h \ No newline at end of file diff --git a/qapi/qmp/json-writer.h b/qapi/qmp/json-writer.h new file mode 120000 index 0000000000..3e952f4c97 --- /dev/null +++ b/qapi/qmp/json-writer.h @@ -0,0 +1 @@ +../../include/qobject/json-writer.h \ No newline at end of file diff --git a/qapi/qmp/qbool.h b/qapi/qmp/qbool.h new file mode 120000 index 0000000000..443c881cf8 --- /dev/null +++ b/qapi/qmp/qbool.h @@ -0,0 +1 @@ +../../include/qobject/qbool.h \ No newline at end of file diff --git a/qapi/qmp/qdict.h b/qapi/qmp/qdict.h new file mode 120000 index 0000000000..8183614eae --- /dev/null +++ b/qapi/qmp/qdict.h @@ -0,0 +1 @@ +../../include/qobject/qdict.h \ No newline at end of file diff --git a/qapi/qmp/qerror.h b/qapi/qmp/qerror.h new file mode 120000 index 0000000000..cf210737a3 --- /dev/null +++ b/qapi/qmp/qerror.h @@ -0,0 +1 @@ +../../include/qobject/qerror.h \ No newline at end of file diff --git a/qapi/qmp/qjson.h b/qapi/qmp/qjson.h new file mode 120000 index 0000000000..85b48c5bfd --- /dev/null +++ b/qapi/qmp/qjson.h @@ -0,0 +1 @@ +../../include/qobject/qjson.h \ No newline at end of file diff --git a/qapi/qmp/qlist.h b/qapi/qmp/qlist.h new file mode 120000 index 0000000000..d40db0a12b --- /dev/null +++ b/qapi/qmp/qlist.h @@ -0,0 +1 @@ +../../include/qobject/qlist.h \ No newline at end of file diff --git a/qapi/qmp/qlit.h b/qapi/qmp/qlit.h new file mode 120000 index 0000000000..5dd5ac8ccb --- /dev/null +++ b/qapi/qmp/qlit.h @@ -0,0 +1 @@ +../../include/qobject/qlit.h \ No newline at end of file diff --git a/qapi/qmp/qnull.h b/qapi/qmp/qnull.h new file mode 120000 index 0000000000..944769d44b --- /dev/null +++ b/qapi/qmp/qnull.h @@ -0,0 +1 @@ +../../include/qobject/qnull.h \ No newline at end of file diff --git a/qapi/qmp/qnum.h b/qapi/qmp/qnum.h new file mode 120000 index 0000000000..8038e2f4d6 --- /dev/null +++ b/qapi/qmp/qnum.h @@ -0,0 +1 @@ +../../include/qobject/qnum.h \ No newline at end of file diff --git a/qapi/qmp/qobject.h b/qapi/qmp/qobject.h new file mode 120000 index 0000000000..89d9118cfd --- /dev/null +++ b/qapi/qmp/qobject.h @@ -0,0 +1 @@ +../../include/qobject/qobject.h \ No newline at end of file diff --git a/qapi/qmp/qstring.h b/qapi/qmp/qstring.h new file mode 120000 index 0000000000..24f48de18a --- /dev/null +++ b/qapi/qmp/qstring.h @@ -0,0 +1 @@ +../../include/qobject/qstring.h \ No newline at end of file -- 2.43.0