From nobody Tue Feb 10 17:12:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660136810; cv=none; d=zohomail.com; s=zohoarc; b=ltWQdAtiCGPpJDspAL8Gcsl8TTn7o932Gd2GnGjiKIo6go/W4RC0H1JM4UoumzzVwcnlPH3aPran+AkZXvo5xG0tGW4sZBtcuNc8YIw1fgLfArRiIdXfylGdH4Ghqt5zuZ6fLctF1+/14Z2xCfZY1Y+Ryx2OMLxQmGUp4pkTIoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660136810; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eHKLpZT4lsKz8ntscq6c0yk6FA9n5rHUUvBl+QS1vU4=; b=SgGVpT/3yTo3k9uNkN6Os1t7YeUF6o1kFc1+e2utRNigETXd3WL02LNVOo7qsCyTeZDThQ6eOH4tGxaQNo0IeKp/aHNhcc/sK4+NfIe7LsTCcEg/c8yDJdP1CZRDAjbVj03PYruj0DDFXCkE0V3iI6CBN/P365Rhglwn9ETlBRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660136810019259.5956092647144; Wed, 10 Aug 2022 06:06:50 -0700 (PDT) Received: from localhost ([::1]:46432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLlQ8-0001hx-TH for importer@patchew.org; Wed, 10 Aug 2022 09:06:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLlAV-0001uN-2l for qemu-devel@nongnu.org; Wed, 10 Aug 2022 08:50:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLlAI-0007sV-H1 for qemu-devel@nongnu.org; Wed, 10 Aug 2022 08:50:33 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-507-wfwJi-tIP9iZcZnoh0q1rw-1; Wed, 10 Aug 2022 08:50:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC155858F11; Wed, 10 Aug 2022 12:50:03 +0000 (UTC) Received: from localhost (unknown [10.39.208.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CA899459C; Wed, 10 Aug 2022 12:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660135823; 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=eHKLpZT4lsKz8ntscq6c0yk6FA9n5rHUUvBl+QS1vU4=; b=TN91+knJdIueK8W1oZL9HuFTnzIJz1DUVeD1fIzpXlpiSSDYg1BCb0APH8lKUdpw6YU5WA B3Zg+eKZ7zPv4FOV9dVrJmsSvBGtknjzKrlBrwkTayTV/qZsW6yzRXBlcKN5HrhXWYbjv5 /XXOVFMxUe1buwO/b0+PQpGxJBx87/8= X-MC-Unique: wfwJi-tIP9iZcZnoh0q1rw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Maydell , Cleber Rosa , Michael Roth , John Snow , Xie Yongji , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v3 12/16] qemu-common: move scripts/qapi Date: Wed, 10 Aug 2022 16:48:53 +0400 Message-Id: <20220810124857.1360211-13-marcandre.lureau@redhat.com> In-Reply-To: <20220810124857.1360211-1-marcandre.lureau@redhat.com> References: <20220810124857.1360211-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660136811943100003 From: Marc-Andr=C3=A9 Lureau This is just moving qapi-gen.py and related subdir to qemu-common, to ease review and proceed step by step. The following patches will move related necessary code, tests etc. Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/conf.py | 2 +- meson.build | 19 ++----------------- MAINTAINERS | 4 ++-- subprojects/qemu-common/meson.build | 2 ++ subprojects/qemu-common/scripts/meson.build | 3 +++ .../qemu-common/scripts}/qapi-gen.py | 0 .../qemu-common/scripts}/qapi/.flake8 | 0 .../qemu-common/scripts}/qapi/.isort.cfg | 0 .../qemu-common/scripts}/qapi/__init__.py | 0 .../qemu-common/scripts}/qapi/commands.py | 0 .../qemu-common/scripts}/qapi/common.py | 0 .../qemu-common/scripts}/qapi/error.py | 0 .../qemu-common/scripts}/qapi/events.py | 0 .../qemu-common/scripts}/qapi/expr.py | 0 .../qemu-common/scripts}/qapi/gen.py | 0 .../qemu-common/scripts}/qapi/introspect.py | 0 .../qemu-common/scripts}/qapi/main.py | 0 .../qemu-common/scripts/qapi/meson.build | 16 ++++++++++++++++ .../qemu-common/scripts}/qapi/mypy.ini | 0 .../qemu-common/scripts}/qapi/parser.py | 0 .../qemu-common/scripts}/qapi/pylintrc | 0 .../qemu-common/scripts}/qapi/schema.py | 0 .../qemu-common/scripts}/qapi/source.py | 0 .../qemu-common/scripts}/qapi/types.py | 0 .../qemu-common/scripts}/qapi/visit.py | 0 tests/qapi-schema/meson.build | 2 +- 26 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 subprojects/qemu-common/scripts/meson.build rename {scripts =3D> subprojects/qemu-common/scripts}/qapi-gen.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/.flake8 (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/.isort.cfg (100= %) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/__init__.py (10= 0%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/commands.py (10= 0%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/common.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/error.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/events.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/expr.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/gen.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/introspect.py (= 100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/main.py (100%) create mode 100644 subprojects/qemu-common/scripts/qapi/meson.build rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/mypy.ini (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/parser.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/pylintrc (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/schema.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/source.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/types.py (100%) rename {scripts =3D> subprojects/qemu-common/scripts}/qapi/visit.py (100%) diff --git a/docs/conf.py b/docs/conf.py index e33cf3d381..02dcd987b4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -56,7 +56,7 @@ # Our extensions are in docs/sphinx; the qapidoc extension requires # the QAPI modules from scripts/. sys.path.insert(0, os.path.join(qemu_docdir, "sphinx")) -sys.path.insert(0, os.path.join(qemu_docdir, "../scripts")) +sys.path.insert(0, os.path.join(qemu_docdir, "../subprojects/qemu-common/s= cripts")) =20 =20 # -- General configuration ------------------------------------------------ diff --git a/meson.build b/meson.build index a47ce88c84..e8ba4361df 100644 --- a/meson.build +++ b/meson.build @@ -1588,6 +1588,8 @@ if libbpf.found() and not cc.links(''' endif =20 qemu_common =3D subproject('qemu-common') +qapi_gen =3D qemu_common.get_variable('qapi_gen') +qapi_gen_depends =3D qemu_common.get_variable('qapi_gen_depends') qemu_common =3D qemu_common.get_variable('qemu_common_dep') =20 ################# @@ -2795,23 +2797,6 @@ genh +=3D configure_file(output: 'config-host.h', co= nfiguration: config_host_data) =20 hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.pl') -qapi_gen =3D find_program('scripts/qapi-gen.py') -qapi_gen_depends =3D [ meson.current_source_dir() / 'scripts/qapi/__init__= .py', - meson.current_source_dir() / 'scripts/qapi/commands.p= y', - meson.current_source_dir() / 'scripts/qapi/common.py', - meson.current_source_dir() / 'scripts/qapi/error.py', - meson.current_source_dir() / 'scripts/qapi/events.py', - meson.current_source_dir() / 'scripts/qapi/expr.py', - meson.current_source_dir() / 'scripts/qapi/gen.py', - meson.current_source_dir() / 'scripts/qapi/introspect= .py', - meson.current_source_dir() / 'scripts/qapi/parser.py', - meson.current_source_dir() / 'scripts/qapi/schema.py', - meson.current_source_dir() / 'scripts/qapi/source.py', - meson.current_source_dir() / 'scripts/qapi/types.py', - meson.current_source_dir() / 'scripts/qapi/visit.py', - meson.current_source_dir() / 'scripts/qapi/common.py', - meson.current_source_dir() / 'scripts/qapi-gen.py' -] =20 tracetool =3D [ python, files('scripts/tracetool.py'), diff --git a/MAINTAINERS b/MAINTAINERS index 5ce4227ff6..abb75008fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2848,8 +2848,8 @@ F: tests/unit/test-*-visitor.c F: tests/unit/test-qapi-*.c F: tests/unit/test-qmp-*.c F: tests/unit/test-visitor-serialization.c -F: scripts/qapi-gen.py -F: scripts/qapi/* +F: subprojects/qemu-common/scripts/qapi-gen.py +F: subprojects/qemu-common/scripts/qapi/* F: docs/sphinx/qapidoc.py F: docs/devel/qapi* T: git https://repo.or.cz/qemu/armbru.git qapi-next diff --git a/subprojects/qemu-common/meson.build b/subprojects/qemu-common/= meson.build index 8969b08473..207e539910 100644 --- a/subprojects/qemu-common/meson.build +++ b/subprojects/qemu-common/meson.build @@ -6,3 +6,5 @@ project('qemu-common', 'c', qemu_common_dep =3D declare_dependency( include_directories: include_directories('include'), ) + +subdir('scripts') diff --git a/subprojects/qemu-common/scripts/meson.build b/subprojects/qemu= -common/scripts/meson.build new file mode 100644 index 0000000000..626bed6dcd --- /dev/null +++ b/subprojects/qemu-common/scripts/meson.build @@ -0,0 +1,3 @@ +qapi_gen =3D find_program('qapi-gen.py') + +subdir('qapi') diff --git a/scripts/qapi-gen.py b/subprojects/qemu-common/scripts/qapi-gen= .py similarity index 100% rename from scripts/qapi-gen.py rename to subprojects/qemu-common/scripts/qapi-gen.py diff --git a/scripts/qapi/.flake8 b/subprojects/qemu-common/scripts/qapi/.f= lake8 similarity index 100% rename from scripts/qapi/.flake8 rename to subprojects/qemu-common/scripts/qapi/.flake8 diff --git a/scripts/qapi/.isort.cfg b/subprojects/qemu-common/scripts/qapi= /.isort.cfg similarity index 100% rename from scripts/qapi/.isort.cfg rename to subprojects/qemu-common/scripts/qapi/.isort.cfg diff --git a/scripts/qapi/__init__.py b/subprojects/qemu-common/scripts/qap= i/__init__.py similarity index 100% rename from scripts/qapi/__init__.py rename to subprojects/qemu-common/scripts/qapi/__init__.py diff --git a/scripts/qapi/commands.py b/subprojects/qemu-common/scripts/qap= i/commands.py similarity index 100% rename from scripts/qapi/commands.py rename to subprojects/qemu-common/scripts/qapi/commands.py diff --git a/scripts/qapi/common.py b/subprojects/qemu-common/scripts/qapi/= common.py similarity index 100% rename from scripts/qapi/common.py rename to subprojects/qemu-common/scripts/qapi/common.py diff --git a/scripts/qapi/error.py b/subprojects/qemu-common/scripts/qapi/e= rror.py similarity index 100% rename from scripts/qapi/error.py rename to subprojects/qemu-common/scripts/qapi/error.py diff --git a/scripts/qapi/events.py b/subprojects/qemu-common/scripts/qapi/= events.py similarity index 100% rename from scripts/qapi/events.py rename to subprojects/qemu-common/scripts/qapi/events.py diff --git a/scripts/qapi/expr.py b/subprojects/qemu-common/scripts/qapi/ex= pr.py similarity index 100% rename from scripts/qapi/expr.py rename to subprojects/qemu-common/scripts/qapi/expr.py diff --git a/scripts/qapi/gen.py b/subprojects/qemu-common/scripts/qapi/gen= .py similarity index 100% rename from scripts/qapi/gen.py rename to subprojects/qemu-common/scripts/qapi/gen.py diff --git a/scripts/qapi/introspect.py b/subprojects/qemu-common/scripts/q= api/introspect.py similarity index 100% rename from scripts/qapi/introspect.py rename to subprojects/qemu-common/scripts/qapi/introspect.py diff --git a/scripts/qapi/main.py b/subprojects/qemu-common/scripts/qapi/ma= in.py similarity index 100% rename from scripts/qapi/main.py rename to subprojects/qemu-common/scripts/qapi/main.py diff --git a/subprojects/qemu-common/scripts/qapi/meson.build b/subprojects= /qemu-common/scripts/qapi/meson.build new file mode 100644 index 0000000000..5f73a966f3 --- /dev/null +++ b/subprojects/qemu-common/scripts/qapi/meson.build @@ -0,0 +1,16 @@ +qapi_gen_depends =3D files( + '__init__.py', + 'commands.py', + 'common.py', + 'error.py', + 'events.py', + 'expr.py', + 'gen.py', + 'introspect.py', + 'parser.py', + 'schema.py', + 'source.py', + 'types.py', + 'visit.py', + 'common.py', +) diff --git a/scripts/qapi/mypy.ini b/subprojects/qemu-common/scripts/qapi/m= ypy.ini similarity index 100% rename from scripts/qapi/mypy.ini rename to subprojects/qemu-common/scripts/qapi/mypy.ini diff --git a/scripts/qapi/parser.py b/subprojects/qemu-common/scripts/qapi/= parser.py similarity index 100% rename from scripts/qapi/parser.py rename to subprojects/qemu-common/scripts/qapi/parser.py diff --git a/scripts/qapi/pylintrc b/subprojects/qemu-common/scripts/qapi/p= ylintrc similarity index 100% rename from scripts/qapi/pylintrc rename to subprojects/qemu-common/scripts/qapi/pylintrc diff --git a/scripts/qapi/schema.py b/subprojects/qemu-common/scripts/qapi/= schema.py similarity index 100% rename from scripts/qapi/schema.py rename to subprojects/qemu-common/scripts/qapi/schema.py diff --git a/scripts/qapi/source.py b/subprojects/qemu-common/scripts/qapi/= source.py similarity index 100% rename from scripts/qapi/source.py rename to subprojects/qemu-common/scripts/qapi/source.py diff --git a/scripts/qapi/types.py b/subprojects/qemu-common/scripts/qapi/t= ypes.py similarity index 100% rename from scripts/qapi/types.py rename to subprojects/qemu-common/scripts/qapi/types.py diff --git a/scripts/qapi/visit.py b/subprojects/qemu-common/scripts/qapi/v= isit.py similarity index 100% rename from scripts/qapi/visit.py rename to subprojects/qemu-common/scripts/qapi/visit.py diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index c18dd7d02f..2c67636004 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -1,5 +1,5 @@ test_env =3D environment() -test_env.set('PYTHONPATH', meson.project_source_root() / 'scripts') +test_env.set('PYTHONPATH', meson.project_source_root() / 'subprojects/qemu= -common/scripts') test_env.set('PYTHONIOENCODING', 'utf-8') =20 schemas =3D [ --=20 2.37.1