Skip to content

Fix compilation issues for Big Sur #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 7, 2020
Merged

Fix compilation issues for Big Sur #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66d6c08
make: Disable -Wpoison-system-directories
rn Dec 5, 2020
fd0675c
block_if: rename preadv/pwritev
rn Dec 5, 2020
d201905
vmx: Improve hv_vm_create() error handling
rn Dec 5, 2020
206b471
build: Fix OCAML build
rn Dec 5, 2020
eb4645d
Add disk.dmg to .gitignore
rn Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ _build
/test/vmlinuz
/test/initrd
/test/initrd.gz
/test/disk.dmg
/test/disk.qcow2
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ OCAML_PACKS := cstruct cstruct-lwt io-page io-page.unix uri mirage-block \
mirage-unix prometheus-app conduit-lwt cohttp-lwt-unix \
unix-type-representations
OCAML_LDLIBS := -L $(OCAML_WHERE) \
$(shell ocamlfind query bigstringaf)/bigstringaf.a \
$(shell ocamlfind query bigstringaf)/libbigstringaf_stubs.a \
$(shell ocamlfind query cstruct)/cstruct.a \
$(shell ocamlfind query cstruct)/libcstruct_stubs.a \
$(shell ocamlfind query io-page)/io_page.a \
Expand Down
4 changes: 3 additions & 1 deletion config.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ CFLAGS_WARN := \
-Wno-reserved-id-macro \
-Wno-unknown-warning-option \
-Wno-unused-macros \
-Wno-switch-enum
-Wno-switch-enum \
-Wno-poison-system-directories

CFLAGS_DIAG := \
-fmessage-length=152 \
Expand Down Expand Up @@ -79,4 +80,5 @@ LDFLAGS := \
-arch x86_64 \
-framework Hypervisor \
-framework vmnet \
-Wl,-no_compact_unwind \
$(LDFLAGS_DBG)
8 changes: 4 additions & 4 deletions src/lib/block_if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static struct blockif_sig_elem *blockif_bse_head;


static ssize_t
preadv(int fd, const struct iovec *iov, int iovcnt, off_t offset)
_preadv(int fd, const struct iovec *iov, int iovcnt, off_t offset)
{
off_t res;

Expand All @@ -149,7 +149,7 @@ preadv(int fd, const struct iovec *iov, int iovcnt, off_t offset)


static ssize_t
pwritev(int fd, const struct iovec *iov, int iovcnt, off_t offset)
_pwritev(int fd, const struct iovec *iov, int iovcnt, off_t offset)
{
off_t res;

Expand Down Expand Up @@ -181,7 +181,7 @@ block_preadv(struct blockif_ctxt *bc, const struct iovec *iov, int iovcnt,
HYPERKIT_BLOCK_PREADV(offset, iovec_len(iov, iovcnt));

if (bc->bc_fd >= 0)
ret = preadv(bc->bc_fd, iov, iovcnt, offset);
ret = _preadv(bc->bc_fd, iov, iovcnt, offset);

#ifdef HAVE_OCAML_QCOW
else if (bc->bc_mbh >= 0)
Expand All @@ -205,7 +205,7 @@ block_pwritev(struct blockif_ctxt *bc, const struct iovec *iov, int iovcnt,
HYPERKIT_BLOCK_PWRITEV(offset, iovec_len(iov, iovcnt));

if (bc->bc_fd >= 0)
ret = pwritev(bc->bc_fd, iov, iovcnt, offset);
ret = _pwritev(bc->bc_fd, iov, iovcnt, offset);

#ifdef HAVE_OCAML_QCOW
else if (bc->bc_mbh >= 0)
Expand Down
5 changes: 4 additions & 1 deletion src/lib/vmm/intel/vmx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,12 @@ vmx_init(void)
case HV_UNSUPPORTED:
/* Don't know if this can happen, report to us */
xhyve_abort("hv_vm_create HV_UNSUPPORTED\n");
case HV_ERROR:
/* An unspecified error happened */
xhyve_abort("hv_vm_create HV_ERROR (unspecified error)\n");
default:
/* Should never happen, report to Apple */
xhyve_abort("hv_vm_create unknown error %d\n", error);
xhyve_abort("hv_vm_create unknown error %#010x\n", error);
}

/*
Expand Down