From 6d378185c665c0edf3081f570c5b42dd3303f9b4 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 31 Jul 2009 12:25:33 +0200 Subject: QemuOpts: qemu_opts_parse: fix id= parsing We can't use get_param_value(), it can't handle parameters without '=' in there. Examples not working because of that: -device foo,id=bar -device file=/path/image,format=qcow2,snapshot,id=disk0 Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori Message-Id: --- qemu-option.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qemu-option.c b/qemu-option.c index 7164ee8da..61141e0bd 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -715,8 +715,13 @@ QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, const char *fi QemuOpts *opts; const char *p,*pe,*pc; - if (get_param_value(value, sizeof(value), "id", params)) + if (strncmp(params, "id=", 3) == 0) { + get_opt_value(value, sizeof(value), params+3); id = qemu_strdup(value); + } else if ((p = strstr(params, ",id=")) != NULL) { + get_opt_value(value, sizeof(value), p+4); + id = qemu_strdup(value); + } opts = qemu_opts_create(list, id, 1); if (opts == NULL) return NULL; -- cgit v1.2.3