From 5ccbaf2b5919172b56c731a9f4f440ece4ef2f06 Mon Sep 17 00:00:00 2001
From: Mark Ryan <mark.d.ryan@intel.com>
Date: Mon, 12 Sep 2016 11:42:40 +0100
Subject: [PATCH] ciao-launcher, qemu: Upgrade to new context package.

Ciao will use the new standard library context package from now on.
This will allow us to use some of the new standard library functions
such as DialContext.

Partial fix for issue #541

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>
---
 examples_test.go | 3 ++-
 qemu.go          | 2 +-
 qmp.go           | 2 +-
 qmp_test.go      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples_test.go b/examples_test.go
index 1fc9dcf3a37..e7ed12abb6f 100644
--- a/examples_test.go
+++ b/examples_test.go
@@ -19,8 +19,9 @@ package qemu_test
 import (
 	"time"
 
+	"context"
+
 	"github.com/01org/ciao/qemu"
-	"golang.org/x/net/context"
 )
 
 func Example() {
diff --git a/qemu.go b/qemu.go
index 6014d36a9e1..4fe3b2b932c 100644
--- a/qemu.go
+++ b/qemu.go
@@ -29,7 +29,7 @@ import (
 	"os"
 	"os/exec"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // LaunchQemu can be used to launch a new qemu instance by invoking the
diff --git a/qmp.go b/qmp.go
index 0634552fe77..bc2596823bb 100644
--- a/qmp.go
+++ b/qmp.go
@@ -26,7 +26,7 @@ import (
 	"net"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // QMPLog is a logging interface used by the qemu package to log various
diff --git a/qmp_test.go b/qmp_test.go
index 9519a176ee5..4d60c0099b8 100644
--- a/qmp_test.go
+++ b/qmp_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/01org/ciao/testutil"
 )