From nobody Mon Feb 9 23:01:41 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=1605689229; cv=none; d=zohomail.com; s=zohoarc; b=PV5psgvWUXs8L4qnS08u32DlkV6oYulcGfT1J2sA0S69kSBBqB5/RWdmQBWnqDuxL19RzbBWoayBBpW04t2LHB2fbSwBScdAKBl8fHoqRxWEam8meadn0Lcp+PDy4EdXl8o6dxu0V6+wuzxgnExtOlaWaavoU0FtROkDLn5uQSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689229; 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=CWWvwSfBU5P/TS6vJ44helDiyjf0Zls6DtnpmzRfbkQ=; b=fhhU6fmipjMbMrgsIsdYL8MOG7dBw7ALoJbVsLHhS9JqUSUrrAU8sWeykK8JLigWNB+OKJ/sMvgpSH98UT87C9A9Dx4Pt/cdP7xWkf13aXURpMC39Z4EgnKgB/VA9uqYpy9u9DyAWO3H156gAX9CK7NO33SgJwtDAJ2MHqs8DTY= 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 1605689229790329.0093051947533; Wed, 18 Nov 2020 00:47:09 -0800 (PST) Received: from localhost ([::1]:55250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJ7M-0004xB-Lg for importer@patchew.org; Wed, 18 Nov 2020 03:47:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyn-0002gt-AT for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyl-0005a0-IR for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:16 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-P9tbHqf6MGeCIxAsdyfXLA-1; Wed, 18 Nov 2020 03:38:13 -0500 Received: by mail-wr1-f71.google.com with SMTP id l5so620095wrn.18 for ; Wed, 18 Nov 2020 00:38:13 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id p12sm31541971wrw.28.2020.11.18.00.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688694; 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=CWWvwSfBU5P/TS6vJ44helDiyjf0Zls6DtnpmzRfbkQ=; b=ecTAlKU/nSg60MzxlyHmdk7smUaAAjPsav5MFthCXCPnjUv+xJNLy1CaiAcK8/CprfCYha nJQnGNwD39VFiTxRAnm4TO0WzCpKLqXopFWLM2BskMvV+FA91lFsb+gcis6V7YUwWQe2Fz xFVyuCQlJPVnYiN1qhN0ZBqyiqnZMEM= X-MC-Unique: P9tbHqf6MGeCIxAsdyfXLA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CWWvwSfBU5P/TS6vJ44helDiyjf0Zls6DtnpmzRfbkQ=; b=QFg+861JOWRwUxkLJz8WJgT6U5CxdGpUbA3gq0lG/wnnuaQKuY1vkrDo1D4sV9z+On TLx8qNIxBFy6NlKS4Ct/nkb34lZAgLFERZvNz2M8gdytz6dgKLwZWCCmL7BOoByuWqfu XbVWztKD7IIkqpbJVb2LMQXWGJtUwNA6j13R8D7Vgi1BmBh4a4dzYjX7IehDqdOXT9iB Hp1DCiTG6z1VtenGIeGVsEH07xV3sADZtcrs00CpUd/HufrXIV97qnSVAHQ7SLFbfBHY AWsn2xHR02TcqWAr9wtccWGUXvw+ADK3GWUP/F+kObWZBDntEMjHq03ZhE8PgeC1pLlN YMcA== X-Gm-Message-State: AOAM531UBARXnqE14TBANVvJ0L7jX1h5s60+nU3Es2TRL32IBowRqQ2A oxa3VfY4De5Lpfl8TROWXy4ux9sZhqx3oETDrlbOwGD/2tgw9zWkjMsGqlCoCTmWkbfoi41i89H N4jHjTMwycO6zwnkWJlm68Dr81Nz0zW4BF5ucGtmovMXUdHU4fHzk7Wsj+Cui6vu8nDc= X-Received: by 2002:adf:a551:: with SMTP id j17mr3956081wrb.217.1605688691885; Wed, 18 Nov 2020 00:38:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMPFKdNaF22wCpI45mo6QIpQpvY4A4kQsUScfandFHBOlcAq5GYhI3jzmTpRpoyEmQ0Dj7gg== X-Received: by 2002:adf:a551:: with SMTP id j17mr3956055wrb.217.1605688691659; Wed, 18 Nov 2020 00:38:11 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 14/27] failover: simplify virtio_net_find_primary() Date: Wed, 18 Nov 2020 09:37:35 +0100 Message-Id: <20201118083748.1328-15-quintela@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201118083748.1328-1-quintela@redhat.com> References: <20201118083748.1328-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 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=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 00:38:29 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.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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini 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" a - is_my_primary() never sets one error b - If we return 1, primary_device_id is always set Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 70fa372c08..881907d1bd 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -828,24 +828,12 @@ static int is_my_primary(void *opaque, QemuOpts *opts= , Error **errp) =20 static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp) { - DeviceState *dev =3D NULL; Error *err =3D NULL; =20 - if (qemu_opts_foreach(qemu_find_opts("device"), - is_my_primary, n, &err)) { - if (err) { - error_propagate(errp, err); - return NULL; - } - if (n->primary_device_id) { - dev =3D qdev_find_recursive(sysbus_get_default(), - n->primary_device_id); - } else { - error_setg(errp, "Primary device id not found"); - return NULL; - } + if (!qemu_opts_foreach(qemu_find_opts("device"), is_my_primary, n, &er= r)) { + return NULL; } - return dev; + return qdev_find_recursive(sysbus_get_default(), n->primary_device_id); } =20 static DeviceState *virtio_connect_failover_devices(VirtIONet *n, Error **= errp) --=20 2.26.2