From nobody Thu Apr 06 06:09:55 2023 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 4PsWLY0118z43ZP4; Thu, 6 Apr 2023 06:09:57 +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 4PsWLW6j7Fz3C4C; Thu, 6 Apr 2023 06:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680761396; 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=K+Mtf08U5MovfzcWYffEWwGx1TqtURst5urjYeTvGw8=; b=DOUH/Mvmt6glTXUzuvLTSH89GgdMlRyx1EYmQg5EVElD2u3SwjdZqLkXT8Fvy64wKLheGg /OZNI52CDpCiGRliS/bovoiiSrmOB0f7yJglE74lGEBsDIPMjberKLKyKKDp/EM8deb1ys PdxU8zsIK+/OcLnu3frlUmVTiHWgTw/jhm6u/VsoTMI6WDbxHesk1bUNOG/6yEEHXh8+Ea Soxh9Js5vGcEZPYT0Pw5jCoSuYTr8rrndW/DKGLmF4Ar2p+IuAB8k867toKz9jP6O9mKjS D0Oxe+uNPOjEVO1AVLFts2xsLFOsp3VagOb35Q3Iwicq/TzehJxRVfuCCqBljA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680761396; 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=K+Mtf08U5MovfzcWYffEWwGx1TqtURst5urjYeTvGw8=; b=xwMayWEyX9yK9R62CcJdZZrVN8sYIMKJNaJYehavVjxGJwLXk8rznTIGQLtRr6yeQZfw1/ TWvci3XZW2rpaHTZNfsSEgMSXKlced8xEvq/mVkqbNFdVru9GiH+7JD5AVPSGcie8lKh6k 83PRuh4mjxmZfdGPQu0wo0vGAsTnA2gRBKbUgk05uNzQmQnqJHJWWQ3BfZXh8QS8e2bL9S TBw+ej2nkHZomm4gUKiHnovW/yBdypkiuzANOY63tF028sgSbP/q/CwPTKQqjTLEqUMyHN ADiv51CE26VJMoJDRHp4Rpy2cxUz3qgaV9xYhZWdA4m2kPt/AuC4cJmn8ohUPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680761396; a=rsa-sha256; cv=none; b=CX6w1Jq6Js3srEKyFsumkkKu6E3tpldJhB8LNgD6TMYiq8q7RRoUW/vha+RkJO1Zs4w6Jf uFRb+VxtOS+LD1yVbzI2Cteo0efVFJcxpn27IzOSa5BiRIlr5f6bW1LeWybftl3Q13Haia BWK92msdlzFo0kaTLXa65bP6qcuYGXO+5VoNMwgCSKBu333gTSrTuKbV3j7mYOTnY1ll56 BUCw9pkL1MTLYXhTmzKaDrVTCqtxx846ODhlVx38OTYL8wODm69H7yg95HcevzfbCgcYFp VDyRGwBfq3yELW8doIV5r4BSBYr6vPTz6EUX+rmKlsCJqJ51yzSpTfaHQY50UA== 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 4PsWLW4DXDzsw0; Thu, 6 Apr 2023 06:09:55 +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 33669tiZ030553; Thu, 6 Apr 2023 06:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33669tuU030552; Thu, 6 Apr 2023 06:09:55 GMT (envelope-from git) Date: Thu, 6 Apr 2023 06:09:55 GMT Message-Id: <202304060609.33669tuU030552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: e6bb702fce3f - stable/13 - bhyve: return EEXIST when adding a fwcfg item twice 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e6bb702fce3feb41a0f30ac9c09e30b70ad850c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=e6bb702fce3feb41a0f30ac9c09e30b70ad850c2 commit e6bb702fce3feb41a0f30ac9c09e30b70ad850c2 Author: Corvin Köhne AuthorDate: 2023-03-30 05:43:28 +0000 Commit: Corvin Köhne CommitDate: 2023-04-06 06:06:23 +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 (cherry picked from commit e37edc91b6a0a0116005bdd0fff7c911c37adabf) --- 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 1b0b5e3e9931..bb86d0371985 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 */