From patchwork Wed Aug 26 10:05:17 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: 510783 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 4397C1401F0 for ; Wed, 26 Aug 2015 20:10:34 +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=zNP60XWG; dkim-atps=neutral Received: from localhost ([::1]:37128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXf6-00009E-FC for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2015 06:10:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXaR-0000e9-4Z for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:05:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUXaN-0007C6-Pg for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:05:43 -0400 Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]:34522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXaN-0007Bp-Kv for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:05:39 -0400 Received: by qgeg42 with SMTP id g42so123542109qge.1 for ; Wed, 26 Aug 2015 03:05:39 -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=hwCw62P3Aet+YLHl9VfR3qufi+yotCW68+AK7pbGOfE=; b=zNP60XWGQFkHVZU0DS43yuGF4kJ7TGLjyq6HV+cpLqaaKlbRjG6jvU5/44yF8vq7eP oQGSbv9Bjo55C96eOUM+L2PMNW3+gmt8EecKVAo93uw9MxesCO588X4sPC6ykrRZASUE nh37CgeLOGW0hF3zXUlhYBODdn2aI/6QGb7U315QQrbWxbpwB1mKZnv2+a5xiHiYKZgb uHD1W2/Ac5svJkSNyDwzU+D/1hh7c1CqiUOKKRLUCVW+X7zM0pxOiWbF9TX9iWq+MRn9 B0N0CZNNHy9/8nuZcI6HenqcEEwY5ibygFUsg9L7FwKVCGiRopa7CLYB42eV4PKJe4a2 3Gvg== X-Received: by 10.140.147.69 with SMTP id 66mr80660305qht.57.1440583539178; Wed, 26 Aug 2015 03:05:39 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id 65sm16102108qks.30.2015.08.26.03.05.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 03:05:38 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2015 12:05:17 +0200 Message-Id: <1440583525-21632-5-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440583525-21632-1-git-send-email-marcandre.lureau@redhat.com> References: <1440583525-21632-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:c04::22f Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v3 04/12] qga: rename 'path' to 'channel_path' 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 'path' is already a global function, rename the variable since it's going to be in global scope in a later patch. Signed-off-by: Marc-André Lureau Reviewed-by: Michael Roth Reviewed-by: Denis V. Lunev --- qga/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qga/main.c b/qga/main.c index e75022c..ede5306 100644 --- a/qga/main.c +++ b/qga/main.c @@ -944,7 +944,7 @@ static GList *split_list(gchar *str, const gchar separator) int main(int argc, char **argv) { const char *sopt = "hVvdm:p:l:f:F::b:s:t:"; - const char *method = NULL, *path = NULL; + const char *method = NULL, *channel_path = NULL; const char *log_filepath = NULL; const char *pid_filepath; #ifdef CONFIG_FSFREEZE @@ -990,7 +990,7 @@ int main(int argc, char **argv) method = optarg; break; case 'p': - path = optarg; + channel_path = optarg; break; case 'l': log_filepath = optarg; @@ -1040,7 +1040,8 @@ int main(int argc, char **argv) if (ga_install_vss_provider()) { exit(EXIT_FAILURE); } - if (ga_install_service(path, log_filepath, fixed_state_dir)) { + if (ga_install_service(channel_path, log_filepath, + fixed_state_dir)) { exit(EXIT_FAILURE); } exit(EXIT_SUCCESS); @@ -1185,7 +1186,7 @@ int main(int argc, char **argv) #endif s->main_loop = g_main_loop_new(NULL, false); - if (!channel_init(ga_state, method, path)) { + if (!channel_init(ga_state, method, channel_path)) { g_critical("failed to initialize guest agent channel"); goto out_bad; }