From nobody Mon Feb 9 16:50:52 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575300951; cv=none; d=zohomail.com; s=zohoarc; b=oIXwE1vdJDTA0Ggq7HpOkrBYuCrY8nQQhr/Ki4YORsCBCoGP5Unh+n7gzGrEbf4zDQX0GItgGLTRvd02ZvXHmWBdP5aLUhclj18SB9n7glzoOmeAaFYGadWcs8TG0PI/Fns6juUvaWgnMYSoh1Ey5f3bhScqi3yXetaZl1y5WSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575300951; 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=9kcUZTGSiLMTPm77liPqmIhGfhTUFPmm1VSRjsADLlM=; b=ZJ9YVD0xZ2+4Kz9RyNxl08t1QjtNNYZe+O02fP+oPU6mTv781iq61tRjwd+09/MEstf1IjUSTOU3GCwP/eDQPEGc7NVRrOGES34268cmXRYSZQ8UUPLvvOdslFU9emcsu7r/kNnYsEEdS0koriO5d8Vzgk28xY4t9NmTtGxjchk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 157530095124864.47172286442913; Mon, 2 Dec 2019 07:35:51 -0800 (PST) Received: from localhost ([::1]:37562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibnjq-0006b2-5j for importer@patchew.org; Mon, 02 Dec 2019 10:35:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46296) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibncL-0006dW-6O for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibncH-0002Hj-LL for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:03 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21701 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ibncF-0002FU-P3 for qemu-devel@nongnu.org; Mon, 02 Dec 2019 10:28:01 -0500 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-60-O79bpIUPMbuSYLELkLm5qQ-1; Mon, 02 Dec 2019 10:27:57 -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 F3ECB8C02D1 for ; Mon, 2 Dec 2019 15:27:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-134.ams2.redhat.com [10.36.116.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93F5D5E240; Mon, 2 Dec 2019 15:27:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1F70311385C7; Mon, 2 Dec 2019 16:27:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575300478; 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=9kcUZTGSiLMTPm77liPqmIhGfhTUFPmm1VSRjsADLlM=; b=LplcCK1jm33rAY7hd/eNEMDxI/UlFJ5r2osLqUaQCOG7hMl1Lq39wpUKBWoRPrxWPjLk5G bsR28XNg8mfQKrC9u3zZDR8YtE16IRTvSxO2x6ZPRTzzPwWYDPXLlqY790ZdQbJNUQSaFx H1fNvFtV1Au0cnd62P7/rgJhB3pMj3c= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL for-4.2 1/3] net/virtio: Drop useless n->primary_dev not null checks Date: Mon, 2 Dec 2019 16:27:44 +0100 Message-Id: <20191202152746.32292-2-armbru@redhat.com> In-Reply-To: <20191202152746.32292-1-armbru@redhat.com> References: <20191202152746.32292-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: O79bpIUPMbuSYLELkLm5qQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Jens Freimann , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" virtio_net_handle_migration_primary() returns early when it can't ensure n->primary_dev is non-null. Checking it again right after that early return is redundant. Drop. If n->primary_dev is null on entering failover_replug_primary(), @pdev will become null, and pdev->partially_hotplugged will crash. Checking n->primary_dev later is useless. It can't actually be null, because its caller virtio_net_handle_migration_primary() ensures it isn't. Drop the useless check. Cc: Jens Freimann Cc: Michael S. Tsirkin Signed-off-by: Markus Armbruster Message-Id: <20191130194240.10517-2-armbru@redhat.com> Reviewed-by: Jens Freimann --- hw/net/virtio-net.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3c31471026..87088ba374 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2810,11 +2810,6 @@ static bool failover_replug_primary(VirtIONet *n, Er= ror **errp) goto out; } } - if (!n->primary_dev) { - error_setg(errp, "virtio_net: couldn't find primary device"); - goto out; - } - n->primary_bus =3D n->primary_dev->parent_bus; if (!n->primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); @@ -2849,8 +2844,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, } } =20 - if (migration_in_setup(s) && !should_be_hidden && - n->primary_dev) { + if (migration_in_setup(s) && !should_be_hidden) { if (failover_unplug_primary(n)) { vmstate_unregister(n->primary_dev, qdev_get_vmsd(n->primary_de= v), n->primary_dev); --=20 2.21.0