From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL v2 16/26] option: Add assigned flag to QEMUOptionParameter
Date: Mon, 2 Sep 2013 10:49:42 +0200 [thread overview]
Message-ID: <1378111792-20436-17-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1378111792-20436-1-git-send-email-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
Adds an "assigned" flag to QEMUOptionParameter which is cleared at the
beginning of parse_option_parameters and set on (successful)
set_option_parameter and set_option_parameter_int.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/qemu/option.h | 1 +
util/qemu-option.c | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 7a58e47..63db4cc 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -46,6 +46,7 @@ typedef struct QEMUOptionParameter {
char* s;
} value;
const char *help;
+ bool assigned;
} QEMUOptionParameter;
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 4ebdc4c..e0844a9 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -275,6 +275,8 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name,
return -1;
}
+ list->assigned = true;
+
return 0;
}
@@ -306,6 +308,8 @@ int set_option_parameter_int(QEMUOptionParameter *list, const char *name,
return -1;
}
+ list->assigned = true;
+
return 0;
}
@@ -397,6 +401,7 @@ QEMUOptionParameter *parse_option_parameters(const char *param,
char value[256];
char *param_delim, *value_delim;
char next_delim;
+ int i;
if (list == NULL) {
return NULL;
@@ -406,6 +411,10 @@ QEMUOptionParameter *parse_option_parameters(const char *param,
dest = allocated = append_option_parameters(NULL, list);
}
+ for (i = 0; dest[i].name; i++) {
+ dest[i].assigned = false;
+ }
+
while (*param) {
// Find parameter name and value in the string
--
1.8.1.4
next prev parent reply other threads:[~2013-09-02 8:50 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 8:49 [Qemu-devel] [PULL v2 00/26] Block patches Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 01/26] qcow2: Change default for new images to compat=1.1 Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 02/26] block: Remove redundant assertion Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 03/26] qapi-types.py: Split off generate_struct_fields() Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 04/26] Revert "block: Disable driver-specific options for 1.6" Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 05/26] qemu-iotests: Update reference output for 051 Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 06/26] block/qcow2.h: Avoid "1LL << 63" (shifts into sign bit) Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 07/26] add skeleton for BSD licensed "raw" BlockDriver Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 08/26] raw_bsd: emit debug events in bdrv_co_readv() and bdrv_co_writev() Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 09/26] raw_bsd: add raw_create() Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 10/26] raw_bsd: introduce "special members" Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 11/26] raw_bsd: add raw_create_options Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 12/26] raw_bsd: register bdrv_raw Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 13/26] switch raw block driver from "raw.o" to "raw_bsd.o" Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 14/26] block: Remove old raw driver Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 15/26] gluster: Abort on AIO completion failure Kevin Wolf
2013-09-02 8:49 ` Kevin Wolf [this message]
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 17/26] qcow2-refcount: Snapshot update for zero clusters Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 18/26] qemu-iotests: Snapshotting " Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 19/26] qcow2: Add corrupt bit Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 20/26] qcow2: Metadata overlap checks Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 21/26] qcow2: Employ metadata " Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 22/26] qcow2-refcount: Move OFLAG_COPIED checks Kevin Wolf
2013-09-02 13:52 ` Stefan Hajnoczi
2013-09-03 7:21 ` Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 23/26] qcow2-refcount: Repair OFLAG_COPIED errors Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 24/26] qcow2-refcount: Repair shared refcount blocks Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 25/26] qcow2_check: Mark image consistent Kevin Wolf
2013-09-02 8:49 ` [Qemu-devel] [PULL v2 26/26] qemu-iotests: Overlapping cluster allocations Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378111792-20436-17-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).