From 410cbafebc7168a278a23c856b4f5ff276ef1c85 Mon Sep 17 00:00:00 2001 From: Yoshiaki Tamura Date: Mon, 21 Jun 2010 10:41:36 +0900 Subject: [PATCH] net: delete QemuOpts when net_client_init() fails. This fixes the following scenario using QMP. First, put a bogus argument "foo" to "type", which results in an error. {"execute": "netdev_add", "arguments": { "type": "foo", "id": "netdev1" } } Then, call it again with correct argument "user". {"execute": "netdev_add", "arguments": { "type": "user", "id": "netdev1" } } This results in "DuplicatedId" error. Because the first command was invalid, it should be able to reuse the same "id", and the second command should work. Reported-by: Luiz Capitulino Signed-off-by: Yoshiaki Tamura Signed-off-by: Luiz Capitulino --- net.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net.c b/net.c index 90bd5a9047..8ddf872a6f 100644 --- a/net.c +++ b/net.c @@ -1208,6 +1208,10 @@ int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data) } res = net_client_init(mon, opts, 1); + if (res < 0) { + qemu_opts_del(opts); + } + return res; }