From nobody Tue Feb 10 02:42:56 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1655720435; cv=none; d=zohomail.com; s=zohoarc; b=IyxjiUV5R8dTAm0fZR+KTqjkZAr2bDyhE9NVA1nczVXPweZux4PsO58t+mpKRJZe9i1ojJLEBoyjBOhaQBk4olDM45vuHnAyvWsqyhIPsHXVP2n1AztDb1ne+ql7CgOCYTK26Zw7uLclFYKz0TBZFR6ZpFO9CY83g28iMj2+DZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655720435; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=URV5SJ9OZ0vZK/rqxQ6XylhDfJMGxmzmh07WeGKkzk8=; b=Ih2YN64raylCtQV3fbSHCLldJVXko/1tUZ8wqyLDJ3zyYjxsMuDIpntSPQ+3UfrgkgAFU2NGMY5aEKXtPtGCteGgG7tEbWJA5KF1iMeMd/rPMuKKEB0TvGeXAaifo4E0Tx2ZzjAJqJqw9dsFDpXObq716/k7hzhpR2hJuc0jZ3U= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655720435436927.8863932428761; Mon, 20 Jun 2022 03:20:35 -0700 (PDT) Received: from localhost ([::1]:48324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3EWI-0000c3-Aj for importer@patchew.org; Mon, 20 Jun 2022 06:20:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3EUR-0006It-EW for qemu-devel@nongnu.org; Mon, 20 Jun 2022 06:18:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:51010) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3EUP-0007UT-Sg for qemu-devel@nongnu.org; Mon, 20 Jun 2022 06:18:39 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-247-8UdjX1WkMoOP9ZM4vJIlFw-1; Mon, 20 Jun 2022 06:18:35 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 177AC29AA2F5 for ; Mon, 20 Jun 2022 10:18:35 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93344492CA4; Mon, 20 Jun 2022 10:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655720316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=URV5SJ9OZ0vZK/rqxQ6XylhDfJMGxmzmh07WeGKkzk8=; b=WDCertclEdxBbT/1JRXVpFd3wZ1yunHqo40GzzOmP9qCvtMjxWYHNN+4AzPsTT61NHxIoW ks9wrM+g8pPdK2PoIwtwONANW/kMc5EHUkyUZtkDwrkvA27QwoAH0FJFaX69pAnncIY0kf wdCKNWl3f+vzOCiIIgv3hkn0lrGZHOE= X-MC-Unique: 8UdjX1WkMoOP9ZM4vJIlFw-1 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Markus Armbruster , Eric Blake , "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Jason Wang , Laurent Vivier Subject: [RFC PATCH v3 02/11] net: remove the @errp argument of net_client_inits() Date: Mon, 20 Jun 2022 12:18:19 +0200 Message-Id: <20220620101828.518865-3-lvivier@redhat.com> In-Reply-To: <20220620101828.518865-1-lvivier@redhat.com> References: <20220620101828.518865-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 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: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655720436948100001 Content-Type: text/plain; charset="utf-8" The only caller passes &error_fatal, so use this directly in the function. It's what we do for -blockdev, -device, and -object. Signed-off-by: Laurent Vivier Reviewed-by: Markus Armbruster --- include/net/net.h | 2 +- net/net.c | 20 +++++++------------- softmmu/vl.c | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 523136c7acba..c53c64ac18c4 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -216,7 +216,7 @@ extern const char *host_net_devices[]; /* from net.c */ int net_client_parse(QemuOptsList *opts_list, const char *str); void show_netdevs(void); -int net_init_clients(Error **errp); +void net_init_clients(void); void net_check_clients(void); void net_cleanup(void); void hmp_host_net_add(Monitor *mon, const QDict *qdict); diff --git a/net/net.c b/net/net.c index d2288bd3a929..15958f881776 100644 --- a/net/net.c +++ b/net/net.c @@ -1562,27 +1562,21 @@ out: return ret; } =20 -int net_init_clients(Error **errp) +void net_init_clients(void) { net_change_state_entry =3D qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL= ); =20 QTAILQ_INIT(&net_clients); =20 - if (qemu_opts_foreach(qemu_find_opts("netdev"), - net_init_netdev, NULL, errp)) { - return -1; - } - - if (qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL, errp= )) { - return -1; - } + qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, + &error_fatal); =20 - if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, er= rp)) { - return -1; - } + qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL, + &error_fatal); =20 - return 0; + qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, + &error_fatal); } =20 int net_client_parse(QemuOptsList *opts_list, const char *optarg) diff --git a/softmmu/vl.c b/softmmu/vl.c index 4c1e94b00eaa..8eed0f31c073 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1925,7 +1925,7 @@ static void qemu_create_late_backends(void) qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); } =20 - net_init_clients(&error_fatal); + net_init_clients(); =20 object_option_foreach_add(object_create_late); =20 --=20 2.36.1