Page MenuHomeFreeBSD
Files F115507191

D43331.id132342.diff
No OneTemporary
Actions

D43331.id132342.diff
View Options

diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -861,18 +861,14 @@
need_reinit = 0;
error = vm_create(vmname);
if (error) {
- if (errno != EEXIST) {
- perror("vm_create");
- exit(1);
- }
+ if (errno != EEXIST)
+ err(1, "vm_create");
need_reinit = 1;
}
ctx = vm_open(vmname);
- if (ctx == NULL) {
- perror("vm_open");
- exit(1);
- }
+ if (ctx == NULL)
+ err(1, "vm_open");
/*
* If we weren't given an explicit loader to use, we need to support the
@@ -882,10 +878,8 @@
cap_rights_t rights;
bootfd = open("/boot", O_DIRECTORY | O_PATH);
- if (bootfd == -1) {
- perror("open");
- exit(1);
- }
+ if (bootfd == -1)
+ err(1, "open");
/*
* bootfd will be used to do a lookup of our loader and do an
@@ -893,19 +887,15 @@
* to the more usual lookup rights.
*/
if (caph_rights_limit(bootfd, cap_rights_init(&rights,
- CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0) {
- perror("caph_rights_limit");
- exit(1);
- }
+ CAP_FSTATAT, CAP_LOOKUP, CAP_MMAP_RX, CAP_READ)) < 0)
+ err(1, "caph_rights_limit");
}
vcpu = vm_vcpu_open(ctx, BSP);
caph_cache_catpages();
- if (caph_enter() < 0) {
- perror("caph_enter");
- exit(1);
- }
+ if (caph_enter() < 0)
+ err(1, "caph_enter");
/*
* setjmp in the case the guest wants to swap out interpreter,
@@ -921,26 +911,19 @@
if (need_reinit) {
error = vm_reinit(ctx);
- if (error) {
- perror("vm_reinit");
- exit(1);
- }
+ if (error)
+ err(1, "vm_reinit");
}
vm_set_memflags(ctx, memflags);
error = vm_setup_memory(ctx, mem_size, VM_MMAP_ALL);
- if (error) {
- perror("vm_setup_memory");
- exit(1);
- }
+ if (error)
+ err(1, "vm_setup_memory");
loader_open(bootfd);
func = dlsym(loader_hdl, "loader_main");
- if (!func) {
- printf("%s\n", dlerror());
- free(loader);
- return (1);
- }
+ if (!func)
+ errx(1, "dlsym: %s", dlerror());
tcgetattr(consout_fd, &term);
oldterm = term;

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 25, 3:20 PM (2 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17787650
Default Alt Text
D43331.id132342.diff (2 KB)

Event Timeline