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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 37942C2D0E4 for ; Tue, 24 Nov 2020 15:48:18 +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 90595206F7 for ; Tue, 24 Nov 2020 15:48:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Bimpy9NO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90595206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khaYC-0003gu-El for qemu-devel@archiver.kernel.org; Tue, 24 Nov 2020 10:48:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khaWi-00033p-5G for qemu-devel@nongnu.org; Tue, 24 Nov 2020 10:46:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1khaWY-0004RU-Ic for qemu-devel@nongnu.org; Tue, 24 Nov 2020 10:46:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606232791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RAw+uRpf93qbCJIdA0RfhcIA56W+DwxugKAsUfDbkyI=; b=Bimpy9NO7bxqsaG/CSmZRs3I+McQNWK2bX9xJO4WCMyXqf4aVzm39wX6C359iTZA3VIKUH ZKPfKvwr7PcayMlpFZUnZoo34F1PZYa1tK9gnSUjsqX+ERvdeEcyv5mYllTIetmv/v2mKq lmntMbnEX58CNR45vDFd9yF+MxDostw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-hwhB5NhyPeuQReyP7W7qXA-1; Tue, 24 Nov 2020 10:46:00 -0500 X-MC-Unique: hwhB5NhyPeuQReyP7W7qXA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8A71809DCD; Tue, 24 Nov 2020 15:45:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72CAE5D9C0; Tue, 24 Nov 2020 15:45:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 05E7D113864E; Tue, 24 Nov 2020 16:45:57 +0100 (CET) From: Markus Armbruster To: Yuri Benditovich Subject: Re: [PATCH] hmp: Changed hmp_netdev_add() using qmp_marshal_netdev_add() References: <20200716035532.1407660-1-andrew@daynix.com> <874klk5gnc.fsf@dusky.pond.sub.org> <87lfesv2zu.fsf@dusky.pond.sub.org> <87blfnp20k.fsf@dusky.pond.sub.org> <87lferm4x5.fsf@dusky.pond.sub.org> <87tutej3dc.fsf@dusky.pond.sub.org> <87blfmj2qx.fsf@dusky.pond.sub.org> Date: Tue, 24 Nov 2020 16:45:56 +0100 In-Reply-To: (Yuri Benditovich's message of "Tue, 24 Nov 2020 16:03:42 +0200") Message-ID: <87y2iqg3m3.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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 , Andrew Melnichenko , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Yuri Benditovich writes: > On Tue, Nov 24, 2020 at 3:36 PM Markus Armbruster wrote: > >> Markus Armbruster writes: >> >> > Yuri Benditovich writes: >> > >> >> Please confirm that this patch is intended to solve only the problem >> with >> >> hmp (and disallow duplicated ids) >> > >> > The intent is to reject duplicate ID and to accept non-duplicate ID, no >> > matter how the device is created (CLI, HMP, QMP) or a prior instance was >> > deleted (HMP, QMP). >> > >> >> With it the netdev that was added from qemu's command line and was >> deleted >> >> (for example by hmp) still can't be created, correct? >> > >> > Yet another case; back to the drawing board... >> >> Next try. Hope this is one holds water :) >> >> >> diff --git a/net/net.c b/net/net.c >> index 794c652282..c1dc75fc37 100644 >> --- a/net/net.c >> +++ b/net/net.c >> @@ -978,6 +978,7 @@ static int (* const >> net_client_init_fun[NET_CLIENT_DRIVER__MAX])( >> static int net_client_init1(const Netdev *netdev, bool is_netdev, Error >> **errp) >> { >> NetClientState *peer = NULL; >> + NetClientState *nc; >> >> if (is_netdev) { >> if (netdev->type == NET_CLIENT_DRIVER_NIC || >> @@ -1005,6 +1006,12 @@ static int net_client_init1(const Netdev *netdev, >> bool is_netdev, Error **errp) >> } >> } >> >> + nc = qemu_find_netdev(netdev->id); >> + if (nc) { >> + error_setg(errp, "Duplicate ID '%s'", netdev->id); >> + return -1; >> + } >> + >> if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) >> < 0) { >> /* FIXME drop when all init functions store an Error */ >> if (errp && !*errp) { >> @@ -1015,8 +1022,6 @@ static int net_client_init1(const Netdev *netdev, >> bool is_netdev, Error **errp) >> } >> >> if (is_netdev) { >> - NetClientState *nc; >> - >> nc = qemu_find_netdev(netdev->id); >> assert(nc); >> nc->is_netdev = true; >> @@ -1137,6 +1142,7 @@ void qmp_netdev_add(Netdev *netdev, Error **errp) >> void qmp_netdev_del(const char *id, Error **errp) >> { >> NetClientState *nc; >> + QemuOpts *opts; >> >> nc = qemu_find_netdev(id); >> if (!nc) { >> @@ -1151,6 +1157,16 @@ void qmp_netdev_del(const char *id, Error **errp) >> } >> >> qemu_del_net_client(nc); >> + >> + /* >> + * Wart: we need to delete the QemuOpts associated with netdevs >> + * created via CLI or HMP, to avoid bogus "Duplicate ID" errors in >> + * HMP netdev_add. >> + */ >> + opts = qemu_opts_find(qemu_find_opts("netdev"), id); >> + if (opts) { >> + qemu_opts_del(opts); >> + } >> } >> >> > With this part there is no need to unconditionally delete the options > in hmp_netdev_add, > correct? Yes. The CLI accumulates -netdev in option group "netdev". It has to, or else -writeconfig doesn't work. Before commit 08712fcb85 "net: Track netdevs in NetClientState rather than QemuOpt", netdev_add added to the option group, and netdev_del removed from it, both for HMP and QMP. Thus, every netdev had a corresponding QemuOpts in this option group. Commit 08712fcb85 dropped this for QMP netdev_add and both netdev_del. Now a netdev has a corresponding QemuOpts only when it was created with CLI or HMP. Two issues: * QMP netdev_add loses its "no duplicate ID" check. My change to net_init_client1() fixes this. * Both netdev_add can leave QemuOpts behind, breaking HMP netdev_add. My change to qmp_netdev_del() fixes this. Questions?