From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMQa-0006XL-I0 for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUMQY-0002cW-Vl for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:48 -0400 Received: from mail-qk0-x233.google.com ([2607:f8b0:400d:c09::233]:34993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMQY-0002c6-QO for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:46 -0400 Received: by qkbm65 with SMTP id m65so108974609qkb.2 for ; Tue, 25 Aug 2015 15:10:46 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Wed, 26 Aug 2015 00:10:19 +0200 Message-Id: <1440540624-7998-8-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> References: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 07/12] qga: fill default options in main() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com From: Marc-André Lureau Fill all default options during main(). This is a preparation patch to allow to dump the configuration. Signed-off-by: Marc-André Lureau Reviewed-by: Michael Roth --- qga/main.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/qga/main.c b/qga/main.c index a8dda38..979ce5c 100644 --- a/qga/main.c +++ b/qga/main.c @@ -658,23 +658,6 @@ static gboolean channel_init(GAState *s, const gchar *method, const gchar *path) { GAChannelMethod channel_method; - if (method == NULL) { - method = "virtio-serial"; - } - - if (path == NULL) { - if (strcmp(method, "virtio-serial") == 0 ) { - /* try the default path for the virtio-serial port */ - path = QGA_VIRTIO_PATH_DEFAULT; - } else if (strcmp(method, "isa-serial") == 0){ - /* try the default path for the serial port - COM1 */ - path = QGA_SERIAL_PATH_DEFAULT; - } else { - g_critical("must specify a path for this channel"); - return false; - } - } - if (strcmp(method, "virtio-serial") == 0) { s->virtio = true; /* virtio requires special handling in some cases */ channel_method = GA_CHANNEL_VIRTIO_SERIAL; @@ -1081,7 +1064,7 @@ static void config_free(GAConfig *config) g_free(config); } - int main(int argc, char **argv) +int main(int argc, char **argv) { GAState *s; GAConfig *config; @@ -1100,6 +1083,23 @@ static void config_free(GAConfig *config) config->state_dir = g_strdup(dfl_pathnames.state_dir); } + if (method == NULL) { + method = g_strdup("virtio-serial"); + } + + if (device_path == NULL) { + if (strcmp(method, "virtio-serial") == 0) { + /* try the default path for the virtio-serial port */ + device_path = g_strdup(QGA_VIRTIO_PATH_DEFAULT); + } else if (strcmp(method, "isa-serial") == 0) { + /* try the default path for the serial port - COM1 */ + device_path = g_strdup(QGA_SERIAL_PATH_DEFAULT); + } else { + g_critical("must specify a path for this channel"); + goto out_bad; + } + } + #ifdef _WIN32 /* On win32 the state directory is application specific (be it the default * or a user override). We got past the command line parsing; let's create -- 2.4.3