From nobody Tue Dec 16 11:56:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1743477623; cv=none; d=zohomail.com; s=zohoarc; b=RFNfTKWPp0JgFW5F2DT7AohkFqMU7q7eAm/pZa/wYX6GGf7/iBHjuGcHUNaNIeoZgu6YoYdOJCMVDGoQAUvmUghJ/jQmA/LWPeEe8JXgZ90q9eOeXZTXYVrSYm6wP2+XcJp5G8lWJCUvFAuS1QBM0URH0gTF//lAm0votibW970= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743477623; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=+vBoxqeeRNvsWFZlQp/JC0NXhQcHFG4AOTyfnplDDHY=; b=aw08Mm5dUThRcYTq/3+C0jbZC8mzFC4J+UJoIsqHjUs1eTT9PjP74TYwcfoGAZUsN84Pm79D9arThNVNy0xv7BW2hVvKOVbAQe4AvJuCZF5Rk+qWKOR5l3PDOpGuSlsTTffxkds3rk6+Nt3jVOMQhSzofDkFs2SH0WKV3PnTSv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1743477623688629.6629486774001; Mon, 31 Mar 2025 20:20:23 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EAC6913C4; Mon, 31 Mar 2025 23:20:22 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 54D6D139C; Mon, 31 Mar 2025 23:18:37 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 585091396; Mon, 31 Mar 2025 23:18:32 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 539921396 for ; Mon, 31 Mar 2025 23:18:12 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-690-SAXaCqM9MlqUJa1yCQJmUw-1; Mon, 31 Mar 2025 23:18:09 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F3CDB1801A12 for ; Tue, 1 Apr 2025 03:18:08 +0000 (UTC) Received: from hjs.brq.redhat.com (unknown [10.43.3.187]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 071711955D81 for ; Tue, 1 Apr 2025 03:18:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743477491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dIF+4UQCi8zRsU5IA5TRXK+YJQJ4D9vYFvPj1Z4W0+c=; b=QyIbqHr6bOSKaaJ0R9d0H/3zZiL1luj77DzXJ4j2F/18J9gfFUhALbTrdlht4l6IRFuDVe 302+gTRwYLrQuWjPj+fHIKY8KMZQfAhHhr/i/hpBVgwPrh+eLb2ITI4qav7jSyRqGG+OVe 2gRwkDY4oOv0NHT1NDOz2fiDKHnxGRU= X-MC-Unique: SAXaCqM9MlqUJa1yCQJmUw-1 X-Mimecast-MFC-AGG-ID: SAXaCqM9MlqUJa1yCQJmUw_1743477489 To: devel@lists.libvirt.org Subject: [libvirt PATCH 4/7] meson: remove all references to QEMU Date: Tue, 1 Apr 2025 05:12:39 +0200 Message-ID: <694604d9e4c2e7f0d79021225090991bb9f5fbe5.1743477161.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: u4CbAm3PCBKGUwPYrj_PnvwCTbdtIootALkNslecUMg_1743477489 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HSWCHOFUMTVHXCVIMZRSEELSZ77X5DXS X-Message-ID-Hash: HSWCHOFUMTVHXCVIMZRSEELSZ77X5DXS X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1743477625015019000 Content-Type: text/plain; charset="utf-8" From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko --- docs/html/meson.build | 2 +- docs/manpages/meson.build | 4 - docs/meson.build | 7 +- meson.build | 16 +--- src/meson.build | 64 +-------------- src/remote/meson.build | 12 +-- src/security/apparmor/meson.build | 4 +- tests/meson.build | 101 ------------------------ tools/meson.build | 16 ---- tools/wireshark/src/libvirt/meson.build | 2 - 10 files changed, 9 insertions(+), 219 deletions(-) diff --git a/docs/html/meson.build b/docs/html/meson.build index abb4fcf72a..c8c70886b8 100644 --- a/docs/html/meson.build +++ b/docs/html/meson.build @@ -40,7 +40,7 @@ index_api_gen =3D custom_target( docs_html_gen +=3D index_api_gen.to_list() docs_html_dep +=3D index_api_gen =20 -foreach name : [ 'admin', 'lxc', 'qemu' ] +foreach name : [ 'admin', 'lxc'] index_api_gen =3D custom_target( 'index-@0@-api'.format(name), input: [ diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index bdc17011a8..8a43d6de7d 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -17,10 +17,7 @@ docs_man_files =3D [ { 'name': 'virt-login-shell', 'section': '1', 'install': conf.has('WITH_= LOGIN_SHELL') }, { 'name': 'virt-pki-query-dn', 'section': '1', 'install': true }, { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, - { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEM= U') }, - { 'name': 'virt-qemu-qmp-proxy', 'section': '1', 'install': conf.has('WI= TH_QEMU') }, { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, - { 'name': 'virt-qemu-sev-validate', 'section': '1', 'install': conf.has(= 'WITH_QEMU') }, =20 { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LI= BVIRTD') }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD= ') }, @@ -35,7 +32,6 @@ docs_man_files =3D [ { 'name': 'virtnodedevd', 'section': '8', 'install': conf.has('WITH_NODE= _DEVICES') }, { 'name': 'virtnwfilterd', 'section': '8', 'install': conf.has('WITH_NWF= ILTER') }, { 'name': 'virtproxyd', 'section': '8', 'install': conf.has('WITH_LIBVIR= TD') }, - { 'name': 'virtqemud', 'section': '8', 'install': conf.has('WITH_QEMU') = }, { 'name': 'virtsecretd', 'section': '8', 'install': conf.has('WITH_SECRE= TS') }, { 'name': 'virtstoraged', 'section': '8', 'install': conf.has('WITH_STOR= AGE') }, { 'name': 'virtvboxd', 'section': '8', 'install': conf.has('WITH_VBOX') = }, diff --git a/docs/meson.build b/docs/meson.build index d7343b6665..79b2cc8d83 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -139,7 +139,6 @@ docs_api_generated =3D custom_target( output: [ 'libvirt-api.xml', 'libvirt-lxc-api.xml', - 'libvirt-qemu-api.xml', 'libvirt-admin-api.xml', ], command: [ @@ -153,20 +152,17 @@ docs_api_generated =3D custom_target( libvirt_common_h_in, libvirt_include, driver_sources, - libvirt_qemu_sources, libvirt_lxc_sources, admin_sources, util_public_sources, meson.project_source_root() / 'src' / 'remote' / 'remote_protocol.x', - meson.project_source_root() / 'src' / 'remote' / 'qemu_protocol.x', meson.project_source_root() / 'src' / 'remote' / 'lxc_protocol.x', ], ) =20 docs_api_xml =3D docs_api_generated[0] docs_lxc_api_xml =3D docs_api_generated[1] -docs_qemu_api_xml =3D docs_api_generated[2] -docs_admin_api_xml =3D docs_api_generated[3] +docs_admin_api_xml =3D docs_api_generated[2] =20 docs_programs_groups =3D [ { 'name': 'rst2html5', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5= -3' ] }, @@ -263,7 +259,6 @@ hvsupport_html_in =3D custom_target( capture: true, depend_files: [ public_sym_file, - libvirt_qemu_syms, libvirt_lxc_syms, driver_header, ], diff --git a/meson.build b/meson.build index 4929ccb42a..f275b991b3 100644 --- a/meson.build +++ b/meson.build @@ -714,7 +714,7 @@ endforeach # check for kernel header required by src/util/virnetdevbridge.c if host_machine.system() =3D=3D 'linux' if not cc.check_header('linux/sockios.h') - error('You must install kernel-headers in order to compile libvirt wit= h QEMU or LXC support') + error('You must install kernel-headers in order to compile libvirt wit= h LXC support') endif endif =20 @@ -1720,7 +1720,7 @@ elif get_option('secdriver_selinux').enabled() error('You must install the libselinux development package in order to c= ompile libvirt.') endif =20 -if conf.has('WITH_QEMU') or conf.has('WITH_LXC') or conf.has('WITH_NETWORK= ') +if conf.has('WITH_LXC') or conf.has('WITH_NETWORK') conf.set('WITH_BRIDGE', 1) endif =20 @@ -2104,7 +2104,6 @@ subdir('build-aux') # install pkgconfig files pkgconfig_files =3D [ 'libvirt.pc.in', - 'libvirt-qemu.pc.in', 'libvirt-lxc.pc.in', 'libvirt-admin.pc.in', ] @@ -2341,14 +2340,3 @@ if missing_optional_programs.length() > 0 } summary(test_programs_summary, section: 'Optional programs', bool_yn: tr= ue) endif - -if conf.has('WITH_QEMU') - qemu_warn =3D '' - if qemu_user =3D=3D 'root' - qemu_warn =3D ' !!! running QEMU as root is strongly discouraged !!!' - endif - priv_summary =3D { - 'QEMU': '@0@:@1@@2@'.format(qemu_user, qemu_group, qemu_warn), - } - summary(priv_summary, section: 'Privileges') -endif diff --git a/src/meson.build b/src/meson.build index 9a818dab50..716d337dc3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -283,7 +283,6 @@ subdir('libxl') subdir('lxc') subdir('ch') subdir('openvz') -subdir('qemu') subdir('test') subdir('vbox') subdir('vmware') @@ -423,65 +422,6 @@ libvirt_lib =3D shared_library( ) =20 =20 -# libvirt-qemu.syms symbol files - -libvirt_qemu_syms =3D meson.current_source_dir() / 'libvirt_qemu.syms' - -if host_machine.system() =3D=3D 'windows' - libvirt_qemu_def =3D custom_target( - 'libvirt_qemu.def', - input: libvirt_qemu_syms, - output: 'libvirt_qemu.def', - command: [ - meson_gen_def_prog, - '@INPUT@', '@OUTPUT@', - ], - ) - libvirt_qemu_syms_file =3D libvirt_qemu_def - libvirt_qemu_syms_path =3D libvirt_qemu_syms_file.full_path() -else - libvirt_qemu_syms_file =3D libvirt_qemu_syms - libvirt_qemu_syms_path =3D libvirt_qemu_syms -endif - - -# libvirt-qemu.so - -libvirt_qemu_link_args =3D [ - libvirt_nodelete, -] -libvirt_qemu_link_depends =3D [] - -if version_script_flags !=3D '' - libvirt_qemu_link_args +=3D '@0@@1@'.format( - version_script_flags, - libvirt_qemu_syms_path, - ) - libvirt_qemu_link_depends +=3D libvirt_qemu_syms_file -endif - -libvirt_qemu_sources =3D files( - 'libvirt-qemu.c', -) - -libvirt_qemu_lib =3D shared_library( - 'virt-qemu', - libvirt_qemu_sources, - dependencies: [ - src_dep, - ], - link_args: libvirt_qemu_link_args, - link_with: [ - libvirt_lib, - ], - link_depends: libvirt_qemu_link_depends, - install: true, - install_rpath: libvirt_rpath, - version: libvirt_lib_version, - soversion: libvirt_so_version, -) - - # libvirt-lxc.so symbol files =20 libvirt_lxc_syms =3D meson.current_source_dir() / 'libvirt_lxc.syms' @@ -654,7 +594,6 @@ foreach daemon : virt_daemons admin_driver_lib, libvirt_lib, libvirt_lxc_lib, - libvirt_qemu_lib, ], link_args: [ libvirt_no_undefined, @@ -1022,7 +961,7 @@ if tests_enabled[0] python3_prog, args: [ check_drivername_prog.full_path(), files(driver_headers), - files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms, + files('libvirt_public.syms'), libvirt_lxc_syms, ], env: runutf8, suite: 'script' @@ -1109,7 +1048,6 @@ endif # configure pkg-config files for run script run_pkg_config_files =3D [ 'libvirt-lxc.pc.in', - 'libvirt-qemu.pc.in', 'libvirt.pc.in', ] =20 diff --git a/src/remote/meson.build b/src/remote/meson.build index 59be94399b..49794683f4 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -5,7 +5,7 @@ remote_driver_sources =3D [ =20 remote_driver_generated =3D [] =20 -foreach name : [ 'remote', 'qemu', 'lxc' ] +foreach name : [ 'remote', 'lxc' ] client_bodies_h =3D '@0@_client_bodies.h'.format(name) protocol_x =3D '@0@_protocol.x'.format(name) =20 @@ -22,7 +22,7 @@ endforeach =20 remote_protocol_generated =3D [] =20 -foreach name : [ 'remote', 'lxc' ] +foreach name : [ 'remote', 'lxc', 'qemu' ] protocol_c =3D '@0@_protocol.c'.format(name) protocol_h =3D '@0@_protocol.h'.format(name) protocol_x =3D '@0@_protocol.x'.format(name) @@ -70,7 +70,7 @@ virt_ssh_helper_dep =3D [ src_dep, ] =20 -foreach name : [ 'remote', 'qemu', 'lxc' ] +foreach name : [ 'remote', 'lxc' ] protocol_x =3D '@0@_protocol.x'.format(name) dispatch_h =3D '@0@_daemon_dispatch_stubs.h'.format(name) =20 @@ -139,7 +139,6 @@ libvirtd_socket_unit_files =3D [ ] =20 logrotate_files =3D [ - 'libvirtd.qemu', 'libvirtd.lxc', 'libvirtd.libxl', 'libvirtd', @@ -169,11 +168,6 @@ if conf.has('WITH_REMOTE') 'lib': remote_driver_lib, } =20 - check_protocols +=3D { - 'name': 'qemu_protocol', - 'lib': remote_driver_lib, - } - check_protocols +=3D { 'name': 'lxc_protocol', 'lib': remote_driver_lib, diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meso= n.build index b9257c816d..1629737fb0 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build @@ -1,12 +1,10 @@ apparmor_gen_profiles =3D [ 'usr.lib.libvirt.virt-aa-helper', 'usr.sbin.libvirtd', - 'usr.sbin.virtqemud', 'usr.sbin.virtxend', ] =20 apparmor_gen_abstractions =3D [ - 'libvirt-qemu', 'libvirt-lxc', ] =20 @@ -73,7 +71,7 @@ foreach name : apparmor_gen_abstractions endforeach =20 install_data( - [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], + [ 'TEMPLATE.lxc' ], install_dir: apparmor_dir / 'libvirt', ) =20 diff --git a/tests/meson.build b/tests/meson.build index 0d76d37959..e8c41aead9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -149,46 +149,6 @@ else test_utils_lxc_lib =3D [] endif =20 -if conf.has('WITH_QEMU') - test_utils_qemu_lib =3D static_library( - 'test_utils_qemu', - [ 'testutilsqemu.c', 'testutilsqemuschema.c' ], - dependencies: [ tests_dep ], - ) - - test_utils_qemu_monitor_lib =3D static_library( - 'test_utils_qemu_monitor', - [ 'qemumonitortestutils.c', ], - dependencies: [ tests_dep ], - ) - - test_qemu_driver_lib =3D shared_library( - 'test_qemu_driver', - [ qemu_dtrace_gen_objects ], - link_args: [ libvirt_flat_namespace ], - link_whole: [ qemu_driver_impl ], - link_with: [ libvirt_lib ], - ) - - mock_libs +=3D [ - { 'name': 'qemucaps2xmlmock' }, - { 'name': 'qemucapsprobemock', 'link_with': [ test_qemu_driver_lib ] }, - { 'name': 'qemucpumock' }, - { 'name': 'qemuhotplugmock', 'link_with': [ test_qemu_driver_lib, test= _utils_qemu_lib, test_utils_lib ] }, - { 'name': 'qemuxml2argvmock' }, - { 'name': 'virhostidmock' }, - ] -else - test_qemu_driver_lib =3D [] - test_utils_qemu_lib =3D [] - test_utils_qemu_monitor_lib =3D [] -endif - -mock_libs +=3D [ - # domaincapsmock has some code guarded with WITH_QEMU - { 'name': 'domaincapsmock', 'link_with': [ test_qemu_driver_lib ] }, -] - test_file_wrapper_lib =3D static_library( 'test_file_wrapper', [ 'virfilewrapper.c' ], @@ -240,10 +200,6 @@ tests =3D [] =20 cputest_link_with =3D [] cputest_link_whole =3D [] -if conf.has('WITH_QEMU') - cputest_link_with +=3D [ test_utils_qemu_monitor_lib, test_qemu_driver_l= ib ] - cputest_link_whole +=3D [ test_utils_qemu_lib ] -endif =20 domaincapstest_link_with =3D [] domaincapstest_link_whole =3D [ test_file_wrapper_lib ] @@ -254,10 +210,6 @@ if conf.has('WITH_LIBXL') domaincapstest_link_with +=3D [ test_xen_driver_lib ] domaincapstest_link_whole +=3D [ test_utils_xen_lib ] endif -if conf.has('WITH_QEMU') - domaincapstest_link_with +=3D [ test_qemu_driver_lib ] - domaincapstest_link_whole +=3D [ test_utils_qemu_lib ] -endif =20 tests +=3D [ { 'name': 'commandtest' }, @@ -452,33 +404,6 @@ if conf.has('WITH_POLKIT') ] endif =20 -if conf.has('WITH_QEMU') - tests +=3D [ - { 'name': 'qemuagenttest', 'link_with': [ test_qemu_driver_lib, test_u= tils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemublocktest', 'include': [ storage_file_inc_dir ], 'link_= with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole':= [ test_utils_qemu_lib ] }, - { 'name': 'qemucapabilitiestest', 'link_with': [ test_qemu_driver_lib,= test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemucaps2xmltest', 'link_with': [ test_qemu_driver_lib ], '= link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemucommandutiltest', 'link_with': [ test_qemu_driver_lib, = test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemudomaincheckpointxml2xmltest', 'link_with': [ test_qemu_= driver_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemudomainsnapshotxml2xmltest', 'link_with': [ test_qemu_dr= iver_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemufirmwaretest', 'link_with': [ test_qemu_driver_lib ], '= link_whole': [ test_file_wrapper_lib ] }, - { 'name': 'qemuhotplugtest', 'link_with': [ test_qemu_driver_lib, test= _utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemumemlocktest', 'link_with': [ test_qemu_driver_lib ], 'l= ink_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemumigparamstest', 'link_with': [ test_qemu_driver_lib, te= st_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemumigrationcookiexmltest', 'link_with': [ test_qemu_drive= r_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, = test_file_wrapper_lib ] }, - { 'name': 'qemumonitorjsontest', 'link_with': [ test_qemu_driver_lib, = test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - { 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemu= securitymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ t= est_utils_qemu_lib ] }, - { 'name': 'qemuxmlactivetest', 'link_with': [ test_qemu_driver_lib ], = 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] }, - { 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib ], = 'link_whole': [ test_file_wrapper_lib ] }, - { 'name': 'qemuxmlconftest', 'timeout': 90, 'link_with': [ test_qemu_d= river_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_l= ib, test_file_wrapper_lib ] }, - ] - if conf.has('WITH_NBDKIT') - tests +=3D [ - { 'name': 'qemunbdkittest', 'link_with': [ test_qemu_driver_lib ], '= link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] }, - ] - endif -endif - if conf.has('WITH_REMOTE') tests +=3D [ { 'name': 'virnetdaemontest' }, @@ -506,11 +431,6 @@ if conf.has('WITH_SECDRIVER_SELINUX') { 'name': 'securityselinuxtest' }, ] =20 - if conf.has('WITH_QEMU') - tests +=3D [ - { 'name': 'securityselinuxlabeltest', 'link_with': [ test_qemu_dri= ver_lib ], 'link_whole': [ test_utils_qemu_lib ] }, - ] - endif endif endif =20 @@ -622,18 +542,6 @@ foreach data : tests ) endforeach =20 -test( - 'qemu replies check', - python3_prog, - args: [ - qemu_replies_tool_prog.full_path(), - '--repliesdir', - meson.project_source_root() / 'tests' / 'qemucapabilitiesdata' - ], - env: runutf8, - suite: 'script', -) - if conf.has('WITH_TEST') # vsh based client self-test, which can be run directly from meson test('virsh self-test', @@ -680,15 +588,6 @@ if conf.has('WITH_NSS') ] endif =20 -if conf.has('WITH_QEMU') - helpers +=3D [ - { - 'name': 'qemucapsprobe', - 'link_with': [ test_qemu_driver_lib, libvirt_lib ], - }, - ] -endif - foreach data : helpers helper_sources =3D '@0@.c'.format(data['name']) helper_bin =3D executable( diff --git a/tools/meson.build b/tools/meson.build index 4d5c9e4bba..3454ab5ff8 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -45,11 +45,6 @@ if conf.has('WITH_HOST_VALIDATE') 'virt-host-validate-common.c', ] =20 - if conf.has('WITH_QEMU') - virt_host_validate_sources +=3D [ - 'virt-host-validate-qemu.c', - ] - endif if conf.has('WITH_LXC') virt_host_validate_sources +=3D [ 'virt-host-validate-lxc.c', @@ -208,7 +203,6 @@ virsh_prog =3D executable( ], link_with: [ libvirt_lxc_lib, - libvirt_qemu_lib, libvirt_shell_lib, ], install: true, @@ -329,11 +323,6 @@ if conf.has('WITH_SANLOCK') ) endif =20 -if conf.has('WITH_QEMU') - install_data('virt-qemu-sev-validate', - install_dir: bindir) -endif - if conf.has('WITH_LIBVIRTD') configure_file( input: 'libvirt-guests.sh.in', @@ -355,11 +344,6 @@ if conf.has('WITH_LIBVIRTD') endif endif =20 -if conf.has('WITH_QEMU') - install_data('virt-qemu-qmp-proxy', - install_dir: bindir) -endif - if bash_completion_dep.found() subdir('bash-completion') endif diff --git a/tools/wireshark/src/libvirt/meson.build b/tools/wireshark/src/= libvirt/meson.build index 9c3b8aadc1..10866c0f81 100644 --- a/tools/wireshark/src/libvirt/meson.build +++ b/tools/wireshark/src/libvirt/meson.build @@ -2,14 +2,12 @@ wireshark_protocol =3D custom_target( 'protocol.h', input: [ meson.project_source_root() / 'src' / 'remote' / 'remote_protocol.x', - meson.project_source_root() / 'src' / 'remote' / 'qemu_protocol.x', meson.project_source_root() / 'src' / 'remote' / 'lxc_protocol.x', meson.project_source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x', ], output: [ 'protocol.h', 'remote.h', - 'qemu.h', 'lxc.h', 'keepalive.h', ], --=20 2.49.0