From: Ján Tomko <jto...@redhat.com>
Signed-off-by: Ján Tomko <jto...@redhat.com>
---
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 = custom_target(
docs_html_gen += index_api_gen.to_list()
docs_html_dep += index_api_gen
-foreach name : [ 'admin', 'lxc', 'qemu' ]
+foreach name : [ 'admin', 'lxc']
index_api_gen = 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 = [
{ '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_QEMU')
},
- { 'name': 'virt-qemu-qmp-proxy', 'section': '1', 'install':
conf.has('WITH_QEMU') },
{ 'name': 'virt-xml-validate', 'section': '1', 'install': true },
- { 'name': 'virt-qemu-sev-validate', 'section': '1', 'install':
conf.has('WITH_QEMU') },
{ 'name': 'libvirt-guests', 'section': '8', 'install':
conf.has('WITH_LIBVIRTD') },
{ 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
@@ -35,7 +32,6 @@ docs_man_files = [
{ 'name': 'virtnodedevd', 'section': '8', 'install':
conf.has('WITH_NODE_DEVICES') },
{ 'name': 'virtnwfilterd', 'section': '8', 'install':
conf.has('WITH_NWFILTER') },
{ 'name': 'virtproxyd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD')
},
- { 'name': 'virtqemud', 'section': '8', 'install': conf.has('WITH_QEMU') },
{ 'name': 'virtsecretd', 'section': '8', 'install': conf.has('WITH_SECRETS')
},
{ 'name': 'virtstoraged', 'section': '8', 'install':
conf.has('WITH_STORAGE') },
{ '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 = 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 = 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',
],
)
docs_api_xml = docs_api_generated[0]
docs_lxc_api_xml = docs_api_generated[1]
-docs_qemu_api_xml = docs_api_generated[2]
-docs_admin_api_xml = docs_api_generated[3]
+docs_admin_api_xml = docs_api_generated[2]
docs_programs_groups = [
{ 'name': 'rst2html5', 'prog': [ 'rst2html5', 'rst2html5.py', 'rst2html5-3'
] },
@@ -263,7 +259,6 @@ hvsupport_html_in = 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() == 'linux'
if not cc.check_header('linux/sockios.h')
- error('You must install kernel-headers in order to compile libvirt with
QEMU or LXC support')
+ error('You must install kernel-headers in order to compile libvirt with
LXC support')
endif
endif
@@ -1720,7 +1720,7 @@ elif get_option('secdriver_selinux').enabled()
error('You must install the libselinux development package in order to
compile libvirt.')
endif
-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
@@ -2104,7 +2104,6 @@ subdir('build-aux')
# install pkgconfig files
pkgconfig_files = [
'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: true)
endif
-
-if conf.has('WITH_QEMU')
- qemu_warn = ''
- if qemu_user == 'root'
- qemu_warn = ' !!! running QEMU as root is strongly discouraged !!!'
- endif
- priv_summary = {
- '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 = shared_library(
)
-# libvirt-qemu.syms symbol files
-
-libvirt_qemu_syms = meson.current_source_dir() / 'libvirt_qemu.syms'
-
-if host_machine.system() == 'windows'
- libvirt_qemu_def = custom_target(
- 'libvirt_qemu.def',
- input: libvirt_qemu_syms,
- output: 'libvirt_qemu.def',
- command: [
- meson_gen_def_prog,
- '@INPUT@', '@OUTPUT@',
- ],
- )
- libvirt_qemu_syms_file = libvirt_qemu_def
- libvirt_qemu_syms_path = libvirt_qemu_syms_file.full_path()
-else
- libvirt_qemu_syms_file = libvirt_qemu_syms
- libvirt_qemu_syms_path = libvirt_qemu_syms
-endif
-
-
-# libvirt-qemu.so
-
-libvirt_qemu_link_args = [
- libvirt_nodelete,
-]
-libvirt_qemu_link_depends = []
-
-if version_script_flags != ''
- libvirt_qemu_link_args += '@0@@1@'.format(
- version_script_flags,
- libvirt_qemu_syms_path,
- )
- libvirt_qemu_link_depends += libvirt_qemu_syms_file
-endif
-
-libvirt_qemu_sources = files(
- 'libvirt-qemu.c',
-)
-
-libvirt_qemu_lib = 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
libvirt_lxc_syms = 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 = [
'libvirt-lxc.pc.in',
- 'libvirt-qemu.pc.in',
'libvirt.pc.in',
]
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 = [
remote_driver_generated = []
-foreach name : [ 'remote', 'qemu', 'lxc' ]
+foreach name : [ 'remote', 'lxc' ]
client_bodies_h = '@0@_client_bodies.h'.format(name)
protocol_x = '@0@_protocol.x'.format(name)
@@ -22,7 +22,7 @@ endforeach
remote_protocol_generated = []
-foreach name : [ 'remote', 'lxc' ]
+foreach name : [ 'remote', 'lxc', 'qemu' ]
protocol_c = '@0@_protocol.c'.format(name)
protocol_h = '@0@_protocol.h'.format(name)
protocol_x = '@0@_protocol.x'.format(name)
@@ -70,7 +70,7 @@ virt_ssh_helper_dep = [
src_dep,
]
-foreach name : [ 'remote', 'qemu', 'lxc' ]
+foreach name : [ 'remote', 'lxc' ]
protocol_x = '@0@_protocol.x'.format(name)
dispatch_h = '@0@_daemon_dispatch_stubs.h'.format(name)
@@ -139,7 +139,6 @@ libvirtd_socket_unit_files = [
]
logrotate_files = [
- 'libvirtd.qemu',
'libvirtd.lxc',
'libvirtd.libxl',
'libvirtd',
@@ -169,11 +168,6 @@ if conf.has('WITH_REMOTE')
'lib': remote_driver_lib,
}
- check_protocols += {
- 'name': 'qemu_protocol',
- 'lib': remote_driver_lib,
- }
-
check_protocols += {
'name': 'lxc_protocol',
'lib': remote_driver_lib,
diff --git a/src/security/apparmor/meson.build
b/src/security/apparmor/meson.build
index b9257c816d..1629737fb0 100644
--- a/src/security/apparmor/meson.build
+++ b/src/security/apparmor/meson.build
@@ -1,12 +1,10 @@
apparmor_gen_profiles = [
'usr.lib.libvirt.virt-aa-helper',
'usr.sbin.libvirtd',
- 'usr.sbin.virtqemud',
'usr.sbin.virtxend',
]
apparmor_gen_abstractions = [
- 'libvirt-qemu',
'libvirt-lxc',
]
@@ -73,7 +71,7 @@ foreach name : apparmor_gen_abstractions
endforeach
install_data(
- [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
+ [ 'TEMPLATE.lxc' ],
install_dir: apparmor_dir / 'libvirt',
)
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 = []
endif
-if conf.has('WITH_QEMU')
- test_utils_qemu_lib = static_library(
- 'test_utils_qemu',
- [ 'testutilsqemu.c', 'testutilsqemuschema.c' ],
- dependencies: [ tests_dep ],
- )
-
- test_utils_qemu_monitor_lib = static_library(
- 'test_utils_qemu_monitor',
- [ 'qemumonitortestutils.c', ],
- dependencies: [ tests_dep ],
- )
-
- test_qemu_driver_lib = 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 += [
- { '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 = []
- test_utils_qemu_lib = []
- test_utils_qemu_monitor_lib = []
-endif
-
-mock_libs += [
- # domaincapsmock has some code guarded with WITH_QEMU
- { 'name': 'domaincapsmock', 'link_with': [ test_qemu_driver_lib ] },
-]
-
test_file_wrapper_lib = static_library(
'test_file_wrapper',
[ 'virfilewrapper.c' ],
@@ -240,10 +200,6 @@ tests = []
cputest_link_with = []
cputest_link_whole = []
-if conf.has('WITH_QEMU')
- cputest_link_with += [ test_utils_qemu_monitor_lib, test_qemu_driver_lib ]
- cputest_link_whole += [ test_utils_qemu_lib ]
-endif
domaincapstest_link_with = []
domaincapstest_link_whole = [ test_file_wrapper_lib ]
@@ -254,10 +210,6 @@ if conf.has('WITH_LIBXL')
domaincapstest_link_with += [ test_xen_driver_lib ]
domaincapstest_link_whole += [ test_utils_xen_lib ]
endif
-if conf.has('WITH_QEMU')
- domaincapstest_link_with += [ test_qemu_driver_lib ]
- domaincapstest_link_whole += [ test_utils_qemu_lib ]
-endif
tests += [
{ 'name': 'commandtest' },
@@ -452,33 +404,6 @@ if conf.has('WITH_POLKIT')
]
endif
-if conf.has('WITH_QEMU')
- tests += [
- { 'name': 'qemuagenttest', 'link_with': [ test_qemu_driver_lib,
test_utils_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_driver_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 ],
'link_whole': [ test_utils_qemu_lib ] },
- { 'name': 'qemumigparamstest', 'link_with': [ test_qemu_driver_lib,
test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] },
- { 'name': 'qemumigrationcookiexmltest', 'link_with': [
test_qemu_driver_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',
'qemusecuritymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [
test_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_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [
test_utils_qemu_lib, test_file_wrapper_lib ] },
- ]
- if conf.has('WITH_NBDKIT')
- tests += [
- { '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 += [
{ 'name': 'virnetdaemontest' },
@@ -506,11 +431,6 @@ if conf.has('WITH_SECDRIVER_SELINUX')
{ 'name': 'securityselinuxtest' },
]
- if conf.has('WITH_QEMU')
- tests += [
- { 'name': 'securityselinuxlabeltest', 'link_with': [
test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib ] },
- ]
- endif
endif
endif
@@ -622,18 +542,6 @@ foreach data : tests
)
endforeach
-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
-if conf.has('WITH_QEMU')
- helpers += [
- {
- 'name': 'qemucapsprobe',
- 'link_with': [ test_qemu_driver_lib, libvirt_lib ],
- },
- ]
-endif
-
foreach data : helpers
helper_sources = '@0@.c'.format(data['name'])
helper_bin = 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',
]
- if conf.has('WITH_QEMU')
- virt_host_validate_sources += [
- 'virt-host-validate-qemu.c',
- ]
- endif
if conf.has('WITH_LXC')
virt_host_validate_sources += [
'virt-host-validate-lxc.c',
@@ -208,7 +203,6 @@ virsh_prog = executable(
],
link_with: [
libvirt_lxc_lib,
- libvirt_qemu_lib,
libvirt_shell_lib,
],
install: true,
@@ -329,11 +323,6 @@ if conf.has('WITH_SANLOCK')
)
endif
-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
-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 = 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',
],
--
2.49.0
