Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 872be34

Browse files
committed
remove vbox driver support
Doesn't maintain vbox driver after this commit. Signed-off-by: Gao feng <[email protected]>
1 parent 4dc0184 commit 872be34

31 files changed

+5
-2163
lines changed

cli/main.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func main() {
8383
},
8484
cli.StringFlag{
8585
Name: "driver",
86-
Usage: "hypervisor driver (supports: kvm xen vbox)",
86+
Usage: "hypervisor driver (supports: kvm xen)",
8787
},
8888
cli.IntFlag{
8989
Name: "default_cpus",
@@ -115,10 +115,6 @@ func main() {
115115
Name: "template",
116116
Usage: "path to the template vm state directory",
117117
},
118-
cli.StringFlag{
119-
Name: "vbox",
120-
Usage: "runv-compatible boot ISO for the container for vbox driver",
121-
},
122118
}
123119
app.After = func(context *cli.Context) error {
124120
// make sure glog flush all the messages to file

configure.ac

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ AM_PROG_AR
1111
AC_PROG_RANLIB
1212
AC_CANONICAL_BUILD
1313

14-
case $build_os in
15-
darwin*)
16-
AM_CONDITIONAL([ON_DARWIN], [ true ])
17-
;;
18-
*)
19-
AM_CONDITIONAL([ON_DARWIN], [ false ])
20-
;;
21-
esac
22-
2314
# Checks for go tool chain
2415
AC_CHECK_PROG([has_go], [go], [yes], [no])
2516
if test "x$has_go" != "xyes" ; then
@@ -36,22 +27,7 @@ esac
3627

3728
# Check for which host we are on and setup a few things
3829
# specifically based on the host
39-
AC_CHECK_PROG([has_virtualbox], [vboxmanage], [yes], [no])
40-
case $host_os in
41-
darwin* )
42-
# Do something specific for mac
43-
if test "x$has_virtualbox" != "xyes" ; then
44-
AC_MSG_ERROR(Unable to find vboxmanage binary in PATH)
45-
fi
46-
;;
47-
linux*)
48-
# Do something specific for linux
49-
;;
50-
*)
51-
#Default Case
52-
AC_MSG_ERROR([Your platform is not currently supported])
53-
;;
54-
esac
30+
5531

5632
# Checks for libraries.
5733

@@ -114,6 +90,4 @@ AC_MSG_RESULT([
11490
with xen: ${with_xen}
11591
11692
with libvirt: ${with_libvirt}
117-
118-
has virtualbox: ${has_virtualbox}
11993
])

driverloader/driverloader_linux.go renamed to driverloader/driverloader.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// +build linux
2+
13
package driverloader
24

35
import (

driverloader/driverloader_darwin.go

Lines changed: 0 additions & 25 deletions
This file was deleted.

hypervisor/driver.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ type BootConfig struct {
2222
Initrd string
2323
Bios string
2424
Cbfs string
25-
Vbox string
2625

2726
// For network QoS (kilobytes/s)
2827
InboundAverage string

hypervisor/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type BlockdevInsertedEvent struct {
4949
}
5050

5151
type InterfaceCreated struct {
52-
Id string //user specified in (ref api.InterfaceDescription: a user identifier of interface, user may use this to specify a nic, normally you can use IPAddr as an Id, however, in some driver (probably vbox?), user may not specify the IPAddr.)
52+
Id string //user specified in (ref api.InterfaceDescription: a user identifier of interface, user may use this to specify a nic, normally you can use IPAddr as an Id.)
5353
Index int
5454
PCIAddr int
5555
Bridge string

hypervisor/vbox/README.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

hypervisor/vbox/network.go

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)