From nobody Mon Feb 9 09:28:56 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=1652196303; cv=none; d=zohomail.com; s=zohoarc; b=EMprQiZyxok3qTC/EG6AckzzuX8BE9RHiz7JwAeFM/pAjKctFaF2RlyEkyDUGI1FQ8Rw/ifNMn5NPZn6mD55ze9hARRbTXoViVKIjDAVUKqqbufaPw+XvzkdqCcVYXFjtodZFcQdNxshDYBitJvuLi5fHG8hklSNaSG13N7RToc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196303; 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=osYNAbU+R2DjffonVfEDeKnfmgIyQH9zHwB71Nesigc=; b=HE1Kwxez4VQxaucNoE/xSgTASe52Wglde03rkhPQLPrSpipH+wNZwnPGOPzK2lJkluFDk5whz0xW2TAGGSevEq+w1Z2+8QDEhw3EOeel12A6UciujMTyaiUtz6BLi0i/SpyHF4XTRvfyH5IJ0S3CBwmdeiMi1djpT4rsERiXPSQ= 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 1652196303751503.9538781183718; Tue, 10 May 2022 08:25:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-1KFio4fVN1GKyMjyRBKQMg-1; Tue, 10 May 2022 11:23:31 -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 19667A18EF8; Tue, 10 May 2022 15:23:16 +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 019D3C28106; Tue, 10 May 2022 15:23:16 +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 B8A621947079; Tue, 10 May 2022 15:23:15 +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 7BE73194705F for ; Tue, 10 May 2022 15:23:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 59ABB202699A; Tue, 10 May 2022 15:23:12 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id C46A4200C0DD for ; Tue, 10 May 2022 15:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652196302; 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=osYNAbU+R2DjffonVfEDeKnfmgIyQH9zHwB71Nesigc=; b=SZ4cLpivD7t2u+oz3q3HFHfw8tt+TTQeI2nLHpopbIUfTvsEWvH7Btul4E3Axsiy2KsgBw fMjj4/vQwdUJ7dzZf1yntkIrg6078Y2F0r2chS46z/6evJGdUAj+fb3VSM9uyeXKKrfH/h Pz9ZAkkEBcn09xY6KqhKnZgXaClLyNc= X-MC-Unique: 1KFio4fVN1GKyMjyRBKQMg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 24/37] qemuBuildHostNetProps: Remove 'vhostfd' machinery Date: Tue, 10 May 2022 17:20:00 +0200 Message-Id: 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: 1652196304335100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 11 ----------- src/qemu/qemu_command.h | 2 -- src/qemu/qemu_hotplug.c | 1 - 3 files changed, 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d30c0de748..d23baa54a2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4189,8 +4189,6 @@ virJSONValue * qemuBuildHostNetProps(virDomainNetDef *net, char **tapfd, size_t tapfdSize, - char **vhostfd, - size_t vhostfdSize, const char *slirpfd) { virDomainNetType netType =3D virDomainNetGetActualType(net); @@ -4256,14 +4254,6 @@ qemuBuildHostNetProps(virDomainNetDef *net, if (nfds > 1) vhostfd_field =3D "s:vhostfds"; - } else if (vhostfdSize > 0) { - vhost =3D true; - - for (i =3D 0; i < vhostfdSize; i++) - virBufferAsprintf(&buf, "%s:", vhostfd[i]); - - if (vhostfdSize > 1) - vhostfd_field =3D "s:vhostfds"; } virBufferTrim(&buf, ":"); @@ -8948,7 +8938,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, if (!(hostnetprops =3D qemuBuildHostNetProps(net, tapfdName, tapfdSize, - NULL, 0, slirpfdName))) goto cleanup; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 3b487a647c..c26305927e 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -89,8 +89,6 @@ virJSONValue * qemuBuildHostNetProps(virDomainNetDef *net, char **tapfd, size_t tapfdSize, - char **vhostfd, - size_t vhostfdSize, const char *slirpfd); int diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 68e8030929..17fe072e02 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1426,7 +1426,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, if (!(netprops =3D qemuBuildHostNetProps(net, tapfdName, tapfdSize, - NULL, 0, slirpfdName))) goto cleanup; --=20 2.35.1