From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUfDa-00088d-1N for qemu-devel@nongnu.org; Wed, 26 Aug 2015 14:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUfDW-0007co-QX for qemu-devel@nongnu.org; Wed, 26 Aug 2015 14:14:37 -0400 Received: from mx2.parallels.com ([199.115.105.18]:48441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUfDW-0007cL-L6 for qemu-devel@nongnu.org; Wed, 26 Aug 2015 14:14:34 -0400 References: <1440583525-21632-1-git-send-email-marcandre.lureau@redhat.com> <1440583525-21632-8-git-send-email-marcandre.lureau@redhat.com> From: "Denis V. Lunev" Message-ID: <55DE0203.8030204@parallels.com> Date: Wed, 26 Aug 2015 21:14:27 +0300 MIME-Version: 1.0 In-Reply-To: <1440583525-21632-8-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v3 07/12] qga: fill default options in main() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com On 08/26/2015 01:05 PM, marcandre.lureau@redhat.com wrote: > 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 | 34 +++++++++++++++++----------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/qga/main.c b/qga/main.c > index 8c4a075..80f51fe 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; > @@ -1100,6 +1083,23 @@ int main(int argc, char **argv) > config->state_dir = g_strdup(dfl_pathnames.state_dir); > } > > + if (config->method == NULL) { > + config->method = g_strdup("virtio-serial"); > + } > + > + if (config->channel_path == NULL) { > + if (strcmp(config->method, "virtio-serial") == 0) { > + /* try the default path for the virtio-serial port */ > + config->channel_path = g_strdup(QGA_VIRTIO_PATH_DEFAULT); > + } else if (strcmp(config->method, "isa-serial") == 0) { > + /* try the default path for the serial port - COM1 */ > + config->channel_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 Reviewed-by: Denis V. Lunev