817b7667e8
Lots of patches touched and some slight changes to the build process since QEMU switched to meson as their build system. Functionality-wise very little rebasing required. New patches introduced: * pve/0058: to fix VMA backups and clean up some code in general with new 5.2 features now available to us (namely coroutine-enabled QMP). * extra/0002: don't build man pages for guest agent when disabled * extra/0003: fix live-migration with hugepages * 0017 and 0018 are adjusted to fix snapshot abort and improve snap performance a bit Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Thu, 28 Jan 2021 15:19:51 +0100
|
|
Subject: [PATCH] docs: don't install man page if guest agent is disabled
|
|
|
|
No sense outputting the qemu-ga and qemu-ga-ref man pages when the guest
|
|
agent binary itself is disabled. This mirrors behaviour from before the
|
|
meson switch.
|
|
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
---
|
|
docs/meson.build | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/docs/meson.build b/docs/meson.build
|
|
index ebd85d59f9..cc6f5007f8 100644
|
|
--- a/docs/meson.build
|
|
+++ b/docs/meson.build
|
|
@@ -46,6 +46,8 @@ if build_docs
|
|
meson.source_root() / 'docs/sphinx/qmp_lexer.py',
|
|
qapi_gen_depends ]
|
|
|
|
+ have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
|
|
+
|
|
configure_file(output: 'index.html',
|
|
input: files('index.html.in'),
|
|
configuration: {'VERSION': meson.project_version()},
|
|
@@ -53,8 +55,8 @@ if build_docs
|
|
manuals = [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ]
|
|
man_pages = {
|
|
'interop' : {
|
|
- 'qemu-ga.8': (have_tools ? 'man8' : ''),
|
|
- 'qemu-ga-ref.7': 'man7',
|
|
+ 'qemu-ga.8': (have_ga ? 'man8' : ''),
|
|
+ 'qemu-ga-ref.7': (have_ga ? 'man7' : ''),
|
|
'qemu-qmp-ref.7': 'man7',
|
|
},
|
|
'tools': {
|