--- lib/PXElator/kvm.pm	2009/08/16 00:03:30	225
+++ lib/PXElator/kvm.pm	2009/08/25 17:39:28	289
@@ -15,23 +15,27 @@
 our $nr = 0;
 
 sub port {
-	my $del = shift;
-	my $port = 10000 + $nr;
+	my ($port,$del) = @_;
+	$port += $nr;
 	return join( $del, $server::ip, $port );
 }
 
-sub fork_if_active { qw/monitor/ }
+sub fork_if_active { qw/monitor serial/ }
 
 use x11;
 
 sub monitor {
-	x11::xterm( "monitor $nr" => 'nc ' . port(' ') );
+	x11::xterm( "monitor $nr" => 'nc ' . port(10000,' ') );
+}
+
+sub serial {
+	x11::xterm( "serial $nr" => 'nc ' . port(11000,' ') );
 }
 
 sub actions { qw/reset activate/ }
 
 sub reset {
-	my $sock = IO::Socket::INET->new( port(':') );
+	my $sock = IO::Socket::INET->new( port(10000,':') );
 	print $sock "system_reset\n";
 	close $sock;
 }
@@ -44,14 +48,27 @@
 	my $nr = shift || 0;
 
 	my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
-	my $mon = port(':');
+	my $mon = port(10000,':');
+	my $ser = port(11000,':');
+
+	my $ifname = 'kvm0';
+
+#	system "ifconfig $ifname down";
+#	system "brctl delif virtual $ifname";
+#	system "tunctl -d $ifname";
+
+	system "tunctl -t $ifname"; # -u $server::user
+	system "ifconfig $ifname up";
+	system "brctl addif virtual $ifname";
 
 	my $kvm = qq|
-		vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
-		-net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
+		kvm -m $memory_size -net nic,macaddr=$mac
+		-net tap,ifname=$ifname,script=no
 		-boot n
 		-monitor tcp:$mon,server,nowait
+		-serial  tcp:$ser,server,nowait
 	|;
+	#	-runas $server::user
 	$kvm =~ s{\s+}{ }gs;
 
 	warn $kvm;