github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-05 00:50:08 +00:00
Code Issues Projects Releases Wiki Activity

vendor: Update hyperkit to latest version

Browse Source 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
This commit is contained in:
Magnus Skjegstad
2017-05-15 18:02:53 +02:00
parent c168d99cc0
commit 11bd203a91
8 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/moby/hyperkit/src/include/xhyve/firmware/bootrom.h generated vendored
View File

@@ -3,6 +3,6 @@
#include <stdint.h>
#include <stdbool.h>
void bootrom_init(const char *bootrom_path);
int bootrom_init(const char *bootrom_path);
uint64_t bootrom_load(void);
bool bootrom_contains_gpa(uint64_t gpa);

2
vendor/github.com/moby/hyperkit/src/include/xhyve/firmware/fbsd.h generated vendored
View File

@@ -97,6 +97,6 @@ struct loader_callbacks {
const char * (*getenv)(void *arg, int num);
};
void fbsd_init(char *userboot_path, char *bootvolume_path, char *kernelenv,
int fbsd_init(char *userboot_path, char *bootvolume_path, char *kernelenv,
char *cons);
uint64_t fbsd_load(void);

2
vendor/github.com/moby/hyperkit/src/include/xhyve/firmware/kexec.h generated vendored
View File

@@ -82,5 +82,5 @@ struct zero_page {
uint8_t _7[276];
} __attribute__((packed));
void kexec_init(char *kernel_path, char *initrd_path, char *cmdline);
int kexec_init(char *kernel_path, char *initrd_path, char *cmdline);
uint64_t kexec(void);

4
vendor/github.com/moby/hyperkit/src/include/xhyve/firmware/multiboot.h generated vendored Normal file
View File

@@ -0,0 +1,4 @@
#include <stdint.h>
int multiboot_init(char *kernel_path, char *module_spec, char *cmdline);
uint64_t multiboot(void);

5
vendor/github.com/moby/hyperkit/src/lib/pci_virtio_net_vpnkit.c generated vendored
View File

@@ -317,11 +317,6 @@ static int vpnkit_connect(int fd, const char uuid[36], struct vif_info *vif)
init_reply.magic[4]);
return -1;
}
if (init_reply.version != 1) {
fprintf(stderr, "virtio-net-vpnkit: bad init version %d\n",
init_reply.version);
return -1;
}
fprintf(stderr, "virtio-net-vpnkit: magic=%c%c%c%c%c version=%d commit=%*s\n",
init_reply.magic[0], init_reply.magic[1],