Changeset 677 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 12, 2009, 12:54:19 AM (16 years ago)

Author:

Bruno Cornec

Message:

Adds kvm support (aligned on qemu support)

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -1412 +1412 @@
         my $vmcmd;      # has to be used for pb_check_ps
         my $vmm;        # has to be used for pb_check_ps
-        if ($vmtype eq "qemu") {
+        if (($vmtype eq "qemu") || ($vmtype eq "kvm")) {
             my $qemucmd32;
             my $qemucmd64;
@@ -1422 +1422 @@
                 $qemucmd64 = "/usr/bin/qemu-system-x86_64";
             }
-        if ($v =~ /x86_64/) {
-                $vmcmd = "$qemucmd64";
-                # Not needed with latest versions of qemu it seems
-                #$vmcmd = "$qemucmd64 -no-kqemu";
-                # This one may now be needed
-                #$vmcmd = "$qemucmd64 -no-kvm";
-            } else {
-                $vmcmd = "$qemucmd32";
-            }
-        $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
-        if ($create != 0) {
-            $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
-        }
-        $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
+            if ($v =~ /x86_64/) {
+                    $vmcmd = "$qemucmd64";
+                } else {
+                    $vmcmd = "$qemucmd32";
+                }
+            if ($vmtype eq "kvm") {
+                $vmcmd = "/usr/bin/kvm";
+                }
+            $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
+            if ($create != 0) {
+                $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
+            }
+            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
         } elsif ($vmtype eq "xen") {
         } elsif ($vmtype eq "vmware") {
@@ -1450 +1449 @@
             if ($create != 0) {
                 die("Found an existing Virtual machine $vmm. Won't overwrite") if (-r $vmm);
-                if (($vmtype eq "qemu") || ($vmtype eq "xen")) {
+                if (($vmtype eq "qemu") || ($vmtype eq "xen") || ($vmtype eq "kvm")) {
                     pb_system("/usr/bin/qemu-img create -f qcow2 $vmm $vmsize->{$ENV{'PBPROJ'}}","Creating the QEMU VM");
                 } elsif ($vmtype eq "vmware") {