From owner-svn-src-all@freebsd.org  Tue May 22 06:02:12 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60610EE7F64;
 Tue, 22 May 2018 06:02:12 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FE7084C1C;
 Tue, 22 May 2018 06:02:12 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E523310179;
 Tue, 22 May 2018 06:02:11 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4M62BOa081594;
 Tue, 22 May 2018 06:02:11 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4M62BKO081593;
 Tue, 22 May 2018 06:02:11 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201805220602.w4M62BKO081593@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Tue, 22 May 2018 06:02:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334021 - head/usr.sbin/bhyve
X-SVN-Group: head
X-SVN-Commit-Author: araujo
X-SVN-Commit-Paths: head/usr.sbin/bhyve
X-SVN-Commit-Revision: 334021
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 May 2018 06:02:12 -0000

Author: araujo
Date: Tue May 22 06:02:11 2018
New Revision: 334021
URL: https://svnweb.freebsd.org/changeset/base/334021

Log:
  Revert: r334016
  Revert for now this change, it in somehow breaks init_pci.

Modified:
  head/usr.sbin/bhyve/pci_emul.c

Modified: head/usr.sbin/bhyve/pci_emul.c
==============================================================================
--- head/usr.sbin/bhyve/pci_emul.c	Tue May 22 05:49:40 2018	(r334020)
+++ head/usr.sbin/bhyve/pci_emul.c	Tue May 22 06:02:11 2018	(r334021)
@@ -231,7 +231,8 @@ pci_parse_slot(char *opt)
 	si->si_funcs[fnum].fi_param = config;
 
 done:
-	free(str);
+	if (error)
+		free(str);
 
 	return (error);
 }