From nobody Tue Apr 12 08:07:03 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2440E11D4222; Tue, 12 Apr 2022 08:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KcyxN0VlKz3Gg6; Tue, 12 Apr 2022 08:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649750824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNun+xpvmFNrizgNrfNn9D65VDuX0uubBOhQy6tCHDg=; b=aXIZiM0WEmYXoUuOqX1agK5GscVsr/R7dg1LMYNDovZXPb5/wThw837XtaH6bCx749hrfL S+YfvbDizFaDqqPHAl9NvdFMMz8pt7/7toUoiNptuMfN94lKtNqGTQEuGhFTUqo3PCwZmh bAVnIF+q3J744+jamKiIYabau7gdpHmweW5k5xlJDb3kmK+Tp3/PVkVyUKLJ6FKCL43GBu xkmGqVvAzYRsG9s+Nryfo1wI1wplB+A3BYxa68+5TK9YN4jWDTnaxIi8qp+k3595oyvRI1 FFJWjmjZ3peT+pq5Bsl9DaZm5jLl2tIsRWj6cJAGo6xYkwRvsOo9Unw484SC3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E555D1360A; Tue, 12 Apr 2022 08:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23C873hR012767; Tue, 12 Apr 2022 08:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23C873h9012766; Tue, 12 Apr 2022 08:07:03 GMT (envelope-from git) Date: Tue, 12 Apr 2022 08:07:03 GMT Message-Id: <202204120807.23C873h9012766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 499d685b02d4 - stable/13 - xen/netback: do not attempt to connect in the Initialised state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 499d685b02d4c3ff5de83f6dc1ea2b2aab7d6909 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649750824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNun+xpvmFNrizgNrfNn9D65VDuX0uubBOhQy6tCHDg=; b=b6fW8FU3KvGPJgKxK+71sMKteZaWHtw1VrmSVFJ36VUoXDDl8FXRallRRvz8IEYAAvbtD2 TAOCUQCYj8zURYkLo5+CdtB2ZKS5EJVEQp5dlRL3lw1qQlOe5pWp/+NeDyzyKv1jEpkBiO v5qnCzxc5cizbExOjx2Yk8DtIglo2ja8jzCJEDXN+SwapWLy52AyGrTzreaCu2UCD9wQS6 tcnBfG+MvXeptmAioGenkAyVLz5e17KlI0uCwyGhmmkkbpHZ6n0IPXj7+y8fmA86CuIz/i Bc1XTR3eOa2D+P6BZKcwEhrmo1Nv24IkOnP2VTdm3h/2OU4dFUCuOEM4eBJKvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649750824; a=rsa-sha256; cv=none; b=SAK6ZZN99nLfSWt8MCgwPr/zJvFJIDdnEWDe9z6W4DTMIG2tmnyjyO48omNL6vkKobS4N1 unvrHy0cz+aSgXS8GRGqjM9aY/mDfrrScIBEaZG+0Oakkre6nS4m/E2jWOKCMcbeg2LHr7 pSBetxuhGZSfXbVhAGtWXF6a+QbQMOrgS3Oo7dT+tmJugDzbjOh02wWrS48U++8Gg7y9U+ 74ueqoxWhdNV3liru3GOeZ70YBa5aXWf/6ZBtBnxbChlzhMO7Klw7FLbQuzYkBJb0zx7TY UKv81ofaS7l+MEwqoHDvQcXQnDscULz6Fv6PGBDHlZ/WpL0IxKqDloGIGTPSjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=499d685b02d4c3ff5de83f6dc1ea2b2aab7d6909 commit 499d685b02d4c3ff5de83f6dc1ea2b2aab7d6909 Author: Roger Pau Monné AuthorDate: 2021-03-16 11:43:49 +0000 Commit: Roger Pau Monné CommitDate: 2022-04-12 08:05:47 +0000 xen/netback: do not attempt to connect in the Initialised state Only attempt to fetch the configuration data and connect the shared ring once the frontend has switched to the 'Connected' state. This seems to be inline with what Linux netback does, and is required to make newer versions of NetBSD netfront work, since NetBSD only publishes the required configuration before switching to the Connected state. Sponsored by: Citrix Systems R&D (cherry picked from commit 4489124c04727a4aad418eec3148e0c8de23ff4d) --- sys/dev/xen/netback/netback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index 8710120ecef3..06d92093d903 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -1392,8 +1392,8 @@ xnb_frontend_changed(device_t dev, XenbusState frontend_state) switch (frontend_state) { case XenbusStateInitialising: - break; case XenbusStateInitialised: + break; case XenbusStateConnected: xnb_connect(xnb); break;