[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 4/8] move parser functions from vl.c to qemu-opti
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v6 4/8] move parser functions from vl.c to qemu-option.c |
Date: |
Wed, 22 Jul 2009 16:43:00 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-option.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
qemu-option.h | 6 +++++
sysemu.h | 8 +------
vl.c | 64 ---------------------------------------------------------
4 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/qemu-option.c b/qemu-option.c
index 646bbad..bb2a09e 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -85,6 +85,70 @@ const char *get_opt_value(char *buf, int buf_size, const
char *p)
return p;
}
+int get_next_param_value(char *buf, int buf_size,
+ const char *tag, const char **pstr)
+{
+ const char *p;
+ char option[128];
+
+ p = *pstr;
+ for(;;) {
+ p = get_opt_name(option, sizeof(option), p, '=');
+ if (*p != '=')
+ break;
+ p++;
+ if (!strcmp(tag, option)) {
+ *pstr = get_opt_value(buf, buf_size, p);
+ if (**pstr == ',') {
+ (*pstr)++;
+ }
+ return strlen(buf);
+ } else {
+ p = get_opt_value(NULL, 0, p);
+ }
+ if (*p != ',')
+ break;
+ p++;
+ }
+ return 0;
+}
+
+int get_param_value(char *buf, int buf_size,
+ const char *tag, const char *str)
+{
+ return get_next_param_value(buf, buf_size, tag, &str);
+}
+
+int check_params(char *buf, int buf_size,
+ const char * const *params, const char *str)
+{
+ const char *p;
+ int i;
+
+ p = str;
+ while (*p != '\0') {
+ p = get_opt_name(buf, buf_size, p, '=');
+ if (*p != '=') {
+ return -1;
+ }
+ p++;
+ for (i = 0; params[i] != NULL; i++) {
+ if (!strcmp(params[i], buf)) {
+ break;
+ }
+ }
+ if (params[i] == NULL) {
+ return -1;
+ }
+ p = get_opt_value(NULL, 0, p);
+ if (*p != ',') {
+ break;
+ }
+ p++;
+ }
+ return 0;
+}
+
/*
* Searches an option list for an option with the given name
*/
diff --git a/qemu-option.h b/qemu-option.h
index 059c0a4..267abae 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -46,6 +46,12 @@ typedef struct QEMUOptionParameter {
const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
const char *get_opt_value(char *buf, int buf_size, const char *p);
+int get_next_param_value(char *buf, int buf_size,
+ const char *tag, const char **pstr);
+int get_param_value(char *buf, int buf_size,
+ const char *tag, const char *str);
+int check_params(char *buf, int buf_size,
+ const char * const *params, const char *str);
/*
diff --git a/sysemu.h b/sysemu.h
index ec55877..3748af1 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -3,6 +3,7 @@
/* Misc. things related to the system emulator. */
#include "qemu-common.h"
+#include "qemu-option.h"
#include "sys-queue.h"
#ifdef _WIN32
@@ -276,13 +277,6 @@ void do_usb_add(Monitor *mon, const char *devname);
void do_usb_del(Monitor *mon, const char *devname);
void usb_info(Monitor *mon);
-int get_param_value(char *buf, int buf_size,
- const char *tag, const char *str);
-int get_next_param_value(char *buf, int buf_size,
- const char *tag, const char **pstr);
-int check_params(char *buf, int buf_size,
- const char * const *params, const char *str);
-
void register_devices(void);
#endif
diff --git a/vl.c b/vl.c
index ae91999..a0e0897 100644
--- a/vl.c
+++ b/vl.c
@@ -1604,70 +1604,6 @@ static int socket_init(void)
}
#endif
-int get_next_param_value(char *buf, int buf_size,
- const char *tag, const char **pstr)
-{
- const char *p;
- char option[128];
-
- p = *pstr;
- for(;;) {
- p = get_opt_name(option, sizeof(option), p, '=');
- if (*p != '=')
- break;
- p++;
- if (!strcmp(tag, option)) {
- *pstr = get_opt_value(buf, buf_size, p);
- if (**pstr == ',') {
- (*pstr)++;
- }
- return strlen(buf);
- } else {
- p = get_opt_value(NULL, 0, p);
- }
- if (*p != ',')
- break;
- p++;
- }
- return 0;
-}
-
-int get_param_value(char *buf, int buf_size,
- const char *tag, const char *str)
-{
- return get_next_param_value(buf, buf_size, tag, &str);
-}
-
-int check_params(char *buf, int buf_size,
- const char * const *params, const char *str)
-{
- const char *p;
- int i;
-
- p = str;
- while (*p != '\0') {
- p = get_opt_name(buf, buf_size, p, '=');
- if (*p != '=') {
- return -1;
- }
- p++;
- for (i = 0; params[i] != NULL; i++) {
- if (!strcmp(params[i], buf)) {
- break;
- }
- }
- if (params[i] == NULL) {
- return -1;
- }
- p = get_opt_value(NULL, 0, p);
- if (*p != ',') {
- break;
- }
- p++;
- }
- return 0;
-}
-
/***********************************************************/
/* Bluetooth support */
static int nb_hcis;
--
1.6.2.5
- [Qemu-devel] [PATCH v6 0/8] drive cleanups + QemuOpts, Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 4/8] move parser functions from vl.c to qemu-option.c,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v6 2/8] add support for drive ids., Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 6/8] qemu-option: factor out parse_option_size, Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 3/8] kill drives_opt, Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 5/8] qemu-option: factor out parse_option_bool, Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 1/8] kill drives_table, Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 7/8] QemuOpts: framework for storing and parsing options., Gerd Hoffmann, 2009/07/22
- [Qemu-devel] [PATCH v6 8/8] switch -drive to QemuOpts., Gerd Hoffmann, 2009/07/22