From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862633; cv=none; d=zohomail.com; s=zohoarc; b=nVbmCkc866/dYBpk0qKN9RS5qJw891XX0iN5jAV0YI4M5SLN+gO9eJJvXHy75Y7HdJJUiWGSuRnnfXk3gen/AKslQ7dKQ10a20Dv+bUXH2E+XEIVebb3nmyar98mUFga1iolDYA/fBUgfr3/dUsKgRojnjLfhU2ojRQozQs+kDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862633; h=Content-Type: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=KZ5NCeGJm4EmgeA3oDH7PFBVHCkQ2/Sa67CewjIBd08=; b=PQ+WyPwjoMRV/hLNYDaOesdnm1qkOJBC7C1GDy+RXXo24Ft0sBXRkN/A1Cl5OnfJ2/qqVsiU/3Uh5Q3AOyHgc7wbAv/j9kWzbDsW2k81lfUVh0PV3BLFzijQLgeb/DxeCGbqBz244dbGqLuktysbY66/09JHVZsSJYTIijvQmUA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862633095341.07449850648857; Mon, 31 Aug 2020 01:30:33 -0700 (PDT) Received: from localhost ([::1]:50460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfCx-0004zD-PI for importer@patchew.org; Mon, 31 Aug 2020 04:30:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfAs-0001PX-Hp for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfAo-0005pd-Uy for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-GJs7O13DO36ee8kHUqYZUw-1; Mon, 31 Aug 2020 04:28:14 -0400 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 87D808015DB for ; Mon, 31 Aug 2020 08:28:13 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D9115D9D3; Mon, 31 Aug 2020 08:28:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KZ5NCeGJm4EmgeA3oDH7PFBVHCkQ2/Sa67CewjIBd08=; b=GWgLHWxExssq1oHDcMyyhXtFgJsqZrrJ9rmB9IWhKp1OvPn3JECJ/G8vpTy6OopvMRgp4s c8yKWmy4th0g49IqU0NosZmWjwFnplOIJoeO74iKiKsz9m/Zxo8kT9nXy12K44/6WrdmQd gfgtKjTIl5YGmiMoRj1j1yqODZ5oCsE= X-MC-Unique: GJs7O13DO36ee8kHUqYZUw-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 1/9] vhost-vdpa: remove the default devname Date: Mon, 31 Aug 2020 16:27:29 +0800 Message-Id: <20200831082737.10983-2-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The code doesn't have a default vhostdev, so remove the default description in net.json. Signed-off-by: Jason Wang --- qapi/net.json | 1 - 1 file changed, 1 deletion(-) diff --git a/qapi/net.json b/qapi/net.json index ddb113e5e5..a2a94fad3e 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -438,7 +438,6 @@ # specifications with a vendor specific control path. # # @vhostdev: path of vhost-vdpa device -# (default:'/dev/vhost-vdpa-0') # # @queues: number of queues to be created for multiqueue vhost-vdpa # (default: 1) --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862566; cv=none; d=zohomail.com; s=zohoarc; b=CasQZaMHjuYQ/YG2b/jL2mr2UM98OnQLyysB+BNV+WDeAZmLyGeyppmjSsD023giWN12BJnO8Pr8uAplZwmU4itjBBOTeusNkqjZde1NNGFhyiOTNWGMWPlhOG3h7gpeE4lXPzJSiiKSgXXjQoKAsBl+PD8ZwtogibSwqYtSHhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862566; h=Content-Type: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=nGjmJH/3NbHPzzFzN8AJV+tMt3zsZYmZtsBmylGI+hc=; b=D9yB69rLtUC3Wr7IBoU8Runs1yNnlW3+sZV9SiZfTvDnlfhliOnDgb7qpjujjQSY6DTpGmYmyYhhTRWkJhiJ6J7NnzRZk16Gqgg576/jpc1gfBXZqvI2NW7CDYYopBTr4Lzk0pK125wb1+Pu8u4BnnyXABPxLv+FvSqlsohw5xc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862566640530.4230955773712; Mon, 31 Aug 2020 01:29:26 -0700 (PDT) Received: from localhost ([::1]:44480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfBt-0002Xy-8h for importer@patchew.org; Mon, 31 Aug 2020 04:29:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfB4-0001Vs-0V for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfB2-0005v1-Ch for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:33 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-519-MZGW5lj8OKKdIPqt15G-9g-1; Mon, 31 Aug 2020 04:28:29 -0400 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 6A5BA10ABDA4; Mon, 31 Aug 2020 08:28:28 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id A86295D9D3; Mon, 31 Aug 2020 08:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nGjmJH/3NbHPzzFzN8AJV+tMt3zsZYmZtsBmylGI+hc=; b=DgKTv6r9x5vwv0LKVCOIx+HEkegJXbPjNmwaNe37zpfN5iJVl8o2NF94uQvR/i8fIQdWRL vD5QIFcNtRZHi7q+8XqikKgeyeZeqXr0TG559Qv0MKQi/Oc4MORRIFdgu2mtp0vj0ikEWd IsbdZWandqFx6VDB0/KF5CTlbD/J8oY= X-MC-Unique: MZGW5lj8OKKdIPqt15G-9g-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 2/9] vhost-vdpa: mandate vhostdev Date: Mon, 31 Aug 2020 16:27:30 +0800 Message-Id: <20200831082737.10983-3-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:43:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-stable@nongnu.org, lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" vhost-dev is mandatory for vhost-vdpa to be initialized otherwise net_vhost_vdpa_init will pass an uninitialized pointer to qemu_open() which will lead a SIGSEV: #0 0x0000555555c3a640 in strstart (str=3Dstr@entry=3D0x0, val=3Dval@entry= =3D0x555555dbcb65 "/dev/fdset/", ptr=3Dptr@entry=3D0x7fffffffdfb8) at ../ut= il/cutils.c:77 #1 0x0000555555c572a7 in qemu_open (name=3Dname@entry=3D0x0, flags=3Dflags= @entry=3D2) at ../util/osdep.c:294 #2 0x000055555584314a in net_vhost_vdpa_init (device=3D0x555555c81baa "vho= st-vdpa", vhostdev=3D0x0, name=3D0x555556396600 "hn0", peer=3D0x0) at ../ne= t/vhost-vdpa.c:187 #3 0x000055555584314a in net_init_vhost_vdpa (netdev=3D, na= me=3D0x555556396600 "hn0", peer=3D0x0, errp=3D) at ../net/vh= ost-vdpa.c:227 #4 0x000055555587e8c9 in net_client_init1 (netdev=3D0x555556398790, is_net= dev=3Dis_netdev@entry=3Dtrue, errp=3Derrp@entry=3D0x7fffffffe290) at ../net= /net.c:1008 #5 0x000055555587ecc7 in net_client_init (opts=3D0x555556192ff0, is_netdev= =3D, errp=3D0x7fffffffe290) at ../net/net.c:1113 #6 0x0000555555c33082 in qemu_opts_foreach (list=3D, func=3Dfunc@entry=3D0x55555587ed50 , opaque=3Dopaque@entry=3D0x0, errp=3Derrp@entry=3D0x7fffffffe290) at= ../util/qemu-option.c:1172 #7 0x0000555555880057 in net_init_clients (errp=3Derrp@entry=3D0x7fffffffe= 290) at ../net/net.c:1494 #8 0x0000555555a7f8e9 in qemu_init (argc=3D, argv=3D, envp=3D) at ../softmmu/vl.c:4250 #9 0x00005555557f26cd in main (argc=3D, argv=3D, envp=3D) at ../softmmu/main.c:49 Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index bc0e0d2d35..b7221beaa1 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -206,7 +206,7 @@ static int net_vhost_check_net(void *opaque, QemuOpts *= opts, Error **errp) } if (strcmp(netdev, name) =3D=3D 0 && !g_str_has_prefix(driver, "virtio-net-")) { - error_setg(errp, "vhost-vdpa requires frontend driver virtio-net-*= "); + error_setg(errp, "Vhost-vdpa requires frontend driver virtio-net-*= "); return -1; } return 0; @@ -224,5 +224,9 @@ int net_init_vhost_vdpa(const Netdev *netdev, const cha= r *name, (char *)name, errp)) { return -1; } + if (!opts->has_vhostdev) { + error_setg(errp, "vhost-vdpa requires vhostdev to be set"); + return -1; + } return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev= ); } --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862589; cv=none; d=zohomail.com; s=zohoarc; b=l/XAHVOo2KkFE57s7ZhznKxhHN6Xt/piGGYimM2l07fMExCgbYigfoI6MagCxIBwLlxqrRrZpr7CjcjiQqNhOHgWd++ya1dqYbJdcNsdZ/BL411LmAlhjbjLAHD+PlMX2geo0imEAQbuZx/45CcU3SxJ3l3e84jYS1jZ0+mofnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862589; h=Content-Type: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=K5tETAoLbfuWF+hCqz5qMjRY7nddCTTiomGWd9L5PXY=; b=YhsCh4V4S+v2XmMgrAXRwoXdwJ4c4zLPBvXBuOhK5mvD8k3xH/HZZjra2IP//O0hLV8W6aUSKD1kRkSEK551QYjaJQZbGaqM3YDvNGODwpyOgDca8qZBdHaltW93h1CGbZqzgHrB1LW8qQzvB8kP+W4xJLlfZZM/SIkhgMWepsw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862589875467.73697828319575; Mon, 31 Aug 2020 01:29:49 -0700 (PDT) Received: from localhost ([::1]:46232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfCG-0003GL-FR for importer@patchew.org; Mon, 31 Aug 2020 04:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfBJ-0001v1-Dv for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51906 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfBH-0005wm-Tq for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:49 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-6d2eNRiaPzuH4zTJ5qlulQ-1; Mon, 31 Aug 2020 04:28:45 -0400 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 2D51910ABDA3 for ; Mon, 31 Aug 2020 08:28:44 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id A24FE5D9D3; Mon, 31 Aug 2020 08:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K5tETAoLbfuWF+hCqz5qMjRY7nddCTTiomGWd9L5PXY=; b=RVTWLCZv+bSV2l0+fL+EKz04xS4VkUvRo7Ez70uLvDer+izxwmi8cBfaC6MFgLXU35hdyU L5lRSiPqnMDeHoPVJdUr5Ys7aAcp/S9jtV12nGrGNPtIPPd7fZVO+5AG+KUDAjBnwnl8dI l89qnmMswqieq/3R1A9xrksvQhgo/f8= X-MC-Unique: 6d2eNRiaPzuH4zTJ5qlulQ-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 3/9] vhost-vdpa: remove the unnecessary assert(s->vhost_net) Date: Mon, 31 Aug 2020 16:27:31 +0800 Message-Id: <20200831082737.10983-4-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 02:13:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" vhost_vdpa_add() can fail before s->vhost_net is set and net_vhost_vdpa_init() can report error. So there's no need for this assert. Let's remove it. Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index b7221beaa1..c4568b885e 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -190,7 +190,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, co= nst char *device, } s->vhost_vdpa.device_fd =3D vdpa_device_fd; ret =3D vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); - assert(s->vhost_net); + return ret; } =20 --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862741; cv=none; d=zohomail.com; s=zohoarc; b=T4fQfr/Js1mEraJ4b7MJyk7HuSo6vhe+W9sNMbWFTwn5Ej1KVZeDmgsLgN1mJMdD8KOaufabHeruQu7RVvofbOyAtLZ7C/aQpAbQ+5vPFQYewdFXknBJ4Ca2zNcmk46NNQrXpkzZ2lTg2qW9NpA2bxnvaYsU/GB8RFHDh2TOktg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862741; h=Content-Type: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=5+BCakrOKFcEAOoI1USC566br9qYiCMgtiiLkMLNqrQ=; b=F9a/cphBh9wsQN0NE7MNTLITavK7+u8yZVT8aEWWGIPadCiCa7cwk+4pJBOI6Z1RRLy9uND/pBp1FTrM3u0sm39wmNniHyE8DV7H7fj/SkcroSk+BdbiZXBCDty5oJgE25SdCthmyS4fnH3Mng2C0E5lTeBLS3WJYu/KIkj/B+o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862741201288.87674593648023; Mon, 31 Aug 2020 01:32:21 -0700 (PDT) Received: from localhost ([::1]:55828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfEh-0007EL-W0 for importer@patchew.org; Mon, 31 Aug 2020 04:32:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfBZ-0002Ha-7w for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:05 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:27130 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfBX-000615-Ap for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-L8prCKE3Nl6fCGFyC79R4w-1; Mon, 31 Aug 2020 04:28:59 -0400 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 EDDE910ABDA0 for ; Mon, 31 Aug 2020 08:28:58 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87D5D5D9D3; Mon, 31 Aug 2020 08:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5+BCakrOKFcEAOoI1USC566br9qYiCMgtiiLkMLNqrQ=; b=Gd3cMDESvH9gAMOqbNERID5qxl3C4wLy++I2bUzp1RUNJG0nWg1D3+oqpapT2CC3KejRwe FQ2mnblPSj7w/maALid1b63bYtyRhyRtSQoHgnNFOiq5V68D9IThSbRywM8KOH5qpqX7q2 vK6wbAxttzNN6t9Oji4ufCQOS4bh8a4= X-MC-Unique: L8prCKE3Nl6fCGFyC79R4w-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 4/9] vhost-vdpa: refine info string Date: Mon, 31 Aug 2020 16:27:32 +0800 Message-Id: <20200831082737.10983-5-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:06:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We use "vhost-vdpa" as nic info string which is not useful, let's add the vhostdev path. before: info network v0: index=3D0,type=3Dvhost-vdpa,vhost-vdpa after: info network v0: index=3D0,type=3Dvhost-vdpa,vhostdev=3D/dev/vhost-vdpa-0 Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index c4568b885e..397d4d3082 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -181,7 +181,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, co= nst char *device, int ret =3D 0; assert(name); nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); - snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA); + snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=3D%s", vhostdev= ); nc->queue_index =3D 0; s =3D DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd =3D qemu_open(vhostdev, O_RDWR); --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862624; cv=none; d=zohomail.com; s=zohoarc; b=GtAkY2JEu0mRTOyq+i1wsDks68RRl5MSY/GjRoUrxbEZ5/5YZzs7T1ypvqyDsYR1xYgqbISAQRfmc59AFcDiwY7QeNL0bnliks750hx256zsn0/v7eg+bHOZfn9F8P1RoFCPZ9HJ5Qkbx46Yi6UIr7N5Doss+0pKoNE1sCOmpZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862624; h=Content-Type: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=4hh/qZDjFKTi3QwYN/AbYw7PuAXqiDG6gOeX+DBWFSg=; b=fjJROnNOKNDkUF4DO/Y14FwcrSXgNYin61yStU1Lufg5+spnRT4FylkkS4EkTbPnvHUFdyu5mcObjgKfUDLX4t4t44KuuvY9R01ZgIi6wgijoRmYgD+1oC1HSmchC13kKhgmLtFH3mMt09GmCzoy3d1+iiMFzgvhL+w0rJIrjTg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862624469578.2677547384508; Mon, 31 Aug 2020 01:30:24 -0700 (PDT) Received: from localhost ([::1]:49468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfCo-0004Ya-S2 for importer@patchew.org; Mon, 31 Aug 2020 04:30:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfBo-0002sS-6v for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26796 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfBm-00064W-Ck for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:19 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-3Zad95GxNDC76flnCVfGLQ-1; Mon, 31 Aug 2020 04:29:15 -0400 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 A8DF2801AC4 for ; Mon, 31 Aug 2020 08:29:14 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id D02155D9D3; Mon, 31 Aug 2020 08:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4hh/qZDjFKTi3QwYN/AbYw7PuAXqiDG6gOeX+DBWFSg=; b=LdUdtoQA88SOb6tiJfGJt8CDDrWBpXxaSeQ1H9JHngwVIJkwigWUV1izNIc6LMk2w/DMmD ANv7cRG0umx5OcN3LgCEPP3EpDA+zZkkoThXDjR9VHcKo0WW1N6BdBpMETeo9iDekg7yeb LiPT4nxyhOR9Ude/Gdc8i1xp2wtZi4A= X-MC-Unique: 3Zad95GxNDC76flnCVfGLQ-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 5/9] vhost-vdpa: remove the unnecessary initialization Date: Mon, 31 Aug 2020 16:27:33 +0800 Message-Id: <20200831082737.10983-6-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 02:13:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 397d4d3082..bcbf49d55b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -175,10 +175,10 @@ static NetClientInfo net_vhost_vdpa_info =3D { static int net_vhost_vdpa_init(NetClientState *peer, const char *device, const char *name, const char *vhostdev) { - NetClientState *nc =3D NULL; + NetClientState *nc; VhostVDPAState *s; - int vdpa_device_fd =3D -1; - int ret =3D 0; + int vdpa_device_fd; + int ret; assert(name); nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=3D%s", vhostdev= ); --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862821; cv=none; d=zohomail.com; s=zohoarc; b=n20xdDtprPjPcmrnCFUCE1NrWi+93hqyAqdQV7AfZWMmrSO5WpA+nZP0dW1k35hoUz2Q+lCw9IFbaH+7H757x/O4UL9C3yQ3DtQmswX4brtQxYx7aNmZ1I/uI+mKti0CBUZAGqASdSfsVX3MsQcNkEvdFFD7Jd27CsDgNzrswZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862821; h=Content-Type: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=Ex8PBSv6bXHMCw9LpxfF6xvEd3IoS3Vnyb9p5IrtWKA=; b=HzCVWMZ2aQXjZgykENlyFAgmlwf1WrGz0z+B5lGABSdjBBROGtj+fmjpZrdm8ih/SIq06Gg3VEtBlESvHjZWMrUGdvvVLf5Dyt/uSQulXt4j9UjEqyOUXeESxJQYo4h8TU2CGGoG9/tOQb3D/qv7mrA9wBTvEVCJujrY7FxGa20= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862821738182.73911853117625; Mon, 31 Aug 2020 01:33:41 -0700 (PDT) Received: from localhost ([::1]:58518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfG0-0008Nc-GY for importer@patchew.org; Mon, 31 Aug 2020 04:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCC-0003iP-16 for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:44 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24442 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCA-000668-3Z for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:43 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-sgPAQTYVPFCo-dwOgqxYKw-1; Mon, 31 Aug 2020 04:29:38 -0400 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 EC53F1019626 for ; Mon, 31 Aug 2020 08:29:37 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D31A5D9D3; Mon, 31 Aug 2020 08:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ex8PBSv6bXHMCw9LpxfF6xvEd3IoS3Vnyb9p5IrtWKA=; b=bQpBtZCL2jrfXV97mwyBRAKy2Be+909+ZW1JCLLWhXansw8s8x+0Zti9wAz4+Qvs+DlhVp UthHKTW4EFdTqNmbR7F6AWLgtQ779qPyHFp/jdXVeYPQ1ht9Voa648m+ThzhSHwK2+IL4G E4ntH9H57wBRr7DRlYwMqqda/IlQ0Go= X-MC-Unique: sgPAQTYVPFCo-dwOgqxYKw-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 6/9] vhost-vdpa: remove the unnecessary queue index assignment Date: Mon, 31 Aug 2020 16:27:34 +0800 Message-Id: <20200831082737.10983-7-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:56:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The nc is allocated through g_malloc0(), so no need to assign its queue_index to zero. Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index bcbf49d55b..1d3ac89135 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -182,7 +182,6 @@ static int net_vhost_vdpa_init(NetClientState *peer, co= nst char *device, assert(name); nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=3D%s", vhostdev= ); - nc->queue_index =3D 0; s =3D DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd =3D qemu_open(vhostdev, O_RDWR); if (vdpa_device_fd =3D=3D -1) { --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862678; cv=none; d=zohomail.com; s=zohoarc; b=EFUVVqW9zhn6EsSekpj7WY6rIwXaD0jR4Ysd+N8jeE2x7E3P0vaA72BPaDlppdKfkaGM7hCK/lx8J5ceV2bYE8h5n9JlANGW1Ed03vNUQHJSQn8CI24EL5FJF5U0gN6R3zi3K/BgFnJD6Sh+5xgELFTTMBYWDP5fE9cAFNwdUf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862678; h=Content-Type: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=ssFNL+9qWeW2P1mJTJW0Zet2cgcckYhuIXxlrOvmdhI=; b=S/IIYUpe09b3q783fKq9UTjwVSYsEHIk2pa01GR2eISErSnx/TuCjzTiX2oW3cfmZ4gl88yQH7LkI2Y3GRAeScD38gsjJ6kHgf/9mjzMJN6mC7JXMIRBGU3hiJYw7dseKp7fZ6mv36YP1NYz6L/8N0KcwwssFGEqgFcFQXBOhuc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862678557841.5062893092777; Mon, 31 Aug 2020 01:31:18 -0700 (PDT) Received: from localhost ([::1]:52902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfDh-00061F-7O for importer@patchew.org; Mon, 31 Aug 2020 04:31:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCJ-000425-0u for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50326) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCH-00066Y-02 for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-527-wG_5OrXnM0-K52Cof_QwpQ-1; Mon, 31 Aug 2020 04:29:46 -0400 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 AA05D1019626 for ; Mon, 31 Aug 2020 08:29:45 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 842145D9D3; Mon, 31 Aug 2020 08:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ssFNL+9qWeW2P1mJTJW0Zet2cgcckYhuIXxlrOvmdhI=; b=EWDFC20677lvi4lSTLkKjYfV/UCe2NPB9QmZ2epULzO1yz6oYvTY8eazKivGj0N/iVczw3 vSxI/9UW6UYBWthX8n/TKd0kA02RVFKxGewL7aelLXc+QszygvF8nahkjD2GSfGmNGtjUG Jpyq5vGvoUTdqA4niy1rXdDbdMxD76o= X-MC-Unique: wG_5OrXnM0-K52Cof_QwpQ-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 7/9] vhost-vdpa: squash net_vhost_vdpa_init() into net_init_vhost_vdpa() Date: Mon, 31 Aug 2020 16:27:35 +0800 Message-Id: <20200831082737.10983-8-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:43:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch squashes net_vhost_vdpa_init() into net_init_vhost_vdpa(). This will simplify adding pre open file descriptor support. Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 1d3ac89135..f5cc4e8326 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -172,27 +172,6 @@ static NetClientInfo net_vhost_vdpa_info =3D { .has_ufo =3D vhost_vdpa_has_ufo, }; =20 -static int net_vhost_vdpa_init(NetClientState *peer, const char *device, - const char *name, const char *vhostdev) -{ - NetClientState *nc; - VhostVDPAState *s; - int vdpa_device_fd; - int ret; - assert(name); - nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); - snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=3D%s", vhostdev= ); - s =3D DO_UPCAST(VhostVDPAState, nc, nc); - vdpa_device_fd =3D qemu_open(vhostdev, O_RDWR); - if (vdpa_device_fd =3D=3D -1) { - return -errno; - } - s->vhost_vdpa.device_fd =3D vdpa_device_fd; - ret =3D vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); - - return ret; -} - static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp) { const char *name =3D opaque; @@ -215,6 +194,10 @@ int net_init_vhost_vdpa(const Netdev *netdev, const ch= ar *name, NetClientState *peer, Error **errp) { const NetdevVhostVDPAOptions *opts; + NetClientState *nc; + VhostVDPAState *s; + int vdpa_device_fd; + int ret; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDPA); opts =3D &netdev->u.vhost_vdpa; @@ -227,5 +210,19 @@ int net_init_vhost_vdpa(const Netdev *netdev, const ch= ar *name, error_setg(errp, "vhost-vdpa requires vhostdev to be set"); return -1; } - return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev= ); + + assert(name); + + nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, TYPE_VHOST_VDPA= , name); + snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=3D%s", opts->vh= ostdev); + + s =3D DO_UPCAST(VhostVDPAState, nc, nc); + vdpa_device_fd =3D qemu_open(opts->vhostdev, O_RDWR); + if (vdpa_device_fd =3D=3D -1) { + return -errno; + } + s->vhost_vdpa.device_fd =3D vdpa_device_fd; + ret =3D vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); + + return ret; } --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598862943; cv=none; d=zohomail.com; s=zohoarc; b=X/3uqyC5UsTHd3NyO6pdccTQLMLpXcxd+mFfT+9AbwAcHzZUR0/FSE4NZwihcTmb4C9qwkUkH521WFfM3bx2Y0XqTBB/4ma2NUdFeQuWLEAxWY18VMUYu8uhNasuiIvErWTi6CgSJZvXMapxd4zIb/A/t8ftkPYRguonEKnF/sQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598862943; h=Content-Type: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=IbfvPAiCabBkFl5XLOooMr9PCV39oAlzl08KWcLQmGs=; b=R5mOGU8UZ2XIZ+aaakk9e+LB4MIha7bGQDeqBbDzbeRSmqsGpup12hN3HjeS0gDvmoGf2Vl/MBLfI2Df5GA6w7tgeIdzAU+hrG19f5oN/ntwCLBDvuZanlNcyIvzzTsPW/H6f3XyoZAWcFgkhME9XM4vdeRfIC4/6AtpMTDduCg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598862943151427.1719610145823; Mon, 31 Aug 2020 01:35:43 -0700 (PDT) Received: from localhost ([::1]:38646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfHx-0003JW-KR for importer@patchew.org; Mon, 31 Aug 2020 04:35:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCa-0004cq-Cj for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCY-00069N-Lk for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:08 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-erqCnJW5PKqMsDvuRG_ACw-1; Mon, 31 Aug 2020 04:30:03 -0400 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 3E9E618BE161 for ; Mon, 31 Aug 2020 08:30:02 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18ADD5D9DD; Mon, 31 Aug 2020 08:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IbfvPAiCabBkFl5XLOooMr9PCV39oAlzl08KWcLQmGs=; b=F9k8dEuMcZR91HQr2IEly2YeAeU8wLSIc1QjHwqErfCDE8SgaBeBt7GllZUaXgY6eYwDVu p6RR4C/cvcCRuXWDXosvcUPqF7nJu4ujcHqHrqHCyy0NQGFD1JS4b3TnEQ2Vk00DFh//qK 3HScEdGPVec4ST6LVT8uR2ibt39RaVo= X-MC-Unique: erqCnJW5PKqMsDvuRG_ACw-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 8/9] vhost-vdpa: add accurate error string when fail to open vhost vDPA device Date: Mon, 31 Aug 2020 16:27:36 +0800 Message-Id: <20200831082737.10983-9-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch adds more accurate error string when fail to open vhost vDPA device. Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index f5cc4e8326..9a6f0b63d3 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -219,6 +219,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const cha= r *name, s =3D DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd =3D qemu_open(opts->vhostdev, O_RDWR); if (vdpa_device_fd =3D=3D -1) { + error_setg(errp, "Fail to open vhost-vdpa device %s", opts->vhostd= ev); return -errno; } s->vhost_vdpa.device_fd =3D vdpa_device_fd; --=20 2.20.1 From nobody Sat Feb 7 05:13:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598863019; cv=none; d=zohomail.com; s=zohoarc; b=htnddg41CqzYpl+OMcGJJ/ijOy3GzJzwxZHxOCUr1vXcvvM5NPnmU7vcGz9QZIF/mCCufgNbS+Okq1dvTj5AgBkIrApxLf3F1lP8zpTl95oDiP7wdKocR03kC7UaMjgyhQTJnARIk6lJPvXstEJHvJl/Q5TEy5DEnemUNR9m6KE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598863019; h=Content-Type: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=v2uE0+ed78+UFuOqAdJL2VFp4mJybTxMVKwhf5ZD7i8=; b=gkf3UrbKmPz8VCCyveq/p26SmQqotg9OuLqZhZdG1/ZfAuv3vcpa2dOmMhkrLZL0bHlvdvmYAKPWobe5/MhPClpu1f/zudwL5OM2OWjBKx8mrOVmnnRH0/otN39hHUcdugH+9hsgKr20+wLkW7FTGyPJCmWUAOm97iw3EI29N6s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598863019454841.0101853342013; Mon, 31 Aug 2020 01:36:59 -0700 (PDT) Received: from localhost ([::1]:46988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfJC-0006iB-3t for importer@patchew.org; Mon, 31 Aug 2020 04:36:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCi-0004wF-0y for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24104) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCf-00069z-IJ for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:15 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-YnZJy_q6On-jVkfNBGzcew-1; Mon, 31 Aug 2020 04:30:10 -0400 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 8CE23802B77 for ; Mon, 31 Aug 2020 08:30:09 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 023D95D9E2; Mon, 31 Aug 2020 08:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v2uE0+ed78+UFuOqAdJL2VFp4mJybTxMVKwhf5ZD7i8=; b=JgM8zzqV/6ls1/D4zWswt1Mn4WtgtgHH9JbSKfvzNxRAPgWyGSLsRYnJHruXlvZgQCDvq0 hGHLOj31EARHwKRZnTASGwPJ/7kGtvYqgbM7VpwEKCpq7AHaV36w4SmUqug5KfG3eo6eQf vnCUTHrrsFZLFNGaiyCW/DnsXYWzkSM= X-MC-Unique: YnZJy_q6On-jVkfNBGzcew-1 From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 9/9] vhost-vdpa: allow pre-opend file descriptor Date: Mon, 31 Aug 2020 16:27:37 +0800 Message-Id: <20200831082737.10983-10-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch allows to initialize vhost-vdpa network backend with pre opened vhost-vdpa file descriptor. This is useful for running unprivileged qemu through libvirt. Cc: Eric Blake Cc: Markus Armbruster Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 24 +++++++++++++++++++----- qapi/net.json | 5 ++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 9a6f0b63d3..f6385cd264 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -206,20 +206,34 @@ int net_init_vhost_vdpa(const Netdev *netdev, const c= har *name, (char *)name, errp)) { return -1; } - if (!opts->has_vhostdev) { - error_setg(errp, "vhost-vdpa requires vhostdev to be set"); + if (!(opts->has_vhostdev ^ opts->has_fd)) { + error_setg(errp, "Vhost-vdpa requires either vhostdev or fd to be = set"); return -1; } =20 assert(name); =20 nc =3D qemu_new_net_client(&net_vhost_vdpa_info, peer, TYPE_VHOST_VDPA= , name); - snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=3D%s", opts->vh= ostdev); + if (opts->has_vhostdev) { + snprintf(nc->info_str, sizeof(nc->info_str), + "vhostdev=3D%s", opts->vhostdev); + vdpa_device_fd =3D qemu_open(opts->vhostdev, O_RDWR); + if (vdpa_device_fd =3D=3D -1) { + error_setg(errp, "Fail to open vhost-vdpa device %s", + opts->vhostdev); + return -errno; + } + } else { + snprintf(nc->info_str, sizeof(nc->info_str), "fd=3D%s", opts->fd); + vdpa_device_fd =3D monitor_fd_param(cur_mon, opts->fd, errp); + if (vdpa_device_fd =3D=3D -1) { + return -1; + } + } =20 s =3D DO_UPCAST(VhostVDPAState, nc, nc); - vdpa_device_fd =3D qemu_open(opts->vhostdev, O_RDWR); if (vdpa_device_fd =3D=3D -1) { - error_setg(errp, "Fail to open vhost-vdpa device %s", opts->vhostd= ev); + return -errno; } s->vhost_vdpa.device_fd =3D vdpa_device_fd; diff --git a/qapi/net.json b/qapi/net.json index a2a94fad3e..5ad60c3045 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -442,12 +442,15 @@ # @queues: number of queues to be created for multiqueue vhost-vdpa # (default: 1) # +# @fd: file descriptor of an already opened vhost-vdpa (since 5.2) +# # Since: 5.1 ## { 'struct': 'NetdevVhostVDPAOptions', 'data': { '*vhostdev': 'str', - '*queues': 'int' } } + '*queues': 'int', + '*fd': 'str' } } =20 ## # @NetClientDriver: --=20 2.20.1