From nobody Mon Feb 9 00:42:09 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=1644422632; cv=none; d=zohomail.com; s=zohoarc; b=EH8IrL5dk+b4iyAILW9QDE3VsS86AEswQjVJ9Apy8Wja8r5U/wu9+YRci0OfOUKmGCxIHyNsA5eANJ6cdbVaSFZlJBHjbxvbr2VSg63g/5GzjJDKz9/guDjmEqFWEVTDYVfxECWxLSv54LlOW8+d71xQhvauuEdLYfoNseDo78U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644422632; 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=tqu6roYNQ/9rbKvjdgb6N53C3m7SlPhupxd+0p/ckck=; b=XHUwjWLPXYtXMNNX6HY/IFlqml4PvfNBYts6P4KttEi2rvaXBR70SQM9YoFG6j+VT1kwVqDYcPJzr70k4fym+Cqi4nc2wa3yQYq2OoGm87Wy7WZhlYTDBCnNgsZg5yUUOZjtec0HArOSgzx4MIT2Bo4e80iZhm0UINcdZlv0Xco= 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 1644422632112356.2562913610907; Wed, 9 Feb 2022 08:03:52 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-235-dtA_pC_2PGqWAGPg0HAWbA-1; Wed, 09 Feb 2022 11:03:46 -0500 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 04141101511E; Wed, 9 Feb 2022 16:03:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C24C1752D6; Wed, 9 Feb 2022 16:03:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9194D4A707; Wed, 9 Feb 2022 16:03:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 219G2lFF012332 for ; Wed, 9 Feb 2022 11:02:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 24E3A7DE4F; Wed, 9 Feb 2022 16:02:47 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FD537DE42 for ; Wed, 9 Feb 2022 16:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644422631; 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=tqu6roYNQ/9rbKvjdgb6N53C3m7SlPhupxd+0p/ckck=; b=bJP6Wf9ka8CqblbJtUUIDJz8lJzqcKf1At5mA4snLlWCq3YKFAus/eoIyxnXc9a0mRzAoJ OYB+4oochF4hta+HKyp+tbFh9aec1vxDqSRhsZ5t6JvdKPdnYRqFCyMznhWJW1mH2Ko6CB g/NFU6LhlyyEhL6U2ev8C51/iTXScYM= X-MC-Unique: dtA_pC_2PGqWAGPg0HAWbA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/27] qemuBuildInterfaceCommandLine: Use new pattern for naming the VDPA fdset Date: Wed, 9 Feb 2022 17:02:05 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: 1644422633100100005 Content-Type: text/plain; charset="utf-8" Prefix the file descriptor name with the alias of the network device so that it's similar to other upcoming use. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 4 ++-- tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 839cd05e23..6667433616 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8830,9 +8830,9 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, if ((vdpafd =3D qemuInterfaceVDPAConnect(net)) < 0) goto cleanup; - vdpa =3D qemuFDPassNew(net->data.vdpa.devicepath, priv, true); + vdpa =3D qemuFDPassNew(net->info.alias, priv, true); - if (qemuFDPassAddFD(vdpa, &vdpafd, NULL) < 0) + if (qemuFDPassAddFD(vdpa, &vdpafd, "-vdpa") < 0) return -1; } break; diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qem= uxml2argvdata/net-vdpa.x86_64-latest.args index 0300f36314..aff024af2f 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D1,fd=3D1732,opaque=3D/dev/vhost-vdpa-0 \ +-add-fd set=3D1,fd=3D1732,opaque=3Dnet0-vdpa \ -netdev vhost-vdpa,vhostdev=3D/dev/fdset/1,id=3Dhostnet0 \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --=20 2.34.1