From patchwork Fri Oct 2 12:58:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 525529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C1F05140D89 for ; Fri, 2 Oct 2015 23:44:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=X5bDZZt0; dkim-atps=neutral Received: from localhost ([::1]:59861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zi0cz-0000Q3-RJ for incoming@patchwork.ozlabs.org; Fri, 02 Oct 2015 09:44:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhzut-0001Qt-Kj for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:58:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zhzus-00077X-Iu for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:58:27 -0400 Received: from mail-qk0-x233.google.com ([2607:f8b0:400d:c09::233]:34131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhzus-000777-Cz for qemu-devel@nongnu.org; Fri, 02 Oct 2015 08:58:26 -0400 Received: by qkbi190 with SMTP id i190so21828350qkb.1 for ; Fri, 02 Oct 2015 05:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=AcMYbaKnOl3CR8hUHWnooZAMfMEgcJEnjDzjnQNuxWw=; b=X5bDZZt0mnIjP2i+T6PXba6E/ulKWLgoEo1LwtVDGC2AjuWUOATPPfw5hEpoxqcAHd G8Ha1UpKFHSgGpajUf4fJWlZwR0L/5s2fmOYmQtvJRQNXBWMwfuIxY2W/P9TzvvGJ1qj FYJ0dJgtRSjvSTm3HCkRoB/Nco/vPk6Qd8kH5ilxv23vTfSBDDf02MjCgJiPW7q9xGuT tox+93SpCgcW5wqR3dfyaj2tQM/VKNfq4ub7rKdCkd60uFKO0vM7Z/EgJeTbv1fx6uDW Oj8LoiMwduzZ/jrBP29dsZ8GowazDwzpqiR5MigLlGm8vEwK79H3ADw+LeUhY8Px6xhm BU9A== X-Received: by 10.55.221.24 with SMTP id n24mr19346157qki.64.1443790705888; Fri, 02 Oct 2015 05:58:25 -0700 (PDT) Received: from localhost ([2001:450:1e:232:3ea9:f4ff:fe4c:6bac]) by smtp.gmail.com with ESMTPSA id 188sm4551349qhx.27.2015.10.02.05.58.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2015 05:58:25 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Fri, 2 Oct 2015 14:58:15 +0200 Message-Id: <1443790698-13327-3-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443790698-13327-1-git-send-email-marcandre.lureau@redhat.com> References: <1443790698-13327-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::233 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v3 2/5] qga: do not override configuration verbosity 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 From: Marc-André Lureau Move the default verbosity settings before loading the configuration file, or it will overwrite it. Found thanks to writing qga tests :) Signed-off-by: Marc-André Lureau Reviewed-by: Michael Roth --- qga/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qga/main.c b/qga/main.c index 18e1e1d..aa6a063 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1083,8 +1083,6 @@ static void config_parse(GAConfig *config, int argc, char **argv) { NULL, 0, NULL, 0 } }; - config->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL; - while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) { switch (ch) { case 'm': @@ -1332,6 +1330,8 @@ int main(int argc, char **argv) GAState *s = g_new0(GAState, 1); GAConfig *config = g_new0(GAConfig, 1); + config->log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL; + module_call_init(MODULE_INIT_QAPI); init_dfl_pathnames();