From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FDA6C433FE for ; Wed, 9 Dec 2020 18:41:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 54B8B2228A for ; Wed, 9 Dec 2020 18:41:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54B8B2228A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn4Og-0006eM-1F for qemu-devel@archiver.kernel.org; Wed, 09 Dec 2020 13:41:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3uI-0003UY-IS for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:09:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn3uF-0008QO-4j for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:09:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607537378; 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: in-reply-to:in-reply-to:references:references; bh=4y8ENnJ8kq53lYL0I8MfUcoNrhixD3RXbbagN88+yWw=; b=cHKYLfA7i4LnB9pZTujElvygjDVyx/8ltMEaxDxKyKZRvKoLkgHk5JmIOZEFZbbPMp61XZ rWt6/NbZtWxdl5OtCzw4zB6hARBjzxEKyEZi/5djUg7LkJZo7d6BpimJlDWls8p0g0c7+U u4c3iCxiu5RiiVFpasBFMpQlpksiVBM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-6ye5-IX2OUyr0X_5ABgKCA-1; Wed, 09 Dec 2020 13:09:36 -0500 X-MC-Unique: 6ye5-IX2OUyr0X_5ABgKCA-1 Received: by mail-wr1-f72.google.com with SMTP id o4so937262wrw.19 for ; Wed, 09 Dec 2020 10:09:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=4y8ENnJ8kq53lYL0I8MfUcoNrhixD3RXbbagN88+yWw=; b=Q++T6ejH4el9V56R8GHj45+biKchMgBJTcIN6adWDdLKvYwVl4DGmq52kg49d/QpcY +6M9Bq9ffXjNZOAR45WIr/H+jLjxaVvu24OXJiw35rcD1LvKSxOnJldsAYK0nh1yid+y DCIT9OZnIDWlUmLtYxut5cJ4cG/JsZzlY78/4n5zMtNEmX0I76o2DUoTXxrZ8FnzLxx/ 7H0gDGPOk5zHWuqcWbeV/GW6xQOy4eB80Plh4WZDUCkXoAVZrMYKmCQCiMuPgOPVf2Ly zG2kmg231EVLzFuY35AN9iCnY5dcRGECtqMCU9PsAFPMoecyfW4Pu7kvbsS24mS3FXW0 /tEA== X-Gm-Message-State: AOAM530GqMSKQAhtV6Ox70EfFfmi9HnoiwjFgCeDJmHfBq6TSMAqGOD+ kJiSbn9HN36F9DG/RGlC5pIeCqu+Flsz9aSaQI/ygAgJSUpn6t9jdZTR5v/eZWKpQRAEqDviH30 xWPYNFdwE9lFd7aj4OAk6rbHqaNiLv/7dOeyoSthHfwPO/ZFXWS+19fnkgGBP X-Received: by 2002:a1c:186:: with SMTP id 128mr4081733wmb.176.1607537375220; Wed, 09 Dec 2020 10:09:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmzqaKiK/XlTePwENG5zSyJ6w1b3B/JoB7s8pf/dIsiH1xXd+e7Z6xtXkTuFEtwkvlLuHPJQ== X-Received: by 2002:a1c:186:: with SMTP id 128mr4081705wmb.176.1607537375001; Wed, 09 Dec 2020 10:09:35 -0800 (PST) Received: from redhat.com (bzq-79-176-44-197.red.bezeqint.net. [79.176.44.197]) by smtp.gmail.com with ESMTPSA id h13sm5115547wrm.28.2020.12.09.10.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 10:09:34 -0800 (PST) Date: Wed, 9 Dec 2020 13:09:30 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 38/65] failover: split failover_find_primary_device_id() Message-ID: <20201209180546.721296-39-mst@redhat.com> References: <20201209180546.721296-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201209180546.721296-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_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: Peter Maydell , Jason Wang , Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Juan Quintela So we can calculate the device id when we need it. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-24-quintela@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 63 +++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index b994796734..2c502c13fd 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -788,6 +788,49 @@ static inline uint64_t virtio_net_supported_guest_offloads(VirtIONet *n) return virtio_net_guest_offloads_by_features(vdev->guest_features); } +typedef struct { + VirtIONet *n; + char *id; +} FailoverId; + +/** + * Set the id of the failover primary device + * + * @opaque: FailoverId to setup + * @opts: opts for device we are handling + * @errp: returns an error if this function fails + */ +static int failover_set_primary(void *opaque, QemuOpts *opts, Error **errp) +{ + FailoverId *fid = opaque; + const char *standby_id = qemu_opt_get(opts, "failover_pair_id"); + + if (g_strcmp0(standby_id, fid->n->netclient_name) == 0) { + fid->id = g_strdup(opts->id); + return 1; + } + + return 0; +} + +/** + * Find the primary device id for this failover virtio-net + * + * @n: VirtIONet device + * @errp: returns an error if this function fails + */ +static char *failover_find_primary_device_id(VirtIONet *n) +{ + Error *err = NULL; + FailoverId fid; + + if (!qemu_opts_foreach(qemu_find_opts("device"), + failover_set_primary, &fid, &err)) { + return NULL; + } + return fid.id; +} + static void failover_add_primary(VirtIONet *n, Error **errp) { Error *err = NULL; @@ -812,20 +855,6 @@ static void failover_add_primary(VirtIONet *n, Error **errp) error_propagate(errp, err); } -static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) -{ - VirtIONet *n = opaque; - int ret = 0; - const char *standby_id = qemu_opt_get(opts, "failover_pair_id"); - - if (g_strcmp0(standby_id, n->netclient_name) == 0) { - n->primary_device_id = g_strdup(opts->id); - ret = 1; - } - - return ret; -} - /** * Find the primary device for this failover virtio-net * @@ -834,11 +863,13 @@ static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) */ static DeviceState *failover_find_primary_device(VirtIONet *n) { - Error *err = NULL; + char *id = failover_find_primary_device_id(n); - if (!qemu_opts_foreach(qemu_find_opts("device"), is_my_primary, n, &err)) { + if (!id) { return NULL; } + n->primary_device_id = g_strdup(id); + return qdev_find_recursive(sysbus_get_default(), n->primary_device_id); } -- MST