From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=47261 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKWts-0005qS-JO for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKWtc-0001qi-PS for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7675) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKWtc-0001qH-Cn for qemu-devel@nongnu.org; Fri, 04 Jun 2010 09:25:12 -0400 From: Jes.Sorensen@redhat.com Date: Fri, 4 Jun 2010 15:24:36 +0200 Message-Id: <1275657882-19268-14-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1275657882-19268-1-git-send-email-Jes.Sorensen@redhat.com> References: <1275657882-19268-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 11/17] Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: Jes Sorensen , qemu-devel@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 ++++++++++ sysemu.h | 1 + vl.c | 19 +++---------------- 5 files changed, 35 insertions(+), 16 deletions(-) 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/sysemu.h b/sysemu.h index affcbea..d7aab40 100644 --- a/sysemu.h +++ b/sysemu.h @@ -81,6 +81,7 @@ void do_info_slirp(Monitor *mon); /* OS specific functions */ 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); } } } -- 1.6.5.2