From patchwork Tue Jul 6 08:27:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 1501077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=d287I8WG; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GJwgm3wBMz9sX1 for ; Tue, 6 Jul 2021 18:28:52 +1000 (AEST) Received: from localhost ([::1]:46038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0gRm-0000gi-7v for incoming@patchwork.ozlabs.org; Tue, 06 Jul 2021 04:28:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0gQx-0000bw-Iy for qemu-devel@nongnu.org; Tue, 06 Jul 2021 04:28:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0gQt-0002Sm-Ju for qemu-devel@nongnu.org; Tue, 06 Jul 2021 04:27:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625560075; 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=8E3Wd714SALkWip6jUvfGkGqyQli2l3JcU3kzo+ApwE=; b=d287I8WG5k/1/sZGtcaUQ2rGQEU2W5q6okvutfftUvJCdB7mKGmikxr33907gwoQPGE8gv nqhTTsndPg4kaLw5eA5RHHWGJa/LvRGqqcBXEoSw+eGed0zW4f9dpMA+vONo0q43svx+0s VyrDA6llvAEe4A5s+Qh9DLlYiViKeQY= 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-264-NHc7orFBPJCRzEC4nZiUzA-1; Tue, 06 Jul 2021 04:27:53 -0400 X-MC-Unique: NHc7orFBPJCRzEC4nZiUzA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B39310C1ADC; Tue, 6 Jul 2021 08:27:53 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-227.pek2.redhat.com [10.72.13.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 834E117A70; Tue, 6 Jul 2021 08:27:50 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com Subject: [PATCH V2 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add() Date: Tue, 6 Jul 2021 16:27:03 +0800 Message-Id: <20210706082717.37730-5-jasowang@redhat.com> In-Reply-To: <20210706082717.37730-1-jasowang@redhat.com> References: <20210706082717.37730-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: eperezma@redhat.com, elic@nvidia.com, lingshan.zhu@intel.com, lulu@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The VhostVDPAState is just allocated by qemu_new_net_client() via g_malloc0() in net_vhost_vdpa_init(). So s->vhost_net is NULL for sure, let's remove this unnecessary check in vhost_vdpa_add(). Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 18b45ad777..728e63ff54 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -112,10 +112,6 @@ static int vhost_vdpa_add(NetClientState *ncs, void *be) error_report("failed to init vhost_net for queue"); goto err; } - if (s->vhost_net) { - vhost_net_cleanup(s->vhost_net); - g_free(s->vhost_net); - } s->vhost_net = net; ret = vhost_vdpa_net_check_device_id(net); if (ret) {