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 16ABBC4361B for ; Wed, 9 Dec 2020 18:52:02 +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 9AC2322BF3 for ; Wed, 9 Dec 2020 18:52:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AC2322BF3 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]:54430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn4ZE-0007Mm-Jg for qemu-devel@archiver.kernel.org; Wed, 09 Dec 2020 13:52:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3so-00026i-B5 for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn3sl-0007zr-6u for qemu-devel@nongnu.org; Wed, 09 Dec 2020 13:08:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607537286; 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=OPkEy7zdzU+em153CCBpKaOYJAvGL44aXjwYpC3hvpA=; b=Sx/f7vo8OpnmmISYrrnc1Mqd6kQP1fgw6PoKPE62Fonl5WtID6zUIXOXYEkHvwSRAdOZML YaDTbF+BKNlwQabQ2zwHH9sjfl6fFw0NtNLyCxbQyw9FNNOEfvO3ZVfoDFG6aZxHYS6YBf tKJZTRBND6HBTB4/tcxAmAY/Rm9ZNAM= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-424-j7qLjOdPNSyeKHot7mafVg-1; Wed, 09 Dec 2020 13:08:04 -0500 X-MC-Unique: j7qLjOdPNSyeKHot7mafVg-1 Received: by mail-wr1-f70.google.com with SMTP id y5so949242wrs.15 for ; Wed, 09 Dec 2020 10:08:04 -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=OPkEy7zdzU+em153CCBpKaOYJAvGL44aXjwYpC3hvpA=; b=rgsVOIee01/46gJwxpy93BtytwWXSu7tPeA++exEapB6isGW8zyVM/niP47A7QAuwh qZHwJHuImBtqnLG+8MY9mCOlqVY4cPbclRQm1N8pAChzeR+RoHnNkss993iijN8D/7a2 riqEOSKLFkmXnzpJcDDu1kZ5XQj8JjuS5i+cONrMOWxo6SfXdiaGNKz79iD5jB+483BM aT1eFWoJs65+DKNNtCvZ3V8v+9aFyF9mmsFi1pIUyMYQ0/ZoXXtlYV0MQw50C18z0NbF nvumq3RHq6R0vhPQYzKtRsd5hfsNyc9Dd99AK+mbGp6/3nAQE/jJfojsG3l8uOTgxS0x T/5A== X-Gm-Message-State: AOAM533IITpC/zlIki28RqIA7q7DUNzR+1QphupesUR6lKUx/3hHc5sD pj6FgRSEiSdyRuSNJROmfvGJdzMhWK3109G7aFvzcsyzpwLK5ahvxfEmVwDqlmYgrHgZkAiu5FP nqma7UYZ6vgKnOdZ6RZQwybMrdiZc/v6QoyCE0ZBZF7hc0Xpi+An4MOP1XLFy X-Received: by 2002:a1c:6002:: with SMTP id u2mr4139184wmb.29.1607537282789; Wed, 09 Dec 2020 10:08:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdXPj8DvIQKKT958pONlOzk5cA1CLJHQSFGeJ9lTuN65lJ+HIIgt7SXpj1b1fFZmzv8CS0wA== X-Received: by 2002:a1c:6002:: with SMTP id u2mr4139155wmb.29.1607537282497; Wed, 09 Dec 2020 10:08:02 -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 n5sm1804808wrp.55.2020.12.09.10.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Dec 2020 10:08:01 -0800 (PST) Date: Wed, 9 Dec 2020 13:07:57 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 17/65] failover: fix indentantion Message-ID: <20201209180546.721296-18-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 , Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= , Eduardo Habkost , Juan Quintela , Jason Wang , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Juan Quintela Once there, remove not needed cast. Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-3-quintela@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/net/virtio-net.c | 33 +++++++++++++++------------------ softmmu/qdev-monitor.c | 4 ++-- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9179013ac4..1011a524bf 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -797,7 +797,7 @@ static void failover_add_primary(VirtIONet *n, Error **errp) } n->primary_device_opts = qemu_opts_find(qemu_find_opts("device"), - n->primary_device_id); + n->primary_device_id); if (n->primary_device_opts) { n->primary_dev = qdev_device_add(n->primary_device_opts, &err); if (err) { @@ -814,9 +814,9 @@ static void failover_add_primary(VirtIONet *n, Error **errp) } else { error_setg(errp, "Primary device not found"); error_append_hint(errp, "Virtio-net failover will not work. Make " - "sure primary device has parameter" - " failover_pair_id=\n"); -} + "sure primary device has parameter" + " failover_pair_id=\n"); + } error_propagate(errp, err); } @@ -824,7 +824,6 @@ 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 (standby_id != NULL && (g_strcmp0(standby_id, n->netclient_name) == 0)) { @@ -841,14 +840,14 @@ static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp) Error *err = NULL; if (qemu_opts_foreach(qemu_find_opts("device"), - is_my_primary, n, &err)) { + is_my_primary, n, &err)) { if (err) { error_propagate(errp, err); return NULL; } if (n->primary_device_id) { dev = qdev_find_recursive(sysbus_get_default(), - n->primary_device_id); + n->primary_device_id); } else { error_setg(errp, "Primary device id not found"); return NULL; @@ -857,8 +856,6 @@ static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp) return dev; } - - static DeviceState *virtio_connect_failover_devices(VirtIONet *n, DeviceState *dev, Error **errp) @@ -3126,9 +3123,9 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) return true; } if (!n->primary_device_opts) { - n->primary_device_opts = qemu_opts_from_qdict( - qemu_find_opts("device"), - n->primary_device_dict, errp); + n->primary_device_opts = qemu_opts_from_qdict(qemu_find_opts("device"), + n->primary_device_dict, + errp); if (!n->primary_device_opts) { return false; } @@ -3176,8 +3173,8 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, if (migration_in_setup(s) && !should_be_hidden) { if (failover_unplug_primary(n)) { vmstate_unregister(VMSTATE_IF(n->primary_dev), - qdev_get_vmsd(n->primary_dev), - n->primary_dev); + qdev_get_vmsd(n->primary_dev), + n->primary_dev); qapi_event_send_unplug_primary(n->primary_device_id); qatomic_set(&n->primary_should_be_hidden, true); } else { @@ -3201,7 +3198,7 @@ static void virtio_net_migration_state_notifier(Notifier *notifier, void *data) } static int virtio_net_primary_should_be_hidden(DeviceListener *listener, - QemuOpts *device_opts) + QemuOpts *device_opts) { VirtIONet *n = container_of(listener, VirtIONet, primary_listener); bool match_found = false; @@ -3211,11 +3208,11 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener, return -1; } n->primary_device_dict = qemu_opts_to_qdict(device_opts, - n->primary_device_dict); + n->primary_device_dict); if (n->primary_device_dict) { g_free(n->standby_id); n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict, - "failover_pair_id")); + "failover_pair_id")); } if (g_strcmp0(n->standby_id, n->netclient_name) == 0) { match_found = true; @@ -3235,7 +3232,7 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener, if (n->primary_device_dict) { g_free(n->primary_device_id); n->primary_device_id = g_strdup(qdict_get_try_str( - n->primary_device_dict, "id")); + n->primary_device_dict, "id")); if (!n->primary_device_id) { warn_report("primary_device_id not set"); } diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index bf79d0bbcd..a25f5d612c 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -573,10 +573,10 @@ void qdev_set_id(DeviceState *dev, const char *id) } static int is_failover_device(void *opaque, const char *name, const char *value, - Error **errp) + Error **errp) { if (strcmp(name, "failover_pair_id") == 0) { - QemuOpts *opts = (QemuOpts *)opaque; + QemuOpts *opts = opaque; if (qdev_should_hide_device(opts)) { return 1; -- MST