D38836.diff
No OneTemporary
Actions

Size

653 B

Referenced Files

None

Subscribers

None

D38836.diff
View Options

	diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
	--- a/usr.sbin/bhyve/bhyverun.c
	+++ b/usr.sbin/bhyve/bhyverun.c
	@@ -1236,7 +1236,7 @@
	int
	main(int argc, char *argv[])
	{
	- int c, error, err;
	+ int c, error;
	int max_vcpus, memflags;
	struct vmctx *ctx;
	uint64_t rip;
	@@ -1437,8 +1437,8 @@
	if (get_config_bool_default("memory.guest_in_core", false))
	memflags \|= VM_MEM_F_INCORE;
	vm_set_memflags(ctx, memflags);
	- err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
	- if (err) {
	+ error = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
	+ if (error) {
	fprintf(stderr, "Unable to setup memory (%d)\n", errno);
	exit(4);
	}