From nobody Mon Feb 9 07:11:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674466483; cv=none; d=zohomail.com; s=zohoarc; b=PRfNN4V0zK95rwYICXU92pHvxSqRjrgi9mJooLj44CTTJcm7dxVjK/sY+/xtbRG1an7aPn8Nwi081GkgemRm+n+b4CgvpXtOcbHaFH038yVqJncviH9BLmGFM/o9ovjq9LP7/vlT5AKWpePW3JHSQUecWGv9QyAlf59Karb9UCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674466483; h=Content-Type:Content-Transfer-Encoding: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=JDKwixKGrIx2cxG4PG54xNUSp5gbqWZ5V1lxAHBJsjw=; b=Tglk60UNxOLAuPv7AsV4wF/8k/kWhL0xEUpLG1nwY2JDROhxuUFJ3d8eW9GeKuPu5UTi3rfV1GscHLgs97y4N7H7ZPNX9dYkuy9VqrwkQa5ZW6HceqbjF18o77LKWzVWmluYXr0bdAu4tTQE3gF2ZxTC4bWqljcxTeHPQSTL/O4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1674466483466695.7820157644376; Mon, 23 Jan 2023 01:34:43 -0800 (PST) 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-673-bjaq8OMGOFWcEGG0auhn_A-1; Mon, 23 Jan 2023 04:34:39 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7392E2A59579; Mon, 23 Jan 2023 09:34:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F49A1121333; Mon, 23 Jan 2023 09:34:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 43C04194658D; Mon, 23 Jan 2023 09:34:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 332501946594 for ; Mon, 23 Jan 2023 09:34:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 095E21121333; Mon, 23 Jan 2023 09:34:35 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A15671121330 for ; Mon, 23 Jan 2023 09:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674466482; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JDKwixKGrIx2cxG4PG54xNUSp5gbqWZ5V1lxAHBJsjw=; b=FkTJaUJF4eDUZOcvF1+TM5eTG+fFut+dUVv17ZuLN/WEIyQ0XjVp6ijWjYjhv5EXmww3BD lol5u4ybdyQ7tkuG/E8EehmW4gA+3JUJK9EtKyn/eJ69sRPfbUWU8s+VMG5/W9k5QckssE Cfr/qjs2NxRdY153+TSeg8gW93l+DiA= X-MC-Unique: bjaq8OMGOFWcEGG0auhn_A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 11/15] vbox: Drop @networkName from UIDHCPServer::Start() Date: Mon, 23 Jan 2023 10:34:20 +0100 Message-Id: <8302a0e38527927b182d377e7613ebab89dff4a8.1674466402.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674466485330100013 Content-Type: text/plain; charset="utf-8"; x-default="true" The @networkName argument of UIDHCPServer::Start() callback is unused. Drop it and also its propagation from parent functions. Signed-off-by: Michal Privoznik --- src/vbox/vbox_network.c | 2 -- src/vbox/vbox_tmpl.c | 2 +- src/vbox/vbox_uniformed_api.h | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index f369e466ab..111bb7144a 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -499,7 +499,6 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const ch= ar *xml, bool start, if (start) gVBoxAPI.UIDHCPServer.Start(dhcpServer, networkNameUtf16, - networkInterfaceNameUtf16, trunkTypeUtf16); =20 VBOX_UTF16_FREE(ipAddressUtf16); @@ -740,7 +739,6 @@ static int vboxNetworkCreate(virNetworkPtr network) =20 gVBoxAPI.UIDHCPServer.Start(dhcpServer, networkNameUtf16, - networkInterfaceNameUtf16, trunkTypeUtf16); =20 VBOX_UTF16_FREE(trunkTypeUtf16); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index fc72a9e001..3aaa6b4c81 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2087,7 +2087,7 @@ _dhcpServerSetConfiguration(IDHCPServer *dhcpServer, = PRUnichar *IPAddress, } =20 static nsresult -_dhcpServerStart(IDHCPServer *dhcpServer, PRUnichar *networkName G_GNUC_UN= USED, +_dhcpServerStart(IDHCPServer *dhcpServer, PRUnichar *trunkName, PRUnichar *trunkType) { return dhcpServer->vtbl->Start(dhcpServer, diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 3416c8bb6b..316f0d8b11 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -482,7 +482,7 @@ typedef struct { nsresult (*SetConfiguration)(IDHCPServer *dhcpServer, PRUnichar *IPAdd= ress, PRUnichar *networkMask, PRUnichar *FromIP= Address, PRUnichar *ToIPAddress); - nsresult (*Start)(IDHCPServer *dhcpServer, PRUnichar *networkName, + nsresult (*Start)(IDHCPServer *dhcpServer, PRUnichar *trunkName, PRUnichar *trunkType); nsresult (*Stop)(IDHCPServer *dhcpServer); } vboxUniformedIDHCPServer; --=20 2.39.1