Patchwork [06/23] net: delete QemuOpts when net_client_init() fails.

login
register
mail settings
Submitter Luiz Capitulino
Date July 1, 2010, 7:21 p.m.
Message ID <1278012111-26227-7-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/57576/
State New
Headers show

Comments

Luiz Capitulino - July 1, 2010, 7:21 p.m.
From: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>

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 <lcapitulino@redhat.com>
Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 net.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Patch

diff --git a/net.c b/net.c
index 90bd5a9..8ddf872 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;
 }