[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/12] qga: fill default options in main()
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 07/12] qga: fill default options in main() |
Date: |
Wed, 26 Aug 2015 00:10:19 +0200 |
From: Marc-André Lureau <address@hidden>
Fill all default options during main(). This is a preparation patch
to allow to dump the configuration.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options, (continued)
- [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 03/12] qga: move string split in separate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 05/12] qga: copy argument strings, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path', marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 06/12] qga: move option parsing to seperate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 09/12] qga: free a bit more, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 07/12] qga: fill default options in main(),
marcandre . lureau <=
- [Qemu-devel] [PATCH v2 10/12] qga: add an optionnal qemu-ga.conf system configuration, marcandre . lureau, 2015/08/25
- Re: [Qemu-devel] [PATCH v2 10/12] qga: add an optionnal qemu-ga.conf system configuration, Markus Armbruster, 2015/08/26
- [Qemu-devel] [PATCH v2 08/12] qga: move agent run in a seperate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 11/12] qga: add --dump-conf option, marcandre . lureau, 2015/08/25