--- lib/PXElator/kvm.pm	2009/07/30 12:28:49	54
+++ lib/PXElator/kvm.pm	2010/07/21 19:01:46	518
@@ -4,49 +4,112 @@
 use strict;
 use autodie;
 
-use File::Slurp;
-
 use server;
 
-my $interfaces = read_file '/etc/network/interfaces';
+use Data::Dump qw/dump/;
 
-if ( $interfaces !~ m{tap0.*$server::ip}s ) {
+our $memory_size = 512;
 
-	system "sudo apt-get install vde2";
+# AC = private, AD = multicast, AE = local
 
-	$interfaces .= qq{
+sub nr { $ENV{nr} || 0 };
 
-iface tap0 inet static
-  address $server::ip
-  netmask $server::netmask
-  vde2-switch -
+sub port {
+	my ($port,$del) = @_;
+	$port += nr();
+	return join( $del, $server::ip, $port );
+}
 
-	};
+sub fork_if_active { qw/monitor serial/ }
 
-	write_file '/etc/network/interfaces', $interfaces;
+use x11;
 
+sub monitor {
+	x11::xterm( 'monitor ' . nr() => 'nc ' . port(10000,' ') );
 }
 
-if ( grep /tap0/, read_file '/proc/net/dev' ) {
-	warn "tap0 started";
-} else {
-	system "sudo ifup tap0";
+sub serial {
+	x11::xterm( 'serial ' . nr() => 'nc ' . port(11000,' ') );
 }
 
-our $memory_size = 512;
-our $mac = '52:54:00:00:00:01';
+sub actions { qw/reset activate/ }
+
+sub reset {
+	my $sock = IO::Socket::INET->new( port(10000,':') );
+	print $sock "system_reset\n";
+	close $sock;
+}
+
+sub activate {
+	system "xdotool windowactivate `xdotool search --class kvm`"
+}
 
 sub start {
+	my $nr = $ENV{nr} || 0;
+
+	my $mac = sprintf('AC:DE:48:00:00:%02x', $nr);
+	my $mon = port(10000,':');
+	my $ser = port(11000,':');
+	my $ip = client::ip_from_mac $mac;
+
+	my $bridge = client::conf( $ip, 'kvm.bridge', default => 'virtual' );
+	$bridge = $ENV{DEV} if $ENV{DEV};
+
+	my $ifname = 'kvm' . $nr;
+
+	warn "# kvm $ip start $nr $mac $mon $ser $ifname $bridge";
+
+#	system "ifconfig $ifname down";
+#	system "brctl delif virtual $ifname";
+#	system "tunctl -d $ifname";
+
+	my $ifconfig = `/sbin/ifconfig $ifname`;
+
+ 	# FIXME tunctl -u $server::user
+	system "tunctl -t $ifname"
+		unless $ifconfig =~ m{$ifname};
+	system "ifconfig $ifname up"
+		unless $ifconfig =~ m{UP};
+	system "brctl addif $bridge $ifname"
+		unless `brctl show` =~ m{$ifname};
+
+	my $name = client::conf( $ip, 'hostname' );
+	$name ||= $nr;
+
+	my $kvm_bin = client::conf( $ip => 'kvm.bin' ) || 'kvm';
+	my $boot = client::conf( $ip, 'kvm.boot' ) || 'n'; # network by default
 
 	my $kvm = qq|
-		vdeq kvm -m $memory_size -net nic,vlan=1,macaddr=$mac
-		-net vde,vlan=1,sock=/var/run/vde2/tap0.ctl
-		-boot n
+		$kvm_bin
+		-name "$name"
+		-m $memory_size -net nic,macaddr=$mac
+		-net tap,ifname=$ifname,script=no
+		-boot $boot
+		-monitor tcp:$mon,server,nowait
+		-serial  tcp:$ser,server,nowait
 	|;
+
+	$kvm .= ' -vnc ' . port(0,':') unless $ENV{DISPLAY};
+
+	#	-runas $server::user
 	$kvm =~ s{\s+}{ }gs;
+
 	warn $kvm;
-	system $kvm;
+	exec $kvm;
+
+}
+
+sub nr_from_mac {
+	my $mac = shift;
+	my $nr = (split(/:/,$mac,6))[-1];
+	$nr = hex($nr);
+	return $nr;
+}
 
+sub next_nr {
+	my @kvms = glob "$server::conf/mac/AC:DE:48:00:00:*";
+	my $nr = nr_from_mac( pop @kvms );
+	return $nr + 1;
 }
 
 warn 'loaded';