From nobody Sun May 19 05:22:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1594870024; cv=none; d=zohomail.com; s=zohoarc; b=WjOIlD47S51aPXNQ0wT+AUFUyz5Hr8CsQfgn4AJsyzuO+X9REfA0GTn+lfHjMGwS3YecyPRWSNsX6pMxCkQNAqAKIWG8ASbJWP4vgfdE+tvq28iNMkw2TqYuCbXSqgPx/JZ2wYtqwgqkRq6QXO08GOgNkY14wstdEoaSkoWB8uE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594870024; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=bEPjoiPi7H2qfpIIVg3VIa6tY0m8LPlx2RcrM5pbFuU=; b=NHrQzs0WSnlK1IKz7z1uK9l2uPPW9IfYw99ZWWAg5GW3jMyKbMExq3o/IUPxHKBQ7749WYSkUaaS6xMFgrIzF42mX9XMwN5SG4g+kWoCx7o0K4CXSKDJL8/apo42bdR5CJAAfa5YYdlesmOJH1VZ9TtrXJ2p9fnEpQAdV/RpzKU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594870024945653.2133379109318; Wed, 15 Jul 2020 20:27:04 -0700 (PDT) Received: from localhost ([::1]:44910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvuY3-0005bJ-EV for importer@patchew.org; Wed, 15 Jul 2020 23:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvuXN-0004u9-0W for qemu-devel@nongnu.org; Wed, 15 Jul 2020 23:26:21 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:38377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvuXL-0001ZY-F2 for qemu-devel@nongnu.org; Wed, 15 Jul 2020 23:26:20 -0400 Received: by mail-lj1-x243.google.com with SMTP id x9so5422581ljc.5 for ; Wed, 15 Jul 2020 20:26:18 -0700 (PDT) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id a23sm887899lfb.10.2020.07.15.20.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 20:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bEPjoiPi7H2qfpIIVg3VIa6tY0m8LPlx2RcrM5pbFuU=; b=Ifm+oVoaYqrYOslWcjkxN3jXKYSuhXc9/n6f2bPnZKiE7GSJLV0qA1SyuLttqHiBs2 jIuALbl3RwuHVxMmMpE6mrKQ0syENQWttEmBPvaZewWB9/ldyQQ4JLwkPxGE9l4q55sL /Jqpbl+TfwkE8if0GrjbX5NWmttEjcUfOfSYS8tkXFzadnH84lNm4I2184KFTo0DhoGD pStYtNJN/YZqfkWOs20FZXehSdXXqT7tEkJgBN+SLzV1k8AbnaGMqZCjCDbKprTfu9x6 NRNi60IBsdDgj0DtDkR+KCew6ZIZSMZLHoew+JF6RtKhFTuD9OngAjh62wcTzBHvKNwn 6pGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bEPjoiPi7H2qfpIIVg3VIa6tY0m8LPlx2RcrM5pbFuU=; b=PtTt2z5t68+PEx0klLaqIUKrkxBk1arb5C+qIa9AxEaUwk92h/3pfMnKEINP48vBup pDLassgRKPOQakrCqH/lhLgfVW9uM7KlDOgslnWiOZe/f+dIeMs7EQVD4cF7UlpDQzLP TUUzSMjcze0Eg3GM9j5yrRQ+qPdUtzwJ2pl9/8K1/7Zc1SjYf8NoUNRZWUF23f43bSNH xJMxjbY8W+cGlPp75qsw1foc78i0Uq2t0sScaI+IZe7Q3AMI34f+HPWqCqBAuPyUclsD zifkyAbPWv1Glfg1fKDW7qWZSwQnKR/z25sXzcTAfjS1oRrthSOKXD4xNi3Gj/4qZLa/ wgSg== X-Gm-Message-State: AOAM530/dDJ3iYb3D/O6QYf82edD2+incORqhOcPFY9p9aMiPlz1THwu jTSE4hXO1OzcmUeOdytJqe8PdxP2s3JJEA== X-Google-Smtp-Source: ABdhPJyTQVCNczsCBo7r2ndHPndfPCXIt1QsFefqk4g2IjB2Nuz3F7Pz8h86i2cWkMYCxX7Eqr8How== X-Received: by 2002:a2e:9f4c:: with SMTP id v12mr935750ljk.327.1594869977333; Wed, 15 Jul 2020 20:26:17 -0700 (PDT) From: andrew@daynix.com To: qemu-devel@nongnu.org Subject: [PATCH] hmp: Changed hmp_netdev_add() using qmp_marshal_netdev_add() Date: Thu, 16 Jul 2020 06:55:32 +0300 Message-Id: <20200716035532.1407660-1-andrew@daynix.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2a00:1450:4864:20::243; envelope-from=andrew@daynix.com; helo=mail-lj1-x243.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @daynix-com.20150623.gappssmtp.com) Content-Type: text/plain; charset="utf-8" From: Andrew Melnychenko There is an issue, that netdev can't be removed if it was added using hmp. The bug appears after 08712fcb851034228b61f75bd922863a984a4f60 commit. It happens because of unclear QemuOpts that was created during hmp_netdev_add(), now it uses qmp analog function - qmp_marshal_netdev_add(). Signed-off-by: Andrew Melnychenko --- monitor/hmp-cmds.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 2b0b58a336..b747935687 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1597,19 +1597,10 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) void hmp_netdev_add(Monitor *mon, const QDict *qdict) { Error *err =3D NULL; - QemuOpts *opts; - - opts =3D qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &err); - if (err) { - goto out; - } + QDict *non_constant_dict =3D qdict_clone_shallow(qdict); =20 - netdev_add(opts, &err); - if (err) { - qemu_opts_del(opts); - } - -out: + qmp_marshal_netdev_add(non_constant_dict, NULL, &err); + qobject_unref(non_constant_dict); hmp_handle_error(mon, err); } =20 --=20 2.27.0