From patchwork Fri Jun 4 16:09:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 54635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 13006B7D30 for ; Sat, 5 Jun 2010 02:48:47 +1000 (EST) Received: from localhost ([127.0.0.1]:57613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKa4Z-0004v9-4I for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 12:48:43 -0400 Received: from [140.186.70.92] (port=47899 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKZoM-0004Zb-7L for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKZSl-0006kR-Fa for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:09:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45151) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKZSl-0006kI-2f for qemu-devel@nongnu.org; Fri, 04 Jun 2010 12:09:39 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54G9b8N001695 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 4 Jun 2010 12:09:37 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o54G9Hq3024734; Fri, 4 Jun 2010 12:09:36 -0400 From: Jes.Sorensen@redhat.com To: anthony@codemonkey.ws Date: Fri, 4 Jun 2010 18:09:09 +0200 Message-Id: <1275667755-4821-12-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com> References: <1275667755-4821-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jes Sorensen , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 11/17] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Introduce OS specific cmdline argument handling by calling os_parse_cmd_args() at the end of switch() statement. Move option enum to qemu-options.h and have it included from os-posix.c and os-win32.c in addition to vl.c. In addition move SMB argument to os-posix.c Signed-off-by: Jes Sorensen --- Makefile.objs | 2 ++ os-posix.c | 19 +++++++++++++++++++ os-win32.c | 10 ++++++++++ qemu-options.h | 41 +++++++++++++++++++++++++++++++++++++++++ sysemu.h | 1 + vl.c | 19 +++---------------- 6 files changed, 76 insertions(+), 16 deletions(-) create mode 100644 qemu-options.h diff --git a/Makefile.objs b/Makefile.objs index 124afe7..27595df 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -259,6 +259,8 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) vl.o: qemu-options.def +os-posix.o: qemu-options.def +os-win32.o: qemu-options.def qemu-options.def: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") diff --git a/os-posix.c b/os-posix.c index 621ad06..0deddf3 100644 --- a/os-posix.c +++ b/os-posix.c @@ -33,6 +33,8 @@ /* Needed early for CONFIG_BSD etc. */ #include "config-host.h" #include "sysemu.h" +#include "net/slirp.h" +#include "qemu-options.h" void os_setup_early_signal_handling(void) { @@ -130,3 +132,20 @@ char *os_find_datadir(const char *argv0) } #undef SHARE_SUFFIX #undef BUILD_SUFFIX + +/* + * Parse OS specific command line options. + * return 0 if option handled, -1 otherwise + */ +void os_parse_cmd_args(int index, const char *optarg) +{ + switch (index) { +#ifdef CONFIG_SLIRP + case QEMU_OPTION_smb: + if (net_slirp_smb(optarg) < 0) + exit(1); + break; +#endif + } + return; +} diff --git a/os-win32.c b/os-win32.c index 1758538..aefc535 100644 --- a/os-win32.c +++ b/os-win32.c @@ -31,6 +31,7 @@ #include #include "config-host.h" #include "sysemu.h" +#include "qemu-options.h" /***********************************************************/ /* Polling handling */ @@ -204,3 +205,12 @@ char *os_find_datadir(const char *argv0) } return NULL; } + +/* + * Parse OS specific command line options. + * return 0 if option handled, -1 otherwise + */ +void os_parse_cmd_args(int index, const char *optarg) +{ + return; +} diff --git a/qemu-options.h b/qemu-options.h new file mode 100644 index 0000000..c96f994 --- /dev/null +++ b/qemu-options.h @@ -0,0 +1,41 @@ +/* + * qemu-options.h + * + * Defines needed for command line argument processing. + * + * Copyright (c) 2003-2008 Fabrice Bellard + * Copyright (c) 2010 Jes Sorensen + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef _QEMU_OPTIONS_H_ +#define _QEMU_OPTIONS_H_ + +enum { +#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ + opt_enum, +#define DEFHEADING(text) +#include "qemu-options.def" +#undef DEF +#undef DEFHEADING +#undef GEN_DOCS +}; + +#endif diff --git a/sysemu.h b/sysemu.h index 72f3734..2162b1d 100644 --- a/sysemu.h +++ b/sysemu.h @@ -82,6 +82,7 @@ void do_info_slirp(Monitor *mon); /* OS specific functions */ void os_setup_early_signal_handling(void); char *os_find_datadir(const char *argv0); +void os_parse_cmd_args(int index, const char *optarg); typedef enum DisplayType { diff --git a/vl.c b/vl.c index 8cd0f8f..7c48024 100644 --- a/vl.c +++ b/vl.c @@ -148,6 +148,7 @@ int main(int argc, char **argv) #include "qemu-option.h" #include "qemu-config.h" #include "qemu-objects.h" +#include "qemu-options.h" #ifdef CONFIG_LINUX #include "fsdev/qemu-fsdev.h" #endif @@ -1899,16 +1900,6 @@ static void help(int exitcode) #define HAS_ARG 0x0001 -enum { -#define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ - opt_enum, -#define DEFHEADING(text) -#include "qemu-options.def" -#undef DEF -#undef DEFHEADING -#undef GEN_DOCS -}; - typedef struct QEMUOption { const char *name; int flags; @@ -2624,12 +2615,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_bootp: legacy_bootp_filename = optarg; break; -#ifndef _WIN32 - case QEMU_OPTION_smb: - if (net_slirp_smb(optarg) < 0) - exit(1); - break; -#endif case QEMU_OPTION_redir: if (net_slirp_redir(optarg) < 0) exit(1); @@ -3126,6 +3111,8 @@ int main(int argc, char **argv, char **envp) fclose(fp); break; } + default: + os_parse_cmd_args(popt->index, optarg); } } }