enabling virtio-net-pci if opsD is set (nanovms#1414)

* initial mac bridge support

* mm

---------

Co-authored-by: Ian Eyberg <[email protected]>

Author: eyberg

.gitignore

@@ -1,3 +1,5 @@
+*.dmg
+*.zip
 *.md5
 /.staging
 /image

cmd/cmd_daemon.go

@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+)
+
+// DaemonizeCommand turns ops into a daemon
+func DaemonizeCommand() *cobra.Command {
+	var cmdDaemonize = &cobra.Command{
+		Use:   "daemonize",
+		Short: "Daemonize OPS",
+		Run:   daemonizeCommandHandler,
+	}
+
+	return cmdDaemonize
+}
+
+func daemonizeCommandHandler(cmd *cobra.Command, args []string) {
+	fmt.Println("Note: If on a mac this expects ops to have suid bit set for networking.")
+	fmt.Println("if you used the installer you are set otherwise run the following command\n" +
+		"\tsudo chown -R root /usr/local/bin/qemu-system-x86_64\n" +
+		"\tsudo chmod u+s /usr/local/bin/qemu-system-x86_64")
+	fmt.Println("daemonizing")
+}

cmd/cmd_root.go

@@ -45,6 +45,7 @@ func GetRootCommand() *cobra.Command {
 	// persist flags transversal to every command
 	PersistGlobalCommandFlags(rootCmd.PersistentFlags())
 
+	rootCmd.AddCommand(DaemonizeCommand())
 	rootCmd.AddCommand(BuildCommand())
 	rootCmd.AddCommand(EnvCommand())
 	rootCmd.AddCommand(ImageCommands())

qemu/qemu_components.go

@@ -55,6 +55,9 @@ func (dv device) String() string {
 			sb.WriteString(fmt.Sprintf("-device %s,%s=%s", dv.driver, dv.devtype, dv.devid))
 		}
 
+	} else if dv.driver == "virtio-net-pci" {
+		sb.WriteString(fmt.Sprintf("-device %s,%s", dv.driver, dv.devtype))
+
 	} else {
 		sb.WriteString(fmt.Sprintf("-device %s,%s=%s", dv.driver, dv.devtype, dv.devid))
 	}
