diff mbox series

[PULL,30/45] docs: set CONFDIR when running sphinx

Message ID	20201215175445.1272776-31-pbonzini@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL 30/45] docs: set CONFDIR when running sphinx Date: Tue, 15 Dec 2020 12:54:30 -0500 Message-Id: <20201215175445.1272776-31-pbonzini@redhat.com> In-Reply-To: <20201215175445.1272776-1-pbonzini@redhat.com> References: <20201215175445.1272776-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/45] remove preconfig state \| expand [PULL,01/45] remove preconfig state [PULL,02/45] vl: remove separate preconfig main_loop [PULL,03/45] vl: allow -incoming defer with -preconfig [PULL,04/45] vl: extract softmmu/runstate.c [PULL,05/45] vl: extract softmmu/globals.c [PULL,06/45] vl: move all generic initialization out of vl.c [PULL,07/45] chardev: do not use machine_init_done [PULL,08/45] machine: introduce MachineInitPhase [PULL,09/45] ppc/spapr: cleanup -machine pseries,nvdimm=X handling [PULL,10/45] vl: make qemu_get_machine_opts static [PULL,11/45] plugin: propagate errors [PULL,12/45] memory: allow creating MemoryRegions before accelerators [PULL,13/45] monitor: allow quitting while in preconfig state [PULL,14/45] qmp: generalize watchdog-set-action to -no-reboot/-no-shutdown [PULL,15/45] vl: Add an -action option specifying response to guest events [PULL,16/45] vl: Add option to avoid stopping VM upon guest panic [PULL,17/45] qtest/pvpanic: Test panic option that allows VM to continue [PULL,18/45] msix: assert that accesses are within bounds [PULL,19/45] memory: clamp cached translation in case it points to an MMIO region [PULL,20/45] accel/tcg: Remove deprecated '-tb-size' option [PULL,21/45] docs/system: Move the list of removed features to a separate file [PULL,22/45] Remove the deprecated -realtime option [PULL,23/45] Remove the deprecated -show-cursor option [PULL,24/45] icount: improve exec nocache usage [PULL,25/45] scsi: fix device removal race vs IO restart callback on resume [PULL,26/45] kvm: Take into account the unaligned section size when preparing bitmap [PULL,27/45] qemu-option: simplify search for end of key [PULL,28/45] qemu-option: pass QemuOptsList to opts_accepts_any [PULL,29/45] vl: rename local variable in configure_accelerators [PULL,30/45] docs: set CONFDIR when running sphinx [PULL,31/45] hw/core: Restrict 'fw-path-provider.c' to system mode emulation [PULL,32/45] qemu/atomic: Drop special case for unsupported compiler [PULL,33/45] accel/tcg: Remove special case for GCC < 4.6 [PULL,34/45] compiler.h: remove GCC < 3 __builtin_expect fallback [PULL,35/45] qemu-plugin.h: remove GCC < 4 [PULL,36/45] tests: remove GCC < 4 fallbacks [PULL,37/45] virtiofsd: replace _Static_assert with QEMU_BUILD_BUG_ON [PULL,38/45] compiler.h: explicit case for Clang printf attribute [PULL,39/45] poison: remove GNUC check [PULL,40/45] xen: remove GNUC check [PULL,41/45] compiler: remove GNUC check [PULL,42/45] linux-user: remove GNUC check [PULL,43/45] compiler.h: remove QEMU_GNUC_PREREQ [PULL,44/45] scripts/git.orderfile: Keep files with .inc extension sorted [PULL,45/45] build: -no-pie is no functional linker flag

Commit Message

Paolo Bonzini Dec. 15, 2020, 5:54 p.m. UTC

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The default configuration path /etc/qemu can be overriden with configure
options, and the generated documentation used to reflect it.

Fixes regression introduced in commit
f8aa24ea9a82da38370470c6bc0eaa393999edfe ("meson: sphinx-build").

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1902537
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201201183704.299697-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 docs/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/docs/meson.build b/docs/meson.build
index ebd85d59f9..bb8fe4c9e4 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -9,7 +9,7 @@  endif
 # Check if tools are available to build documentation.
 build_docs = false
 if sphinx_build.found()
-  SPHINX_ARGS = [sphinx_build]
+  SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build]
   # If we're making warnings fatal, apply this to Sphinx runs as well
   if get_option('werror')
     SPHINX_ARGS += [ '-W' ]