From nobody Thu Mar 30 16:11:00 2023 X-Original-To: dev-commits-src-all@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 4PnT1J5c68z4207R; Thu, 30 Mar 2023 16:11:00 +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 4PnT1J59h3z4KmN; Thu, 30 Mar 2023 16:11:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680192660; 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=ByJIoqlk5ywoCE6TNgZeuVJT74BjL8kYCM/Cxy+/RVI=; b=uwcZOro9zpFKh147q0Y/kOY5Izbki7vTtjOBR4aQJr6/sTRwXPp0uwi/wx2vsJEWgZ9cCg 3Kx31bVledhmVU4UJfGqCf8gEKqTaZ5Ld7iYqFS7Zx7M27oTjJfwkNwxLrReL6/wdm1/DW LrFm6l1FmN4cvAPrA5qGsYI+ZyOPJivtRKQQyB55YvPmc+VVDTbL9YH5gqlwrW5BcFaaIo NKxorZmVlzIFqtJdM6KyzdD2sxGQdCvM/VrWYds4rakdOwgiSKYLLAkWqAMWU1+0PBYTZx 75P3bAg7wKRYhrSPZ4s27R7NcgfSktbOWNq6VQsrAmMQJ0Z+44i0FXDGuBYTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680192660; 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=ByJIoqlk5ywoCE6TNgZeuVJT74BjL8kYCM/Cxy+/RVI=; b=N9fTjQ87aSD2+Vm+m6K6CNcr7dQc0xcot5PDFcQdhbxkzpHKqRqhs8JUluN7j3GAwAV7SH 3uwcVBiWbvkD0p0k5GwYdgyAARjkfczVCjjTPyUgsX+6PKsZ1Jk9KyS1Y9sBhm6VHoU4aO lVxmO8c9zB41GiX8EMo+oFaatW/OoY6ZeT2r+qlVrvHI6ChslmRgz9pT4yX7ZPpJ6u9dD5 Th473/Qh7Oo+/SMl/3oegY9BCDVZeT/g6/rszG1q1zqBpo1iQXtldthgJ7oebhNJK87P5b sK2mr0K2pZbE6JoL6UPTFn0G6BYcxwPDxvfg61j4gfdaTZEwiPsWYJwcpun3nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680192660; a=rsa-sha256; cv=none; b=P0DKAsK2DuJkehcID5xi5QwVzPGBor9IjiyLb7T4x/LwP8bVeFxzjpjZoPvTEr4PjBYPnr l1cGfK2/bjuvb9nmy9kBks+UG3wR8TmEoM85TX+DS+0JOfLZJCqZ8XB/cH9j/0kvIleCXP JplCi1QIJBcRrFH1MNtGtF4xq5j2UM0rHrau99F3DNu3QcIML+DzENVu62+iF6Oi6w4JRQ rX3Zdh4cAZY7lFceztvEmjI9Ed8pyLzrXOgCmOxTP9fKPx85RHetOupw+ne2OJzGYNen2v mi7+CyEavQZ9TItpRTVOjDpbcqORqvkYyOEK205w3l4RpiPXSVvRuTE5l6mHag== 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 4PnT1J4G8ZzJS1; Thu, 30 Mar 2023 16:11:00 +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 32UGB0Ol038022; Thu, 30 Mar 2023 16:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UGB0R2038021; Thu, 30 Mar 2023 16:11:00 GMT (envelope-from git) Date: Thu, 30 Mar 2023 16:11:00 GMT Message-Id: <202303301611.32UGB0R2038021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: e37edc91b6a0 - main - bhyve: return EEXIST when adding a fwcfg item twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e37edc91b6a0a0116005bdd0fff7c911c37adabf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=e37edc91b6a0a0116005bdd0fff7c911c37adabf commit e37edc91b6a0a0116005bdd0fff7c911c37adabf Author: Corvin Köhne AuthorDate: 2023-03-30 05:43:28 +0000 Commit: Corvin Köhne CommitDate: 2023-03-30 16:10:31 +0000 bhyve: return EEXIST when adding a fwcfg item twice Reviewed by: rew MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39338 --- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 2cc334190c15..1da0a42819b8 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -178,7 +178,7 @@ qemu_fwcfg_add_item(const uint16_t architecture, const uint16_t index, if (fwcfg_item->data != NULL) { warnx("%s: qemu fwcfg item exists (architecture %s index 0x%x)", __func__, arch ? "specific" : "generic", idx); - return (-1); + return (EEXIST); } /* save data of the item */