From patchwork Wed Nov 23 11:49:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 9443053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4AC260235 for ; Wed, 23 Nov 2016 11:57:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79E29206AF for ; Wed, 23 Nov 2016 11:57:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B9F223D5E; Wed, 23 Nov 2016 11:57:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8DF42206AF for ; Wed, 23 Nov 2016 11:57:23 +0000 (UTC) Received: from localhost ([::1]:33051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9WB0-00007U-3J for patchwork-qemu-devel@patchwork.kernel.org; Wed, 23 Nov 2016 06:57:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c9W4G-0003Yg-Vo for qemu-devel@nongnu.org; Wed, 23 Nov 2016 06:50:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c9W4D-0002cp-Ti for qemu-devel@nongnu.org; Wed, 23 Nov 2016 06:50:25 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:24554) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1c9W4D-0002Rp-59 for qemu-devel@nongnu.org; Wed, 23 Nov 2016 06:50:21 -0500 Received: from 172.24.1.137 (EHLO szxeml433-hub.china.huawei.com) ([172.24.1.137]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CLU33858; Wed, 23 Nov 2016 19:50:08 +0800 (CST) Received: from localhost (10.177.18.62) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.235.1; Wed, 23 Nov 2016 19:49:59 +0800 From: Gonglei To: Date: Wed, 23 Nov 2016 19:49:51 +0800 Message-ID: <1479901791-144760-1-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 2.8.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.177.18.62] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH for-2.8] qom: fix qemu_opts leak when hot unplug object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gonglei , afaerber@suse.de Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If we assign the user crateable object in QEMU command line, then the correspeonding qemu_opts for the object doesn't be deleted, which will produce a wrong result. If we hot unplug the object by object_del, the qemu_opts will be leaked, ann then if we hot plug the object using the same id by object_add, we will get a error: "Duplicate ID 'xxxx' for object" Let's del the qemu opts after the object created, just likes what the hmp_object_add function does. Signed-off-by: Gonglei --- qom/object_interfaces.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ded4d84..b8fe9db 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -189,6 +189,10 @@ int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp) return -1; } object_unref(obj); + + qemu_opts_del(opts); + opts = NULL; + return 0; }