From 158a60465f3487bf38f728a2678aa45acb568ad2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Feb 2011 10:41:11 +0000
Subject: [PATCH] * The vde_switch startup code was reading from the wrong
 filehandle,   so the startup synchronisation didn't work, causing spurious
 QEMU   failures ("Device 'vde' could not be initialized").

svn path=/nixos/trunk/; revision=26055
---
 lib/test-driver/test-driver.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index bdb3f40ca6cb..547f1da1af72 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -38,9 +38,10 @@ foreach my $vlan (split / /, $ENV{VLANS} || "") {
     }
     close $stdoutW;
     print $pty "version\n";
-    readline $pty or die "cannot start vde_switch";
+    readline $stdoutR or die "cannot start vde_switch";
     $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
     $vlans{$vlan} = $pty;
+    die unless -e "$socket/ctl";
 }