From nobody Mon May 6 08:31:55 2024 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=1605688900; cv=none; d=zohomail.com; s=zohoarc; b=Zhz+TrK/ayNW/L2xIhuJ3yTk6JqoCb14bQLsJ2azdF3R3VCu7uEomDAVYgqjYcpnNBUYXXZX2xCUHVsga78o8ysdYaQwxTlh4oo9VrdwAdAL0+0DuFnOATbnh8+wgQ+XMj2Yy6zx9ZWNw5eXj+o/o3C7srGqNKVEygY+0z3fBRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605688900; 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=OWuey6nF2A1oCBUf0dA4SccomTLKM7KgHltxbmb1Ko0=; b=JhscICuw/qfUWoO4cf1ZJH9y0I1A8Na3yp31hNY7JGpEF3YiYF0NmcVhn5en4znDfRys5QsihfSqCZju8t0CzE20jIn0mYqKgOdQYdF9uSh4gkOwvs3GZckkeKRIAmFIUZnH0KiXpHM9ebhXOVTcgzIGlE0W4dftN8w5nVJdtKM= 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 1605688900134322.4966982964363; Wed, 18 Nov 2020 00:41:40 -0800 (PST) Received: from localhost ([::1]:38676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJ23-0006V7-13 for importer@patchew.org; Wed, 18 Nov 2020 03:41:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyW-00021V-Lw for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyT-0005Um-D1 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:00 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-B9msWSKAPdisVOv0TOldMw-1; Wed, 18 Nov 2020 03:37:53 -0500 Received: by mail-wr1-f69.google.com with SMTP id e18so615616wrs.23 for ; Wed, 18 Nov 2020 00:37:53 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id c17sm2473074wml.14.2020.11.18.00.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:37:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688676; 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=OWuey6nF2A1oCBUf0dA4SccomTLKM7KgHltxbmb1Ko0=; b=iIeKbOTZf8gSxpsJICKDw57BZrpTgeOo+qNcEXjM25CNfdorN3fs656V/oGLYfdcGWEB/u BuAW8togs7orX9fu1Alz3PV08lxGsD3Ozyj9WT8xykLOGN4Z07U3MKgKlAslmpkIOgh3Rd 29v7BD+LIpad5QgPw0m+9sobtRECM5k= X-MC-Unique: B9msWSKAPdisVOv0TOldMw-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=OWuey6nF2A1oCBUf0dA4SccomTLKM7KgHltxbmb1Ko0=; b=bi740W4osRkhdUYv5lfTVQmMKL3KDIqhAaDN3xq/WPc8X3t76ESY54JGRmy4iVp/U+ S4oQVAMsqDnxyEZ459MXsHWxr0hjF7uzQSpmWuC0uXjWg+JVcPyEwWJaSUsChKFlSbZ/ fzOD+Ocsh7FNIwrYvB9p+VTsf05RQ3Z73gjW/YTGP0hBfGKBnHK2/JqRKruxx1NvKGrE AV4I1ef6KM4yNjeZ/q4hMWnG8gGf/y0X3vcJS93KVytAfx2RommdutDqDssm6XKkzdeg wbwCvK4IzePmG74oV/yp9Sx9/1BPkAGrckos0A2rp4wvF09AqlImGZdwlZRvXR3zAO+5 iODQ== X-Gm-Message-State: AOAM532v5VqqzSnu6IkU5pcSlGnVhLDku5DHbJJI7M8qOkR1qiOQcbd2 Ux7HY9z5xfavxlFnTe+wdkD8rDWRRz2BEnpSXihJ9fJLi1RBdhr3KQ+p02pS60/sTU9kOX9Nsa9 SIVFIbjXqqTOLDYfWB3fmKaZEGk1jPRfxwUuOPyDRdIGJutpuw2jBzvCy5cdL8Ft23MI= X-Received: by 2002:a5d:4d86:: with SMTP id b6mr3673348wru.80.1605688672170; Wed, 18 Nov 2020 00:37:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyjUU137DvLBG0A1h26Q1b8/csDjAuQKhVka9OOP1Pgmcnpy9QhKiEH2szg0px6ZYqk5i4Tw== X-Received: by 2002:a5d:4d86:: with SMTP id b6mr3673324wru.80.1605688671936; Wed, 18 Nov 2020 00:37:51 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 01/27] migration: Network Failover can't work with a paused guest Date: Wed, 18 Nov 2020 09:37:22 +0100 Message-Id: <20201118083748.1328-2-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=63.128.21.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/17 19:41:43 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_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: =?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" If we have a paused guest, it can't unplug the network VF device, so we wait there forever. Just change the code to give one error on that case. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 87a9b59f83..d44fc880f9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3548,6 +3548,18 @@ static void *migration_thread(void *opaque) qemu_savevm_state_setup(s->to_dst_file); =20 if (qemu_savevm_state_guest_unplug_pending()) { + /* if guest is paused, it can send back the wait event */ + if (!runstate_is_running()) { + Error *local_err =3D NULL; + + error_setg(&local_err, "migration: network failover and " + "guest is paused'"); + migrate_set_error(s, local_err); + error_free(local_err); + migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, + MIGRATION_STATUS_FAILED); + goto end; + } migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_WAIT_UNPLUG); =20 @@ -3597,6 +3609,7 @@ static void *migration_thread(void *opaque) } =20 trace_migration_thread_after_loop(); +end: migration_iteration_finish(s); object_unref(OBJECT(s)); rcu_unregister_thread(); --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689191; cv=none; d=zohomail.com; s=zohoarc; b=IL03B+Y33z2miQTOoNSZ+Tiyp7M4N7n8yLVPs6MXAWJHwbNs5gaB5M7/71JW0SWxuj3l7Sc4GU/UDXKIrP30YhTMa+lDhWRRSh8G2Vs/89Zu5LkbmjcC6zdBRNNZkyAaYGvBMBWpApCPQ56jBWBhz0uLbfOrTfAQpZVkxiA5aQU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689191; 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=UEx0whCz0mLvY9uxkc6IoWWcbp6CVeC5vBqQGd8fODw=; b=XIBiiMwsxD+BPy017mp9FOsGOzbTrCCD3XzA7gNeqtdYxXRwhnEmdksF9Bxsh+fJj2V9oI481X4XkOdFbAFMvMvO5TQbtXUC91VwYF4L7tZvJ6l24atOLYBhVXpd/TXGB9oQ9qhhFxMrvjbsXwWhxFxj9OSxCKQXtgij4mcX6cw= 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 1605689191208837.1139364561046; Wed, 18 Nov 2020 00:46:31 -0800 (PST) Received: from localhost ([::1]:52592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJ6k-0003pP-61 for importer@patchew.org; Wed, 18 Nov 2020 03:46:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyW-000220-T2 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyT-0005Uw-EL for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:00 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-219-_zxRrx-eMC2Z1NTW-AcEzA-1; Wed, 18 Nov 2020 03:37:55 -0500 Received: by mail-wm1-f72.google.com with SMTP id c131so106247wma.0 for ; Wed, 18 Nov 2020 00:37:54 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id 109sm33234725wra.29.2020.11.18.00.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:37:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688676; 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=UEx0whCz0mLvY9uxkc6IoWWcbp6CVeC5vBqQGd8fODw=; b=PkDwzb1vL+95hlH1SElaFGZrOqDwqw+wpH6YO7K0Okedef8yYxq5Ocwd9kVQgIDYgJRNm3 6ldMRVWBCfjueRiQEzagUqXOD5bu8dMEJdzh3yQIS89SFLPlbfYAWAk+K0DS0FOA29Ve/5 V0hichAhnE0Ucd6/nlfM51ErvYLvr3o= X-MC-Unique: _zxRrx-eMC2Z1NTW-AcEzA-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=UEx0whCz0mLvY9uxkc6IoWWcbp6CVeC5vBqQGd8fODw=; b=cdNqgD8d0NptuyAZFG2f1O4o+dGptEpsqZ8AvgTOPQLNubgjI+Z0j7/ogOJdBx7Pmv nAnxw0ZwLoUuuEM0/DXrzBiqZA437xeyz1ZXXLYqq9GXcCM8USCjeo43D/ZfGdyGrRVt m08qmAF4LK9SabCL2s2J//hn7sA/1LvIKOUvmFxukTxQXEPUT2Hme4KpeEWPx4qI+Kzy U9pGJU6eWzsyZEUjBOlpuppRfmcadD3UVdgZDVYyxF21BmqlG2SJ+mU3q9+uHzq9MGaj uYNGheTeaZ3wvRCEDHnvEoxKOUhxn4uH5JH5C1Pxrbftsxa34HzFF7jOcHv3BsYaLQEn ggAg== X-Gm-Message-State: AOAM533X6QNM72XbrexHHkm15Z2/unwia9O35kbW0CaEKxkWBdukKJ4q EAhCDHqA42PN5eJ9IYc5bx7uLLw7Yj04zJSshsV1QZ8PVb3wuvez3z9Bg0l8+/7MvTM843dMBAU wqIkyGXAP636ZGJbSFiH+8qfESHnJ3bOJVIrG5aptXsCtckEPIsnPXIOc7veJMP0YCcQ= X-Received: by 2002:a1c:9ad3:: with SMTP id c202mr3072989wme.43.1605688673742; Wed, 18 Nov 2020 00:37:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMvj7/0v6pehfrxoLbRMl2WCdda37+kpipLxuriNXcz2sPgJ+K3PVKqHKyK6vbjmVG58WSkg== X-Received: by 2002:a1c:9ad3:: with SMTP id c202mr3072969wme.43.1605688673583; Wed, 18 Nov 2020 00:37:53 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 02/27] failover: fix indentantion Date: Wed, 18 Nov 2020 09:37:23 +0100 Message-Id: <20201118083748.1328-3-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" Once there, remove not needed cast. Signed-off-by: Juan Quintela --- 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) } =20 n->primary_device_opts =3D qemu_opts_find(qemu_find_opts("device"), - n->primary_device_id); + n->primary_device_id); if (n->primary_device_opts) { n->primary_dev =3D 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=3D\n"); -} + "sure primary device has parameter" + " failover_pair_id=3D\n"); + } error_propagate(errp, err); } =20 @@ -824,7 +824,6 @@ static int is_my_primary(void *opaque, QemuOpts *opts, = Error **errp) { VirtIONet *n =3D opaque; int ret =3D 0; - const char *standby_id =3D qemu_opt_get(opts, "failover_pair_id"); =20 if (standby_id !=3D NULL && (g_strcmp0(standby_id, n->netclient_name) = =3D=3D 0)) { @@ -841,14 +840,14 @@ static DeviceState *virtio_net_find_primary(VirtIONet= *n, Error **errp) Error *err =3D NULL; =20 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 =3D 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; } =20 - - static DeviceState *virtio_connect_failover_devices(VirtIONet *n, DeviceState *dev, Error **errp) @@ -3126,9 +3123,9 @@ static bool failover_replug_primary(VirtIONet *n, Err= or **errp) return true; } if (!n->primary_device_opts) { - n->primary_device_opts =3D qemu_opts_from_qdict( - qemu_find_opts("device"), - n->primary_device_dict, errp); + n->primary_device_opts =3D qemu_opts_from_qdict(qemu_find_opts("de= vice"), + n->primary_device_di= ct, + errp); if (!n->primary_device_opts) { return false; } @@ -3176,8 +3173,8 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *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(Notif= ier *notifier, void *data) } =20 static int virtio_net_primary_should_be_hidden(DeviceListener *listener, - QemuOpts *device_opts) + QemuOpts *device_opts) { VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); bool match_found =3D false; @@ -3211,11 +3208,11 @@ static int virtio_net_primary_should_be_hidden(Devi= ceListener *listener, return -1; } n->primary_device_dict =3D 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 =3D g_strdup(qdict_get_try_str(n->primary_device_dic= t, - "failover_pair_id")); + "failover_pair_id")); } if (g_strcmp0(n->standby_id, n->netclient_name) =3D=3D 0) { match_found =3D true; @@ -3235,7 +3232,7 @@ static int virtio_net_primary_should_be_hidden(Device= Listener *listener, if (n->primary_device_dict) { g_free(n->primary_device_id); n->primary_device_id =3D 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) } =20 static int is_failover_device(void *opaque, const char *name, const char *= value, - Error **errp) + Error **errp) { if (strcmp(name, "failover_pair_id") =3D=3D 0) { - QemuOpts *opts =3D (QemuOpts *)opaque; + QemuOpts *opts =3D opaque; =20 if (qdev_should_hide_device(opts)) { return 1; --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689450; cv=none; d=zohomail.com; s=zohoarc; b=cvBn/t0GpI9HREdlQROAHBO4GuykLHjDJYhZasBsHV6/zh1XN1nRHHY103D9k5OcYnEnW4TUBBmM47W8LjK8L0YJrf+WW9q+kboeFHr3VPgxKgDfCoMMzUly3mM/YJ74PkkcBXZsWUzIICCrrjp8QNio8iZIL8kjiW5VJgJZbCU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689450; 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=XE+D/DLmVINJcL8aFHcKzDkBgbQT8a1kgkHrYvtFwcE=; b=apnaErw5apMeTClN3gHOY6V42Q3Cfq87QQc1QqqWUcK2y54308Efvd1UVTz+PUS/cdjzbL55FS4r6bRm+lJ6iZEm6kWvCWz+ZJiqPuXKFDl2ncLnYAP1MpvY/sryVR2E5MNCEGiLBcTBHfgDtnUXuN5xJSEDRtPTLz6aqBM17HQ= 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 1605689450386646.6578138810537; Wed, 18 Nov 2020 00:50:50 -0800 (PST) Received: from localhost ([::1]:43318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJAv-000397-9d for importer@patchew.org; Wed, 18 Nov 2020 03:50:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyY-00026x-Vd for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyX-0005W5-9r for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:02 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-332-FyKtwlCePquyR1n60IPTWw-1; Wed, 18 Nov 2020 03:37:56 -0500 Received: by mail-wm1-f72.google.com with SMTP id j62so724813wma.4 for ; Wed, 18 Nov 2020 00:37:56 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id t23sm2507042wmn.4.2020.11.18.00.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688680; 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=XE+D/DLmVINJcL8aFHcKzDkBgbQT8a1kgkHrYvtFwcE=; b=eZ9oo2csLIXcpKtxmPsdMQSNmlxOtEDXoIQ6G5gJqqo7xLyXccIhgkWCk6J634NlxpIRnk r5KFWKQ5N5Oypm8MOJFLXc1WWd2uFdeuK25docxjyYJcBQW8cERwvJoHU6BMduSjTX2wH1 GCOYxf3EmLlhFVQ4Nuk5pp+d3cU7vY0= X-MC-Unique: FyKtwlCePquyR1n60IPTWw-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=XE+D/DLmVINJcL8aFHcKzDkBgbQT8a1kgkHrYvtFwcE=; b=CVVq7WhO3m8KV+T3V3Z5nJFnDo5vSsNI7ibpo6VqWNZ/ZCzmNFjZJ2Cv+nu+OWT7XN Dzxdw676tuuWduN4usmtwP77K+VVdQSedmteJI60cKfubO5xqxxvrkziRRxAsBjxTXYB CcuuM/cEJyojcAsUJjrzgfOxlS46nZFTQ0QXX5tgG0LRGys4bbs+nSjG5JLlC/3KHVfg m0hyZ0efaif7MDvdByk5chav5yhvlNd9L29miMzegG6Gvia1x/Q8h+EYJ2O4Ya0jxXb7 qQ0WjnX4GmtfH1IC+FRr4DxELmAlXqFtdeWoKt717ZBapFBBX8VCZqm43+lhmJ10Mymq McHA== X-Gm-Message-State: AOAM533p8kecg1km5IhYxJ2ik4jNDLG8Vfg9wy3CS+ejGNeJerelzF9Y WKexZFpUei3HzLhnCxnNy5Q86BTxRwMXKj2Bl8FXq5Cdb9ZiyWWQgPhi05S0EONRfV1GAa4+8af YdPBgkSQUdXSTwYSqDCcWX/tZiZbmOZ3Mel54eWdrZX+17m8xSK1/9GYULaB+gjkXew4= X-Received: by 2002:a5d:4690:: with SMTP id u16mr3745873wrq.263.1605688675264; Wed, 18 Nov 2020 00:37:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJydJFfEubJeFTFrpXrsMeGkk0euSzNHh1zJsMsRU1gRTCjNTXTDVJcESWsHOLEXbCLiUSqvIg== X-Received: by 2002:a5d:4690:: with SMTP id u16mr3745853wrq.263.1605688675071; Wed, 18 Nov 2020 00:37:55 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 03/27] failover: Use always atomics for primary_should_be_hidden Date: Wed, 18 Nov 2020 09:37:24 +0100 Message-Id: <20201118083748.1328-4-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=63.128.21.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/17 19:41:43 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_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: =?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" Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 1011a524bf..a0fa63e7cb 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3136,7 +3136,7 @@ static bool failover_replug_primary(VirtIONet *n, Err= or **errp) return false; } qdev_set_parent_bus(n->primary_dev, n->primary_bus, &error_abort); - n->primary_should_be_hidden =3D false; + qatomic_set(&n->primary_should_be_hidden, false); if (!qemu_opt_set_bool(n->primary_device_opts, "partially_hotplugged", true, errp)) { return false; --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689398; cv=none; d=zohomail.com; s=zohoarc; b=PWk71tPMVX9mgyKy65UHGHitghym2w1uVzMm0WZAJBibfuUoT4NPr9oGhuMyePF//VjfdEGClBYjo9Laup1K8YkxnO7KFIBZwrKcRwjxGGpqqk8n2MURwF79HnpHcDBBhR8gI84SV8rmcCWLefE1Wd4trz88idXsTPB0wgEaRcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689398; 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=WfdfLJ+ZbjNx1xgyxW1tL91idQG0uPVSDz63aaYX6og=; b=MbBSORiRzlzLL1rp2nAdH7J/cOgRmsQtZsduc7kNBcPZxM1kDVOTE1xPA/xt+Z9myOQIVOa5Q1dw3h+MJ446ulMtCn8mnR9BTf3n3MbXf/SdfzLK2KW/24Pf6ZrIMrMAOgR6AJpruJ6uhrjxOc9ItjIoAESQuuYUCHHl4lqboX0= 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 1605689398903706.6557395240548; Wed, 18 Nov 2020 00:49:58 -0800 (PST) Received: from localhost ([::1]:39170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJA5-0001Tk-IJ for importer@patchew.org; Wed, 18 Nov 2020 03:49:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyY-00025M-Ak for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyW-0005VK-B6 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:01 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-5B5BqBeiMMCASo4_LDoqzA-1; Wed, 18 Nov 2020 03:37:58 -0500 Received: by mail-wm1-f69.google.com with SMTP id a130so2359156wmf.0 for ; Wed, 18 Nov 2020 00:37:58 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id u8sm2538025wmg.6.2020.11.18.00.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688679; 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=WfdfLJ+ZbjNx1xgyxW1tL91idQG0uPVSDz63aaYX6og=; b=YUBShOZH7bSYLKLafoBOVV3nG/teB9WV+pXMperBOLnIH69FFqCE8e6cpoionJtZtegO37 5GEIkC278fP7v4R5QRej8SA0RaxYVmbHF36K4wWcS0qR1e1cIgyOJHoebqx8iEbOMEydd4 dqD8003D0W55Zy4NckzQTtnJrtGlF0U= X-MC-Unique: 5B5BqBeiMMCASo4_LDoqzA-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=WfdfLJ+ZbjNx1xgyxW1tL91idQG0uPVSDz63aaYX6og=; b=bA9N6MGkoNcHaHyn+e7XBbMnHFk4aq20h2d6UDi3ol4wY2bLPo9HZPKe78KzsVL8nl Wt2owu9Nn9e81vDeN+PSpLZSQRnRjnjNwjQCFQS/Fr3T1oOdCw1eA/nc6TpZdr65GA81 DokRFDCrmT6hG6i0WTcQ2U/OV0aVRuuHwC9LmMVZHu2Ui3vXm7jPfQsd1kktmbS8u+VK 11lILtvUtNAfQa/Uj3rbkb69YLbTAjlIwkfrnz5qiMaLUhR/HKY6cPZtPLg29BtjMf6z X8vwtUNB87CFhc0AGyrGD7N0adhF3vZnTnTxyw5PYkBKrtswpwjhtu7xfl/fV4etre37 rtkg== X-Gm-Message-State: AOAM531uHPvXv7GfCseq1c/fmR5vEADzfbiifKVYFw+uoBXb0p2PSHun qV2Bcqg4XtADjOISlxJkhqGhScuhXI67q7Bmq32WnVqSi6yhkIVRY8k7WETsw80Xu1p4c/NxgoP rUZU+AUcOuG+SrLHEevtkEznmQ5sD8KIXSWcwtBO0Mq49sS8wSEWnm5bx0vNNQSPRNkI= X-Received: by 2002:a5d:448b:: with SMTP id j11mr3559304wrq.236.1605688676706; Wed, 18 Nov 2020 00:37:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJyG5S3IkfQAdeF8R+YpH2klvBlFpOY7YuqwKu6mRL/wtaT+PGW03rwtXVaD02ge/q3h+YZpLQ== X-Received: by 2002:a5d:448b:: with SMTP id j11mr3559286wrq.236.1605688676530; Wed, 18 Nov 2020 00:37:56 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 04/27] failover: primary bus is only used once, and where it is set Date: Wed, 18 Nov 2020 09:37:25 +0100 Message-Id: <20201118083748.1328-5-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=63.128.21.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/17 19:41:43 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_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: =?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" Just remove the struct member. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index f4852ac27b..c8da637d40 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -205,7 +205,6 @@ struct VirtIONet { QemuOpts *primary_device_opts; QDict *primary_device_dict; DeviceState *primary_dev; - BusState *primary_bus; char *primary_device_id; char *standby_id; bool primary_should_be_hidden; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a0fa63e7cb..786d313330 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -804,7 +804,6 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) qemu_opts_del(n->primary_device_opts); } if (n->primary_dev) { - n->primary_bus =3D n->primary_dev->parent_bus; if (err) { qdev_unplug(n->primary_dev, &err); qdev_set_id(n->primary_dev, ""); @@ -3118,6 +3117,7 @@ static bool failover_replug_primary(VirtIONet *n, Err= or **errp) Error *err =3D NULL; HotplugHandler *hotplug_ctrl; PCIDevice *pdev =3D PCI_DEVICE(n->primary_dev); + BusState *primary_bus; =20 if (!pdev->partially_hotplugged) { return true; @@ -3130,12 +3130,12 @@ static bool failover_replug_primary(VirtIONet *n, E= rror **errp) return false; } } - n->primary_bus =3D n->primary_dev->parent_bus; - if (!n->primary_bus) { + primary_bus =3D n->primary_dev->parent_bus; + if (!primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); return false; } - qdev_set_parent_bus(n->primary_dev, n->primary_bus, &error_abort); + qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); qatomic_set(&n->primary_should_be_hidden, false); if (!qemu_opt_set_bool(n->primary_device_opts, "partially_hotplugged", true, errp)) { --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689300; cv=none; d=zohomail.com; s=zohoarc; b=LxdbtNYCXRHGZxUv90N/x6zVm8JYyJvsz/bu/VblmV54ZNJL8xoMvNzKX1CW6YA6q3iVa+qbnzGnoW/f0kEsLS+1O1ZOgBi+PJoJ1VlY6ikzvxG5lzH1F7KeGMII55Sq/VbQNz1QwTDCgt4RrNElhBI0y1ZeeMxVf490ZXlM4T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689300; 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=w+PuKfLUpB50oOMefJm/RuJkzqe63XbJCDC2Z/lmLEM=; b=A2izEwfDjVbHBSfbpOwcB+ilcjj834LHHqQ5S5Dr5H+1wtYr0z/AKOsk0y9fujEO8UA1rczOL0wxTHlEnPujOqD5K1PmsIh+FQ86BbrgUOnxZ0RoUVetOdrGQMxs4CE/8RT7/nUMnUyFGPmgqlLvMqXg3w5fOcp1krVJvE17fzM= 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 1605689300972435.1900552323332; Wed, 18 Nov 2020 00:48:20 -0800 (PST) Received: from localhost ([::1]:60986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJ8V-0007H7-TP for importer@patchew.org; Wed, 18 Nov 2020 03:48:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIya-0002A5-57 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyY-0005WF-9Z for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:03 -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-308--teDCaViPd2Jr6n50-qHkg-1; Wed, 18 Nov 2020 03:37:59 -0500 Received: by mail-wr1-f71.google.com with SMTP id x16so631338wrn.9 for ; Wed, 18 Nov 2020 00:37:59 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id 8sm933622wmg.28.2020.11.18.00.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688681; 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=w+PuKfLUpB50oOMefJm/RuJkzqe63XbJCDC2Z/lmLEM=; b=g+pLHKBGOHVncgZMRcYY+bIabGzCdeAn4peWgPUKnucJAe7ZVMHxk0MBeWVGiSUTl9Y2Mq bnK0dwld94fBJ10ocSEagWMPQUSyGxc63KhnjDXOEl0z3KVB6zIQ4mWXwu0qIcVRGQMMhE V7x8yQmRvWz2fEjKw2huslW8eLVwGlM= X-MC-Unique: -teDCaViPd2Jr6n50-qHkg-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=w+PuKfLUpB50oOMefJm/RuJkzqe63XbJCDC2Z/lmLEM=; b=uTsULyO4L8o8qhZXSkBEh6G6nVBfdwCevvLT+zc/TCvTCmn3rDYWGmphksxGnQ6wQM R95adHwRuHnvDMfwTy3ACgb7F8Tjfvrcmi8uZeEw3+rzun/JaunGgNfo7uMbEomvl7dH TrOlmTXSpeKU1fSb7txSbI8pGoTuixeEUs42aVVFYkEJZFJq8UxgjRWq3e5eFD0JSz5T kDTgdvtLzIX269P7YEBqLeA66B3jjC76di05oG+laV1eQxGWFXqQmUyK4VMSnqm0Zuw0 BYlO0crPD4O+23we2vYx0Nngp0ZfNCEA2Bv7x4VDD0/aNdkVD5lRyd4c8W2ior9G7jqO gjsQ== X-Gm-Message-State: AOAM530wkYE7WSKn3gqf3ZuGzavg8vxh6oQH+H28/JPx/Z+6hbPjvwJY l+VmW86i7mPwkJ4278ALUl/ZJGzrOsllE0d4wqPH4Hl+5dy+91/1S8oAUl2jwYExB2jTCfXTuz+ Gsak+YBZ9DDNIO/m2KTiIMDWMjiq+1qS2JnPUFJFlTrxQ0JQRZXTWMMLVaF5rH4cxrR0= X-Received: by 2002:adf:9461:: with SMTP id 88mr3511269wrq.171.1605688678317; Wed, 18 Nov 2020 00:37:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJw08vRikOjSkxOc4MmFeBBIIVgVqemc/nnR7ZvQLHStqDOMMVhi3uKglFgGAExRZybD1DM6Mg== X-Received: by 2002:adf:9461:: with SMTP id 88mr3511239wrq.171.1605688678035; Wed, 18 Nov 2020 00:37:58 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 05/27] failover: Remove unused parameter Date: Wed, 18 Nov 2020 09:37:26 +0100 Message-Id: <20201118083748.1328-6-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=63.128.21.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/17 19:41:43 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_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: =?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" Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 786d313330..3f658d6246 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -855,9 +855,7 @@ static DeviceState *virtio_net_find_primary(VirtIONet *= n, Error **errp) return dev; } =20 -static DeviceState *virtio_connect_failover_devices(VirtIONet *n, - DeviceState *dev, - Error **errp) +static DeviceState *virtio_connect_failover_devices(VirtIONet *n, Error **= errp) { DeviceState *prim_dev =3D NULL; Error *err =3D NULL; @@ -928,7 +926,7 @@ static void virtio_net_set_features(VirtIODevice *vdev,= uint64_t features) qatomic_set(&n->primary_should_be_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev =3D virtio_connect_failover_devices(n, n->qdev,= &err); + n->primary_dev =3D virtio_connect_failover_devices(n, &err); if (err) { goto out_err; } @@ -3164,7 +3162,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, should_be_hidden =3D qatomic_read(&n->primary_should_be_hidden); =20 if (!n->primary_dev) { - n->primary_dev =3D virtio_connect_failover_devices(n, n->qdev, &er= r); + n->primary_dev =3D virtio_connect_failover_devices(n, &err); if (!n->primary_dev) { return; } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689427; cv=none; d=zohomail.com; s=zohoarc; b=hw1IHibtcEw2m1SmFDhhzZJdqI8fXPkKvnHajNpLJDN6KygqvF3YzAdhkG1gQ5AhQRx2X9aR46ZX8+d2eUWzR79l2R/4HLWGsEzdb2RVHH8ql6xUfcV+mx7jsNaGfok3YK1e65SHnCDzq9Sv/tytFL8v5MpaVno3wxAzpK7MJfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689427; 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=W6LPgdYtq9wsraNQWeYw6RGzqst9S7TBwLVOmdRFdOk=; b=fdCrPVCo2ZbAsoGs2WIbXS9kkCHpgTFY3X9B6URM0HBj8LwNcEAZGaO35fKxwIk4ekjhbnHvUJDHxuNfVvPRYD6JCwRqxbUuclD8iN+3QD5gKbSBH7rtb3FLL2P0+85ErhTnSf3LqZ3nbQS3qgVUDRG6vaORnAhpyMhlOu8twc4= 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 1605689427585853.0950179864385; Wed, 18 Nov 2020 00:50:27 -0800 (PST) Received: from localhost ([::1]:41094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJAX-0002G1-Q1 for importer@patchew.org; Wed, 18 Nov 2020 03:50:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyb-0002DG-ES for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyZ-0005WT-Gd for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:05 -0500 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-371-DvclWaV6Nz2YukO2Xq-0KA-1; Wed, 18 Nov 2020 03:38:01 -0500 Received: by mail-wr1-f70.google.com with SMTP id f4so621215wru.21 for ; Wed, 18 Nov 2020 00:38:00 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id o14sm28202103wrw.4.2020.11.18.00.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:37:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688682; 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=W6LPgdYtq9wsraNQWeYw6RGzqst9S7TBwLVOmdRFdOk=; b=GzeKNyYIXe4rGcoct3/TamSNZmVRv5iHz+B7RxTlBq0Xxkliq3HV5xaOfdMDlSn8Nh1ZNH IO/RM8nNpkJbUMp+xsBWFLVVAVnobXnzhS+XOcwAJ7wgDpVupat+Iw1oWLM8lY2NIE9axz Pbgr/Cpeb01Lri2Y8+Dd2X5wpsSid18= X-MC-Unique: DvclWaV6Nz2YukO2Xq-0KA-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=W6LPgdYtq9wsraNQWeYw6RGzqst9S7TBwLVOmdRFdOk=; b=mQm1cMei6hjFhjTJMcOsHAXlA6atfRfHCzSgM6GuUIqCf2qmSMghJmlTVRuGFy4Yf7 ADDkntk0GDfpCXMNBSrp0Qoz9rzNFnXT50w9Sdje2ieYvwlA01bBFbudPPxh8mHY7goh FVz5e3OdAtSPVoGb/vWyN/SDXuJJBc74gmn7N4qaXvHL2bF96Uk8NG+8VWKBlH2dEWLo CRluj8EezDRg45N12lO5pi+PbYbL+kwDAjusiUHjzrEj/5EOpkOrgrUEmWrg4rikamN/ +VVRoyl1+J+2sIR1q6u5ij65pBmeLBEbKmZPgXE2+tWDgEYl7YLhM9eWOUTsahS3lrhK 7k8g== X-Gm-Message-State: AOAM530qiEWM3JgWliEgPebA/QhBoI15oqF+MPYOr9PPFCkfNXdCYATJ WM12VRKaYihyya31T5UMnUUehByvJGrf3QDHTS+INrrqUoBBja4e7Fg5YFG6wPbDEsz1QQ5hQba JHzGB9KAh7vcA2tFl1hEza9E18/1kB9gRO9rUHTaNkkqkpchTUOYoYPRJkhoaeK6rKfk= X-Received: by 2002:a7b:cbc8:: with SMTP id n8mr3157194wmi.124.1605688679733; Wed, 18 Nov 2020 00:37:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/uNM4Ikk7a3Eg4aUQowGykK9WNUHGyeDfAAlqZ7Iu1JPGI1g5qcL95zVnYiYUOkCFGUHzjA== X-Received: by 2002:a7b:cbc8:: with SMTP id n8mr3157168wmi.124.1605688679525; Wed, 18 Nov 2020 00:37:59 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 06/27] failover: Remove external partially_hotplugged property Date: Wed, 18 Nov 2020 09:37:27 +0100 Message-Id: <20201118083748.1328-7-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" It was only set "once", and with the wrong value. As far as I can see, libvirt still don't use it. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3f658d6246..6ca85627d8 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3135,10 +3135,6 @@ static bool failover_replug_primary(VirtIONet *n, Er= ror **errp) } qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); qatomic_set(&n->primary_should_be_hidden, false); - if (!qemu_opt_set_bool(n->primary_device_opts, - "partially_hotplugged", true, errp)) { - return false; - } hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); if (hotplug_ctrl) { hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, &err); --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689589; cv=none; d=zohomail.com; s=zohoarc; b=PQatnhdZwEaylrTqGzhMOoMQo15mJiGHMRNOHokbgHj26LQ/lMaO66oBjJcRkW4x8C/W4VEdTK7IHhnW7XCKomITsHcItx5ho2Qb0/HPV7uAKr5vSlZLoSjNGwvs+raZrGFRZnxn4z5m9XTgNZBNOM8a3RWZLd8IWFmuImpjV2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689589; 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=kYZSLRqC9j22vej73kBvhYsMjfvpg2Ebg2eTVplCMaA=; b=V3AN3vDH2s7EOeRtFSklTAV9aB6Gwmf29IoddV/llBZ+TeisSHTXRZBodPKpehdMUgdkB2IjmPU56Jmbt2PMHaXZoeFbyINvVR7Z6B/0+FhRu3/81AFR4xxY8MZyHVElpzu8eHnMl0g0itb65H3pBu0TZaNJn1DDuBOJ46Bjyus= 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 1605689589314103.62039873088736; Wed, 18 Nov 2020 00:53:09 -0800 (PST) Received: from localhost ([::1]:49572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJDA-0005mr-4W for importer@patchew.org; Wed, 18 Nov 2020 03:53:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyg-0002PT-C9 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyd-0005Wz-D7 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:09 -0500 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-81-QMSZ24hFMUG-xleIB9pslQ-1; Wed, 18 Nov 2020 03:38:05 -0500 Received: by mail-wr1-f70.google.com with SMTP id y2so638668wrl.3 for ; Wed, 18 Nov 2020 00:38:05 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id d128sm2609088wmc.7.2020.11.18.00.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688686; 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=kYZSLRqC9j22vej73kBvhYsMjfvpg2Ebg2eTVplCMaA=; b=Lqy7I+re+ALTwlgOAVW2UU2/l1nVtIXQHi8Uij2Wznls5nPaGIabCEEf9RjUpBPWjNo12Y uXsBBj+hoG45EC9DoU2XxfSbVUnITNMyy8rQ4+mb8q7Ct8KXNSM7gj3a/1ojQ1vRqwRay0 H8fCPHUrWDZaQhw15NEsvwqmg09DBbw= X-MC-Unique: QMSZ24hFMUG-xleIB9pslQ-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=kYZSLRqC9j22vej73kBvhYsMjfvpg2Ebg2eTVplCMaA=; b=X2RBI7zy7wM7m7JXqVcgz72ba9ltutnG8vV2gkvRAYiRa54I94ObUaoIr5qIQ87lWk uo/oK86HF7XDn4Ru3m4eT/WocuJDbql+DHSwIy7TDrs3RwbXcr8fyRw/JKgXE3jIP7+f ddWkW5Wt8OEd9TMI1C+YRxVv9A/wHbK2oNGJnz56KhN1986kBevfIBBDrVcLrBD534EP xinmui7HNpFQ+HkZxus2OzGnLg0pi864qA5VACR+2issQT2VdrX4utBp5VzKSvBnQWN0 LI9HYVtmM+m7EcRRCr661BsBYhgJ5tKZJhORKxDqFOIbgAIPbM1ia84ViHsLNQVoZkMN OTOw== X-Gm-Message-State: AOAM53332m0UPkIIoT2grs7RcLp5RGLNXe3t6J5WagOmmVY2h2dCjeD5 0t8f2PC/uYjscZBFDdm2nsGqraS+1d7EzldXsbXe7Hu88wSJnGXB9Yq50AjqYJcDKyWP+IKaEKI afYr9l2bWTBYRkUhFa+77D8evtRBrOe0DTpB0u7E/NLgTCYGDayv4rYENrj/XUFB/Hz8= X-Received: by 2002:a1c:230e:: with SMTP id j14mr3078585wmj.187.1605688681279; Wed, 18 Nov 2020 00:38:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqcNcrHunvk746Z/7+wiD0eqwDrrG8AH3R4NC/f6ZeJVV2cZ2wb0YXFSy+inZDwc5aCDIGMQ== X-Received: by 2002:a1c:230e:: with SMTP id j14mr3078559wmj.187.1605688681065; Wed, 18 Nov 2020 00:38:01 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 07/27] failover: qdev_device_add() returns err or dev set Date: Wed, 18 Nov 2020 09:37:28 +0100 Message-Id: <20201118083748.1328-8-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" Never both. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 6ca85627d8..3e82108d42 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -803,13 +803,6 @@ static void failover_add_primary(VirtIONet *n, Error *= *errp) if (err) { qemu_opts_del(n->primary_device_opts); } - if (n->primary_dev) { - if (err) { - qdev_unplug(n->primary_dev, &err); - qdev_set_id(n->primary_dev, ""); - - } - } } else { error_setg(errp, "Primary device not found"); error_append_hint(errp, "Virtio-net failover will not work. Make " --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689542; cv=none; d=zohomail.com; s=zohoarc; b=D1fZ1TkWcmJxU8qoaF5iQ2X0DhN3rDdExgFEOjPoZDdPlocVVJmygtv7z1BjCLpNbNXLiPdPSC3pkheaVpmVq5+bYdzSoijZV/JGLvwgKMLfe8bJWZO/1HWjqVsjuPMwLGpEhhzgG8Nz2clzPTMcaqwM9vZ8hw+TWv0+f+FJN4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689542; 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=6ufDql2Ya5R4LbrJR/qCOveRn++UqTWUAYCeIRx1GXs=; b=Qwzp1piu3fFhUW8JLnE9BGZ30F03zwpjb/KcqtWYt9jvPC8wW8O1/B6fdaSSWAUQxi90qV9FLPYXJTSIX78leny9WRrgmclEH0csdC0SAxAbgw3XwLu83sBz7wb5bSmoZoulOXUsoaf8H3Tlnb2hHqdBp90Ocj/JgonhjdAVBkk= 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 1605689542472279.3908347172015; Wed, 18 Nov 2020 00:52:22 -0800 (PST) Received: from localhost ([::1]:47646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJCP-0004zU-9R for importer@patchew.org; Wed, 18 Nov 2020 03:52:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIye-0002MH-Vr for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyd-0005Wo-1P for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:08 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-137-xPFOsDPXODqhnDJAw7AkAQ-1; Wed, 18 Nov 2020 03:38:04 -0500 Received: by mail-wm1-f70.google.com with SMTP id d2so716309wmd.8 for ; Wed, 18 Nov 2020 00:38:04 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id x2sm26291648wru.44.2020.11.18.00.38.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688686; 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=6ufDql2Ya5R4LbrJR/qCOveRn++UqTWUAYCeIRx1GXs=; b=araE0f0ez9wi4LHpQz+75b3wX6/65EqFbERxQCDuZX1w0RUTswlIuy4vjcGnu3q4nDTetf MzvugyuKjD0vUY6TgJ4GpXUsp5EkTIn0sVYQfFfnBcrP5u1yuzMKCssbE1Qsg+X/V/FWaB mSRwkGXa3DxqJF0sIJe3D5TDr+9LiJM= X-MC-Unique: xPFOsDPXODqhnDJAw7AkAQ-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=6ufDql2Ya5R4LbrJR/qCOveRn++UqTWUAYCeIRx1GXs=; b=Rc4ZVyh1h/CYMP2kSuTpATAXWiTEkDFEureaVn6Gbydn8/UVPk02fz2G0IxuVWswnG eQNUnEHH+EP8PzHCjPuHe0TguAuj6m8Nk2qbucRinw56w78bpiqxTvamBSHdbSUuUg9d 2VnDP9ZEXpliqZuP7L7IP5IvofP4xQKIQsw6VznSweAQTEDQV0cpXqJZmAv4YqmTbaig EWZKvMEENm63kNoYpzvvKKf2kLN98oUj1p1lIScW7vEgHL3cc4MJHflVCjVjZhGaqIAw iq2eh5ZoDabihAl+W0UtxWJCLAu3qnlrI0utGjA3iJzp1PL685QhegaSZYdQsL0GhE1q affw== X-Gm-Message-State: AOAM532+3UYrXyBgdK6GQau2zMvxxYTG2fYfRuNAapKyNP/J/9tdZjXi pynegtmbI/pDAAv3yCKZU3nLJ/8XtE5Y4uF+bYfIJ2AUidFMar96so1BDSa78Sna49XYCBB6HRQ 9JVk9He6pKsdP5T0ALVX5dkMHCl0GVg2blLEAB1Hh40qEjmdUjs8j6FFYRnQ8jo1p/9Y= X-Received: by 2002:a1c:3c8a:: with SMTP id j132mr3113754wma.75.1605688682967; Wed, 18 Nov 2020 00:38:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+DlUXFYy5J2Xj72xpu3WzJ6tNhk4mJktWNozypnhCcPfgAFa2yAc6QKcdPwK2nXf0gdlFEg== X-Received: by 2002:a1c:3c8a:: with SMTP id j132mr3113732wma.75.1605688682739; Wed, 18 Nov 2020 00:38:02 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 08/27] failover: Rename bool to failover_primary_hidden Date: Wed, 18 Nov 2020 09:37:29 +0100 Message-Id: <20201118083748.1328-9-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" You should not use passive naming variables. And once there, be able to search for them. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 3 ++- hw/net/virtio-net.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index c8da637d40..ca68be759f 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -207,7 +207,8 @@ struct VirtIONet { DeviceState *primary_dev; char *primary_device_id; char *standby_id; - bool primary_should_be_hidden; + /* primary failover device is hidden*/ + bool failover_primary_hidden; bool failover; DeviceListener primary_listener; Notifier migration_state; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 3e82108d42..c221671852 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -916,7 +916,7 @@ static void virtio_net_set_features(VirtIODevice *vdev,= uint64_t features) =20 if (virtio_has_feature(features, VIRTIO_NET_F_STANDBY)) { qapi_event_send_failover_negotiated(n->netclient_name); - qatomic_set(&n->primary_should_be_hidden, false); + qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { n->primary_dev =3D virtio_connect_failover_devices(n, &err); @@ -3127,7 +3127,7 @@ static bool failover_replug_primary(VirtIONet *n, Err= or **errp) return false; } qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); - qatomic_set(&n->primary_should_be_hidden, false); + qatomic_set(&n->failover_primary_hidden, false); hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); if (hotplug_ctrl) { hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, &err); @@ -3148,7 +3148,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, bool should_be_hidden; Error *err =3D NULL; =20 - should_be_hidden =3D qatomic_read(&n->primary_should_be_hidden); + should_be_hidden =3D qatomic_read(&n->failover_primary_hidden); =20 if (!n->primary_dev) { n->primary_dev =3D virtio_connect_failover_devices(n, &err); @@ -3163,7 +3163,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, 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); + qatomic_set(&n->failover_primary_hidden, true); } else { warn_report("couldn't unplug primary device"); } @@ -3213,8 +3213,8 @@ static int virtio_net_primary_should_be_hidden(Device= Listener *listener, =20 n->primary_device_opts =3D device_opts; =20 - /* primary_should_be_hidden is set during feature negotiation */ - hide =3D qatomic_read(&n->primary_should_be_hidden); + /* failover_primary_hidden is set during feature negotiation */ + hide =3D qatomic_read(&n->failover_primary_hidden); =20 if (n->primary_device_dict) { g_free(n->primary_device_id); @@ -3271,7 +3271,7 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) if (n->failover) { n->primary_listener.should_be_hidden =3D virtio_net_primary_should_be_hidden; - qatomic_set(&n->primary_should_be_hidden, true); + qatomic_set(&n->failover_primary_hidden, true); device_listener_register(&n->primary_listener); n->migration_state.notify =3D virtio_net_migration_state_notifier; add_migration_state_change_notifier(&n->migration_state); --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689707; cv=none; d=zohomail.com; s=zohoarc; b=TAIE3FBmrYKIfiT9iryktm8MMpyr0qAM+Q7H5BbZORcuMb4KNctJ33Y927MWndcFVjVXls0Ykvk3ADAfUmKihILvZiTr4lkPohWq2gLjs08t/ENGH1xod3I/KEvKDI/EsvuCmiUCkjylkD5QSOB4WjLazEvtzYSOb5egDLIMCBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689707; 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=d4sASdiOBxcUCw9YqrDuOiiCFz7HXE2/vEeYC4wwCPs=; b=fYloU7vcRi3NwH7fD7TEfdDNxC5uEevo4y7BpsFVl3/xqLjTJX9So6ldN9+fQ5+kNl33A3D70OH2HOtgjfWuZ97DloTdb4Kr8P1yVcMJ8jU7MFK0lLW3DX7iPH/hRqmdNDj/Ve9myulbvu79Ay7gUD4YcQ67uGqFshRiExZG7W8= 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 1605689707896167.65157418136778; Wed, 18 Nov 2020 00:55:07 -0800 (PST) Received: from localhost ([::1]:57816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJF4-0000hM-Ll for importer@patchew.org; Wed, 18 Nov 2020 03:55:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyg-0002Pd-Db for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:56578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIye-0005Xg-Bd for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:10 -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-177-F6LKR9TiNBm8dk0YgB212Q-1; Wed, 18 Nov 2020 03:38:05 -0500 Received: by mail-wr1-f71.google.com with SMTP id g5so631728wrp.5 for ; Wed, 18 Nov 2020 00:38:05 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id b14sm30469014wrq.47.2020.11.18.00.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688687; 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=d4sASdiOBxcUCw9YqrDuOiiCFz7HXE2/vEeYC4wwCPs=; b=GkhKqeupggc2cFRjTWf+EbdCIqOAljKMd7YzTL5XzX5ktfyr1gpjl5SqWfShK6wVMPyone fdI/+bmo7ypZr7OHarhuLDfN3YZEPJhL934/nUpMIcJlNWHT6G43f9gLqmybVrh/7ahQ4L DBUl+D1O9Q/TRmat1V5DytB6ICXueCM= X-MC-Unique: F6LKR9TiNBm8dk0YgB212Q-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=d4sASdiOBxcUCw9YqrDuOiiCFz7HXE2/vEeYC4wwCPs=; b=TnOXgtZBhGsUfLOGUnSZc8smZTGUi3GsiIMg9WhUFPKib+ox9ik5I5uVI0A2Spd1Cb Twei3jti4CSdArrENWRO4mhnUvoiqyxk+6mcvPq1l47+dQSfz+vua8h4So0wtADV4x99 /cWTtMPH9C+h10ciGFVvqzNRVdYXrJ7BJPbrT74JbPAX7k0CtFgCI1wJ9WTqaorNq3EA T+YbhaUhrY1tepD8FVlLnj7pgEzdSYhdFqxM7TbPSz16JZuzxuQtAG+QpPQugr3AkhzT 08cd89ZWJmp13wf4wsBj3vCCH4D5U21RmVrtveKHDNUgYHJoEw6DrJ1Y6NiZd5Utm3Mu TxpA== X-Gm-Message-State: AOAM532t9QUSRrwFyw2AiIXL1zSAdWZmf2SK9QKWOMgoA88F3zEjTXMs Wh9zvc7nV8FjZmXRwVbo+X4Aa/rbKGyiYLOTicbP1FrjLpwfV77lsjcdUHHxHdLZRXe296tgY7b pqtJa7hngbdMaz+QzmgDelpL5MQQYGPQn24QqUld88fU4Cpgfq0CJyzlrMhjDAnrXDho= X-Received: by 2002:a05:600c:1497:: with SMTP id c23mr1311613wmh.86.1605688684418; Wed, 18 Nov 2020 00:38:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4RHk4DPWQA17Cv3vBmd7UuQXljSvS5n8HOT/acGwvF9810WTzygnkhPUIuNUVyCoNRXRnLQ== X-Received: by 2002:a05:600c:1497:: with SMTP id c23mr1311595wmh.86.1605688684276; Wed, 18 Nov 2020 00:38:04 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 09/27] failover: g_strcmp0() knows how to handle NULL Date: Wed, 18 Nov 2020 09:37:30 +0100 Message-Id: <20201118083748.1328-10-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" Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c221671852..e334f05352 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -818,7 +818,7 @@ static int is_my_primary(void *opaque, QemuOpts *opts, = Error **errp) int ret =3D 0; const char *standby_id =3D qemu_opt_get(opts, "failover_pair_id"); =20 - if (standby_id !=3D NULL && (g_strcmp0(standby_id, n->netclient_name) = =3D=3D 0)) { + if (g_strcmp0(standby_id, n->netclient_name) =3D=3D 0) { n->primary_device_id =3D g_strdup(opts->id); ret =3D 1; } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689674; cv=none; d=zohomail.com; s=zohoarc; b=DDlk4OINqF8vsDOc9w4tKhu3loJ1f32eKunQN+okp0MlaheIwtQM0N4uV8e9VsjxgLHJPRJxqFbY1gwmXwZDH9SrNh8fszJjKpPSBRms263a4E9iqA77TU1K4a+1TzqI09sqikaGnUZr3ayJY2mlKfFsySQ9MxoK3no9rD95AZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689674; 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=3Zs9QCYAUuykjnvuko8MIrrIrOFsDvt5vyAiRoVxnno=; b=eqaRPCkdd/+dn98vMu29hmW9VRaA3CIRYKle+J23arJXJBIzhmqzePEGDRzXfYYvbYvUeb6CIwMDxY0vxrrshNbTQe+2sZTeZ1RHtGpPiemW9RagzG8epl5N3X9xMC3aHURHNxUZh8H/V70Z4WSod7OZWlvZkCvT0fx+GSceK0E= 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 1605689674037484.2799790548006; Wed, 18 Nov 2020 00:54:34 -0800 (PST) Received: from localhost ([::1]:55974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJEX-0008OT-1o for importer@patchew.org; Wed, 18 Nov 2020 03:54:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyh-0002Sk-KQ for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyf-0005Xr-Kr for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:11 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-mPwZL6TlN6uHNXFt4X9B1g-1; Wed, 18 Nov 2020 03:38:07 -0500 Received: by mail-wr1-f69.google.com with SMTP id 91so615444wrk.17 for ; Wed, 18 Nov 2020 00:38:07 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id h17sm26727027wrp.54.2020.11.18.00.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688688; 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=3Zs9QCYAUuykjnvuko8MIrrIrOFsDvt5vyAiRoVxnno=; b=HePSqY/S0uxIi+m8N0JpBQg6We5muBlC5gaD13xcZi0NfioHKX8YeEsWwdqXGD1f7AIJbm WrNPqjvnj9V8WunIZJvYx7BQRdyG7/VEB1aEy35QrAy+RagY61kpQKHQwLPHxFCu4UXsM1 irMBwK2gL30KnCW5v7lKOXlbm+ULGSM= X-MC-Unique: mPwZL6TlN6uHNXFt4X9B1g-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=3Zs9QCYAUuykjnvuko8MIrrIrOFsDvt5vyAiRoVxnno=; b=lNyDaAJpphzu0OciwlSel/Rpk3NQMtq5IgrXmFWJSRY4Xk6D40qPStjzdDHabi4Meg EKw9srEZcHA25jWfHqJoS+ukvZciHnq1pn7crm0C75/+xMtY/MEJaOgvT5BCkl7H/mGV zYI0+2RwrOCNokdOt5R4sudoDD7MPbA965NSwORorytonJKUEv81Q6Lp5+B1JxsvA5Kq nBwB8pWPSb7f0/PlspGKUI5QZD6oozSFIanhaxUfUmm+hw8d7YLjMcXuCC+h4Nmsmoa7 kc4qyA3Ne7LHqnJqedhUvG89/bftRqrP3cSCm+LAXDohKqNvh7J0autzr70xJShQqOou C3LQ== X-Gm-Message-State: AOAM532OU4Ou57qiUAOXR4Y0UTiRTv68oJJ4mIUwLUXwTXmeuvGCJ5i1 hH/Z7iJd7TYU+BJ2y+ZEu/GGFQLd9POkm0TRixAp003kjHBeQrYzEk0GFmfEp67E9oCZrT1rinY sRQDqGvAWxU3UjJWPe+MiXYESP2NcIdwh660MkoPrFTbiUXYubNMbWMlkzH7LgqBc61k= X-Received: by 2002:adf:8284:: with SMTP id 4mr3719802wrc.386.1605688685954; Wed, 18 Nov 2020 00:38:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXokDvITtCK9TN/q66TK+7Ij1fty9nfH6vKNG0V2pu+AOtvXt6bnGJUCwnWSDzkuQPbbjlgA== X-Received: by 2002:adf:8284:: with SMTP id 4mr3719781wrc.386.1605688685768; Wed, 18 Nov 2020 00:38:05 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 10/27] failover: Remove primary_device_opts Date: Wed, 18 Nov 2020 09:37:31 +0100 Message-Id: <20201118083748.1328-11-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=63.128.21.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/17 19:41:43 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_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: =?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" It was really only used once, in failover_add_primary(). Just search for it on global opts when it is needed. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 21 +++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index ca68be759f..7159e6c0a0 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -202,7 +202,6 @@ struct VirtIONet { AnnounceTimer announce_timer; bool needs_vnet_hdr_swap; bool mtu_bypass_backend; - QemuOpts *primary_device_opts; QDict *primary_device_dict; DeviceState *primary_dev; char *primary_device_id; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index e334f05352..2a99b0e0f6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -791,17 +791,17 @@ static inline uint64_t virtio_net_supported_guest_off= loads(VirtIONet *n) static void failover_add_primary(VirtIONet *n, Error **errp) { Error *err =3D NULL; + QemuOpts *opts; =20 if (n->primary_dev) { return; } =20 - n->primary_device_opts =3D qemu_opts_find(qemu_find_opts("device"), - n->primary_device_id); - if (n->primary_device_opts) { - n->primary_dev =3D qdev_device_add(n->primary_device_opts, &err); + opts =3D qemu_opts_find(qemu_find_opts("device"), n->primary_device_id= ); + if (opts) { + n->primary_dev =3D qdev_device_add(opts, &err); if (err) { - qemu_opts_del(n->primary_device_opts); + qemu_opts_del(opts); } } else { error_setg(errp, "Primary device not found"); @@ -856,7 +856,6 @@ static DeviceState *virtio_connect_failover_devices(Vir= tIONet *n, Error **errp) prim_dev =3D virtio_net_find_primary(n, &err); if (prim_dev) { n->primary_device_id =3D g_strdup(prim_dev->id); - n->primary_device_opts =3D prim_dev->opts; } else { error_propagate(errp, err); } @@ -3113,14 +3112,6 @@ static bool failover_replug_primary(VirtIONet *n, Er= ror **errp) if (!pdev->partially_hotplugged) { return true; } - if (!n->primary_device_opts) { - n->primary_device_opts =3D qemu_opts_from_qdict(qemu_find_opts("de= vice"), - n->primary_device_di= ct, - errp); - if (!n->primary_device_opts) { - return false; - } - } primary_bus =3D n->primary_dev->parent_bus; if (!primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); @@ -3211,8 +3202,6 @@ static int virtio_net_primary_should_be_hidden(Device= Listener *listener, goto out; } =20 - n->primary_device_opts =3D device_opts; - /* failover_primary_hidden is set during feature negotiation */ hide =3D qatomic_read(&n->failover_primary_hidden); =20 --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689062; cv=none; d=zohomail.com; s=zohoarc; b=WxwH1pO10x7ktyVHWVvSwSEutDSS5TtnAKkZy7OWoDuIyKs08nJqwrvtyXb6wo5Lu5UIlxOnnVSC8nLkP7xgFOpVBD8bJh74TlHXO0bLw/fThhEQqioBtPuXOQZ5QKJXGQUIDqIrXzKAykDAIkiUjwGAcMfdVEmSiHy4TfcVGU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689062; 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=/JGMosYZm4Pd7viaXatygVdYP6fY/otp+/zbPBrEozA=; b=L4PlHyzKdoNTLnqdIl1OS2PF4SiqLFYxrOpXzQu2xRzL/kWSFIfAT9k5n2TEumS9h+FkiiTRkrIoH5UJbPV8K6ru0LN6D8WZL2L2kEFeSWAPBbUWAeABqjKj9UyMKX2bFiN1HatkTaiITXSBCThlBS77bZNWccKC1Y4Eu67v7xw= 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 1605689062014766.6591675743495; Wed, 18 Nov 2020 00:44:22 -0800 (PST) Received: from localhost ([::1]:46918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJ4e-0001SP-Ty for importer@patchew.org; Wed, 18 Nov 2020 03:44:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyi-0002Vb-O6 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyg-0005YI-VE for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:12 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561-Bu32On-8OhytL63ASJbtjg-1; Wed, 18 Nov 2020 03:38:08 -0500 Received: by mail-wm1-f70.google.com with SMTP id u9so568959wmb.2 for ; Wed, 18 Nov 2020 00:38:08 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id d3sm31414174wre.91.2020.11.18.00.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688690; 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=/JGMosYZm4Pd7viaXatygVdYP6fY/otp+/zbPBrEozA=; b=Hx0US+cCSrIEU4l9s+g+UE450JbvFhV1po0bGX2e8c6V+GxkB+CRYCH4ENpmq+T8ILSC3I wJ8du6otDVDagB1AHAZhHFjPQ4aXh+0pJ9Nmb54FN5w4gYDGjQjTP6C056zuOV0eQQcBLy 0YRJsju7Bqow4HWTp8BwZAsFU2JHs/k= X-MC-Unique: Bu32On-8OhytL63ASJbtjg-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=/JGMosYZm4Pd7viaXatygVdYP6fY/otp+/zbPBrEozA=; b=rN3Pnt3c6FcWUbY+ApkcbzfqaarLB76wrqDXYpKp0HGBxNFThCpUIRiIFBzEud3dfj E7pBCXxXs+F1Jh6qYXT4MSXoV6EeUgQg7paiANWqC4Qu1ukKCJ/OGqd84mdM+NM/mUj9 HU++MKygwheMJ4/eCEIJ7OHzjwArlPKOHXjs0ScWSD93TQO7WryqjzVYoKtturKiwYrK 4JMQRXW+8uu2uMs++GHotN3bqr33KQzgwAZXMZhqo6Jtn7suv5oJoRMevjcCpOaceb7J qbGxjX6N/o2lSvRkcwG7P+ThIGicI5YYcoCw0kt5DRa0LWVJsbbHCeI+IF8IMSsD8rsy pcgA== X-Gm-Message-State: AOAM53196Wz2UHNZf8+/snbdWtmZIELk5Fp67qCDXpJTY8PyW9hDPvPF r/ui4hsNSOj89T7bE8kBQqJMTq0nLT0SpLcufR3ij5/tmoOAQpZNBDyIbJ1e/guEdPWRL57i931 YDA++xxzKRbV03r6xZ886b/MBtZHYWvHVFESJnHEhgdVEW2eP8MucYIBOD6xIKpdv7AI= X-Received: by 2002:a1c:7318:: with SMTP id d24mr3311660wmb.39.1605688687433; Wed, 18 Nov 2020 00:38:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMgkqkBJXFrrHlmm1p/1DWormI0cuLS+/HqpXQUIOtqC/EVsUd+Jr2eddU+W1t70AE4Qf92A== X-Received: by 2002:a1c:7318:: with SMTP id d24mr3311636wmb.39.1605688687269; Wed, 18 Nov 2020 00:38:07 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 11/27] failover: remove standby_id variable Date: Wed, 18 Nov 2020 09:37:32 +0100 Message-Id: <20201118083748.1328-12-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" We can calculate it, and we only use it once anyways. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 7159e6c0a0..a055f39dd6 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -205,7 +205,6 @@ struct VirtIONet { QDict *primary_device_dict; DeviceState *primary_dev; char *primary_device_id; - char *standby_id; /* primary failover device is hidden*/ bool failover_primary_hidden; bool failover; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 2a99b0e0f6..953d5c2bc8 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3181,23 +3181,19 @@ static int virtio_net_primary_should_be_hidden(Devi= ceListener *listener, VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); bool match_found =3D false; bool hide =3D false; + const char *standby_id; =20 if (!device_opts) { return -1; } n->primary_device_dict =3D qemu_opts_to_qdict(device_opts, n->primary_device_dict); - if (n->primary_device_dict) { - g_free(n->standby_id); - n->standby_id =3D g_strdup(qdict_get_try_str(n->primary_device_dic= t, - "failover_pair_id")); - } - if (g_strcmp0(n->standby_id, n->netclient_name) =3D=3D 0) { + standby_id =3D qemu_opt_get(device_opts, "failover_pair_id"); + if (g_strcmp0(standby_id, n->netclient_name) =3D=3D 0) { match_found =3D true; } else { match_found =3D false; hide =3D false; - g_free(n->standby_id); n->primary_device_dict =3D NULL; goto out; } @@ -3400,7 +3396,6 @@ static void virtio_net_device_unrealize(DeviceState *= dev) if (n->failover) { device_listener_unregister(&n->primary_listener); g_free(n->primary_device_id); - g_free(n->standby_id); qobject_unref(n->primary_device_dict); n->primary_device_dict =3D NULL; } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689877; cv=none; d=zohomail.com; s=zohoarc; b=hIv89dZaLNWl2YIUiq3BGSF4xxZ9h41fEL9TX80jPuPz6PHJFmB+4rV0bprRcEeUZuaL8QbLNCC3SwNrXKNG3LwwZ/LMOmFRTjqSjo287wYn+ALGah358Y5YoG5dnaZSilkqkZeVF20ezWSpK+AXVN3AuAlfRWrmIBhbVSt0Oy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689877; 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=ZitZm1Vwi2HnXMn3z66NARvXR7SABBnylrQjF1/e6gA=; b=JhGaDZEWWULPOsvFFxKbbF/7cc9x0z01ocn6ShIZOzUF5fq2V2N/SADX0aA6Z51gZ6ZWcM6ohKs6y+gEgv62jgr9Bxv04rF7RVQ8LbJUnNtLsUvMkIkPVLtlmnG2UzjYdxQWUNXOqvFIXAQgkBqIorBK2+Zsx7PRe4FqH9hXb3A= 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 1605689877610513.148449284168; Wed, 18 Nov 2020 00:57:57 -0800 (PST) Received: from localhost ([::1]:37814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJHo-00048x-Gw for importer@patchew.org; Wed, 18 Nov 2020 03:57:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyn-0002gP-3s 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]:36426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyl-0005Zl-93 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-517-HLgCnaWyN5KNi7lhfMCsaQ-1; Wed, 18 Nov 2020 03:38:12 -0500 Received: by mail-wr1-f71.google.com with SMTP id f4so621345wru.21 for ; Wed, 18 Nov 2020 00:38:10 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id g20sm2430408wmh.20.2020.11.18.00.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:08 -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=ZitZm1Vwi2HnXMn3z66NARvXR7SABBnylrQjF1/e6gA=; b=QP6tIbe81jBobUreHGDiXapKTQE830nskrYnFLUyp7FoDOh2CJvy4uowLa0wiqk8ALoaa3 IPpyhgfTIbCwn0L5rxCJbTe/yEwoWdk/CvGUfj8TtEwEh3oLRHqoXNwsncR3W5EmmKFIMj 9zPVQnu+IZLIXBO02aqcXgJMVGpx7GY= X-MC-Unique: HLgCnaWyN5KNi7lhfMCsaQ-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=ZitZm1Vwi2HnXMn3z66NARvXR7SABBnylrQjF1/e6gA=; b=axMxBhFcQP+5pWT0plg1dtn5bSUOpN6WX38px7SRU6L+I5NG64H8lIF8NCO0Gw/a97 OQMfrgtBjIRScFZ4pFBleAtsLd9CpC+JP7VkQPBDPCdydqEwLIrWVWHdxl5wa5kyufcg CnIaa+3RMWSuB2V43xn0oMu+YQQoe72QEJlcS+ss81MZWhNGLjL1T8/k4/3+n/88j4xv 6mimoyG9h0e5gjGUab+J7xT6o+AQYu811zPeKzAQ+gYgIrw215MX2TKRhSF5XAg5JcZm wzVEDJohgvTI0sxaVk8IyIOGMUI/pKHoKhDkc8tWGUcvLq4/gPjQ3DOsffjKZDy4ggcO EnkQ== X-Gm-Message-State: AOAM531N4K6aiQDjMnkFW1emZDmJZVfi88xKfcP9GqdAzHoeOV/RmHX5 +sXM6oTzZOO2U08op0fpEWkHTdUhrztrSgY/R10kv9WIPVVRftzW/3ioucDAYMqfG9Fh7Weel2S 1DaJ/1VFE/9LvKnYWcsVEOUz9Y+gkzusdEoDfJ1YlEhnUHBQccAvpLsg06vwVXpGppXM= X-Received: by 2002:a5d:438f:: with SMTP id i15mr3641768wrq.121.1605688688930; Wed, 18 Nov 2020 00:38:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQ18jcbOr6Gmtt7X4KYo6tTBzCANLH9k9sFW1+G1gKTfomoE1GlExq1RvLniJpbK7Z6tPG/Q== X-Received: by 2002:a5d:438f:: with SMTP id i15mr3641748wrq.121.1605688688746; Wed, 18 Nov 2020 00:38:08 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 12/27] failover: Remove primary_device_dict Date: Wed, 18 Nov 2020 09:37:33 +0100 Message-Id: <20201118083748.1328-13-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" It was only used once. And we have there opts->id, so no need for it. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 17 ++++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index a055f39dd6..fe353d8299 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -202,7 +202,6 @@ struct VirtIONet { AnnounceTimer announce_timer; bool needs_vnet_hdr_swap; bool mtu_bypass_backend; - QDict *primary_device_dict; DeviceState *primary_dev; char *primary_device_id; /* primary failover device is hidden*/ diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 953d5c2bc8..6e5a56a230 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3186,28 +3186,21 @@ static int virtio_net_primary_should_be_hidden(Devi= ceListener *listener, if (!device_opts) { return -1; } - n->primary_device_dict =3D qemu_opts_to_qdict(device_opts, - n->primary_device_dict); standby_id =3D qemu_opt_get(device_opts, "failover_pair_id"); if (g_strcmp0(standby_id, n->netclient_name) =3D=3D 0) { match_found =3D true; } else { match_found =3D false; hide =3D false; - n->primary_device_dict =3D NULL; goto out; } =20 /* failover_primary_hidden is set during feature negotiation */ hide =3D qatomic_read(&n->failover_primary_hidden); - - if (n->primary_device_dict) { - g_free(n->primary_device_id); - n->primary_device_id =3D g_strdup(qdict_get_try_str( - n->primary_device_dict, "id")); - if (!n->primary_device_id) { - warn_report("primary_device_id not set"); - } + g_free(n->primary_device_id); + n->primary_device_id =3D g_strdup(device_opts->id); + if (!n->primary_device_id) { + warn_report("primary_device_id not set"); } =20 out: @@ -3396,8 +3389,6 @@ static void virtio_net_device_unrealize(DeviceState *= dev) if (n->failover) { device_listener_unregister(&n->primary_listener); g_free(n->primary_device_id); - qobject_unref(n->primary_device_dict); - n->primary_device_dict =3D NULL; } =20 max_queues =3D n->multiqueue ? n->max_queues : 1; --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689660; cv=none; d=zohomail.com; s=zohoarc; b=LdwHneDyavDyEuxtVoNH50JGwzFWXvEHZz2ETjJlPFulVqLjbb9tUlUxPm2ydJhn69OHQOPdeAJQT302v1Dcx3G2RAY4g0pLUl2M0M3J7MYCLHNbwY6XeJ0pxHoddzK35MW6NEjq0LXh2uUTI/rW/KpICkt7m8gAb6r8/cW/UXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689660; 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=OpPV6GUv7MN9+cQxrkR8TqpocJUitSTRT5ASK8zHguw=; b=QgFxmKuUhebd43+EBDk3gtzhGMBhG2tC6boZqbsn36I+GyZS/X6QJ0KFPlfsDIIS7ROfb5hQxvmj1NDIxQnnU49wwurQuYqQCHXpiYyfiQ+zthcRCp7FmT93omoEg1Di09QLnzHdMgrLpNySe1zZZqFnzK5C6/EqZfitZGIs3zk= 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 1605689660409506.6672265757388; Wed, 18 Nov 2020 00:54:20 -0800 (PST) Received: from localhost ([::1]:54558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJEJ-0007ps-Ch for importer@patchew.org; Wed, 18 Nov 2020 03:54:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyl-0002dQ-SJ for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58259) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyj-0005Yl-Rs for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:15 -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-44-vnhOhaNMP8aoX7go_0Gxng-1; Wed, 18 Nov 2020 03:38:11 -0500 Received: by mail-wr1-f71.google.com with SMTP id c8so625389wrh.16 for ; Wed, 18 Nov 2020 00:38:11 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id j127sm2543460wma.31.2020.11.18.00.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688693; 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=OpPV6GUv7MN9+cQxrkR8TqpocJUitSTRT5ASK8zHguw=; b=N4ROP/LABr/b972FDC95WKU72glk4X7ipelp7AIaaB2+i0V0FSnIQLHRGR2FTzyi//Lc7e OHeHRpY4E+r6YWa//k70az21NYCPdMO05RMpAl23OJ6c5BUAKyQCgYETQbzu+2tPAdQJAL y/QmZUNR8RRdYtig5FGtAwtoDs82DMc= X-MC-Unique: vnhOhaNMP8aoX7go_0Gxng-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=OpPV6GUv7MN9+cQxrkR8TqpocJUitSTRT5ASK8zHguw=; b=bnX1ZyvNHXDBlXRHI7Lxr7J9szIx10ZbDjp/9J4V58ggrKiFbTiLgbc5MBqfnHql8Y 65S8v0dL0xONa0mKfgFjTHDoQe0pqcjuzUQt5MW9CaSLwG0ieYZe7ftpSjFTL6DGXXU3 nBhkDZoGZjFjmd7paouC4h55UlsoCCsnz5UWHW7+ciBFi7OW7hoYeZKgH/vb8SLL4K02 EUNw8xIn+BgTndEntzlB/lnmn4o3mNgrTG70TEYiFmuf7LP3gE+daND/6u2RKCjz+Koj KydsEUsxcnmGCJ1XI4txw8O14uu96kRRrE2or38sZibX6fsINPrxpdXQ3j04sjxhMIMK F5ww== X-Gm-Message-State: AOAM5322s5YKdg/fa6LVAkTMxQ4JnB1czhPr+aaxajJv0IolqSWyVQyH DWuIxJzJhzDgRl7zKiyAxdbYpCaJKVR7EQ7jNSchBlIvMkZdB+TuQqop6/nb2YLrOasmjwmnwkA LcQtaFObYsa8CTPuLJLf7pCUAph/7JXirzQWRH7c88KiBboa4/YcJntYf++grb7lHYIo= X-Received: by 2002:a05:600c:286:: with SMTP id 6mr2996730wmk.125.1605688690375; Wed, 18 Nov 2020 00:38:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaQOMM7u5WldRdiktXiyw16zMlbf76OP2irMIqu/ainWZyL22RIgbb5Lu6rEmpqucUNtAuSQ== X-Received: by 2002:a05:600c:286:: with SMTP id 6mr2996706wmk.125.1605688690208; Wed, 18 Nov 2020 00:38:10 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 13/27] failover: Remove memory leak Date: Wed, 18 Nov 2020 09:37:34 +0100 Message-Id: <20201118083748.1328-14-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=63.128.21.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/17 19:41:43 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_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: =?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" Two things, at this point: * n->primary_device_id has to be set, otherwise virtio_net_find_primary don't work. So we have a leak here. * it has to be exactly the same that prim_dev->id because what qdev_find_recursive() does is just compare this two values. So remove the unneeded assignment and leaky bits. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 6e5a56a230..70fa372c08 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -854,9 +854,7 @@ static DeviceState *virtio_connect_failover_devices(Vir= tIONet *n, Error **errp) Error *err =3D NULL; =20 prim_dev =3D virtio_net_find_primary(n, &err); - if (prim_dev) { - n->primary_device_id =3D g_strdup(prim_dev->id); - } else { + if (!prim_dev) { error_propagate(errp, err); } =20 --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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 From nobody Mon May 6 08:31:55 2024 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=1605690001; cv=none; d=zohomail.com; s=zohoarc; b=KkRgIhOMHYAou2eiX6s6i3meHEeT62IDy8Q3dwachzuJm9ljHLz5Pnvi3cGtFChwVrGj7fd1CnX2+/rAPBWBx9EkVO9xLxDyIoJ2vAJlzMI1tPAK9nFbOLV+Y1nPQNEW2JrkNDpL3ODRFnz9Pu4Y5hLfop5GcYrLmaubuDPtTD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690001; 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=HdTOdTsL0DiSoAF/9pIsiWi1rLD7PCVN16ZBBTE6i60=; b=X3fcxZdqoN54uyH1g8M5PJ+tQKHNan08aqsljrm1OnmhnzpqknASSwYzxQp5O4IDxf5vO6t+ljEPJHDnyv6nc/e/YNkqIvDfT+KbMOtDio5KCDyRcVFIiuT6Af6lWvTFn7PEiSdMDdnRoS0QjJ2LXmCyEICRpfqcxY58hEzgYsA= 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 1605690001198376.04126199776533; Wed, 18 Nov 2020 01:00:01 -0800 (PST) Received: from localhost ([::1]:46226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJJo-0007Xo-23 for importer@patchew.org; Wed, 18 Nov 2020 04:00:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyo-0002kP-O3 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIym-0005aB-Nu for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:18 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-587-4onaqdxzPAuC8EMTLGz7nQ-1; Wed, 18 Nov 2020 03:38:14 -0500 Received: by mail-wr1-f69.google.com with SMTP id w5so610146wrm.22 for ; Wed, 18 Nov 2020 00:38:14 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id g4sm32516779wrp.0.2020.11.18.00.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688696; 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=HdTOdTsL0DiSoAF/9pIsiWi1rLD7PCVN16ZBBTE6i60=; b=JphY4aMicEPWKOmm305QjWxZCpyNzAVTVfUVgQHF/keNk1T4ScHQJknhDPA+sFyZydJtam vc55RMMU0sxIOIBbK3YLH6FXfwpFSrPRtzLckdjmYPHI+VlYvM49ZZLdNYLXhTgNzbYF+v KxJ9eX9r1JAyPyiWNz9xLOvcTzetjdY= X-MC-Unique: 4onaqdxzPAuC8EMTLGz7nQ-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=HdTOdTsL0DiSoAF/9pIsiWi1rLD7PCVN16ZBBTE6i60=; b=AkfalJeSHPpFNiRu9+1VGBWgjOgAyOZ6RrrT/D3wFMa6sGo2OEKYqWQKijXVqpaiLe AxbWFLpogJiDoYSE1Ih6i3BYt2WqhNxhmhzEjU8D6l78wdWsMbS2tiTFGgv9ZNL9oMVp Fowy5QNqO+hkEKIVXNcrT6yzT92Q7Scd2GWUg3yrqVoRTUvo3UesgLjWHpbxb1GYSfNI Uaer3gAoZASbvCBoxxm2hSRXxN+gupKV5JmwUnpw+xk/9J0R0M/k7Zf87SiV3SCzzpAo QFSWl2wQLRK9asvD7oEc0wPdfJ2uvXM9sVXFlE1z4Ha+iLFlZwgEPbL1+gja+ByGATlu 8MsQ== X-Gm-Message-State: AOAM533DSwOpYXVQkN5qkYtgBkF1gTJ4ppo5kgESocNuiAwak8oeZzCo BxOcTWy+H1bK8OHXRvxNbj261c9CIUlS7r/Tm6EQDVDWEABTZ4/IyPp2e+OAbCk5EWdG8cHawrG R7E5wE6mEKB9gPyp7IpqjUYpuLIJhNzxDWX6vAWJuqOymPsPmDXj8EM0wovhSEASOK24= X-Received: by 2002:a1c:4055:: with SMTP id n82mr3449450wma.68.1605688693359; Wed, 18 Nov 2020 00:38:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpMLwnPIc7DA6OXupYKuqd5mnHuD/0CRWoqx5+Np7469OeohzduUAbFvgoB0e4rgRFj8QQ/A== X-Received: by 2002:a1c:4055:: with SMTP id n82mr3449428wma.68.1605688693120; Wed, 18 Nov 2020 00:38:13 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 15/27] failover: should_be_hidden() should take a bool Date: Wed, 18 Nov 2020 09:37:36 +0100 Message-Id: <20201118083748.1328-16-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" We didn't use at all the -1 value, and we don't really care. It was only used for the cases when this is not the device that we are searching for. And in that case we should not hide the device. Once there, simplify virtio-Snet_primary_should_be_hidden. Signed-off-by: Juan Quintela --- include/hw/qdev-core.h | 2 +- hw/core/qdev.c | 19 +++++-------------- hw/net/virtio-net.c | 27 +++++++-------------------- 3 files changed, 13 insertions(+), 35 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 5e737195b5..250f4edef6 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -200,7 +200,7 @@ struct DeviceListener { * inform qdev that a device should be hidden, depending on the device * opts, for example, to hide a standby device. */ - int (*should_be_hidden)(DeviceListener *listener, QemuOpts *device_opt= s); + bool (*should_be_hidden)(DeviceListener *listener, QemuOpts *device_op= ts); QTAILQ_ENTRY(DeviceListener) link; }; =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 262bca716f..8f4b8f3cc1 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -214,26 +214,17 @@ void device_listener_unregister(DeviceListener *liste= ner) =20 bool qdev_should_hide_device(QemuOpts *opts) { - int rc =3D -1; DeviceListener *listener; =20 QTAILQ_FOREACH(listener, &device_listeners, link) { - if (listener->should_be_hidden) { - /* - * should_be_hidden_will return - * 1 if device matches opts and it should be hidden - * 0 if device matches opts and should not be hidden - * -1 if device doesn't match ops - */ - rc =3D listener->should_be_hidden(listener, opts); - } - - if (rc > 0) { - break; + if (listener->should_be_hidden) { + if (listener->should_be_hidden(listener, opts)) { + return true; + } } } =20 - return rc > 0; + return false; } =20 void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 881907d1bd..9f12d33da0 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3161,24 +3161,19 @@ static void virtio_net_migration_state_notifier(Not= ifier *notifier, void *data) virtio_net_handle_migration_primary(n, s); } =20 -static int virtio_net_primary_should_be_hidden(DeviceListener *listener, - QemuOpts *device_opts) +static bool virtio_net_primary_should_be_hidden(DeviceListener *listener, + QemuOpts *device_opts) { VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); - bool match_found =3D false; - bool hide =3D false; + bool hide; const char *standby_id; =20 if (!device_opts) { - return -1; + return false; } standby_id =3D qemu_opt_get(device_opts, "failover_pair_id"); - if (g_strcmp0(standby_id, n->netclient_name) =3D=3D 0) { - match_found =3D true; - } else { - match_found =3D false; - hide =3D false; - goto out; + if (g_strcmp0(standby_id, n->netclient_name) !=3D 0) { + return false; } =20 /* failover_primary_hidden is set during feature negotiation */ @@ -3188,15 +3183,7 @@ static int virtio_net_primary_should_be_hidden(Devic= eListener *listener, if (!n->primary_device_id) { warn_report("primary_device_id not set"); } - -out: - if (match_found && hide) { - return 1; - } else if (match_found && !hide) { - return 0; - } else { - return -1; - } + return hide; } =20 static void virtio_net_device_realize(DeviceState *dev, Error **errp) --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605690139; cv=none; d=zohomail.com; s=zohoarc; b=X0liztIWKseJMIGjLogUU0RhR5Eqboq69iKgjSKYXOigIcubQBOinsjXoubNdP1Lja9dsRaJd6Z15NrAYrIOC9cVjji/q+7GhZZS4ezFMnFTnQ7ix85X77CjOrDul1bYNf0DsrgLMP2px9bvizQA5VBD+D/M65xPCfaIdyst2OE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690139; 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=FPtoxv7WglKBnzgx+soovpjTMEuQkTMmvaZ6ApeJyOI=; b=BHWqPzJfFV5h/gAs8DGoU3gF9Ii9u8MQ4pAlZ1F3YAEOxm9EXWFF1jquzw8Lh/KENbqacYjz6nTt1q1RtNDBozaWZmVCOm3UZwItW6EJIGzsjpunM5sdX+SZeaWM7NuzoZVEhVDRNF2OAiIZJ6Boc2U02UrDHqeqM1wxrWa8WVE= 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 1605690139123361.0335709023118; Wed, 18 Nov 2020 01:02:19 -0800 (PST) Received: from localhost ([::1]:54136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJM2-0002SP-2t for importer@patchew.org; Wed, 18 Nov 2020 04:02:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyq-0002pX-MH for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48312) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyo-0005b5-P7 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:20 -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-398-icS13zy2OcqVXJFHSyWbAg-1; Wed, 18 Nov 2020 03:38:16 -0500 Received: by mail-wr1-f71.google.com with SMTP id w6so636993wrk.1 for ; Wed, 18 Nov 2020 00:38:16 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id 17sm7656486wma.3.2020.11.18.00.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688698; 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=FPtoxv7WglKBnzgx+soovpjTMEuQkTMmvaZ6ApeJyOI=; b=Cch/MK859D8kgzWlQU56xmSB0MC9GkzRmTLdzB9OYzLpDIqsElg6bk+Fjdwlot+gmpVHV5 g8e0tqzi+JJDIgtwz65r0EIORgJv2r2TcJT3pV+eIzdKKIFIRqH4Vqw22tVHyOxPBpnVP1 MBH5uaMXVGnxpQLWSVjATV64o2efhE8= X-MC-Unique: icS13zy2OcqVXJFHSyWbAg-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=FPtoxv7WglKBnzgx+soovpjTMEuQkTMmvaZ6ApeJyOI=; b=WwwMuosOTYTK87gkCYFAkZvg+G8e2FN+/2Ny0kMQiDapE2si+6QSXiObQ59U/APur8 WHf6FKV63yaSshTDUqjZoOpAz3YilBlg8bHv9o8bN8IPSDFYJk1znNI3CsKYkENwYxc5 tAgfUkXCr1f4OYKN7buEKmAK15NWc1VaaPOq6jvcpdbAE0Gki78f5GnbnHvilSoeexgS Uu8rzNd0YChxVo/LwzLojHIZ+/Mit+zLSpZWyfV7oGYL3hgPE489/dU97Ca+0wbcFnjR 8IzuFIpjfqHfN8O/W5kuiLyMuMLvOZgB0HKMngkFVcpk6mp/CS4PAzwV9hb/EJt9Cemr rmeg== X-Gm-Message-State: AOAM533Wc9gKRICcYb5p/xT9sRZzk4caLv8TJ6wM/y+JQf+3GQrumeOk osgM2Y13kPhRCwi/Ktgb9TFES5CX1ceXiqocXtBCe+wBosOp62Z0QBR0y16GG1/6LwtaDBcDTI0 5/YvuBcd9XVYwlZuAc+AJyXnGD4kVFlC2ATirwpJEF+7OyI6b8KRKO9qYqJdk9ZZ/tkk= X-Received: by 2002:a5d:6447:: with SMTP id d7mr3723263wrw.96.1605688694853; Wed, 18 Nov 2020 00:38:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/64tz/J/1yCJW+YtAzifGvixV7GaEpevSGQdCB5qvzagFWSSHJwObmBfTjfFmLG+3Od5ZuA== X-Received: by 2002:a5d:6447:: with SMTP id d7mr3723241wrw.96.1605688694634; Wed, 18 Nov 2020 00:38:14 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 16/27] failover: Rename function to hide_device() Date: Wed, 18 Nov 2020 09:37:37 +0100 Message-Id: <20201118083748.1328-17-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=63.128.21.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/17 19:41:43 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_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: =?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" You should not use pasive. Signed-off-by: Juan Quintela --- include/hw/qdev-core.h | 28 +++++++++++++++------------- hw/core/qdev.c | 4 ++-- hw/net/virtio-net.c | 7 +++---- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 250f4edef6..6ac86db44e 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -81,16 +81,17 @@ typedef void (*BusUnrealize)(BusState *bus); * * * # Hiding a device # - * To hide a device, a DeviceListener function should_be_hidden() needs to + * To hide a device, a DeviceListener function hide_device() needs to * be registered. - * It can be used to defer adding a device and therefore hide it from the - * guest. The handler registering to this DeviceListener can save the QOpts - * passed to it for re-using it later and must return that it wants the de= vice - * to be/remain hidden or not. When the handler function decides the device - * shall not be hidden it will be added in qdev_device_add() and - * realized as any other device. Otherwise qdev_device_add() will return e= arly - * without adding the device. The guest will not see a "hidden" device - * until it was marked don't hide and qdev_device_add called again. + * It can be used to defer adding a device and therefore hide it from + * the guest. The handler registering to this DeviceListener can save + * the QOpts passed to it for re-using it later. It must return if it + * wants the device to be hidden or visible. When the handler function + * decides the device shall be visible it will be added with + * qdev_device_add() and realized as any other device. Otherwise + * qdev_device_add() will return early without adding the device. The + * guest will not see a "hidden" device until it was marked visible + * and qdev_device_add called again. * */ struct DeviceClass { @@ -196,11 +197,12 @@ struct DeviceListener { void (*realize)(DeviceListener *listener, DeviceState *dev); void (*unrealize)(DeviceListener *listener, DeviceState *dev); /* - * This callback is called upon init of the DeviceState and allows to - * inform qdev that a device should be hidden, depending on the device - * opts, for example, to hide a standby device. + * This callback is called upon init of the DeviceState and + * informs qdev if a device should be visible or hidden. We can + * hide a failover device depending for example on the device + * opts. */ - bool (*should_be_hidden)(DeviceListener *listener, QemuOpts *device_op= ts); + bool (*hide_device)(DeviceListener *listener, QemuOpts *device_opts); QTAILQ_ENTRY(DeviceListener) link; }; =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 8f4b8f3cc1..cbdff0b6c6 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -217,8 +217,8 @@ bool qdev_should_hide_device(QemuOpts *opts) DeviceListener *listener; =20 QTAILQ_FOREACH(listener, &device_listeners, link) { - if (listener->should_be_hidden) { - if (listener->should_be_hidden(listener, opts)) { + if (listener->hide_device) { + if (listener->hide_device(listener, opts)) { return true; } } diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9f12d33da0..747614ff2a 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3161,8 +3161,8 @@ static void virtio_net_migration_state_notifier(Notif= ier *notifier, void *data) virtio_net_handle_migration_primary(n, s); } =20 -static bool virtio_net_primary_should_be_hidden(DeviceListener *listener, - QemuOpts *device_opts) +static bool failover_hide_primary_device(DeviceListener *listener, + QemuOpts *device_opts) { VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); bool hide; @@ -3220,8 +3220,7 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) } =20 if (n->failover) { - n->primary_listener.should_be_hidden =3D - virtio_net_primary_should_be_hidden; + n->primary_listener.hide_device =3D failover_hide_primary_device; qatomic_set(&n->failover_primary_hidden, true); device_listener_register(&n->primary_listener); n->migration_state.notify =3D virtio_net_migration_state_notifier; --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689837; cv=none; d=zohomail.com; s=zohoarc; b=PvuHsslSk5+b6OOTZv6uzjFi0rtI5Z6976lST9xqxuHW90WRj5ab59bJ/IKZ2zgH8oVWfuMK+UMYxdNu5ijPsGyhDSnm8tmlbPLWweQlDOOgKsZSZ1AEo4riDa9cQjq8UpILAM8lmgiyjOQu9ciZ01NS7lIPUI9WYDKBM9wqlWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689837; 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=TKjA9dVcSC0JEo7h0l2QsV1O0jLd78r7tcrL0jEGH+0=; b=Z2CNtqBYYuUI4DaxJWrEIzpVWTxlG1nURF0HEHHP3gqVTIfykO9h0Q6JFr4Iziy0hedAi97/AZlHcCqOEgYvMYfSkeI84bzIrBX3l7zLfyYEgHlsFbgrQtNH80T3ewJ77f714nAlWFzMXkFGqYomsfh/ZWhdaxEnt9h+BV5vRtQ= 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 1605689837559140.285839362381; Wed, 18 Nov 2020 00:57:17 -0800 (PST) Received: from localhost ([::1]:36128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJHA-0003Sx-Gg for importer@patchew.org; Wed, 18 Nov 2020 03:57:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIys-0002uz-OS for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyq-0005bo-VI for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:22 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-ViXRwuRgNAi_shaNWq27zw-1; Wed, 18 Nov 2020 03:38:17 -0500 Received: by mail-wm1-f69.google.com with SMTP id a134so558335wmd.8 for ; Wed, 18 Nov 2020 00:38:17 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id f16sm32438410wrp.66.2020.11.18.00.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688700; 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=TKjA9dVcSC0JEo7h0l2QsV1O0jLd78r7tcrL0jEGH+0=; b=ST+hcccdbNu4lvsu1Uz1nq+JjyJd0i7w6utOlp9qqwS8FyCVTiqbZ7ZE/xm3QMwYrNDz5m TEiBgjX5zmYKPr9mn32+elTBsuNaIyOxAT2ew6WJ726fT4W8EETNrtS56HCpF8JdxZwQnW XNFZrormz/kCfncgs3nITWL+pzpgWFk= X-MC-Unique: ViXRwuRgNAi_shaNWq27zw-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=TKjA9dVcSC0JEo7h0l2QsV1O0jLd78r7tcrL0jEGH+0=; b=LTdkOKcML4ibBCPZ6O5taB+ciq21ljAJWdeNB4ZK5MPcbtd5e5BK0YW5HtnLn7IGMl kUJDRb6dd6x4LJwD8W0jxjGniYyXlEtpAdwnROC1IoNPPWvrLXrfBU1ijGpo3Ph1l/xv k3tkOvOzpytSZXgzd4n9AWNvLKLX90SIZsf8s9xKFTvCiZyLv6AzB2xR5Aek+7HL75e+ nzz7Whe4xWRvLtD/YR1ymLWFTpHImT9ecXAGpEL8oH4xx3/ZxyyHLO2Bp0LzlAk1mFTJ ojOY1VtbmVdyTdVUnXL/QWMQjEBBjj8mJ8rZq+toWYiPdRR6IDY3daU9cl6NmvYAsh4X U2eA== X-Gm-Message-State: AOAM530jTLmw90B2xF4bY2FSmYQULysIDyokqn+BkRn2l3TgsePPFCFE aXs+ck9dJmLriiOFMcakMU5q37Y8yaDfmxdqC1NX1/0XuOdKA4eul7WVqMCk0xcVx2Ih+R+VrKw fgMEr/kUWB8TQ9NBHjq88mOm3Dw5E/idkXK+Hazmd9p0U8CpLYQSdt1xFAdFFHJSg93E= X-Received: by 2002:a1c:f619:: with SMTP id w25mr2747714wmc.55.1605688696388; Wed, 18 Nov 2020 00:38:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2Z0hFfkJPnfbVKb/odaNN59PeojixyRUrhTUvaE68XwjYCtkthUqBl7jNVtdVu3hDbGrqug== X-Received: by 2002:a1c:f619:: with SMTP id w25mr2747692wmc.55.1605688696177; Wed, 18 Nov 2020 00:38:16 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 17/27] failover: virtio_net_connect_failover_devices() does nothing Date: Wed, 18 Nov 2020 09:37:38 +0100 Message-Id: <20201118083748.1328-18-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" It just calls virtio_net_find_primary(), so just update the callers. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 747614ff2a..c6200b924e 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -836,19 +836,6 @@ static DeviceState *virtio_net_find_primary(VirtIONet = *n, Error **errp) return qdev_find_recursive(sysbus_get_default(), n->primary_device_id); } =20 -static DeviceState *virtio_connect_failover_devices(VirtIONet *n, Error **= errp) -{ - DeviceState *prim_dev =3D NULL; - Error *err =3D NULL; - - prim_dev =3D virtio_net_find_primary(n, &err); - if (!prim_dev) { - error_propagate(errp, err); - } - - return prim_dev; -} - static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) { VirtIONet *n =3D VIRTIO_NET(vdev); @@ -904,7 +891,7 @@ static void virtio_net_set_features(VirtIODevice *vdev,= uint64_t features) qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev =3D virtio_connect_failover_devices(n, &err); + n->primary_dev =3D virtio_net_find_primary(n, &err); if (err) { goto out_err; } @@ -3128,7 +3115,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, should_be_hidden =3D qatomic_read(&n->failover_primary_hidden); =20 if (!n->primary_dev) { - n->primary_dev =3D virtio_connect_failover_devices(n, &err); + n->primary_dev =3D virtio_net_find_primary(n, &err); if (!n->primary_dev) { return; } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605690226; cv=none; d=zohomail.com; s=zohoarc; b=bm2IC51XhPBa3LQJrClemzVCqfTmlM/Z2q0ni3ZHtu71TE9JiqK8mCD9niY9NuIDx2s5mBOg5clStL3HVg/s4ziJuoqkybrz2rAFgLShr4n64BSzCwzZYJdoCdh2EAI6p9v734SLV3jStJnk8W6zf7Hb2PfzHhe8vVRmgcpwgBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690226; 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=/jGTDMTMDo6OHg04m4Nw1t8XiWyL716KsxIBNAYZE00=; b=ij5qTIn7NkEvEMWqMv7DoNKaT4Gpb9z6RK5ai7jzpx/ktTyxHAuFVgpyZ7m7eg7x3tuIRAj7dSz1Y0A2qauLnB8Kq8Iwn5nPGQY2llk8tE4cup86bQ0zdhq9vyggzfHF4Cmb+aM57Ma7q0n+JbdF8PT843BEsLwpYs4acx+D4bg= 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 1605690226508788.4751683903554; Wed, 18 Nov 2020 01:03:46 -0800 (PST) Received: from localhost ([::1]:60248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJNR-00050F-GH for importer@patchew.org; Wed, 18 Nov 2020 04:03:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyt-0002vx-62 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyr-0005bw-C0 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:22 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-311-ZWDSR1UKPl-osqUNYYupIw-1; Wed, 18 Nov 2020 03:38:19 -0500 Received: by mail-wr1-f69.google.com with SMTP id w17so621265wrp.11 for ; Wed, 18 Nov 2020 00:38:18 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id b73sm9861465wmb.0.2020.11.18.00.38.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688700; 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=/jGTDMTMDo6OHg04m4Nw1t8XiWyL716KsxIBNAYZE00=; b=KWItVvc62XTLylXAiNUUCCWAQJdxqZNmRyUXPadTnZA3Pv3OTlb/0b1iSaidoYV3Ponfex 7jq+0Uqe0MvzfZ3eskLcUkDK74dgOV8e8NLke/odXaFKbmyDxSdDcMAImhhMBWCJ9BCW2A G95JlubUr/z5l/5jPVv4gn/BQp+2wn0= X-MC-Unique: ZWDSR1UKPl-osqUNYYupIw-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=/jGTDMTMDo6OHg04m4Nw1t8XiWyL716KsxIBNAYZE00=; b=kkGGZKT7xb5OkFUWb3mVvSBEXsTLOhc/7rmvX31axfRxCjSYJwBi6TNleAqyErGZzD TQu/fUClQy2V3rWhHj2lJfhSQZnqJm+xxKfLfvoTD4UUVFTgKCZKCqS5PqdKIJGaVYcL Z52N2PS9Nvmx4FXRc896khrLYtmREF+Hzp7BsUn74r/X4gYQBVXHCsGHQ0dwBcHaffNJ FzD4SXF0T/YvxLQ/+6KuZuJiX0gag67ErnMgoLAVfm2H7QSirxjb4zqcLljs8VjN6SVV iy2wJ61h81x48vy+PJ8O/+AhIEPOetoHCO6u8Hw7JslmcXlZndjwRn6LgOHiq6Msl9ku Du1g== X-Gm-Message-State: AOAM531+GIrzu4IG7R6Cb0HlBjFwe86WzmWFASY6m2M2M2NU14pTK0yE ucwcjCXbi4WxTpYRb06qwSzbvWNGe9EWb8nFV1siLW0BdyoQPBLPE17YqTMzl/HVW02tQv+BPgc 8d3zaz0J5cVZyIA0J+58dLHP5o/cLLhL51vq4+hjDG/yccYhG3EFkLld60mCZJElCf7w= X-Received: by 2002:adf:f6cd:: with SMTP id y13mr3870470wrp.363.1605688697821; Wed, 18 Nov 2020 00:38:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMa78wnTOfqiVvDvaLmpBG0TV8SMTbNVSHnKtLVVCvG9XJir7YPMIvY3BquegrPFjtPN8n6A== X-Received: by 2002:adf:f6cd:: with SMTP id y13mr3870455wrp.363.1605688697657; Wed, 18 Nov 2020 00:38:17 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 18/27] failover: Rename to failover_find_primary_device() Date: Wed, 18 Nov 2020 09:37:39 +0100 Message-Id: <20201118083748.1328-19-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" This commit: * Rename them to failover_find_primary_devices() so - it starts with failover_ - it don't connect anything, just find the primary device * Create documentation for the function Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c6200b924e..ff82f1017d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -826,7 +826,13 @@ static int is_my_primary(void *opaque, QemuOpts *opts,= Error **errp) return ret; } =20 -static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp) +/** + * Find the primary device for this failover virtio-net + * + * @n: VirtIONet device + * @errp: returns an error if this function fails + */ +static DeviceState *failover_find_primary_device(VirtIONet *n, Error **err= p) { Error *err =3D NULL; =20 @@ -891,7 +897,7 @@ static void virtio_net_set_features(VirtIODevice *vdev,= uint64_t features) qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev =3D virtio_net_find_primary(n, &err); + n->primary_dev =3D failover_find_primary_device(n, &err); if (err) { goto out_err; } @@ -3115,7 +3121,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, should_be_hidden =3D qatomic_read(&n->failover_primary_hidden); =20 if (!n->primary_dev) { - n->primary_dev =3D virtio_net_find_primary(n, &err); + n->primary_dev =3D failover_find_primary_device(n, &err); if (!n->primary_dev) { return; } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689816; cv=none; d=zohomail.com; s=zohoarc; b=RA3ArKWrWn4R3GniDlvGeLYR0PM5rpPVo4UcILLVXoCqb0YUZG7yOs+B2Wd8qYb42zH6AKesQroLUyqG3UHnd9oIizVpUFdRhH5eVWSyuSxQ+5Kw/q0YmkfNbEYlw9ahOD3IQIhKPomrMSTKn7dDcEZyc2XKFnZm5EF1yr8Cj6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689816; 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=/d1v6DBgojNw2uMHK1agy5e9FlbdhWGWctrKkwB9trQ=; b=OF3UbOSoZctzSBau+XD5FZ3W7nnQ8iYxRIvAwpIvyzd0TVeRgZTTHHbYIyZzB1FPVVDdgst8HDlU/dOAqpGvgmlZEhQy7zzXeCYt6WJjzHbFzY4irNvDAeKbYZCaWWlrzTjHY0PTh2fn7WolTUHAX9uWFscv4ofa7BM+OBUBgFI= 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 1605689816849429.87995426539567; Wed, 18 Nov 2020 00:56:56 -0800 (PST) Received: from localhost ([::1]:34706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJGp-0002qx-O8 for importer@patchew.org; Wed, 18 Nov 2020 03:56:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyv-00030Z-1s for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyt-0005cc-78 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:24 -0500 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-434-0HDYRPwJPeeMhnaNctoUyA-1; Wed, 18 Nov 2020 03:38:20 -0500 Received: by mail-wr1-f72.google.com with SMTP id k1so625218wrg.12 for ; Wed, 18 Nov 2020 00:38:20 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id j71sm2522761wmj.10.2020.11.18.00.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688702; 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=/d1v6DBgojNw2uMHK1agy5e9FlbdhWGWctrKkwB9trQ=; b=GELGOcThShwlwpnTSt3y5K3QQLhjc7jWUFo8HcqdFDdJLh6eHw/488PEXYznOUTx2gN8zo q0KTxne3Ej/6MZqNVt7126OLM9SaoWvHG73deVDTmHDYNBVMYs2/VSK040EjBT2rpsvjDE faJayMrSsX08QI/7dNGDb2cX+lEaMbY= X-MC-Unique: 0HDYRPwJPeeMhnaNctoUyA-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=/d1v6DBgojNw2uMHK1agy5e9FlbdhWGWctrKkwB9trQ=; b=ArTgfIaK45OtNlNyv4Mn09LcSqOmwcTc1UnHOv2FU3oq4dgr2V5d7EsWT891vZa4ev xmlam20eiIOgPEMjOq4OW3L0mf5FKM1gcLcTqtvPI55Q7dLMsRa6uT3yCyqPbIv9JVRI npR5yZ8n89ePIE9cxoxdoDCAieEO4rR0OviGTG2cogiP7q0+eSmoGyQRVPzbiDP32SoH DJnMVWEecQE7qpLFzNUgRbQhEeZBsJ/JYYif4dLO3GIO1XQ5G9EsiJZiczZX9FG9tbjV zVjDZYLxGT+O65gaBzjSNEeYkM2qjl7kvQC8C7fmLgnTetiSFJOdpFupxaXH1oyGqg1/ a2EQ== X-Gm-Message-State: AOAM532S2v+VIMMgsm+GTeTfQ6iBuKSHBomZWoQEh6wN/IILN+clukVJ QiC25acicL3rPxXO22TTpBc9gmLmVcYQwKTVv7+UphBjsSYJ+tSRaXh4iIm0BzxaQJcfioOj+HX kdElZ/VfAaJK/wtwK1vMUAqWc2NXBV1DU7LmPTXFuxziMlSKZ3zQE1Hx8Q9iBSyvLy3w= X-Received: by 2002:adf:d84b:: with SMTP id k11mr3543762wrl.305.1605688699422; Wed, 18 Nov 2020 00:38:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwiN19WF4OtArHliT8uWJPU14nVVviCfHAScJTRcWyCWZMeXEbRQoqP8vEkPfxEbE/ZJYDx0A== X-Received: by 2002:adf:d84b:: with SMTP id k11mr3543738wrl.305.1605688699246; Wed, 18 Nov 2020 00:38:19 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 19/27] failover: simplify qdev_device_add() failover case Date: Wed, 18 Nov 2020 09:37:40 +0100 Message-Id: <20201118083748.1328-20-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=63.128.21.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/17 19:41:43 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_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: =?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" Just put allthe logic inside the same if. Signed-off-by: Juan Quintela --- softmmu/qdev-monitor.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index a25f5d612c..12b7540f17 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -600,7 +600,6 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **er= rp) const char *driver, *path; DeviceState *dev =3D NULL; BusState *bus =3D NULL; - bool hide; =20 driver =3D qemu_opt_get(opts, "driver"); if (!driver) { @@ -634,17 +633,19 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **= errp) return NULL; } } - hide =3D should_hide_device(opts); =20 - if ((hide || qdev_hotplug) && bus && !qbus_is_hotpluggable(bus)) { + if (should_hide_device(opts)) { + if (bus && !qbus_is_hotpluggable(bus)) { + error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name); + } + return NULL; + } + + if (qdev_hotplug && bus && !qbus_is_hotpluggable(bus)) { error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name); return NULL; } =20 - if (hide) { - return NULL; - } - if (!migration_is_idle()) { error_setg(errp, "device_add not allowed while migrating"); return NULL; --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605690344; cv=none; d=zohomail.com; s=zohoarc; b=jK+siQlDrpupDRx2fwpC4X9ny4mJW6vGwuph5oJaswZPfFmJybvCpK5R6kRNUQMhGbNgyrql5IfRIPwMPWarYQqkzjcHJiK1AnHQDMcKjy/jT+TczDR1JGPUXRaubEM9rkV06FCyxskr+vsLosXWGHvP9CpID4nyQEczVUqV+e4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690344; 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=8f+XuO3LDEIIB2EAEZIj7OLu1bSb0Kj1s21nNqxaLGw=; b=XjbEUF1E3AkTtnNHQaaiAn3x/wj///zsHF+vkyroTMPTOKExS6Iat2u9lmHcEtqIGaxkqDoWIfBSOaW90MXQJ1j93r9vp2lJ4dCzjd1uZVR/NaWkIXZlC440InvrgR6qA6z9Xc8rmWzr0eRBngEaaCa0Ju0nhrm0efkdKlgbjmU= 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 1605690344532332.707733862586; Wed, 18 Nov 2020 01:05:44 -0800 (PST) Received: from localhost ([::1]:37730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJPL-0007LJ-DJ for importer@patchew.org; Wed, 18 Nov 2020 04:05:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyw-00033g-9v for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56354) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyu-0005dV-Er for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:25 -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-534-NTmCdXOnPOSmvgjLS03fIA-1; Wed, 18 Nov 2020 03:38:22 -0500 Received: by mail-wr1-f71.google.com with SMTP id v5so645334wrr.0 for ; Wed, 18 Nov 2020 00:38:22 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id v19sm33119536wrf.40.2020.11.18.00.38.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688703; 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=8f+XuO3LDEIIB2EAEZIj7OLu1bSb0Kj1s21nNqxaLGw=; b=CxrpC6sx+kck6DuE7Q6PKHxzs/OZEkufymuZH/v5H32O3M2lFVV/Q11tCDgtxTT1IjPzMY NLDSCIOgZXGzngIMksRGwY6QJ7lfK+NSIKqwoAldfYrNuRJgRntivNx+YZchyzAVviamDR qcbOFZohs5XkAnDhWMxFppEj4ZCBiOI= X-MC-Unique: NTmCdXOnPOSmvgjLS03fIA-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=8f+XuO3LDEIIB2EAEZIj7OLu1bSb0Kj1s21nNqxaLGw=; b=A5BTrSwff1nt35j8+WQNm51S3zG5rQFy3dXM7hEYXFoVa2wjHBDVZ811oU4AKCABb7 YklBBHeuDP2INaevdHVzlXbN81guC+q5f2zClJjcnKfuypvof8Dg8IAcqCyZNQ8Tkczw NIfPDyyfUrn2/fOvHF9HgHmtnLoyMxb6YW5zzM68O5LwKf4puVyNTBMB/H9w2lB3fg1+ Vk+Ya25JjqhCtwij+IdhwukvKfFSR5oWBXWjK+5QnQW5B32ye9wgYOLUmtaZvKFODnbE FsI8xlHtx4Sjg2wUiWJiqKL1hhywSx9Lg0Tb7X88Ue8yKvO2X4n6M2W7+DTAHNpk+xy4 EK7Q== X-Gm-Message-State: AOAM533NDXBQfaaUMpj1yO/ccaaoqwIazCve+xYM7CUiZkfUiXoqRVOZ XkYqfye80ngHdlF6m6h8CH/V6tsOovu8SnTJs8V5saLpYReiYmWPQ2kcxYmpEAzFRFkvnAwL34x 3avit1+wbfBNdoZAZyzd3jlMzS5auJcyd+kP0UeheEf548pi15Er8uTDA/PKgj1IeNJk= X-Received: by 2002:a1c:4944:: with SMTP id w65mr3310516wma.50.1605688700869; Wed, 18 Nov 2020 00:38:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxYAYsN574m73lHJqJdq4j2tZx800f67ztwnPaG2rpsRTHpqC5MvXoJZLwqHZRDefEWWypkTw== X-Received: by 2002:a1c:4944:: with SMTP id w65mr3310494wma.50.1605688700702; Wed, 18 Nov 2020 00:38:20 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 20/27] failover: simplify qdev_device_add() Date: Wed, 18 Nov 2020 09:37:41 +0100 Message-Id: <20201118083748.1328-21-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=63.128.21.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/17 19:41:43 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_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: =?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" We don't need to walk the opts by hand. qmp_opt_get() already does that. And then we can remove the functions that did that walk. Signed-off-by: Juan Quintela --- softmmu/qdev-monitor.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 12b7540f17..0e10f0466f 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -572,28 +572,6 @@ void qdev_set_id(DeviceState *dev, const char *id) } } =20 -static int is_failover_device(void *opaque, const char *name, const char *= value, - Error **errp) -{ - if (strcmp(name, "failover_pair_id") =3D=3D 0) { - QemuOpts *opts =3D opaque; - - if (qdev_should_hide_device(opts)) { - return 1; - } - } - - return 0; -} - -static bool should_hide_device(QemuOpts *opts) -{ - if (qemu_opt_foreach(opts, is_failover_device, opts, NULL) =3D=3D 0) { - return false; - } - return true; -} - DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) { DeviceClass *dc; @@ -634,11 +612,13 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **= errp) } } =20 - if (should_hide_device(opts)) { - if (bus && !qbus_is_hotpluggable(bus)) { - error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name); + if (qemu_opt_get(opts, "failover_pair_id")) { + if (qdev_should_hide_device(opts)) { + if (bus && !qbus_is_hotpluggable(bus)) { + error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name); + } + return NULL; } - return NULL; } =20 if (qdev_hotplug && bus && !qbus_is_hotpluggable(bus)) { --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689348; cv=none; d=zohomail.com; s=zohoarc; b=lcI/Fl6d4Ydaqd6D2MqIg63xyCIJzn+ndscrl2tQ1q68HqSNX0weiUSxVPKFqoncgN7700IyCZ6bny+XdqEA/KzWXRAIoXAdo6GBEOyX4Jnwt0a4MaSmyllrbsbDsp/jbFpiWBdnAAIx9S38dngDUx150BfkSy5gsQcRe1PtR2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689348; 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=1R0n35H5sAIJXQAJfTFrPCVAG+M0rxW+OPbeTrYzwsw=; b=Sv3MROgKVvFy/19zR0xEPWZpyxOZ8YGcL/nZ6U3NqBp9QKGXAGv5A0hizPFi0ePeA5+p5janitNpkPB3B+7cJzPItEyp6d45JNBxSb2JkjOMqdu6+K3hvnTu9l9wcZ5rMabw4WwUGM1iQy7J5xQsBeda1XFkWmSny9+fpCVRMQ0= 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 160568934802183.36356615102522; Wed, 18 Nov 2020 00:49:08 -0800 (PST) Received: from localhost ([::1]:35320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJ9G-0008I4-PL for importer@patchew.org; Wed, 18 Nov 2020 03:49:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyy-00038X-5H for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyw-0005eK-Cb for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:27 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-h1EasgwcNueSDIRkIDIRvw-1; Wed, 18 Nov 2020 03:38:23 -0500 Received: by mail-wm1-f72.google.com with SMTP id e15so565810wme.4 for ; Wed, 18 Nov 2020 00:38:23 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id a18sm2369776wme.18.2020.11.18.00.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688705; 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=1R0n35H5sAIJXQAJfTFrPCVAG+M0rxW+OPbeTrYzwsw=; b=MiExtPcRwGkNT7ybP0f9YsM0pK07bvpgDthV+LUQLeDaKKUEESfAHhuFy26e8/EAll1I8N pZ6HIiVliNkmM2R4WLDDK0e5jQoMvHd9n+eZ1pjYtAXZDyxhoMGrNvEHcrdXS4MgL5Xf5G FgATC2onhYOT39ZWtVsZRKuJgad4ltY= X-MC-Unique: h1EasgwcNueSDIRkIDIRvw-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=1R0n35H5sAIJXQAJfTFrPCVAG+M0rxW+OPbeTrYzwsw=; b=dhM2i+krr3fntBmAjO2y9xTOTg+Xtw2L+Gm6iYQ3UAHxLky981L5BhcJa1bna4tJwl Rn4bN1K4RJ7dyidETZnVEq8jEGxVMH9kjtBNyHdRGtBy3g+ZwdduHwn6ntAW7bfwqO7C FN5FJKEqpJU+U86C1CykEqJ+wXvb5VfopD7unJbhD5+FZE3bRGD6XXblx8HjqM3CdQZZ x02Zf95Q14I1SjRc/gDURN46h1ZUOTgps/8iUUufZU92COUkyGyIrLFzYWxhzr/r1DiF 3SZp+3CxEBMVt/d0dk+lfZHYDaecwsPvUhjUqOjCK/Zb/D/LrllHrsxQLS/tASZfgLY3 WxVA== X-Gm-Message-State: AOAM530Flo5wEFrkfbTfQo5kLlHb9pj76zkwb8de4Upf/OGtMegvLSty iPIp4jqYQjtTl5nBzh0O92SYEJZYF+DdanCnNctJhlg6p1fF6PQODBuEIJfAR89G4A7bdx5ENMe 3VKSKdaVIMlfj9yEGcTClU7rn77HLOssyhRlkoY/3gfsTeZb6GLq81Mxw6482bj1Pubo= X-Received: by 2002:adf:f347:: with SMTP id e7mr3514988wrp.183.1605688702359; Wed, 18 Nov 2020 00:38:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIj5enEtMFRi9/Nx7fcwGjwlsYuJvb+dDUSSq+biM1PlI3KS7hxs1oas5Ck8WaKGztqlWv7A== X-Received: by 2002:adf:f347:: with SMTP id e7mr3514969wrp.183.1605688702186; Wed, 18 Nov 2020 00:38:22 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 21/27] failover: make sure that id always exist Date: Wed, 18 Nov 2020 09:37:42 +0100 Message-Id: <20201118083748.1328-22-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=63.128.21.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/17 19:41:43 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_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: =?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" We check that it exist at device creation time, so we don't have to check anywhere else. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 3 --- softmmu/qdev-monitor.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ff82f1017d..c708c03cf6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3173,9 +3173,6 @@ static bool failover_hide_primary_device(DeviceListen= er *listener, hide =3D qatomic_read(&n->failover_primary_hidden); g_free(n->primary_device_id); n->primary_device_id =3D g_strdup(device_opts->id); - if (!n->primary_device_id) { - warn_report("primary_device_id not set"); - } return hide; } =20 diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 0e10f0466f..301089eaea 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -613,6 +613,10 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **e= rrp) } =20 if (qemu_opt_get(opts, "failover_pair_id")) { + if (!opts->id) { + error_setg(errp, "Device with failover_pair_id don't have id"); + return NULL; + } if (qdev_should_hide_device(opts)) { if (bus && !qbus_is_hotpluggable(bus)) { error_setg(errp, QERR_BUS_NO_HOTPLUG, bus->name); --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689471; cv=none; d=zohomail.com; s=zohoarc; b=UKklALVLNwOwppLj7hV3+xx9gyA5U/yGF6DBwsVMvm5gt4GezzRM5crPceRLCxbzXL9fkKfWWGNHHTZNlktr2IMBwc1mc5dposcOmN3YP2xzR+685FvIzPoB9i4TClAEuN3Zn3ACAvlw8yiZV5A6eLTLa2L63WaixNIwRfU16Mo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689471; 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=+DjcrFX/SZO4uvLCdwPo4LksdrvbzrZYiF03v5Y6+HI=; b=W62xOrxdq8z+Tq43I0XuEPZqKBjdxEUdpyRnxyxGh8tiT01UPKVnT9+GvsxgHI/xgjzylZTnw9JQmH/W1w5EvvWDRZizYRLaWg+4cueC6T5ljJO9qtMOLV2RgDBYxrYNq+XbI9yc2fE0uwdea6ZrlU/EJhin8josru7ced4t5pE= 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 1605689471585213.07464584800834; Wed, 18 Nov 2020 00:51:11 -0800 (PST) Received: from localhost ([::1]:43728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJBG-0003J8-FP for importer@patchew.org; Wed, 18 Nov 2020 03:51:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIyz-0003CU-Je for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:60094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyx-0005eS-QM for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:29 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-554-U502-uvYMKqa1PEdtDOPIQ-1; Wed, 18 Nov 2020 03:38:25 -0500 Received: by mail-wr1-f69.google.com with SMTP id z13so623054wrm.19 for ; Wed, 18 Nov 2020 00:38:25 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id a14sm2330119wmj.40.2020.11.18.00.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688707; 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=+DjcrFX/SZO4uvLCdwPo4LksdrvbzrZYiF03v5Y6+HI=; b=Np/SjMYygLCp+UpzV64mPhWdOAf5YBXoGaspzrogpqWe9D/pU7ABSsyfAEMMBp0jy2OKUA OCVM1KJh0bpHOnroRHnYstF/ErCxa5n1IF0Mc/15P+NnohdfhrSOaXaro7YZYkAdpnVc/6 bf/i1XWxWrfiWXBKbPoObnqS44MdGAc= X-MC-Unique: U502-uvYMKqa1PEdtDOPIQ-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=+DjcrFX/SZO4uvLCdwPo4LksdrvbzrZYiF03v5Y6+HI=; b=pChE7wkoryLzNpWZAqKU7w/q+/OOQJDpvudYvuxV+CaqqBuJjOurD+EcRyuKyVn2Vy MauofsZ2V/P5e3AYfunXZ6NerZxclXBG5JqjuI4LMtpC+oWoGx6QshiBkYRCcWg4Unsu VP2BE1iqYvMdGEr0ywfpZSIcby6Msrkt/Ivm5rt4VIRee+rAwmCqED4+3XB8jW2Te5W9 RUfr1oSq4nYC25s6vpaSJsxQ++6JrNBN5WDVNseCrfFktzRKWwkqzcOfyZNqKpuoo+BL 6k5L/ASlHR7G4f6dcWAigD3lK+NsWC2Zw4haySxgk7OuRXcud7OPZsPMoXLkZ/ZaTJoA xnrg== X-Gm-Message-State: AOAM530bzadi6fHUq/QMsvQcMxlXAinFtC6/2LtT+AEb7PZtQY4DhIv0 5Q6uyivIzbvofE1FSoAktJTQpVTvIS0eU0E0TfnwViEgod5Pe4X+nXfhWOFIyaRvKgktiFoFY6B oZjKCm+p5o9eVttXvkFwyj8E97SdTKEsM/wnbV889Ls/pki1gRG/FG2VmD0dNSlOY76Q= X-Received: by 2002:a5d:4e0e:: with SMTP id p14mr3591060wrt.160.1605688703991; Wed, 18 Nov 2020 00:38:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoFJ94NUG8U4bR1G0spCYEErKHYzj6y+uE92z8wl5NuEigOrll6XDEr5v0chcxMtgmQJW4Lw== X-Received: by 2002:a5d:4e0e:: with SMTP id p14mr3591032wrt.160.1605688703708; Wed, 18 Nov 2020 00:38:23 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 22/27] failover: remove failover_find_primary_device() error parameter Date: Wed, 18 Nov 2020 09:37:43 +0100 Message-Id: <20201118083748.1328-23-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=63.128.21.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/17 19:41:43 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_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: =?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" It can never give one error. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c708c03cf6..b994796734 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -832,7 +832,7 @@ static int is_my_primary(void *opaque, QemuOpts *opts, = Error **errp) * @n: VirtIONet device * @errp: returns an error if this function fails */ -static DeviceState *failover_find_primary_device(VirtIONet *n, Error **err= p) +static DeviceState *failover_find_primary_device(VirtIONet *n) { Error *err =3D NULL; =20 @@ -897,10 +897,7 @@ static void virtio_net_set_features(VirtIODevice *vdev= , uint64_t features) qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev =3D failover_find_primary_device(n, &err); - if (err) { - goto out_err; - } + n->primary_dev =3D failover_find_primary_device(n); failover_add_primary(n, &err); if (err) { goto out_err; @@ -3121,7 +3118,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, should_be_hidden =3D qatomic_read(&n->failover_primary_hidden); =20 if (!n->primary_dev) { - n->primary_dev =3D failover_find_primary_device(n, &err); + n->primary_dev =3D failover_find_primary_device(n); if (!n->primary_dev) { return; } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689637; cv=none; d=zohomail.com; s=zohoarc; b=X4tZgZfNDw2I+GmgNetEUhVTXZuTQJDmA2mlFy1kh0cog9JX2a6yJE2qJgIYhpYqkUvBSOGWtLSMnP76DscBLa4M9TiHTx6tZd3oShA37kpvL7h73wlrbdGv7rvxp7Ws43/JnuK4BzoR/N7kA7SpgxhdBK/TUZkev9u4jwasRYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689637; 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=PScUSnzo5GHMizm0nLJO+Mk51/VpAqVCKTwHPYtrlhM=; b=bmW5E5OjC0GTJjnsIaKIDVLV9Bs88GB7tpvXEbkTKx9cgRURFB+rRxf/kmi1ra4EfCnJ14PgfRjXFzwkOwiSuSycEA16mM7fkWQfLG44elUGTdNMT8z0V8iak8WKDr0Bzo4mMI1YL2GYbTZlWJvqwac+1ZaBdJUmydcu60Ky7ic= 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 1605689637894341.4459848388817; Wed, 18 Nov 2020 00:53:57 -0800 (PST) Received: from localhost ([::1]:52138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJDw-0006pG-BM for importer@patchew.org; Wed, 18 Nov 2020 03:53:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIz0-0003GA-Uw for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIyy-0005ed-U8 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:30 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-tRRPd2SxMOS8BJiL7oDOoQ-1; Wed, 18 Nov 2020 03:38:26 -0500 Received: by mail-wm1-f70.google.com with SMTP id o203so567003wmo.3 for ; Wed, 18 Nov 2020 00:38:26 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id q16sm32028418wrn.13.2020.11.18.00.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688708; 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=PScUSnzo5GHMizm0nLJO+Mk51/VpAqVCKTwHPYtrlhM=; b=SAhReeBKfRhK9snDfAl8miz1/zb+9QUuRH3EXJMENN5GeRTAxba1C3FNQIoQUfB/2GFk3W tybwOPApRhcG28VeGJVYpV5l7w2evpeNz7lBxOkxvpc3pVIri/2EP3n0c3fHVRjYVy6TlV IpmEpP/5vkWAISbXO7X9j1KXEOie0/8= X-MC-Unique: tRRPd2SxMOS8BJiL7oDOoQ-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=PScUSnzo5GHMizm0nLJO+Mk51/VpAqVCKTwHPYtrlhM=; b=l+uFlW4Imb1kQyoE5OFNCo8/QHc7Dol0pm29bzlBuMewcwQyvI0Dj1/GI9QByAExWr VZeVjd7rVXxjDa/oRX/UmRkMDulEX1USAizYwPvhA5yualCb/HAUGs7SIsHSFNZXWlg3 D8SMYm6nsdDuAhMqt7UgLF/C1i+BRFU5bcv14dTHYjgyj7G3M1G+LJ9+m+6kvkcohCl5 B+4u2HvBI7dxkXAAbsWwcG1rUuy9+iBkmwVEu9ag7+SRjpLHy1PB/R8d3yf7ZatOYWgE wepA04BtKNQhf547CgBlP2TTUunFZOnrFrLJeFkjTMc1UUIrG6TgqmzD9ZJB3HVdHiZp I/Kw== X-Gm-Message-State: AOAM5310gXS4Qke1mfJ7EQE7n97P6SWb67creK1FeVuvcsQaSx/t8Ghf iZhpNjrASxupmKtHT6whq0bz75ZB23Ndq/mkJfRuU8UOjCiSLPpbsEZCQgvaS1QOkgZwnjiCg0z wN/D/FXRyrT7kH8O5ie2QUUXgXFKikcnMfMn8wBdEHDm8b+EZ4MrJ6QOCHAl2e29rInc= X-Received: by 2002:a05:6000:1150:: with SMTP id d16mr3463534wrx.320.1605688705472; Wed, 18 Nov 2020 00:38:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWQi82sBlUDPOaTQrW8s3wcBz0VVNfaF+pwR16P+Ju6sZI5A0kJO7O678SPsi4FbBJMn+k3A== X-Received: by 2002:a05:6000:1150:: with SMTP id d16mr3463514wrx.320.1605688705296; Wed, 18 Nov 2020 00:38:25 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 23/27] failover: split failover_find_primary_device_id() Date: Wed, 18 Nov 2020 09:37:44 +0100 Message-Id: <20201118083748.1328-24-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" So we can calculate the device id when we need it. Signed-off-by: Juan Quintela --- 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_offl= oads(VirtIONet *n) return virtio_net_guest_offloads_by_features(vdev->guest_features); } =20 +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 =3D opaque; + const char *standby_id =3D qemu_opt_get(opts, "failover_pair_id"); + + if (g_strcmp0(standby_id, fid->n->netclient_name) =3D=3D 0) { + fid->id =3D 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 =3D 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 =3D NULL; @@ -812,20 +855,6 @@ static void failover_add_primary(VirtIONet *n, Error *= *errp) error_propagate(errp, err); } =20 -static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) -{ - VirtIONet *n =3D opaque; - int ret =3D 0; - const char *standby_id =3D qemu_opt_get(opts, "failover_pair_id"); - - if (g_strcmp0(standby_id, n->netclient_name) =3D=3D 0) { - n->primary_device_id =3D g_strdup(opts->id); - ret =3D 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 =3D NULL; + char *id =3D failover_find_primary_device_id(n); =20 - if (!qemu_opts_foreach(qemu_find_opts("device"), is_my_primary, n, &er= r)) { + if (!id) { return NULL; } + n->primary_device_id =3D g_strdup(id); + return qdev_find_recursive(sysbus_get_default(), n->primary_device_id); } =20 --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689982; cv=none; d=zohomail.com; s=zohoarc; b=Z3zbccklosq2nzRAP9c8P8BBWWNWKTfVFo1VwoUKf+/i95k0GZvmTvcbMwkmIJ9Ld6kfXvsxU4+olPH3RMkTaRT4iCXQnBBZ7zDZSWxnEgIXqlzi7/xy3K1u2a1KfQdwxnP5MzzGLfO/hauGhyCRQksZ+7OXz9FS8nPjXoJkR4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689982; 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=4u/G4VgwO4KYIr2oyq3QhfAIkQUBpe92eiudE1xPv4c=; b=SkKHYjZe1D8nrzAmg+GB3CWE6uN8c8wBaiworg1yndr42HotyVC6JwQyy6qX3PkGo81HTeEky47cqJTNaD6QRMoMUtVKJFyKTzyAdvsTJMrBBf2Y0y6QDyGznfPZiQz6EbTH6dWr76TWR+P0G7uDXjHnhEQuXojDieG0E8wjb7c= 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 1605689982817274.8765478971669; Wed, 18 Nov 2020 00:59:42 -0800 (PST) Received: from localhost ([::1]:44578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJJV-0006tQ-Mq for importer@patchew.org; Wed, 18 Nov 2020 03:59:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIz2-0003Ks-Ka for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIz0-0005f2-Pw for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:32 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-578-Qp7J-6y8P0iPb21ohkkoSQ-1; Wed, 18 Nov 2020 03:38:28 -0500 Received: by mail-wm1-f69.google.com with SMTP id j62so725365wma.4 for ; Wed, 18 Nov 2020 00:38:28 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id l3sm2749419wmf.0.2020.11.18.00.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688710; 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=4u/G4VgwO4KYIr2oyq3QhfAIkQUBpe92eiudE1xPv4c=; b=i4CJb6X06JLxJweER9eE2Tol4S0X7+O4tPdujVEzIwyU9+11hKwveIwT5RSNQJfWtQmi1Q MSwYcaoK2D0mctoplLGBLnQF8c3y7zui7/NCVFRISWGVXEUmC27MPDiQDkqrr7ngp4GSf+ qa3PolxCnqLCb4NETirXvTh3d38R8NU= X-MC-Unique: Qp7J-6y8P0iPb21ohkkoSQ-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=4u/G4VgwO4KYIr2oyq3QhfAIkQUBpe92eiudE1xPv4c=; b=H3almbA+eNQkx9388QYQVDYZec6jg9htLWrdiO8hxo81E9jMd6P1ozr+XTWcUuREJI zLNrKf9xCuhDQsFcCgxr1UUSPUWGkGxf9GuKNuoJfN0KeO4oVtioGd3J7H0Yx5JocDF5 l2VHjcVLeUyWPUV86aNjaHpECOVwc4rNvPxb4Hl+GCpksF3QkemxIHQsUmUWQ3h3oW6q yEUP2TYWHH0GsWMeCZnnTvYj3r5H4ovw7Zr9iV5nR7k+33VFciSYX4kNkWq9zR/378s4 TsNMMvszce49VIirUtCjBhvJB8VXzDcpCnoTeQerzazYM4FKeWEdNZUEwEBdySaBYXNj cTmA== X-Gm-Message-State: AOAM530rgbQWfKgpQ0lxY00LeBOK6HpRM+qWL+4pWRBLpXXpH1eB7dZi CMm2rbzm2l0/PwbbwyuTuIW57nItTTFmcskKU++Jt2xyq+42iUqQIQ77fLHPeX0cX71SnMsUXxM MGeeCndKINFU8ANliZtdPsPnNE6PANAen8cgdzM+VQRjCcoMR1d+mbzk4dPlVW4WAP0Y= X-Received: by 2002:a5d:51c2:: with SMTP id n2mr3812746wrv.326.1605688706932; Wed, 18 Nov 2020 00:38:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgfGjvnGNsubNaiE/d6pAcl+bUzCodj2NTICTdZmEivMc89rShZpHM2fIaSqiea7KfjpYQfw== X-Received: by 2002:a5d:51c2:: with SMTP id n2mr3812724wrv.326.1605688706751; Wed, 18 Nov 2020 00:38:26 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 24/27] failover: We don't need to cache primary_device_id anymore Date: Wed, 18 Nov 2020 09:37:45 +0100 Message-Id: <20201118083748.1328-25-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=63.128.21.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/17 19:41:43 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_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: =?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" Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index fe353d8299..efef64e02f 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -203,7 +203,6 @@ struct VirtIONet { bool needs_vnet_hdr_swap; bool mtu_bypass_backend; DeviceState *primary_dev; - char *primary_device_id; /* primary failover device is hidden*/ bool failover_primary_hidden; bool failover; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 2c502c13fd..746ed3fb71 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -824,6 +824,7 @@ static char *failover_find_primary_device_id(VirtIONet = *n) Error *err =3D NULL; FailoverId fid; =20 + fid.n =3D n; if (!qemu_opts_foreach(qemu_find_opts("device"), failover_set_primary, &fid, &err)) { return NULL; @@ -835,12 +836,17 @@ static void failover_add_primary(VirtIONet *n, Error = **errp) { Error *err =3D NULL; QemuOpts *opts; + char *id; =20 if (n->primary_dev) { return; } =20 - opts =3D qemu_opts_find(qemu_find_opts("device"), n->primary_device_id= ); + id =3D failover_find_primary_device_id(n); + if (!id) { + return; + } + opts =3D qemu_opts_find(qemu_find_opts("device"), id); if (opts) { n->primary_dev =3D qdev_device_add(opts, &err); if (err) { @@ -868,9 +874,8 @@ static DeviceState *failover_find_primary_device(VirtIO= Net *n) if (!id) { return NULL; } - n->primary_device_id =3D g_strdup(id); =20 - return qdev_find_recursive(sysbus_get_default(), n->primary_device_id); + return qdev_find_recursive(sysbus_get_default(), id); } =20 static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) @@ -3160,7 +3165,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, vmstate_unregister(VMSTATE_IF(n->primary_dev), qdev_get_vmsd(n->primary_dev), n->primary_dev); - qapi_event_send_unplug_primary(n->primary_device_id); + qapi_event_send_unplug_primary(n->primary_dev->id); qatomic_set(&n->failover_primary_hidden, true); } else { warn_report("couldn't unplug primary device"); @@ -3186,7 +3191,6 @@ static bool failover_hide_primary_device(DeviceListen= er *listener, QemuOpts *device_opts) { VirtIONet *n =3D container_of(listener, VirtIONet, primary_listener); - bool hide; const char *standby_id; =20 if (!device_opts) { @@ -3198,10 +3202,7 @@ static bool failover_hide_primary_device(DeviceListe= ner *listener, } =20 /* failover_primary_hidden is set during feature negotiation */ - hide =3D qatomic_read(&n->failover_primary_hidden); - g_free(n->primary_device_id); - n->primary_device_id =3D g_strdup(device_opts->id); - return hide; + return qatomic_read(&n->failover_primary_hidden); } =20 static void virtio_net_device_realize(DeviceState *dev, Error **errp) @@ -3378,7 +3379,6 @@ static void virtio_net_device_unrealize(DeviceState *= dev) =20 if (n->failover) { device_listener_unregister(&n->primary_listener); - g_free(n->primary_device_id); } =20 max_queues =3D n->multiqueue ? n->max_queues : 1; --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605690124; cv=none; d=zohomail.com; s=zohoarc; b=feESY2trO6eia4V8adfRffnFqIFT9GdDtcUlT+SYXtDqTquhSwi0rOtJeg7bSA0inUBvro8/EP+Xa7/5sSyNQnD6IPWBGUZkjwssbdL9/CA3illYZLuUHiLQ0IRbHjRJVkQsIeRuwg8aYIJcziCtIcDMlV3J0GOZQ+nTU0Kkpwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690124; 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=LwfAnqKkvd3KtGEnOzJlbeEpwQWJWYlc8So1esTOmIU=; b=H7d3rsvv0SQYDMQ4xXXIPijWx7B3CcG3CsafCgyC/fEg/vD7tPT9jmEeduXP5OL9PD0tARjam/RQ2NPBwuxWXopnLAWxxcYP0cd8kFjUFOsFgTuqxSG2flBfiy4HLvWxeN3h2h6A9ZXOKW3ZOzDbU3DfC9UPNMDHinF3XMrUF3c= 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 1605690124719942.1464291306623; Wed, 18 Nov 2020 01:02:04 -0800 (PST) Received: from localhost ([::1]:52886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJLn-0001vs-Jf for importer@patchew.org; Wed, 18 Nov 2020 04:02:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIz5-0003SG-Av for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIz3-0005gI-GD for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:35 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-118-7PIyPJDRNSCqua0o-ndpSg-1; Wed, 18 Nov 2020 03:38:30 -0500 Received: by mail-wr1-f69.google.com with SMTP id w6so637175wrk.1 for ; Wed, 18 Nov 2020 00:38:30 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id a18sm2370036wmm.22.2020.11.18.00.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688712; 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=LwfAnqKkvd3KtGEnOzJlbeEpwQWJWYlc8So1esTOmIU=; b=G+v4f6Njjb7VMoM9nJl9uAe9pMO2yE2+OkYz3wwNCRxxbA6EtPsmaFde+kGWvfDwD2bOFI 5RYVzTaqzmnltzMIBaAXL81DOLF3RbXeGXfOiCU5NGdPuwOV0/kDznvk3b4ltdGkqd39zc XXvf9/EVjPl82a9SfckPUvIx3f7/mfA= X-MC-Unique: 7PIyPJDRNSCqua0o-ndpSg-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=LwfAnqKkvd3KtGEnOzJlbeEpwQWJWYlc8So1esTOmIU=; b=m92nyRuFs8CVmq7BpztHmCe2PFVXwxxeyuxPNyMQQXvDiu/wOiVrYWk8HoACS/DJYx AF3Vcfvuoaqub2UfS5DfT/8CvvVObEccOiujuyV0VIeh+h5xXGpo3U4oxO9e2vlCsLaJ WjL/W1MJ+sp94uwzw4yzaPYupo/JCUbsO7pvZYTSu1YIKg0DO9NwrUx2A+/p9I1YRi1M eiwmGxBLYFO4cpaAMREGBNSQkVe7Imaaq/FMtNKeF0dHvtGT4UnjX3WQ/VwHBr9axyoM txVD5tR1lyqEFzFBgpng+cnC7PZJyWHvMY6GspVDqDlUxm2WNaZld8G6BC6WGZIQB1bA L9iw== X-Gm-Message-State: AOAM531SUnd1qD2ZLn7R1/KQjr2Y1SmZEkRl+1O49jyRoGcOfvyG1ghK boleWabJrPL08M7uopC43oaj1hTeT0M9t7HkaS1bZjMHwxYnBtgYMilieGBQiOt3JuSxNsKzydw 7W/t6WsT9AtcTKOTiPC0DZwqdrGuTxDwLGmNL8lGjSvsa7Yq8VR0OuPgYd7zRkUiNTx8= X-Received: by 2002:a5d:474f:: with SMTP id o15mr3446598wrs.377.1605688708650; Wed, 18 Nov 2020 00:38:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyeIN2kKUcv+1zuXp4DBBqHeafXzwDENXn0I/nb1RV+Ft3m8XreFi5GW33TYmL1UD8m7XF3A== X-Received: by 2002:a5d:474f:: with SMTP id o15mr3446579wrs.377.1605688708418; Wed, 18 Nov 2020 00:38:28 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 25/27] failover: Caller of this two functions already have primary_dev Date: Wed, 18 Nov 2020 09:37:46 +0100 Message-Id: <20201118083748.1328-26-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=63.128.21.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/17 19:41:43 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_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: =?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" Pass it as an argument. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 746ed3fb71..b37e9cd1d9 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3093,17 +3093,17 @@ void virtio_net_set_netclient_name(VirtIONet *n, co= nst char *name, n->netclient_type =3D g_strdup(type); } =20 -static bool failover_unplug_primary(VirtIONet *n) +static bool failover_unplug_primary(VirtIONet *n, DeviceState *dev) { HotplugHandler *hotplug_ctrl; PCIDevice *pci_dev; Error *err =3D NULL; =20 - hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); + hotplug_ctrl =3D qdev_get_hotplug_handler(dev); if (hotplug_ctrl) { - pci_dev =3D PCI_DEVICE(n->primary_dev); + pci_dev =3D PCI_DEVICE(dev); pci_dev->partially_hotplugged =3D true; - hotplug_handler_unplug_request(hotplug_ctrl, n->primary_dev, &err); + hotplug_handler_unplug_request(hotplug_ctrl, dev, &err); if (err) { error_report_err(err); return false; @@ -3114,30 +3114,31 @@ static bool failover_unplug_primary(VirtIONet *n) return true; } =20 -static bool failover_replug_primary(VirtIONet *n, Error **errp) +static bool failover_replug_primary(VirtIONet *n, DeviceState *dev, + Error **errp) { Error *err =3D NULL; HotplugHandler *hotplug_ctrl; - PCIDevice *pdev =3D PCI_DEVICE(n->primary_dev); + PCIDevice *pdev =3D PCI_DEVICE(dev); BusState *primary_bus; =20 if (!pdev->partially_hotplugged) { return true; } - primary_bus =3D n->primary_dev->parent_bus; + primary_bus =3D dev->parent_bus; if (!primary_bus) { error_setg(errp, "virtio_net: couldn't find primary bus"); return false; } - qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort); + qdev_set_parent_bus(dev, primary_bus, &error_abort); qatomic_set(&n->failover_primary_hidden, false); - hotplug_ctrl =3D qdev_get_hotplug_handler(n->primary_dev); + hotplug_ctrl =3D qdev_get_hotplug_handler(dev); if (hotplug_ctrl) { - hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, &err); + hotplug_handler_pre_plug(hotplug_ctrl, dev, &err); if (err) { goto out; } - hotplug_handler_plug(hotplug_ctrl, n->primary_dev, &err); + hotplug_handler_plug(hotplug_ctrl, dev, &err); } =20 out: @@ -3161,7 +3162,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, } =20 if (migration_in_setup(s) && !should_be_hidden) { - if (failover_unplug_primary(n)) { + if (failover_unplug_primary(n, n->primary_dev)) { vmstate_unregister(VMSTATE_IF(n->primary_dev), qdev_get_vmsd(n->primary_dev), n->primary_dev); @@ -3172,7 +3173,7 @@ static void virtio_net_handle_migration_primary(VirtI= ONet *n, } } else if (migration_has_failed(s)) { /* We already unplugged the device let's plug it back */ - if (!failover_replug_primary(n, &err)) { + if (!failover_replug_primary(n, n->primary_dev, &err)) { if (err) { error_report_err(err); } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605689961; cv=none; d=zohomail.com; s=zohoarc; b=NqZLXIFDeLVz4hmomKWX5HcLEM8TbeKGsryOasAr/f913cACLlkLFQY7iuPaq4eIbT86V7xKyEah3FLo9bNyLwx1PraubmoTrtIlTMO8fZDdJzdUr1LUxgqyg2nId9HVJmQJb8jPJuWyUGvWSVjJarASIPHpVcdMu5VonFqvGIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605689961; 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=UpaUk+ACBC4f62mVNQkHaVFxtHEivSP3ZKjo3c+Mo1U=; b=MaD7sF3UQE6ZnJekS52YNMYDnvWwaXUDgspy3QIuqx0uNWBZOVpa3o6ByJh2yUpp68OUrxkGS1RQsGwRip+PSsCE703fbgTwGJdMb5gmfuiyRMnvgFqYZqmFzfpiESImiuy5s7zW1CwIOr/sy4XfJxwKkzuV34yihgqfo97BwAs= 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 1605689961401622.1284510515563; Wed, 18 Nov 2020 00:59:21 -0800 (PST) Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJJA-0006Mx-3Y for importer@patchew.org; Wed, 18 Nov 2020 03:59:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIz8-0003Yz-08 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIz6-0005hh-3F for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:37 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-594-9iP9svn_PAKnRdi8ozTHTA-1; Wed, 18 Nov 2020 03:38:31 -0500 Received: by mail-wm1-f70.google.com with SMTP id k128so719725wme.7 for ; Wed, 18 Nov 2020 00:38:31 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id w21sm2361887wmi.29.2020.11.18.00.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688715; 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=UpaUk+ACBC4f62mVNQkHaVFxtHEivSP3ZKjo3c+Mo1U=; b=UK3L4yHxo2+v7ZsDwCw9pGgcgW/dw1XdlI/zZwVAIFgckVeqbIz/aKcGntHTZ0BpBGcpip Pn5JYSKht2uyRpLmL+zZw+03ojC9IOmfRByp/CQH8A6P+E/rSFRp7ynvGbnTJONRDFncRX DT4BEd0RYeO6fs5Fb8JnhVV5JzbPdVc= X-MC-Unique: 9iP9svn_PAKnRdi8ozTHTA-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=UpaUk+ACBC4f62mVNQkHaVFxtHEivSP3ZKjo3c+Mo1U=; b=V3kdBX8hlTzRqekUXt7nt8nIA1T0ZHAAgBXCNBf6SbpoS1qqpumLQVigC3JAcaBBzB MqxWmboAihAVFwXS0DC93dRWjO65LVE0kiYBZgvhOA8v/vlBoouS81liWjwIxnj0Jyd+ D8XI7gLwZtmnaSzyEAzFuuYQOXA6YsybASIqHSq+3oSa4N3kQwaVLaquAAxZUQac61ZZ 4QcvbLn6zt/IL7LQRIz1jMxhWOzKgK7PzTXp/mgWN9B6yhmMCG9TCHCDp5C6uH3zSUkk RxZQlGksWIQjSYXwhDCWNwssdgfyePUZH6OevqHJLUTEXryCYiOkZ+Y5WCFdr/D21lXS ewGA== X-Gm-Message-State: AOAM532YJsx9uYxTFlc82x1iJXu1anDP3+PUOoTCmyJE3U8zhu4heUV1 ZpL6VMwQnQTcdFcImRj+OkGmUDspZTVVAg2vwSK8ZiKKZfYeNZDHPEN21cZE2PZ5cPIcFWLXd/6 LOeIAnpm0kXJQyiRGfNm2Ku4fSAfrkPclKTKBRMPxbJVWMrQPUPKWPeQYJAtt06L1Sa0= X-Received: by 2002:adf:f005:: with SMTP id j5mr3518822wro.417.1605688710136; Wed, 18 Nov 2020 00:38:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIcEpMbmK5cM7k2jrzahbeWATa3QR7zbwOui3uF6UH9PqmQak7+sTMrVnQ3ycYHrhi1eBvsQ== X-Received: by 2002:adf:f005:: with SMTP id j5mr3518794wro.417.1605688709913; Wed, 18 Nov 2020 00:38:29 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 26/27] failover: simplify failover_unplug_primary Date: Wed, 18 Nov 2020 09:37:47 +0100 Message-Id: <20201118083748.1328-27-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=63.128.21.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/17 19:41:43 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_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: =?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" We can calculate device just once. Signed-off-by: Juan Quintela --- hw/net/virtio-net.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index b37e9cd1d9..9203d81780 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3146,34 +3146,29 @@ out: return !err; } =20 -static void virtio_net_handle_migration_primary(VirtIONet *n, - MigrationState *s) +static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationSta= te *s) { bool should_be_hidden; Error *err =3D NULL; + DeviceState *dev =3D failover_find_primary_device(n); + + if (!dev) { + return; + } =20 should_be_hidden =3D qatomic_read(&n->failover_primary_hidden); =20 - if (!n->primary_dev) { - n->primary_dev =3D failover_find_primary_device(n); - if (!n->primary_dev) { - return; - } - } - if (migration_in_setup(s) && !should_be_hidden) { - if (failover_unplug_primary(n, n->primary_dev)) { - vmstate_unregister(VMSTATE_IF(n->primary_dev), - qdev_get_vmsd(n->primary_dev), - n->primary_dev); - qapi_event_send_unplug_primary(n->primary_dev->id); + if (failover_unplug_primary(n, dev)) { + vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev); + qapi_event_send_unplug_primary(dev->id); qatomic_set(&n->failover_primary_hidden, true); } else { warn_report("couldn't unplug primary device"); } } else if (migration_has_failed(s)) { /* We already unplugged the device let's plug it back */ - if (!failover_replug_primary(n, n->primary_dev, &err)) { + if (!failover_replug_primary(n, dev, &err)) { if (err) { error_report_err(err); } --=20 2.26.2 From nobody Mon May 6 08:31:55 2024 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=1605690452; cv=none; d=zohomail.com; s=zohoarc; b=HakH26ZUamJCJ6iDGGwrLE5pmHS9/qtvdCu5bWjSJH+0LnyEMBnRp+cy2t4j6ktC9S1BQng0HVmR1QIB95BYVvogaE7qTrIc56/OY3R1HE9me2DFVc9hTscJT43RcdoY7M5bUXVh9qXiW3d+iwAWQ7lwfkv1ZdLWT3nd7Il05DE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605690452; 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=CYb6fiPj5EFAv8ZxJdzIa0JaYihePB45/157vgEZlH0=; b=jHH9RpGIMbHz2EKMwAc28zSUSXAZwOrIpCxByVXmuiTlyheMQL0P9rApmpakhTuJd64OoPqo1Zq3bB4SQh8QawHOl4AYQ2U8SqMA3kX3pBrnfpBUV9LgWJcqblCYIItkK1WIkdOcF/VaAcnYekpOyBxF7bDAOa4H0M4HD7ihByo= 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 1605690452029767.2936367034551; Wed, 18 Nov 2020 01:07:32 -0800 (PST) Received: from localhost ([::1]:42664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfJR4-00010v-Tl for importer@patchew.org; Wed, 18 Nov 2020 04:07:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfIz7-0003WZ-2H for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfIz5-0005hD-AR for qemu-devel@nongnu.org; Wed, 18 Nov 2020 03:38:36 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-77-g2_iiMzqNnCXl1Q3i8I87A-1; Wed, 18 Nov 2020 03:38:32 -0500 Received: by mail-wr1-f69.google.com with SMTP id w5so610363wrm.22 for ; Wed, 18 Nov 2020 00:38:32 -0800 (PST) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id o197sm2383541wme.17.2020.11.18.00.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 00:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605688714; 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=CYb6fiPj5EFAv8ZxJdzIa0JaYihePB45/157vgEZlH0=; b=Pk/KWlEinncwrhri39jw+g9Es9+ci06sxJrXOyaGY4MehaKUwasrvFw7m7TwXdB2GO+NcM sl4WflEfKiyCIWQZTzEfPQQ7Yd442EIwYJ03WLetlVizqaxOt/MdTsMwmHINWtPAR+jc3b bN5DCRHsdx+2H8+sH1zAQIuBo94mzHM= X-MC-Unique: g2_iiMzqNnCXl1Q3i8I87A-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=CYb6fiPj5EFAv8ZxJdzIa0JaYihePB45/157vgEZlH0=; b=lPEIgN56Osc0ud0lzmWxffxSvaWC2gd+Sha6LQkHw+K1YGWcs1ButgSujZnBMwVdFV 3T8tp8kJ5Bivef8k0k8QMEDVyVFllKd1KUjLooc80dPsqcY8N5OXx2Eoni54+10ZKwWW z4Vt00xd5Yim5pY3Sub2RXaK7JPRQNmAQ1xojMMPHSaqjJC/SajQBbbwvjZrcmReyAcl GD1ziwCeK/Qr+ur0JsYhXhQEvBTffqteZauXl+ruG75RzoZYDFCuX7f1hCUJFCtovwVW TDBo0vfw/fZsCbvBIKVG5HUl1taV+GOmnahKtr+NHDAaaXEpMFM/SYPkbw2HRPER/hOB e25g== X-Gm-Message-State: AOAM531LZhd+OPR9VBJKuDsQStUPOXoRpW9A+XQd7Mp49CMKRd8cs/Az BLWlS7UBoDwNTGnqaCwKFev6cbZi9m1akpKm+D4gpenirERtIq0kRTwx25nX+/2oiYIMzfQxQnT 6Hx202StIa3677rm7Ln1wVdNc1/egBlNvxDYqedsfQfgaddq/L9tovCJYnYrZvMjjoHs= X-Received: by 2002:a1c:750b:: with SMTP id o11mr3323905wmc.32.1605688711552; Wed, 18 Nov 2020 00:38:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxugSUA4uBg3uk8SP/RtEBJBx23bbmPmDtHdAdQ6CV2TuIyrUfZRpS3kgP4dyQ80Kcinc6XcQ== X-Received: by 2002:a1c:750b:: with SMTP id o11mr3323879wmc.32.1605688711326; Wed, 18 Nov 2020 00:38:31 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v2 27/27] failover: Remove primary_dev member Date: Wed, 18 Nov 2020 09:37:48 +0100 Message-Id: <20201118083748.1328-28-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" Only three uses remained, and we can remove them on that case. Signed-off-by: Juan Quintela --- include/hw/virtio/virtio-net.h | 1 - hw/net/virtio-net.c | 55 +++++++++++++++------------------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index efef64e02f..7e96d193aa 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -202,7 +202,6 @@ struct VirtIONet { AnnounceTimer announce_timer; bool needs_vnet_hdr_swap; bool mtu_bypass_backend; - DeviceState *primary_dev; /* primary failover device is hidden*/ bool failover_primary_hidden; bool failover; diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9203d81780..044ac95f6f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -832,13 +832,31 @@ static char *failover_find_primary_device_id(VirtIONe= t *n) return fid.id; } =20 +/** + * Find the primary device for this failover virtio-net + * + * @n: VirtIONet device + * @errp: returns an error if this function fails + */ +static DeviceState *failover_find_primary_device(VirtIONet *n) +{ + char *id =3D failover_find_primary_device_id(n); + + if (!id) { + return NULL; + } + + return qdev_find_recursive(sysbus_get_default(), id); +} + static void failover_add_primary(VirtIONet *n, Error **errp) { Error *err =3D NULL; QemuOpts *opts; char *id; + DeviceState *dev =3D failover_find_primary_device(n); =20 - if (n->primary_dev) { + if (dev) { return; } =20 @@ -848,7 +866,7 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) } opts =3D qemu_opts_find(qemu_find_opts("device"), id); if (opts) { - n->primary_dev =3D qdev_device_add(opts, &err); + dev =3D qdev_device_add(opts, &err); if (err) { qemu_opts_del(opts); } @@ -861,23 +879,6 @@ static void failover_add_primary(VirtIONet *n, Error *= *errp) error_propagate(errp, err); } =20 -/** - * Find the primary device for this failover virtio-net - * - * @n: VirtIONet device - * @errp: returns an error if this function fails - */ -static DeviceState *failover_find_primary_device(VirtIONet *n) -{ - char *id =3D failover_find_primary_device_id(n); - - if (!id) { - return NULL; - } - - return qdev_find_recursive(sysbus_get_default(), id); -} - static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) { VirtIONet *n =3D VIRTIO_NET(vdev); @@ -933,19 +934,9 @@ static void virtio_net_set_features(VirtIODevice *vdev= , uint64_t features) qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev =3D failover_find_primary_device(n); - failover_add_primary(n, &err); - if (err) { - goto out_err; - } + warn_report_err(err); } } - return; - -out_err: - if (err) { - warn_report_err(err); - } } =20 static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, @@ -3420,13 +3411,15 @@ static int virtio_net_pre_save(void *opaque) static bool primary_unplug_pending(void *opaque) { DeviceState *dev =3D opaque; + DeviceState *primary; VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIONet *n =3D VIRTIO_NET(vdev); =20 if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { return false; } - return n->primary_dev ? n->primary_dev->pending_deleted_event : false; + primary =3D failover_find_primary_device(n); + return primary ? primary->pending_deleted_event : false; } =20 static bool dev_unplug_pending(void *opaque) --=20 2.26.2