From 895d26b4b073b2184087b24ee00af7ac0b6be189 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 25 Mar 2019 17:03:10 +0000 Subject: [PATCH 01/15] Fix NFS mount for macOS 10.14 Fixes the following error: ``` (default) Error setting up mounts: Something went wrong running an SSH command! (default) command : echo -e "#/bin/bash\nsudo mkdir -p /Users\nsudo /usr/local/etc/init.d/nfs-client start\nsudo mount -t nfs -o noacl,async 192.168.64.1:/Users /Users\n" | sudo tee /var/lib/boot2docker/bootlocal.sh && sudo chmod +x /var/lib/boot2docker/bootlocal.sh && /var/lib/boot2docker/bootlocal.sh ``` --- xhyve/xhyve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xhyve/xhyve.go b/xhyve/xhyve.go index c2f90d3..377b6fb 100644 --- a/xhyve/xhyve.go +++ b/xhyve/xhyve.go @@ -1044,7 +1044,7 @@ func (d *Driver) setupNFSShare() error { root := path.Clean(d.NFSSharesRoot) mountCommands += fmt.Sprintf("sudo mkdir -p %s/%s\\n", root, share) - mountCommands += fmt.Sprintf("sudo mount -t nfs -o noacl,async %s:%s %s/%s\\n", hostIP, share, root, share) + mountCommands += fmt.Sprintf("sudo mount -t nfs -o noacl,async,nfsvers=3 %s:%s %s/%s\\n", hostIP, share, root, share) } if err := nfsexports.ReloadDaemon(); err != nil { From 74c4e35ed3bc7d213a0d8a31fd6965afdfd33269 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Sat, 30 Mar 2019 11:51:12 +0000 Subject: [PATCH 02/15] check for macOS version --- xhyve/xhyve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xhyve/xhyve.go b/xhyve/xhyve.go index 377b6fb..89954a0 100644 --- a/xhyve/xhyve.go +++ b/xhyve/xhyve.go @@ -1044,7 +1044,7 @@ func (d *Driver) setupNFSShare() error { root := path.Clean(d.NFSSharesRoot) mountCommands += fmt.Sprintf("sudo mkdir -p %s/%s\\n", root, share) - mountCommands += fmt.Sprintf("sudo mount -t nfs -o noacl,async,nfsvers=3 %s:%s %s/%s\\n", hostIP, share, root, share) + mountCommands += fmt.Sprintf("sudo mount -t nfs -o noacl,async$( [ -n "$(sw_vers | grep 10.14)" ] && echo ",nfsvers=3 ") %s:%s %s/%s\\n", hostIP, share, root, share) } if err := nfsexports.ReloadDaemon(); err != nil { From 25ea7db81efbb2864cc1225d0f6d7ba2ac60ebff Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 15:47:56 +0100 Subject: [PATCH 03/15] update .travis.yml and Makefile --- .travis.yml | 12 ++++++------ Makefile | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9a7e31..60434b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ os: osx -osx_image: xcode8.3 +osx_image: xcode10.1 language: go go: - - 1.8.x + - 1.12.x - tip env: global: - - GO_BUILD_TAGS='lib9p qcow2' + - GO_BUILD_TAGS='lib9p' - HOMEBREW_NO_AUTO_UPDATE=1 - MAKEFLAGS="-j$(sysctl -n hw.ncpu)" - RELEASE_GO_VERSION='' @@ -25,7 +25,7 @@ before_install: # for ocaml-qcow - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/opam.rb - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/libev.rb - - opam --version && opam init && opam install uri qcow-format io-page.1.6.1 ocamlfind conf-libev + - opam --version && opam init && opam install uri qcow-format io-page ocamlfind conf-libev - eval `opam config env` install: @@ -44,14 +44,14 @@ before_deploy: - sudo chown travis:staff bin/docker-machine-driver-xhyve # add version suffix to binary if not stable Go version - if [[ "$TRAVIS_GO_VERSION" == "tip" ]]; then - export RELEASE_GO_VERSION=_$TRAVIS_GO_VERSION && mv bin/docker-machine-driver-xhyve{,$RELEASE_GO_VERSION}; + export RELEASE_GO_VERSION=_$TRAVIS_GO_VERSION && mv bin/docker-machine-driver-xhyve{,$RELEASE_GO_VERSION}; fi deploy: provider: releases skip_cleanup: true file_glob: true - file: 'bin/docker-machine-driver-xhyve*' + file: "bin/docker-machine-driver-xhyve*" on: repo: zchee/docker-machine-driver-xhyve tags: true diff --git a/Makefile b/Makefile index 8216d8f..c52c0db 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ endif # Package settings # Build package infomation -GITHUB_USER := zchee +GITHUB_USER := machine-drivers TOP_PACKAGE_DIR := github.com/${GITHUB_USER} PACKAGE := $(shell basename $(PWD)) OUTPUT := bin/docker-machine-driver-xhyve @@ -41,8 +41,8 @@ MAIN_FILE := $(shell grep "func main\(\)" *.go -l) # ---------------------------------------------------------------------------- # Define main commands -CC := $(shell xcrun -f clang) -LIBTOOL := $(shell xcrun -f libtool) +CC := xcrun --sdk macosx clang +LIBTOOL := xcrun --sdk macosx libtool GO_CMD := $(shell which go) GIT_CMD := $(shell which git) DOCKER_CMD := $(shell which docker) From 0fcc8617f9633c51961aba9add218c385e8d881f Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 15:49:40 +0100 Subject: [PATCH 04/15] fix package path and format yaml --- glide.yaml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/glide.yaml b/glide.yaml index 4284d49..1022d71 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,23 +1,23 @@ -package: github.com/zchee/docker-machine-driver-xhyve +package: github.com/docker-machine/docker-machine-driver-xhyve import: -- package: github.com/docker/machine - version: v0.11.0 - subpackages: - - libmachine/drivers - - libmachine/drivers/plugin - - libmachine/log - - libmachine/mcnflag - - libmachine/mcnutils - - libmachine/ssh - - libmachine/state -- package: github.com/johanneswuerbach/nfsexports -- package: github.com/mitchellh/go-ps -- package: github.com/zchee/go-qcow2 -- package: github.com/zchee/libhyperkit -- package: github.com/jceel/lib9p - version: 7be3e0b914fbb2d2ecfe2984d02bacfd8e762eae + - package: github.com/docker/machine + version: v0.11.0 + subpackages: + - libmachine/drivers + - libmachine/drivers/plugin + - libmachine/log + - libmachine/mcnflag + - libmachine/mcnutils + - libmachine/ssh + - libmachine/state + - package: github.com/johanneswuerbach/nfsexports + - package: github.com/mitchellh/go-ps + - package: github.com/zchee/go-qcow2 + - package: github.com/zchee/libhyperkit + - package: github.com/jceel/lib9p + version: 7be3e0b914fbb2d2ecfe2984d02bacfd8e762eae testImport: -- package: github.com/stretchr/testify - version: v1.1.4 - subpackages: - - assert + - package: github.com/stretchr/testify + version: v1.1.4 + subpackages: + - assert From a956dba493f0874f1b6b94c1e2f2297518548b0d Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 16:17:32 +0100 Subject: [PATCH 05/15] fix types --- vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml b/vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml index 70588d2..37a5ea7 100644 --- a/vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml +++ b/vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml @@ -113,7 +113,7 @@ module Protocol = struct (fun () -> in_flight_requests := t :: !in_flight_requests; ); - let n = Unix.write request_writer "X" 0 1 in + let n = Unix.write request_writer (Bytes.unsafe_of_string "X") 0 1 in if n = 0 then begin Printf.fprintf stderr "Got EOF while writing signal to the pipe\n%!"; exit 1; @@ -314,7 +314,7 @@ let process_one t = (* An Lwt thread which receives the signals from the pipe, grabs the in-flight requests and forks background threads to process all the requests. *) let serve_forever () = - let buf = String.make 1 '\000' in + let buf = Bytes.make 1 '\000' in let request_reader = Lwt_unix.of_unix_file_descr Protocol.request_reader in let rec loop () = From 8a74f17a1780d1483dd7eedd693008d174fb32ef Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 17:07:07 +0100 Subject: [PATCH 06/15] fix package path --- glide.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glide.yaml b/glide.yaml index 1022d71..800866d 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/docker-machine/docker-machine-driver-xhyve +package: github.com/machine-drivers/docker-machine-driver-xhyve import: - package: github.com/docker/machine version: v0.11.0 From 9cd9834febd6efccdc7933968cf0049eada53de9 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 17:07:13 +0100 Subject: [PATCH 07/15] fix imports --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index e4b8cd1..a85bb0f 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( "github.com/docker/machine/libmachine/drivers/plugin" "github.com/docker/machine/libmachine/ssh" - "github.com/zchee/docker-machine-driver-xhyve/xhyve" + "github.com/machine-drivers/docker-machine-driver-xhyve/xhyve" hyperkit "github.com/zchee/libhyperkit" ) From 9334d013f7bd16d7417b24d448d4ec51571abf40 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 17:12:09 +0100 Subject: [PATCH 08/15] fix imports --- xhyve/xhyve.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xhyve/xhyve.go b/xhyve/xhyve.go index 89954a0..9b364b0 100644 --- a/xhyve/xhyve.go +++ b/xhyve/xhyve.go @@ -33,8 +33,8 @@ import ( "github.com/docker/machine/libmachine/state" "github.com/johanneswuerbach/nfsexports" ps "github.com/mitchellh/go-ps" - "github.com/zchee/docker-machine-driver-xhyve/b2d" - "github.com/zchee/docker-machine-driver-xhyve/vmnet" + "github.com/machine-drivers/docker-machine-driver-xhyve/b2d" + "github.com/machine-drivers/docker-machine-driver-xhyve/vmnet" qcow2 "github.com/zchee/go-qcow2" ) From 384f406385347622b77d05d470aca9b118345205 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 17:12:31 +0100 Subject: [PATCH 09/15] update repo path for deployment --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 60434b4..18feea2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ deploy: file_glob: true file: "bin/docker-machine-driver-xhyve*" on: - repo: zchee/docker-machine-driver-xhyve + repo: machine-drivers/docker-machine-driver-xhyve tags: true api_key: secure: ooncVJ4sSfcLiQ/0mNivrShRbUBcywocGd7mOhWp1MsyKdnAv7/In2qiyw4GD1x/AWyXOGWKGouDATeiP3kQ7jnIw7YoaNcbu/QeKD2xIODf4tYGXDf7AQUEwKnof5XBTIbU7oRgBe+NH1bN6iDh8XBgLqZPXFjaIQSq3gudM2/zJlzcrCdXAA8oKOJdsS4TR4/cCVMou3gV54mbkxmsr+F1BN3zKO7k1ZBv4BDYbkrN1RvBiEOXq7c+ab3ubd4L/AGxU1oou+0qRJMXF7jCyIq4zHrwl4iAQUd5AVKlZRFVWRF2RdGc7ExCA+ZGZZhhvpCmMsldiqjPWRPdcF4rCkaWk1RKhOL4VwSZUaXwVgEM4k9GRuKD0LVqkzPhvPG9DVpEA2rtnmkVtQ6/AttqkV6vDH5emL4zt6Mw4/Uphb0rdKrSYKbpE4NUpMikQXbzmXeEyXjhoNE9I7k8Dkh5CFnlS2VxVl/ECEOA4b2nKClGN+UhM7Z5Hkk/Sx/22mUFAnzwa/1x0gVyG8ONy8JdrbeEUnA03eeXIcvmAvfeyk6QkZMyHL1UGRm7VoN3y5uX30RHS6fDmhsE5CS2VE+TjbM6XppWwxaBueEzKwA5qtdfCiE+Wilttx4GS9bpa7FS8Efw1p/x69yZjzGNQhPC1mjCX3e3XFP35qF4+ZfP8aw= From fbd82363b5f37931d5eea21c5c93d45a1cca424e Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 19:32:43 +0100 Subject: [PATCH 10/15] pin io-page version to 1.6.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18feea2..2b295c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: # for ocaml-qcow - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/opam.rb - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/libev.rb - - opam --version && opam init && opam install uri qcow-format io-page ocamlfind conf-libev + - opam --version && opam init && opam install uri qcow-format io-page.1.6.1 ocaml.4.05.0 ocamlfind conf-libev - eval `opam config env` install: From fc67e8593178cab0a8354c437bb6ef5a565eba7b Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 19:34:49 +0100 Subject: [PATCH 11/15] update xcode to 10.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b295c6..73f986e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ os: osx -osx_image: xcode10.1 +osx_image: xcode10.2 language: go go: From 9e683a2b34bd72c833f264fa3c07fe6421d934b8 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 20:03:26 +0100 Subject: [PATCH 12/15] pin opam to version 4.05.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 73f986e..1698be3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: # for ocaml-qcow - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/opam.rb - brew install https://github.com/Homebrew/homebrew-core/raw/master/Formula/libev.rb - - opam --version && opam init && opam install uri qcow-format io-page.1.6.1 ocaml.4.05.0 ocamlfind conf-libev + - opam --version && opam init --comp 4.05.0 && opam install uri qcow-format io-page.1.6.1 ocaml ocamlfind conf-libev - eval `opam config env` install: From d2c406bb2c5a301130a23464510c9ddb4580ba0c Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 20:40:30 +0100 Subject: [PATCH 13/15] use patched version of libhyperkit --- Makefile | 8 ++++---- glide.yaml | 3 ++- main.go | 2 +- vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c52c0db..7175cea 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ OCAML_LDLIBS := -L $(OCAML_WHERE) \ CGO_CFLAGS += -DHAVE_OCAML=1 -DHAVE_OCAML_QCOW=1 -DHAVE_OCAML=1 -I$(OCAML_WHERE) CGO_LDFLAGS += $(OCAML_LDLIBS) GO_BUILD_TAGS += qcow2 -bin/docker-machine-driver-xhyve: vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.o +bin/docker-machine-driver-xhyve: vendor/github.com/urbantrout/libhyperkit/mirage_block_ocaml.o endif @@ -175,8 +175,8 @@ default: build build: bin/docker-machine-driver-xhyve -vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.o: - $(VERBOSE) $(GO_CMD) generate $(GO_BUILD_FLAG) $(GO_VERBOSE) ./vendor/github.com/zchee/libhyperkit +vendor/github.com/urbantrout/libhyperkit/mirage_block_ocaml.o: + $(VERBOSE) $(GO_CMD) generate $(GO_BUILD_FLAG) $(GO_VERBOSE) ./vendor/github.com/urbantrout/libhyperkit bin/docker-machine-driver-xhyve: $(VERBOSE) test -d bin || mkdir -p bin; @@ -221,7 +221,7 @@ docker-build-nocache: clean: clean-lib9p - @${RM} -r ./bin ./vendor/github.com/zchee/libhyperkit/*.cmi ./vendor/github.com/zchee/libhyperkit/*.cmx ./vendor/github.com/zchee/libhyperkit/*.syso + @${RM} -r ./bin ./vendor/github.com/urbantrout/libhyperkit/*.cmi ./vendor/github.com/urbantrout/libhyperkit/*.cmx ./vendor/github.com/urbantrout/libhyperkit/*.syso run: driver-run diff --git a/glide.yaml b/glide.yaml index 800866d..580ff25 100644 --- a/glide.yaml +++ b/glide.yaml @@ -13,7 +13,8 @@ import: - package: github.com/johanneswuerbach/nfsexports - package: github.com/mitchellh/go-ps - package: github.com/zchee/go-qcow2 - - package: github.com/zchee/libhyperkit + - package: github.com/urbantrout/libhyperkit + version: patch-1 - package: github.com/jceel/lib9p version: 7be3e0b914fbb2d2ecfe2984d02bacfd8e762eae testImport: diff --git a/main.go b/main.go index a85bb0f..655b2a5 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( "github.com/docker/machine/libmachine/drivers/plugin" "github.com/docker/machine/libmachine/ssh" "github.com/machine-drivers/docker-machine-driver-xhyve/xhyve" - hyperkit "github.com/zchee/libhyperkit" + hyperkit "github.com/urbantrout/libhyperkit" ) func main() { diff --git a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go b/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go index 18356af..953d510 100644 --- a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go +++ b/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go @@ -4,10 +4,9 @@ import ( "fmt" "os" - hyperkit "github.com/zchee/libhyperkit" + hyperkit "github.com/urbantrout/libhyperkit" ) - func main() { done := make(chan bool) ptyCh := make(chan string) From 99152d495913c6f3434aec980122098f2dac3104 Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 21:10:31 +0100 Subject: [PATCH 14/15] add patched libhyperkit --- glide.lock | 8 ++++---- .../{zchee => urbantrout}/libhyperkit/.gitignore | 0 .../{zchee => urbantrout}/libhyperkit/.gitmodules | 0 .../libhyperkit/CONTRIBUTING.md | 0 .../{zchee => urbantrout}/libhyperkit/LICENSE | 0 .../{zchee => urbantrout}/libhyperkit/Makefile | 0 .../libhyperkit/README.hyperkit.md | 0 .../{zchee => urbantrout}/libhyperkit/README.md | 0 .../libhyperkit/README.xhyve.md | 0 .../{zchee => urbantrout}/libhyperkit/acpitbl.c | 0 .../{zchee => urbantrout}/libhyperkit/atkbdc.c | 0 .../{zchee => urbantrout}/libhyperkit/block_if.c | 0 .../{zchee => urbantrout}/libhyperkit/bootrom.c | 10 +++++----- .../libhyperkit/cmd/hyperkit/imgs/initrd.gz | Bin .../libhyperkit/cmd/hyperkit/imgs/tinycore.txt | 0 .../libhyperkit/cmd/hyperkit/imgs/userboot.txt | 0 .../libhyperkit/cmd/hyperkit/imgs/vmlinuz | Bin .../libhyperkit/cmd/hyperkit/main.go | 3 ++- .../{zchee => urbantrout}/libhyperkit/consport.c | 0 .../{zchee => urbantrout}/libhyperkit/dbgport.c | 0 .../{zchee => urbantrout}/libhyperkit/fbsd.c | 0 .../{zchee => urbantrout}/libhyperkit/hyperkit.c | 0 .../libhyperkit/include/xhyve/acpi.h | 0 .../libhyperkit/include/xhyve/ahci.h | 0 .../libhyperkit/include/xhyve/block_if.h | 0 .../libhyperkit/include/xhyve/dbgport.h | 0 .../libhyperkit/include/xhyve/dtrace.h | 0 .../libhyperkit/include/xhyve/firmware/bootrom.h | 0 .../libhyperkit/include/xhyve/firmware/fbsd.h | 0 .../libhyperkit/include/xhyve/firmware/kexec.h | 0 .../libhyperkit/include/xhyve/inout.h | 0 .../libhyperkit/include/xhyve/ioapic.h | 0 .../libhyperkit/include/xhyve/mem.h | 0 .../libhyperkit/include/xhyve/mevent.h | 0 .../libhyperkit/include/xhyve/mptbl.h | 0 .../libhyperkit/include/xhyve/pci_emul.h | 0 .../libhyperkit/include/xhyve/pci_irq.h | 0 .../libhyperkit/include/xhyve/pci_lpc.h | 0 .../libhyperkit/include/xhyve/rtc.h | 0 .../libhyperkit/include/xhyve/smbiostbl.h | 0 .../libhyperkit/include/xhyve/support/acpi_hpet.h | 0 .../libhyperkit/include/xhyve/support/apicreg.h | 0 .../libhyperkit/include/xhyve/support/ata.h | 0 .../libhyperkit/include/xhyve/support/atomic.h | 0 .../libhyperkit/include/xhyve/support/bitset.h | 0 .../libhyperkit/include/xhyve/support/cpuset.h | 0 .../libhyperkit/include/xhyve/support/i8253reg.h | 0 .../libhyperkit/include/xhyve/support/i8259.h | 0 .../libhyperkit/include/xhyve/support/linker_set.h | 0 .../libhyperkit/include/xhyve/support/md5.h | 0 .../libhyperkit/include/xhyve/support/misc.h | 0 .../libhyperkit/include/xhyve/support/mptable.h | 0 .../libhyperkit/include/xhyve/support/ns16550.h | 0 .../libhyperkit/include/xhyve/support/pcireg.h | 0 .../libhyperkit/include/xhyve/support/psl.h | 0 .../libhyperkit/include/xhyve/support/rtc.h | 0 .../libhyperkit/include/xhyve/support/segments.h | 0 .../libhyperkit/include/xhyve/support/specialreg.h | 0 .../libhyperkit/include/xhyve/support/timerreg.h | 0 .../libhyperkit/include/xhyve/support/tree.h | 0 .../libhyperkit/include/xhyve/support/uuid.h | 0 .../libhyperkit/include/xhyve/uart_emul.h | 0 .../libhyperkit/include/xhyve/virtio.h | 0 .../libhyperkit/include/xhyve/vmm/intel/vmcs.h | 0 .../libhyperkit/include/xhyve/vmm/intel/vmx.h | 0 .../include/xhyve/vmm/intel/vmx_controls.h | 0 .../libhyperkit/include/xhyve/vmm/intel/vmx_msr.h | 0 .../libhyperkit/include/xhyve/vmm/io/vatpic.h | 0 .../libhyperkit/include/xhyve/vmm/io/vatpit.h | 0 .../libhyperkit/include/xhyve/vmm/io/vhpet.h | 0 .../libhyperkit/include/xhyve/vmm/io/vioapic.h | 0 .../libhyperkit/include/xhyve/vmm/io/vlapic.h | 0 .../libhyperkit/include/xhyve/vmm/io/vlapic_priv.h | 0 .../libhyperkit/include/xhyve/vmm/io/vpmtmr.h | 0 .../libhyperkit/include/xhyve/vmm/io/vrtc.h | 0 .../libhyperkit/include/xhyve/vmm/vmm.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_api.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_callout.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_common.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_host.h | 0 .../include/xhyve/vmm/vmm_instruction_emul.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_ioport.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_ktr.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_lapic.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_mem.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_stat.h | 0 .../libhyperkit/include/xhyve/vmm/vmm_util.h | 0 .../libhyperkit/include/xhyve/vmm/x86.h | 0 .../libhyperkit/include/xhyve/xhyve.h | 0 .../libhyperkit/include/xhyve/xmsr.h | 0 .../{zchee => urbantrout}/libhyperkit/inout.c | 0 .../{zchee => urbantrout}/libhyperkit/ioapic.c | 0 .../{zchee => urbantrout}/libhyperkit/kexec.c | 0 .../{zchee => urbantrout}/libhyperkit/md5c.c | 0 .../{zchee => urbantrout}/libhyperkit/mem.c | 0 .../{zchee => urbantrout}/libhyperkit/mevent.c | 0 .../libhyperkit/mirage_block_c.c | 0 .../libhyperkit/mirage_block_c.h | 0 .../libhyperkit/mirage_block_ocaml.ml | 4 ++-- .../{zchee => urbantrout}/libhyperkit/mptbl.c | 0 .../libhyperkit/patch/hyperkit.c.patch | 0 .../libhyperkit/patch/mevent.c.patch | 0 .../libhyperkit/patch/mevent.h.patch | 0 .../libhyperkit/patch/pci_virtio_9p.c.patch | 0 .../libhyperkit/patch/pci_virtio_net_vpnkit.c.patch | 0 .../libhyperkit/patch/uart_emul.c.patch | 0 .../libhyperkit/patch/uart_emul.h.patch | 0 .../libhyperkit/patch/xhyve.h.patch | 0 .../{zchee => urbantrout}/libhyperkit/pci_ahci.c | 0 .../{zchee => urbantrout}/libhyperkit/pci_emul.c | 0 .../libhyperkit/pci_hostbridge.c | 0 .../{zchee => urbantrout}/libhyperkit/pci_irq.c | 0 .../{zchee => urbantrout}/libhyperkit/pci_lpc.c | 0 .../{zchee => urbantrout}/libhyperkit/pci_uart.c | 0 .../libhyperkit/pci_virtio_9p.c | 0 .../libhyperkit/pci_virtio_block.c | 0 .../libhyperkit/pci_virtio_net_tap.c | 0 .../libhyperkit/pci_virtio_net_vmnet.c | 0 .../libhyperkit/pci_virtio_net_vpnkit.c | 0 .../libhyperkit/pci_virtio_rnd.c | 0 .../libhyperkit/pci_virtio_sock.c | 0 .../{zchee => urbantrout}/libhyperkit/pm.c | 0 .../{zchee => urbantrout}/libhyperkit/post.c | 0 .../{zchee => urbantrout}/libhyperkit/rtc.c | 0 .../{zchee => urbantrout}/libhyperkit/smbiostbl.c | 0 .../{zchee => urbantrout}/libhyperkit/task_switch.c | 0 .../{zchee => urbantrout}/libhyperkit/uart_emul.c | 0 .../{zchee => urbantrout}/libhyperkit/vatpic.c | 0 .../{zchee => urbantrout}/libhyperkit/vatpit.c | 0 .../{zchee => urbantrout}/libhyperkit/vhpet.c | 0 .../{zchee => urbantrout}/libhyperkit/vioapic.c | 0 .../{zchee => urbantrout}/libhyperkit/virtio.c | 0 .../{zchee => urbantrout}/libhyperkit/vlapic.c | 0 .../{zchee => urbantrout}/libhyperkit/vmcs.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_api.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_callout.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_host.c | 0 .../libhyperkit/vmm_instruction_emul.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_ioport.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_lapic.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_mem.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_stat.c | 0 .../{zchee => urbantrout}/libhyperkit/vmm_util.c | 0 .../{zchee => urbantrout}/libhyperkit/vmx.c | 0 .../{zchee => urbantrout}/libhyperkit/vmx_msr.c | 0 .../{zchee => urbantrout}/libhyperkit/vpmtmr.c | 0 .../{zchee => urbantrout}/libhyperkit/vrtc.c | 0 .../{zchee => urbantrout}/libhyperkit/x86.c | 0 .../{zchee => urbantrout}/libhyperkit/xhyve.go | 0 .../{zchee => urbantrout}/libhyperkit/xhyve.mk | 0 .../libhyperkit/xhyve_qcow2.go | 0 .../{zchee => urbantrout}/libhyperkit/xmsr.c | 0 153 files changed, 13 insertions(+), 12 deletions(-) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/.gitignore (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/.gitmodules (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/CONTRIBUTING.md (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/LICENSE (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/Makefile (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/README.hyperkit.md (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/README.md (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/README.xhyve.md (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/acpitbl.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/atkbdc.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/block_if.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/bootrom.c (92%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/cmd/hyperkit/imgs/initrd.gz (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/cmd/hyperkit/imgs/tinycore.txt (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/cmd/hyperkit/imgs/userboot.txt (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/cmd/hyperkit/imgs/vmlinuz (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/cmd/hyperkit/main.go (91%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/consport.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/dbgport.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/fbsd.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/hyperkit.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/acpi.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/ahci.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/block_if.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/dbgport.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/dtrace.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/firmware/bootrom.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/firmware/fbsd.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/firmware/kexec.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/inout.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/ioapic.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/mem.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/mevent.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/mptbl.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/pci_emul.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/pci_irq.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/pci_lpc.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/rtc.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/smbiostbl.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/acpi_hpet.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/apicreg.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/ata.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/atomic.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/bitset.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/cpuset.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/i8253reg.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/i8259.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/linker_set.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/md5.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/misc.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/mptable.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/ns16550.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/pcireg.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/psl.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/rtc.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/segments.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/specialreg.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/timerreg.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/tree.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/support/uuid.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/uart_emul.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/virtio.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/intel/vmcs.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/intel/vmx.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/intel/vmx_controls.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/intel/vmx_msr.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vatpic.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vatpit.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vhpet.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vioapic.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vlapic.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vlapic_priv.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vpmtmr.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/io/vrtc.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_api.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_callout.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_common.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_host.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_instruction_emul.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_ioport.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_ktr.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_lapic.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_mem.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_stat.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/vmm_util.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/vmm/x86.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/xhyve.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/include/xhyve/xmsr.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/inout.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/ioapic.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/kexec.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/md5c.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/mem.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/mevent.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/mirage_block_c.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/mirage_block_c.h (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/mirage_block_ocaml.ml (98%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/mptbl.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/hyperkit.c.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/mevent.c.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/mevent.h.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/pci_virtio_9p.c.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/pci_virtio_net_vpnkit.c.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/uart_emul.c.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/uart_emul.h.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/patch/xhyve.h.patch (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_ahci.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_emul.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_hostbridge.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_irq.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_lpc.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_uart.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_9p.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_block.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_net_tap.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_net_vmnet.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_net_vpnkit.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_rnd.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pci_virtio_sock.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/pm.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/post.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/rtc.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/smbiostbl.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/task_switch.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/uart_emul.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vatpic.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vatpit.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vhpet.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vioapic.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/virtio.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vlapic.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmcs.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_api.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_callout.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_host.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_instruction_emul.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_ioport.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_lapic.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_mem.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_stat.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmm_util.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmx.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vmx_msr.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vpmtmr.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/vrtc.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/x86.c (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/xhyve.go (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/xhyve.mk (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/xhyve_qcow2.go (100%) rename vendor/github.com/{zchee => urbantrout}/libhyperkit/xmsr.c (100%) diff --git a/glide.lock b/glide.lock index 8c9831b..56da516 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: d35f4c0286fb07f6ca4356fa997095df46d74eba662956a6566abafd37d81213 -updated: 2017-06-29T14:50:19.010643722+05:30 +hash: 8705fc0cc5db3b3f64a8796055d109e4dd986d81deb36b3d563271dbda6109a7 +updated: 2019-04-15T21:06:43.620593+01:00 imports: - name: github.com/docker/docker version: a8a31eff10544860d2188dddabdee4d727545796 @@ -28,12 +28,12 @@ imports: - name: github.com/pkg/errors version: a887431f7f6ef7687b556dbf718d9f351d4858a0 repo: https://github.com/pkg/errors +- name: github.com/urbantrout/libhyperkit + version: 1f4784ffdcf51a4f3a04ef2818946a02b5e42391 - name: github.com/zchee/go-qcow2 version: 9a991fd172f0e8a2a3adfe529ff5e6b814e26b97 subpackages: - internal/mem -- name: github.com/zchee/libhyperkit - version: 1a19a7693fac32b46ec6cdd22da6fbec974447fc - name: golang.org/x/crypto version: beef0f4390813b96e8e68fd78570396d0f4751fc subpackages: diff --git a/vendor/github.com/zchee/libhyperkit/.gitignore b/vendor/github.com/urbantrout/libhyperkit/.gitignore similarity index 100% rename from vendor/github.com/zchee/libhyperkit/.gitignore rename to vendor/github.com/urbantrout/libhyperkit/.gitignore diff --git a/vendor/github.com/zchee/libhyperkit/.gitmodules b/vendor/github.com/urbantrout/libhyperkit/.gitmodules similarity index 100% rename from vendor/github.com/zchee/libhyperkit/.gitmodules rename to vendor/github.com/urbantrout/libhyperkit/.gitmodules diff --git a/vendor/github.com/zchee/libhyperkit/CONTRIBUTING.md b/vendor/github.com/urbantrout/libhyperkit/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/zchee/libhyperkit/CONTRIBUTING.md rename to vendor/github.com/urbantrout/libhyperkit/CONTRIBUTING.md diff --git a/vendor/github.com/zchee/libhyperkit/LICENSE b/vendor/github.com/urbantrout/libhyperkit/LICENSE similarity index 100% rename from vendor/github.com/zchee/libhyperkit/LICENSE rename to vendor/github.com/urbantrout/libhyperkit/LICENSE diff --git a/vendor/github.com/zchee/libhyperkit/Makefile b/vendor/github.com/urbantrout/libhyperkit/Makefile similarity index 100% rename from vendor/github.com/zchee/libhyperkit/Makefile rename to vendor/github.com/urbantrout/libhyperkit/Makefile diff --git a/vendor/github.com/zchee/libhyperkit/README.hyperkit.md b/vendor/github.com/urbantrout/libhyperkit/README.hyperkit.md similarity index 100% rename from vendor/github.com/zchee/libhyperkit/README.hyperkit.md rename to vendor/github.com/urbantrout/libhyperkit/README.hyperkit.md diff --git a/vendor/github.com/zchee/libhyperkit/README.md b/vendor/github.com/urbantrout/libhyperkit/README.md similarity index 100% rename from vendor/github.com/zchee/libhyperkit/README.md rename to vendor/github.com/urbantrout/libhyperkit/README.md diff --git a/vendor/github.com/zchee/libhyperkit/README.xhyve.md b/vendor/github.com/urbantrout/libhyperkit/README.xhyve.md similarity index 100% rename from vendor/github.com/zchee/libhyperkit/README.xhyve.md rename to vendor/github.com/urbantrout/libhyperkit/README.xhyve.md diff --git a/vendor/github.com/zchee/libhyperkit/acpitbl.c b/vendor/github.com/urbantrout/libhyperkit/acpitbl.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/acpitbl.c rename to vendor/github.com/urbantrout/libhyperkit/acpitbl.c diff --git a/vendor/github.com/zchee/libhyperkit/atkbdc.c b/vendor/github.com/urbantrout/libhyperkit/atkbdc.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/atkbdc.c rename to vendor/github.com/urbantrout/libhyperkit/atkbdc.c diff --git a/vendor/github.com/zchee/libhyperkit/block_if.c b/vendor/github.com/urbantrout/libhyperkit/block_if.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/block_if.c rename to vendor/github.com/urbantrout/libhyperkit/block_if.c diff --git a/vendor/github.com/zchee/libhyperkit/bootrom.c b/vendor/github.com/urbantrout/libhyperkit/bootrom.c similarity index 92% rename from vendor/github.com/zchee/libhyperkit/bootrom.c rename to vendor/github.com/urbantrout/libhyperkit/bootrom.c index 25b109b..5373771 100644 --- a/vendor/github.com/zchee/libhyperkit/bootrom.c +++ b/vendor/github.com/urbantrout/libhyperkit/bootrom.c @@ -82,13 +82,13 @@ uint64_t bootrom_load(void) * MMIO space (e.g. APIC, HPET, MSI). */ if (sbuf.st_size > MAX_BOOTROM_SIZE || sbuf.st_size < XHYVE_PAGE_SIZE) { - fprintf(stderr, "Invalid bootrom size %zd\n", sbuf.st_size); + fprintf(stderr, "Invalid bootrom size %lld\n", (long long)sbuf.st_size); goto done; } if (sbuf.st_size & XHYVE_PAGE_MASK) { - fprintf(stderr, "Bootrom size %zd is not a multiple of the " - "page size\n", sbuf.st_size); + fprintf(stderr, "Bootrom size %lld is not a multiple of the " + "page size\n", (long long)sbuf.st_size); goto done; } @@ -98,8 +98,8 @@ uint64_t bootrom_load(void) ptr = vmm_mem_alloc(gpa, (size_t)sbuf.st_size); if (!ptr) { fprintf(stderr, - "Failed to allocate %zd bytes of memory for bootrom\n", - sbuf.st_size); + "Failed to allocate %lld bytes of memory for bootrom\n", + (long long)sbuf.st_size); rv = -1; goto done; } diff --git a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/initrd.gz b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/initrd.gz similarity index 100% rename from vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/initrd.gz rename to vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/initrd.gz diff --git a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/tinycore.txt b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/tinycore.txt similarity index 100% rename from vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/tinycore.txt rename to vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/tinycore.txt diff --git a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/userboot.txt b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/userboot.txt similarity index 100% rename from vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/userboot.txt rename to vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/userboot.txt diff --git a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/vmlinuz b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/vmlinuz similarity index 100% rename from vendor/github.com/zchee/libhyperkit/cmd/hyperkit/imgs/vmlinuz rename to vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/imgs/vmlinuz diff --git a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go similarity index 91% rename from vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go rename to vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go index 953d510..18356af 100644 --- a/vendor/github.com/zchee/libhyperkit/cmd/hyperkit/main.go +++ b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go @@ -4,9 +4,10 @@ import ( "fmt" "os" - hyperkit "github.com/urbantrout/libhyperkit" + hyperkit "github.com/zchee/libhyperkit" ) + func main() { done := make(chan bool) ptyCh := make(chan string) diff --git a/vendor/github.com/zchee/libhyperkit/consport.c b/vendor/github.com/urbantrout/libhyperkit/consport.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/consport.c rename to vendor/github.com/urbantrout/libhyperkit/consport.c diff --git a/vendor/github.com/zchee/libhyperkit/dbgport.c b/vendor/github.com/urbantrout/libhyperkit/dbgport.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/dbgport.c rename to vendor/github.com/urbantrout/libhyperkit/dbgport.c diff --git a/vendor/github.com/zchee/libhyperkit/fbsd.c b/vendor/github.com/urbantrout/libhyperkit/fbsd.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/fbsd.c rename to vendor/github.com/urbantrout/libhyperkit/fbsd.c diff --git a/vendor/github.com/zchee/libhyperkit/hyperkit.c b/vendor/github.com/urbantrout/libhyperkit/hyperkit.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/hyperkit.c rename to vendor/github.com/urbantrout/libhyperkit/hyperkit.c diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/acpi.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/acpi.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/acpi.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/acpi.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/ahci.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/ahci.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/ahci.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/ahci.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/block_if.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/block_if.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/block_if.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/block_if.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/dbgport.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/dbgport.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/dbgport.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/dbgport.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/dtrace.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/dtrace.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/dtrace.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/dtrace.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/bootrom.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/firmware/bootrom.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/bootrom.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/firmware/bootrom.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/fbsd.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/firmware/fbsd.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/fbsd.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/firmware/fbsd.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/kexec.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/firmware/kexec.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/kexec.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/firmware/kexec.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/inout.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/inout.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/inout.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/inout.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/ioapic.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/ioapic.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/ioapic.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/ioapic.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/mem.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/mem.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/mem.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/mem.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/mevent.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/mevent.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/mevent.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/mevent.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/mptbl.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/mptbl.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/mptbl.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/mptbl.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/pci_emul.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/pci_emul.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/pci_emul.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/pci_emul.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/pci_irq.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/pci_irq.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/pci_irq.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/pci_irq.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/pci_lpc.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/pci_lpc.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/pci_lpc.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/pci_lpc.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/rtc.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/rtc.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/rtc.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/rtc.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/smbiostbl.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/smbiostbl.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/smbiostbl.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/smbiostbl.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/acpi_hpet.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/acpi_hpet.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/acpi_hpet.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/acpi_hpet.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/apicreg.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/apicreg.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/apicreg.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/apicreg.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/ata.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/ata.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/ata.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/ata.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/atomic.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/atomic.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/atomic.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/atomic.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/bitset.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/bitset.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/bitset.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/bitset.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/cpuset.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/cpuset.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/cpuset.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/cpuset.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/i8253reg.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/i8253reg.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/i8253reg.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/i8253reg.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/i8259.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/i8259.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/i8259.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/i8259.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/linker_set.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/linker_set.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/linker_set.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/linker_set.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/md5.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/md5.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/md5.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/md5.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/misc.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/misc.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/misc.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/misc.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/mptable.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/mptable.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/mptable.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/mptable.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/ns16550.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/ns16550.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/ns16550.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/ns16550.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/pcireg.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/pcireg.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/pcireg.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/pcireg.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/psl.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/psl.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/psl.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/psl.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/rtc.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/rtc.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/rtc.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/rtc.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/segments.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/segments.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/segments.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/segments.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/specialreg.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/specialreg.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/specialreg.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/specialreg.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/timerreg.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/timerreg.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/timerreg.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/timerreg.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/tree.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/tree.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/tree.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/tree.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/support/uuid.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/uuid.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/support/uuid.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/support/uuid.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/uart_emul.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/uart_emul.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/uart_emul.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/uart_emul.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/virtio.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/virtio.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/virtio.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/virtio.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmcs.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmcs.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmcs.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmcs.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmx.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmx.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmx.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmx.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmx_controls.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmx_controls.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmx_controls.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmx_controls.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmx_msr.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmx_msr.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/intel/vmx_msr.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/intel/vmx_msr.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vatpic.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vatpic.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vatpic.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vatpic.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vatpit.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vatpit.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vatpit.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vatpit.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vhpet.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vhpet.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vhpet.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vhpet.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vioapic.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vioapic.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vioapic.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vioapic.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vlapic.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vlapic.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vlapic.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vlapic.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vlapic_priv.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vlapic_priv.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vlapic_priv.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vlapic_priv.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vpmtmr.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vpmtmr.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vpmtmr.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vpmtmr.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vrtc.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vrtc.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/io/vrtc.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/io/vrtc.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_api.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_api.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_api.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_api.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_callout.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_callout.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_callout.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_callout.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_common.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_common.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_common.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_common.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_host.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_host.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_host.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_host.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_instruction_emul.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_instruction_emul.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_instruction_emul.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_instruction_emul.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_ioport.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_ioport.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_ioport.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_ioport.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_ktr.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_ktr.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_ktr.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_ktr.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_lapic.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_lapic.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_lapic.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_lapic.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_mem.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_mem.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_mem.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_mem.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_stat.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_stat.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_stat.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_stat.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_util.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_util.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/vmm_util.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/vmm_util.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/x86.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/x86.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/vmm/x86.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/vmm/x86.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/xhyve.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/xhyve.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/xhyve.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/xhyve.h diff --git a/vendor/github.com/zchee/libhyperkit/include/xhyve/xmsr.h b/vendor/github.com/urbantrout/libhyperkit/include/xhyve/xmsr.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/include/xhyve/xmsr.h rename to vendor/github.com/urbantrout/libhyperkit/include/xhyve/xmsr.h diff --git a/vendor/github.com/zchee/libhyperkit/inout.c b/vendor/github.com/urbantrout/libhyperkit/inout.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/inout.c rename to vendor/github.com/urbantrout/libhyperkit/inout.c diff --git a/vendor/github.com/zchee/libhyperkit/ioapic.c b/vendor/github.com/urbantrout/libhyperkit/ioapic.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/ioapic.c rename to vendor/github.com/urbantrout/libhyperkit/ioapic.c diff --git a/vendor/github.com/zchee/libhyperkit/kexec.c b/vendor/github.com/urbantrout/libhyperkit/kexec.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/kexec.c rename to vendor/github.com/urbantrout/libhyperkit/kexec.c diff --git a/vendor/github.com/zchee/libhyperkit/md5c.c b/vendor/github.com/urbantrout/libhyperkit/md5c.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/md5c.c rename to vendor/github.com/urbantrout/libhyperkit/md5c.c diff --git a/vendor/github.com/zchee/libhyperkit/mem.c b/vendor/github.com/urbantrout/libhyperkit/mem.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/mem.c rename to vendor/github.com/urbantrout/libhyperkit/mem.c diff --git a/vendor/github.com/zchee/libhyperkit/mevent.c b/vendor/github.com/urbantrout/libhyperkit/mevent.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/mevent.c rename to vendor/github.com/urbantrout/libhyperkit/mevent.c diff --git a/vendor/github.com/zchee/libhyperkit/mirage_block_c.c b/vendor/github.com/urbantrout/libhyperkit/mirage_block_c.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/mirage_block_c.c rename to vendor/github.com/urbantrout/libhyperkit/mirage_block_c.c diff --git a/vendor/github.com/zchee/libhyperkit/mirage_block_c.h b/vendor/github.com/urbantrout/libhyperkit/mirage_block_c.h similarity index 100% rename from vendor/github.com/zchee/libhyperkit/mirage_block_c.h rename to vendor/github.com/urbantrout/libhyperkit/mirage_block_c.h diff --git a/vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml b/vendor/github.com/urbantrout/libhyperkit/mirage_block_ocaml.ml similarity index 98% rename from vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml rename to vendor/github.com/urbantrout/libhyperkit/mirage_block_ocaml.ml index 37a5ea7..70588d2 100644 --- a/vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.ml +++ b/vendor/github.com/urbantrout/libhyperkit/mirage_block_ocaml.ml @@ -113,7 +113,7 @@ module Protocol = struct (fun () -> in_flight_requests := t :: !in_flight_requests; ); - let n = Unix.write request_writer (Bytes.unsafe_of_string "X") 0 1 in + let n = Unix.write request_writer "X" 0 1 in if n = 0 then begin Printf.fprintf stderr "Got EOF while writing signal to the pipe\n%!"; exit 1; @@ -314,7 +314,7 @@ let process_one t = (* An Lwt thread which receives the signals from the pipe, grabs the in-flight requests and forks background threads to process all the requests. *) let serve_forever () = - let buf = Bytes.make 1 '\000' in + let buf = String.make 1 '\000' in let request_reader = Lwt_unix.of_unix_file_descr Protocol.request_reader in let rec loop () = diff --git a/vendor/github.com/zchee/libhyperkit/mptbl.c b/vendor/github.com/urbantrout/libhyperkit/mptbl.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/mptbl.c rename to vendor/github.com/urbantrout/libhyperkit/mptbl.c diff --git a/vendor/github.com/zchee/libhyperkit/patch/hyperkit.c.patch b/vendor/github.com/urbantrout/libhyperkit/patch/hyperkit.c.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/hyperkit.c.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/hyperkit.c.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/mevent.c.patch b/vendor/github.com/urbantrout/libhyperkit/patch/mevent.c.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/mevent.c.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/mevent.c.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/mevent.h.patch b/vendor/github.com/urbantrout/libhyperkit/patch/mevent.h.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/mevent.h.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/mevent.h.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/pci_virtio_9p.c.patch b/vendor/github.com/urbantrout/libhyperkit/patch/pci_virtio_9p.c.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/pci_virtio_9p.c.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/pci_virtio_9p.c.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/pci_virtio_net_vpnkit.c.patch b/vendor/github.com/urbantrout/libhyperkit/patch/pci_virtio_net_vpnkit.c.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/pci_virtio_net_vpnkit.c.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/pci_virtio_net_vpnkit.c.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/uart_emul.c.patch b/vendor/github.com/urbantrout/libhyperkit/patch/uart_emul.c.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/uart_emul.c.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/uart_emul.c.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/uart_emul.h.patch b/vendor/github.com/urbantrout/libhyperkit/patch/uart_emul.h.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/uart_emul.h.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/uart_emul.h.patch diff --git a/vendor/github.com/zchee/libhyperkit/patch/xhyve.h.patch b/vendor/github.com/urbantrout/libhyperkit/patch/xhyve.h.patch similarity index 100% rename from vendor/github.com/zchee/libhyperkit/patch/xhyve.h.patch rename to vendor/github.com/urbantrout/libhyperkit/patch/xhyve.h.patch diff --git a/vendor/github.com/zchee/libhyperkit/pci_ahci.c b/vendor/github.com/urbantrout/libhyperkit/pci_ahci.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_ahci.c rename to vendor/github.com/urbantrout/libhyperkit/pci_ahci.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_emul.c b/vendor/github.com/urbantrout/libhyperkit/pci_emul.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_emul.c rename to vendor/github.com/urbantrout/libhyperkit/pci_emul.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_hostbridge.c b/vendor/github.com/urbantrout/libhyperkit/pci_hostbridge.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_hostbridge.c rename to vendor/github.com/urbantrout/libhyperkit/pci_hostbridge.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_irq.c b/vendor/github.com/urbantrout/libhyperkit/pci_irq.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_irq.c rename to vendor/github.com/urbantrout/libhyperkit/pci_irq.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_lpc.c b/vendor/github.com/urbantrout/libhyperkit/pci_lpc.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_lpc.c rename to vendor/github.com/urbantrout/libhyperkit/pci_lpc.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_uart.c b/vendor/github.com/urbantrout/libhyperkit/pci_uart.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_uart.c rename to vendor/github.com/urbantrout/libhyperkit/pci_uart.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_9p.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_9p.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_9p.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_9p.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_block.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_block.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_block.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_block.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_net_tap.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_net_tap.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_net_tap.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_net_tap.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_net_vmnet.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_net_vmnet.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_net_vmnet.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_net_vmnet.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_net_vpnkit.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_net_vpnkit.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_net_vpnkit.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_net_vpnkit.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_rnd.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_rnd.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_rnd.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_rnd.c diff --git a/vendor/github.com/zchee/libhyperkit/pci_virtio_sock.c b/vendor/github.com/urbantrout/libhyperkit/pci_virtio_sock.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pci_virtio_sock.c rename to vendor/github.com/urbantrout/libhyperkit/pci_virtio_sock.c diff --git a/vendor/github.com/zchee/libhyperkit/pm.c b/vendor/github.com/urbantrout/libhyperkit/pm.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/pm.c rename to vendor/github.com/urbantrout/libhyperkit/pm.c diff --git a/vendor/github.com/zchee/libhyperkit/post.c b/vendor/github.com/urbantrout/libhyperkit/post.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/post.c rename to vendor/github.com/urbantrout/libhyperkit/post.c diff --git a/vendor/github.com/zchee/libhyperkit/rtc.c b/vendor/github.com/urbantrout/libhyperkit/rtc.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/rtc.c rename to vendor/github.com/urbantrout/libhyperkit/rtc.c diff --git a/vendor/github.com/zchee/libhyperkit/smbiostbl.c b/vendor/github.com/urbantrout/libhyperkit/smbiostbl.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/smbiostbl.c rename to vendor/github.com/urbantrout/libhyperkit/smbiostbl.c diff --git a/vendor/github.com/zchee/libhyperkit/task_switch.c b/vendor/github.com/urbantrout/libhyperkit/task_switch.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/task_switch.c rename to vendor/github.com/urbantrout/libhyperkit/task_switch.c diff --git a/vendor/github.com/zchee/libhyperkit/uart_emul.c b/vendor/github.com/urbantrout/libhyperkit/uart_emul.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/uart_emul.c rename to vendor/github.com/urbantrout/libhyperkit/uart_emul.c diff --git a/vendor/github.com/zchee/libhyperkit/vatpic.c b/vendor/github.com/urbantrout/libhyperkit/vatpic.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vatpic.c rename to vendor/github.com/urbantrout/libhyperkit/vatpic.c diff --git a/vendor/github.com/zchee/libhyperkit/vatpit.c b/vendor/github.com/urbantrout/libhyperkit/vatpit.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vatpit.c rename to vendor/github.com/urbantrout/libhyperkit/vatpit.c diff --git a/vendor/github.com/zchee/libhyperkit/vhpet.c b/vendor/github.com/urbantrout/libhyperkit/vhpet.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vhpet.c rename to vendor/github.com/urbantrout/libhyperkit/vhpet.c diff --git a/vendor/github.com/zchee/libhyperkit/vioapic.c b/vendor/github.com/urbantrout/libhyperkit/vioapic.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vioapic.c rename to vendor/github.com/urbantrout/libhyperkit/vioapic.c diff --git a/vendor/github.com/zchee/libhyperkit/virtio.c b/vendor/github.com/urbantrout/libhyperkit/virtio.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/virtio.c rename to vendor/github.com/urbantrout/libhyperkit/virtio.c diff --git a/vendor/github.com/zchee/libhyperkit/vlapic.c b/vendor/github.com/urbantrout/libhyperkit/vlapic.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vlapic.c rename to vendor/github.com/urbantrout/libhyperkit/vlapic.c diff --git a/vendor/github.com/zchee/libhyperkit/vmcs.c b/vendor/github.com/urbantrout/libhyperkit/vmcs.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmcs.c rename to vendor/github.com/urbantrout/libhyperkit/vmcs.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm.c b/vendor/github.com/urbantrout/libhyperkit/vmm.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm.c rename to vendor/github.com/urbantrout/libhyperkit/vmm.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_api.c b/vendor/github.com/urbantrout/libhyperkit/vmm_api.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_api.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_api.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_callout.c b/vendor/github.com/urbantrout/libhyperkit/vmm_callout.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_callout.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_callout.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_host.c b/vendor/github.com/urbantrout/libhyperkit/vmm_host.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_host.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_host.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_instruction_emul.c b/vendor/github.com/urbantrout/libhyperkit/vmm_instruction_emul.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_instruction_emul.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_instruction_emul.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_ioport.c b/vendor/github.com/urbantrout/libhyperkit/vmm_ioport.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_ioport.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_ioport.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_lapic.c b/vendor/github.com/urbantrout/libhyperkit/vmm_lapic.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_lapic.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_lapic.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_mem.c b/vendor/github.com/urbantrout/libhyperkit/vmm_mem.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_mem.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_mem.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_stat.c b/vendor/github.com/urbantrout/libhyperkit/vmm_stat.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_stat.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_stat.c diff --git a/vendor/github.com/zchee/libhyperkit/vmm_util.c b/vendor/github.com/urbantrout/libhyperkit/vmm_util.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmm_util.c rename to vendor/github.com/urbantrout/libhyperkit/vmm_util.c diff --git a/vendor/github.com/zchee/libhyperkit/vmx.c b/vendor/github.com/urbantrout/libhyperkit/vmx.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmx.c rename to vendor/github.com/urbantrout/libhyperkit/vmx.c diff --git a/vendor/github.com/zchee/libhyperkit/vmx_msr.c b/vendor/github.com/urbantrout/libhyperkit/vmx_msr.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vmx_msr.c rename to vendor/github.com/urbantrout/libhyperkit/vmx_msr.c diff --git a/vendor/github.com/zchee/libhyperkit/vpmtmr.c b/vendor/github.com/urbantrout/libhyperkit/vpmtmr.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vpmtmr.c rename to vendor/github.com/urbantrout/libhyperkit/vpmtmr.c diff --git a/vendor/github.com/zchee/libhyperkit/vrtc.c b/vendor/github.com/urbantrout/libhyperkit/vrtc.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/vrtc.c rename to vendor/github.com/urbantrout/libhyperkit/vrtc.c diff --git a/vendor/github.com/zchee/libhyperkit/x86.c b/vendor/github.com/urbantrout/libhyperkit/x86.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/x86.c rename to vendor/github.com/urbantrout/libhyperkit/x86.c diff --git a/vendor/github.com/zchee/libhyperkit/xhyve.go b/vendor/github.com/urbantrout/libhyperkit/xhyve.go similarity index 100% rename from vendor/github.com/zchee/libhyperkit/xhyve.go rename to vendor/github.com/urbantrout/libhyperkit/xhyve.go diff --git a/vendor/github.com/zchee/libhyperkit/xhyve.mk b/vendor/github.com/urbantrout/libhyperkit/xhyve.mk similarity index 100% rename from vendor/github.com/zchee/libhyperkit/xhyve.mk rename to vendor/github.com/urbantrout/libhyperkit/xhyve.mk diff --git a/vendor/github.com/zchee/libhyperkit/xhyve_qcow2.go b/vendor/github.com/urbantrout/libhyperkit/xhyve_qcow2.go similarity index 100% rename from vendor/github.com/zchee/libhyperkit/xhyve_qcow2.go rename to vendor/github.com/urbantrout/libhyperkit/xhyve_qcow2.go diff --git a/vendor/github.com/zchee/libhyperkit/xmsr.c b/vendor/github.com/urbantrout/libhyperkit/xmsr.c similarity index 100% rename from vendor/github.com/zchee/libhyperkit/xmsr.c rename to vendor/github.com/urbantrout/libhyperkit/xmsr.c From 39ffa645ea11d906d872542b9384eaafc1a8b67b Mon Sep 17 00:00:00 2001 From: Harald Atteneder Date: Mon, 15 Apr 2019 21:38:56 +0100 Subject: [PATCH 15/15] fix imports --- glide.yaml | 2 +- vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/glide.yaml b/glide.yaml index 580ff25..85d7300 100644 --- a/glide.yaml +++ b/glide.yaml @@ -14,7 +14,7 @@ import: - package: github.com/mitchellh/go-ps - package: github.com/zchee/go-qcow2 - package: github.com/urbantrout/libhyperkit - version: patch-1 + version: 0504b2483743da67ddc056c5c48b2a26d34dce39 - package: github.com/jceel/lib9p version: 7be3e0b914fbb2d2ecfe2984d02bacfd8e762eae testImport: diff --git a/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go index 18356af..953d510 100644 --- a/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go +++ b/vendor/github.com/urbantrout/libhyperkit/cmd/hyperkit/main.go @@ -4,10 +4,9 @@ import ( "fmt" "os" - hyperkit "github.com/zchee/libhyperkit" + hyperkit "github.com/urbantrout/libhyperkit" ) - func main() { done := make(chan bool) ptyCh := make(chan string)