From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EEF9C5519F for ; Fri, 20 Nov 2020 10:35:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B3CE2224C for ; Fri, 20 Nov 2020 10:34:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.b="MRmOIwMM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B3CE2224C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg3kn-0007vJ-Pj for qemu-devel@archiver.kernel.org; Fri, 20 Nov 2020 05:34:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg3jW-0007Dy-QN for qemu-devel@nongnu.org; Fri, 20 Nov 2020 05:33:40 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:35208) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kg3jT-0004lb-SZ for qemu-devel@nongnu.org; Fri, 20 Nov 2020 05:33:38 -0500 Received: by mail-wm1-x343.google.com with SMTP id w24so9363953wmi.0 for ; Fri, 20 Nov 2020 02:33:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=izi/+3GQVvv6ylb4eoz5qfCN7h+rm4Fyx9uyOgjA+hQ=; b=MRmOIwMMnMHVSgVLB+HltU23Od2wLANLE5xOUDcPiLPQJmvYiUqWlobGy7t40n3Cgx WqcOb4ErqaSotW1Sb5W6AYLB6iFQjrhN0+my5aWObZUoi3Jtcl2fvup8XLxIH3XIEjkN Gq3qoTnbLvG+cW8pUKMUgsB94dukOYAvUhxqpzAruXkullAMKJxxWnrXKLLOw/H0QPEc xE47hkeVJt2JRxUz4aBlxkGANsboC2aJ8fVZGVokA8N8xcK903xq+PeFLJztNEJq5MUX ZZo+XqYijST3xMLoOGbFIM2VHcNYsx/0xaZ2IrgcS6n5voWrlW0HTtzhs3Kk6V4Ldf6X 77Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=izi/+3GQVvv6ylb4eoz5qfCN7h+rm4Fyx9uyOgjA+hQ=; b=enyyTFH5CE6bGnWJJV1E5tCgX0K9o9FJCz9QIxsZSWNHrxvtFNVf5LM9EjMTna/SoU q6GtqKclXTMQyQujvThZeZz5vm2Np2Bug0S3deqb6YtzbMQhI9fT+DvPC6WatsEt4/Sv K84uCi7RaEJFsd0kbRSaBvg0RyTtB/5nwOjX2dPxJ1iB80nxQue+DwwvLJlJdI3UrpFF 74eHHzBLUhwVYzXHiqUWXyb08eJn/BSWjYfiGVenPLyulob9aN2vybaD4IYhkcwV+pnT y+M5ztzONp7k20er1uZMtKPktVrgPkE2N6v23Ru7TntfnYV4lSkoaOyexu45046NqeVr ke2Q== X-Gm-Message-State: AOAM532A+rwVeFCqNfWNUVe7wdPXXnom8/PyDfJ/MgNnIGsfFth5VfrE z6KAtyf2PPvJyeUxZnR9PKNk/TMfOtenv5OMVXk3sU8eHgg= X-Google-Smtp-Source: ABdhPJzPMhwfOHmYACXvzkF3p88XHr0gaRUMIiVIIufUa+SVX/Ie6Zk0P8349gk8r3ShCNr+Y+DX3AVdVS/DkyQi73Q= X-Received: by 2002:a1c:e482:: with SMTP id b124mr9599327wmh.25.1605868413382; Fri, 20 Nov 2020 02:33:33 -0800 (PST) MIME-Version: 1.0 References: <20200716035532.1407660-1-andrew@daynix.com> In-Reply-To: <20200716035532.1407660-1-andrew@daynix.com> From: Andrew Melnichenko Date: Fri, 20 Nov 2020 13:05:36 +0200 Message-ID: Subject: Re: [PATCH] hmp: Changed hmp_netdev_add() using qmp_marshal_netdev_add() To: qemu-devel@nongnu.org Content-Type: multipart/alternative; boundary="0000000000005615b405b4876031" Received-SPF: none client-ip=2a00:1450:4864:20::343; envelope-from=andrew@daynix.com; helo=mail-wm1-x343.google.com 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, HTML_MESSAGE=0.001, 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: Yan Vugenfirer , Yuri Benditovich , dgilbert@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000005615b405b4876031 Content-Type: text/plain; charset="UTF-8" Ping On Thu, Jul 16, 2020 at 6:26 AM wrote: > 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 = NULL; > - QemuOpts *opts; > - > - opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &err); > - if (err) { > - goto out; > - } > + QDict *non_constant_dict = qdict_clone_shallow(qdict); > > - 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); > } > > -- > 2.27.0 > > --0000000000005615b405b4876031 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Ping

On Thu, Jul 16, 2020 at 6:26 AM <andrew@daynix.com> wrote:
From: Andrew Melnychenko <andrew@daynix.com><= br>
There is an issue, that netdev can't be removed if it was added using h= mp.
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 <andrew@daynix.com>
---
=C2=A0monitor/hmp-cmds.c | 15 +++------------
=C2=A01 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)<= br> =C2=A0void hmp_netdev_add(Monitor *mon, const QDict *qdict)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0Error *err =3D NULL;
-=C2=A0 =C2=A0 QemuOpts *opts;
-
-=C2=A0 =C2=A0 opts =3D qemu_opts_from_qdict(qemu_find_opts("netdev&qu= ot;), qdict, &err);
-=C2=A0 =C2=A0 if (err) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 goto out;
-=C2=A0 =C2=A0 }
+=C2=A0 =C2=A0 QDict *non_constant_dict =3D qdict_clone_shallow(qdict);

-=C2=A0 =C2=A0 netdev_add(opts, &err);
-=C2=A0 =C2=A0 if (err) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 qemu_opts_del(opts);
-=C2=A0 =C2=A0 }
-
-out:
+=C2=A0 =C2=A0 qmp_marshal_netdev_add(non_constant_dict, NULL, &err); +=C2=A0 =C2=A0 qobject_unref(non_constant_dict);
=C2=A0 =C2=A0 =C2=A0hmp_handle_error(mon, err);
=C2=A0}

--
2.27.0

--0000000000005615b405b4876031--