|
 |
9ae3a8 |
From 1d20e66fdee76ee9a7cab19de50a138588f0c8c8 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <1d20e66fdee76ee9a7cab19de50a138588f0c8c8.1383564115.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 27 Sep 2013 13:31:12 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 02/14] qemu-option: check_params() is now unused, drop it
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1380288680-26645-3-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54559
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 02/10] qemu-option: check_params() is now unused, drop it
|
|
|
9ae3a8 |
Bugzilla: 997817
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
9ae3a8 |
Message-id: 1371208516-7857-3-git-send-email-armbru@redhat.com
|
|
|
9ae3a8 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
9ae3a8 |
(cherry picked from commit a86b35f992f107323e432c0a96107e11e1b699ad)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/qemu/option.h | 2 --
|
|
|
9ae3a8 |
util/qemu-option.c | 30 ------------------------------
|
|
|
9ae3a8 |
2 files changed, 32 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/qemu/option.h | 2 --
|
|
|
9ae3a8 |
util/qemu-option.c | 30 ------------------------------
|
|
|
9ae3a8 |
2 files changed, 32 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/qemu/option.h b/include/qemu/option.h
|
|
|
9ae3a8 |
index 9db74fb..13f5e72 100644
|
|
|
9ae3a8 |
--- a/include/qemu/option.h
|
|
|
9ae3a8 |
+++ b/include/qemu/option.h
|
|
|
9ae3a8 |
@@ -55,8 +55,6 @@ int get_next_param_value(char *buf, int buf_size,
|
|
|
9ae3a8 |
const char *tag, const char **pstr);
|
|
|
9ae3a8 |
int get_param_value(char *buf, int buf_size,
|
|
|
9ae3a8 |
const char *tag, const char *str);
|
|
|
9ae3a8 |
-int check_params(char *buf, int buf_size,
|
|
|
9ae3a8 |
- const char * const *params, const char *str);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
diff --git a/util/qemu-option.c b/util/qemu-option.c
|
|
|
9ae3a8 |
index 37e7640..5d686c8 100644
|
|
|
9ae3a8 |
--- a/util/qemu-option.c
|
|
|
9ae3a8 |
+++ b/util/qemu-option.c
|
|
|
9ae3a8 |
@@ -123,36 +123,6 @@ int get_param_value(char *buf, int buf_size,
|
|
|
9ae3a8 |
return get_next_param_value(buf, buf_size, tag, &str);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-int check_params(char *buf, int buf_size,
|
|
|
9ae3a8 |
- const char * const *params, const char *str)
|
|
|
9ae3a8 |
-{
|
|
|
9ae3a8 |
- const char *p;
|
|
|
9ae3a8 |
- int i;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- p = str;
|
|
|
9ae3a8 |
- while (*p != '\0') {
|
|
|
9ae3a8 |
- p = get_opt_name(buf, buf_size, p, '=');
|
|
|
9ae3a8 |
- if (*p != '=') {
|
|
|
9ae3a8 |
- return -1;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- p++;
|
|
|
9ae3a8 |
- for (i = 0; params[i] != NULL; i++) {
|
|
|
9ae3a8 |
- if (!strcmp(params[i], buf)) {
|
|
|
9ae3a8 |
- break;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- if (params[i] == NULL) {
|
|
|
9ae3a8 |
- return -1;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- p = get_opt_value(NULL, 0, p);
|
|
|
9ae3a8 |
- if (*p != ',') {
|
|
|
9ae3a8 |
- break;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- p++;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
- return 0;
|
|
|
9ae3a8 |
-}
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
* Searches an option list for an option with the given name
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|