From nobody Sun Feb 8 21:33:28 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=1652196392; cv=none; d=zohomail.com; s=zohoarc; b=AmSaVrKR3x4i7ojLu5EQd0Sbsfvbi2Yf5oldMH/4Ragf/lLKawkoQ51jKNxeXg+2TIiDI9oeiFcFvoaTiMShvg1EJX64tHXJM3nxMMw3kKAeWBGy4hKQj9l33jaW2LoMe2so4iC0vSN4+6edeZKwppEXJH9qt6zUnR80fnfXemo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196392; 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=YURCQUIxueNFOvFP5HCUmyzaJjSBrxayFnxti8DXQdk=; b=L/ljZgNk0CuzPETdyRoIblDqVGhgt3KpknSYpk11/vweQaXwOU4b8rksUqd6gqO24JPA1+hxL1TWE4WPxnIACwnqDxU5uBisUpL721HoFcKIOaj8HxmsAo3UTEy+yT5r6oKUSdAGzoi600NbTKsQY3CCgvg1QwiPuFZZVvcUeUA= 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 1652196392270332.1728860746989; Tue, 10 May 2022 08:26:32 -0700 (PDT) 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-558-jO5Qaz6YOy6T4gX4tTvfyA-1; Tue, 10 May 2022 11:23:35 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 397472919EAE; Tue, 10 May 2022 15:23:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24B77C27E94; Tue, 10 May 2022 15:23:19 +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 5074B1947BA7; Tue, 10 May 2022 15:23:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3B20D1947072 for ; Tue, 10 May 2022 15:23:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0F205200BCE9; Tue, 10 May 2022 15:23:15 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 918DC202699A for ; Tue, 10 May 2022 15:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652196391; 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=YURCQUIxueNFOvFP5HCUmyzaJjSBrxayFnxti8DXQdk=; b=dotp7plgZcQnQJEUAUwxRnOcob7oHNpNzk2pbbxXPTk8fjjzxza8DDrbhO/5ehfrZswzLy b4oeXpa+zK/zZiKcdewJatH/vb1r2VsGtDalnmiyx+fKkbCRyAaZijHppos/cOiv2Y2ROT oHkRrrAk/u2CV2gJGn/bSkAT7Ekx72s= X-MC-Unique: jO5Qaz6YOy6T4gX4tTvfyA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 27/37] qemuBuildInterfaceCommandLine: Remove 'tapfd' infrastructure Date: Tue, 10 May 2022 17:20:03 +0200 Message-Id: <4e08dd7135f97ee557e6ed4fbef3334514a45fa8.1652195735.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1652196392884100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 78baa840a8..a3b4b8c412 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8768,15 +8768,11 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, int ret =3D -1; g_autoptr(virJSONValue) nicprops =3D NULL; g_autofree char *nic =3D NULL; - int *tapfd =3D NULL; - size_t tapfdSize =3D 0; - char **tapfdName =3D NULL; g_autofree char *slirpfdName =3D NULL; virDomainNetType actualType =3D virDomainNetGetActualType(net); const virNetDevBandwidth *actualBandwidth; bool requireNicdev =3D false; qemuSlirp *slirp; - size_t i; g_autoptr(virJSONValue) hostnetprops =3D NULL; qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); GSList *n; @@ -8910,17 +8906,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, slirpfdName =3D g_strdup_printf("%d", slirpfd); } - - for (i =3D 0; i < tapfdSize; i++) { - if (qemuSecuritySetTapFDLabel(driver->securityManager, - def, tapfd[i]) < 0) - goto cleanup; - tapfdName[i] =3D g_strdup_printf("%d", tapfd[i]); - virCommandPassFD(cmd, tapfd[i], - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - tapfd[i] =3D -1; - } - for (n =3D netpriv->tapfds; n; n =3D n->next) { if (qemuFDPassTransferCommand(n->data, cmd) < 0) return -1; @@ -8935,7 +8920,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, return -1; if (!(hostnetprops =3D qemuBuildHostNetProps(net, - tapfdName, tapfdSize, + NULL, 0, slirpfdName))) goto cleanup; @@ -8980,14 +8965,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, virDomainConfNWFilterTeardown(net); virErrorRestore(&saved_err); } - for (i =3D 0; tapfd && i < tapfdSize; i++) { - if (ret < 0) - VIR_FORCE_CLOSE(tapfd[i]); - if (tapfdName) - VIR_FREE(tapfdName[i]); - } - VIR_FREE(tapfdName); - VIR_FREE(tapfd); return ret; } --=20 2.35.1