Merge pull request #121 from penberg/fix-osx-build

Fix O_DIRECT build breakage on OS X

hypervisor/qemu/qemu.go

@@ -21,7 +21,6 @@ import (
 	"regexp"
 	"runtime"
 	"strconv"
-	"syscall"
 )
 
 type VMConfig struct {
@@ -227,14 +226,8 @@ func ParseVersion(text string) (*Version, error) {
 	}, nil
 }
 
-func isDirectIOSupported(path string) bool {
-	f, err := os.OpenFile(path, syscall.O_DIRECT, 0)
-	defer f.Close()
-	return err == nil
-}
-
 func (c *VMConfig) vmDriveCache() string {
-	if isDirectIOSupported(c.Image) {
+	if util.IsDirectIOSupported(c.Image) {
 		return "none"
 	}
 	return "unsafe"

util/util_darwin.go

@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2014 Cloudius Systems, Ltd.
+ *
+ * This work is open source software, licensed under the terms of the
+ * BSD license as described in the LICENSE file in the top-level directory.
+ */
+
+package util
+
+func IsDirectIOSupported(path string) bool {
+	return false
+}

util/util_linux.go

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2014 Cloudius Systems, Ltd.
+ *
+ * This work is open source software, licensed under the terms of the
+ * BSD license as described in the LICENSE file in the top-level directory.
+ */
+
+package util
+
+import (
+	"os"
+	"syscall"
+)
+
+func IsDirectIOSupported(path string) bool {
+	f, err := os.OpenFile(path, syscall.O_DIRECT, 0)
+	defer f.Close()
+	return err == nil
+}

util/util_win.go

@@ -17,3 +17,7 @@ import (
 func Connect(network, path string) (net.Conn, error) {
 	return npipe.Dial(path)
 }
+
+func IsDirectIOSupported(path string) bool {
+	return false
+}