@@ -80,7 +83,7 @@ func (nd netdev) String() string {
 	if len(nd.ifname) > 0 {
 		sb.WriteString(fmt.Sprintf(",ifname=%s", nd.ifname))
 	}
-	if nd.nettype != "user" {
+	if nd.nettype != "user" && nd.nettype != "vmnet-bridged" {
 		if len(nd.script) > 0 {
 			sb.WriteString(fmt.Sprintf(",script=%s", nd.script))
 		} else {

qemu/qemu_unix.go

@@ -117,48 +117,71 @@ func (q *qemu) addSerial(serialType string) {
 	q.serial = serial{serialtype: serialType}
 }
 
+// we inject at release build time to enable virtio-net-pci
+// this is only for a packaged macos release
+var opsD = ""
+
 // addDevice adds a device to the qemu for rendering to string arguments. If the
 // devType is "user" then the ifaceName is ignored and host forward ports are
 // added. If the mac address is empty then a random mac address is chosen.
 // Backend interface are created for each device and their ids are auto
 // incremented.
 func (q *qemu) addNetDevice(devType, ifaceName, mac string, hostPorts []string, udpPorts []string) {
-	i := len(q.ifaces)
-	si := strconv.Itoa(i)
+	if opsD != "" {
+		dv := device{
+			driver:  "virtio-net-pci",
+			devtype: "netdev=vmnet",
+		}
 
-	id := "n" + si
-	dv := device{
-		driver:  "virtio-net",
-		devtype: "netdev",
-		devid:   id,
-		addr:    "0x" + si,
-	}
-	ndv := netdev{
-		nettype: devType,
-		id:      id,
-	}
+		ndv := netdev{
+			nettype: "vmnet-bridged",
+			id:      "vmnet",
+		}
 
-	if mac == "" {
 		dv.mac = generateMac()
-	}
+		ndv.ifname = "en0"
+
+		q.devices = append(q.devices, dv)
+		q.ifaces = append(q.ifaces, ndv)
 
-	if devType != "user" {
-		ndv.ifname = ifaceName
 	} else {
-		// hack - FIXME
-		// this is user-mode
-		if i == 0 {
-			for _, p := range hostPorts {
-				ndv.hports = append(ndv.hports, portfwd{port: p, proto: "tcp"})
-			}
-			for _, p := range udpPorts {
-				ndv.hports = append(ndv.hports, portfwd{port: p, proto: "udp"})
+		i := len(q.ifaces)
+		si := strconv.Itoa(i)
+
+		id := fmt.Sprintf("n%d", i)
+		dv := device{
+			driver:  "virtio-net",
+			devtype: "netdev",
+			devid:   id,
+			addr:    "0x" + si,
+		}
+		ndv := netdev{
+			nettype: devType,
+			id:      id,
+		}
+
+		if mac == "" {
+			dv.mac = generateMac()
+		}
+
+		if devType != "user" {
+			ndv.ifname = ifaceName
+		} else {
+			// hack - FIXME
+			// this is user-mode
+			if i == 0 {
+				for _, p := range hostPorts {
+					ndv.hports = append(ndv.hports, portfwd{port: p, proto: "tcp"})
+				}
+				for _, p := range udpPorts {
+					ndv.hports = append(ndv.hports, portfwd{port: p, proto: "udp"})
+				}
 			}
 		}
-	}
 
-	q.devices = append(q.devices, dv)
-	q.ifaces = append(q.ifaces, ndv)
+		q.devices = append(q.devices, dv)
+		q.ifaces = append(q.ifaces, ndv)
+	}
 }
 
 func (q *qemu) addDiskDevice(id, driver string) {

release.sh

@@ -27,6 +27,8 @@ gsutil setacl public-read gs://cli/linux/release/"$VERSION"/ops
 gsutil cp "$hash" gs://cli/linux/release/"$VERSION"/"$hash"
 gsutil setacl public-read gs://cli/linux/release/"$VERSION"/"$hash"
 
+# TODO:
+# flag here with "-X github.com/nanovms/ops/qemu.opsD=true" for signed/packaged mac binaries
 GO111MODULE=on GOOS=darwin go build -ldflags "-w -X github.com/nanovms/ops/lepton.Version=$VERSION"
 gsutil cp ops gs://cli/darwin
 
@@ -45,6 +47,12 @@ gsutil setacl public-read gs://cli/darwin/release/"$VERSION"/ops
 gsutil cp "$hash" gs://cli/darwin/release/"$VERSION"/"$hash"
 gsutil setacl public-read gs://cli/darwin/release/"$VERSION"/"$hash"
 
+# export AC_PASSWORD=
+# export AC_EMAIL=
+# gon config.hcl
+# /usr/local/bin/packagesbuild -v ops-d/ops-d.pkgproj
+# scp ~/ops-d/build/ops-d.pkg
+
 GO111MODULE=on GOOS=linux GOARCH=arm64 go build -ldflags "-X github.com/nanovms/ops/lepton.Version=$VERSION"
 gsutil cp ops gs://cli/linux/aarch64/
 

scripts/config.hcl

@@ -0,0 +1,22 @@
+// export AC_EMAIL && AC_PASSWORD && APP_IDENTITY
+
+source = ["./ops"]
+bundle_id = "com.nanovms.ops"
+
+apple_id {
+  username = "@env:AC_EMAIL"
+  password = "@env:AC_PASSWORD"
+}
+
+sign {
+  application_identity = "@env:APP_IDENTITY"
+}
+
+dmg {
+  output_path = "ops.dmg"
+  volume_name = "OPS"
+}
+
+zip {
+  output_path = "ops.zip"
+}