Re: git: 10c6af344108 - main - bhyve: Fix build when BHYVE_SNAPSHOT is set

On Tue, 13 Sep 2022 15:34:45 +0100
Jessica Clarke <jrtc27@freebsd.org> wrote:

> On 13 Sept 2022, at 15:32, Emmanuel Vadot <manu@bidouilliste.com> wrote:
> > 
> > On Tue, 13 Sep 2022 10:49:46 -0300
> > Mitchell Horne <mhorne@freebsd.org> wrote:
> > 
> >> 
> >> 
> >> On 9/13/22 03:32, Emmanuel Vadot wrote:
> >>> The branch main has been updated by manu:
> >>> 
> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=10c6af344108a8cfdc431b5b304de9c0fddcec47
> >>> 
> >>> commit 10c6af344108a8cfdc431b5b304de9c0fddcec47
> >>> Author: Filipe da Silva Santos <contact@mail.shiori.com.br>
> >>> AuthorDate: 2022-09-13 06:30:41 +0000
> >>> Commit: Emmanuel Vadot <manu@FreeBSD.org>
> >>> CommitDate: 2022-09-13 06:32:09 +0000
> >>> 
> >>> bhyve: Fix build when BHYVE_SNAPSHOT is set
> >>> 
> >> 
> >> Can this option be added to LINT?
> >> 
> >> Mitchell
> > 
> > Probably should as it would have prevent this, but I'm not sure of why
> > this is an option currently, John ?
> 
> It disables capsicum support as the two aren?t currently compatible.

 Oh ok.

> Also, LINT wouldn?t help, this is userspace not the kernel.

 Yeah true, this part is.

> Jess
> 
> >> 
> >>> Fixes: 9cc9abf409cc ("bhyve: create all vcpus on startup")
> >>> Sponsored by: Beckhoff Automation GmbH & Co. KG
> >>> X-MFC-With: 9cc9abf409cc
> >>> ---
> >>> usr.sbin/bhyve/bhyverun.c | 1 -
> >>> 1 file changed, 1 deletion(-)
> >>> 
> >>> diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
> >>> index 550cc9d15477..27f1d8ea8892 100644
> >>> --- a/usr.sbin/bhyve/bhyverun.c
> >>> +++ b/usr.sbin/bhyve/bhyverun.c
> >>> @@ -1244,7 +1244,6 @@ main(int argc, char *argv[])
> >>> #ifdef BHYVE_SNAPSHOT
> >>> 	char *restore_file;
> >>> 	struct restore_state rstate;
> >>> -	int vcpu;
> >>> 
> >>> 	restore_file = NULL;
> >>> #endif
> > 
> > 
> > -- 
> > Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>
> 


-- 
Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>