From nobody Tue Nov 18 07:41:49 2025 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=1608071602; cv=none; d=zohomail.com; s=zohoarc; b=QlNow0IBApOAcnvIfwnWEm75ZrleZcoZuAx+JrUTz1RGHgAf0YKp0rnipIAP8a+SOH2DswQoNmCylBw0XOOnH2BvdGhEpi561F55H6/+FvnhBQZJ6pWXdBSkZfrkAX/kEgZ8bDZ9+gRJ+oYdnvsRuXOwRXgytrz+LKZCIj9KKco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608071602; 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=dnpVozzVLrWshLQCxyWMRt/jtzXionN1lAp0SaRMTlA=; b=QSC+WRujbBpCbFxHAwf5nffc4YTbI7fDcBMOAig0VbvnYFZelPsdBDAQc6VL3qmAiQrg6U5QOAsJOj8Fc3/oQlAVuGrVvYo0nOfJBdwjyCoyiuoy/4n0nYy6Q572DUun+sSkJwtLkoVtaJGIb5qZWiOhODwEkszdFesBOee7uHQ= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608071602226332.63772917007327; Tue, 15 Dec 2020 14:33:22 -0800 (PST) Received: from localhost ([::1]:44820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpEof-0002VR-7s for importer@patchew.org; Tue, 15 Dec 2020 13:12:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpEXX-0003IS-H2 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 12:55:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39073) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpEXS-0001X2-W6 for qemu-devel@nongnu.org; Tue, 15 Dec 2020 12:55:11 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-185-BnMqt0T8NECn8wPSH8JwGQ-1; Tue, 15 Dec 2020 12:55:03 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82DC5107ACFA for ; Tue, 15 Dec 2020 17:55:02 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97BDD6267D; Tue, 15 Dec 2020 17:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608054905; 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=dnpVozzVLrWshLQCxyWMRt/jtzXionN1lAp0SaRMTlA=; b=WBJu1EksnfOozd1HK2xIculgb3Wauih6eI1OstkEfzNH4jxqGlIUh1FYU4NWQtX5YEzkQi JGkNoh4gotjp9sbFbOdZZDbrP/y3gi/O8dYo3nOuRxIhV+uwMZHhYcTfH22+05LYLg3GVE flDrsBHWOxcNgFvz8T2aYFpqOBVxDb8= X-MC-Unique: BnMqt0T8NECn8wPSH8JwGQ-1 From: Paolo Bonzini 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 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau 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=3D1902537 Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20201201183704.299697-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- docs/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 =3D false if sphinx_build.found() - SPHINX_ARGS =3D [sphinx_build] + SPHINX_ARGS =3D ['env', 'CONFDIR=3D' + qemu_confdir, sphinx_build] # If we're making warnings fatal, apply this to Sphinx runs as well if get_option('werror') SPHINX_ARGS +=3D [ '-W' ] --=20 2.26.2