From patchwork Tue Mar 20 20:15:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 147833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9C914B6EF3 for ; Wed, 21 Mar 2012 07:16:11 +1100 (EST) Received: from localhost ([::1]:47627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SA5TV-0001ZW-CY for incoming@patchwork.ozlabs.org; Tue, 20 Mar 2012 16:16:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SA5Sv-00005L-Cz for qemu-devel@nongnu.org; Tue, 20 Mar 2012 16:15:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SA5SX-0004Yl-4t for qemu-devel@nongnu.org; Tue, 20 Mar 2012 16:15:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SA5SW-0004Xu-SG for qemu-devel@nongnu.org; Tue, 20 Mar 2012 16:15:09 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2KKF5bM024986 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Mar 2012 16:15:05 -0400 Received: from blackpad.lan.raisama.net (ovpn-116-78.ams2.redhat.com [10.36.116.78]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2KKF4Yp029395; Tue, 20 Mar 2012 16:15:04 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 424822005B5; Tue, 20 Mar 2012 17:15:04 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 20 Mar 2012 17:15:03 -0300 Message-Id: <1332274504-10437-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1332274504-10437-1-git-send-email-ehabkost@redhat.com> References: <1332274504-10437-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Anthony Liguori Subject: [Qemu-devel] [PATCH 2/3] qemu-options.hx: refer to confdir instead of sysconfdir on docs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The current docs are wrong: ${sysconfdir} is (by default) /etc, ${confdir} is (by default) /etc/qemu, that's where the config files are stored. Signed-off-by: Eduardo Habkost --- qemu-options.hx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index daefce3..39578f1 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2676,8 +2676,8 @@ DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, STEXI @item -nodefconfig @findex -nodefconfig -Normally QEMU loads a configuration file from @var{sysconfdir}/qemu.conf and -@var{sysconfdir}/target-@var{ARCH}.conf on startup. The @code{-nodefconfig} +Normally QEMU loads a configuration file from @var{confdir}/qemu.conf and +@var{confdir}/target-@var{ARCH}.conf on startup. The @code{-nodefconfig} option will prevent QEMU from loading these configuration files at startup. ETEXI DEF("trace", HAS_ARG, QEMU_OPTION_trace,