add template_create

[qemu-server.git] / qm

diff --git a/qm b/qm
index a03c0df7a0dbfcc6b28b905cfea6f692ab0cc349..93f621c10e0de51d81ea89afb6a9d4d8eb81f792 100755 (executable)
--- a/qm
+++ b/qm
@@ -35,6 +35,12 @@ $rpcenv->init_request();
 $rpcenv->set_language($ENV{LANG});
 $rpcenv->set_user('root@pam'); 
 
+my $upid_exit = sub {
+    my $upid = shift;
+    my $status = PVE::Tools::upid_read_status($upid);
+    exit($status eq 'OK' ? 0 : -1);
+};
+
 my $nodename = PVE::INotify::nodename();
 
 sub run_vnc_proxy {
@@ -179,7 +185,9 @@ __PACKAGE__->register_method ({
        my $vmid = $param->{vmid};
 
        PVE::QemuServer::lock_config ($vmid, sub {
-           PVE::QemuServer::change_config_nolock  ($vmid, {}, { lock => 1 }, 1);
+           my $conf = PVE::QemuServer::load_config($vmid);
+           delete $conf->{lock};
+           PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
        });
 
        return undef;
@@ -214,73 +222,6 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
-__PACKAGE__->register_method ({
-    name => 'startall', 
-    path => 'startall', 
-    method => 'POST',
-    description => "Start all virtual machines (when onboot=1).",
-    parameters => {
-       additionalProperties => 0,
-       properties => {},
-    },
-    returns => { type => 'null'},
-    code => sub {
-       my ($param) = @_;
-
-       my $vzlist = PVE::QemuServer::vzlist();
-       my $storecfg = PVE::Storage::config();
-
-       PVE::Cluster::check_cfs_quorum();
-
-       my $count = 0;
-       foreach my $vmid (keys %$vzlist) {
-           next if $vzlist->{$vmid}->{pid}; # already running
-
-           sleep(2) if $count != 0; # reduce load
-           $count++;
-
-           PVE::Cluster::check_cfs_quorum(); # abort when we loose quorum
-
-           eval {
-               my $conf = PVE::QemuServer::load_config($vmid);
-               if ($conf->{onboot}) {
-                   print STDERR "Starting Qemu VM $vmid\n";
-                   PVE::QemuServer::vm_start($storecfg, $vmid);
-               }
-           };
-           print STDERR $@ if $@;
-       }
-
-       return undef;
-    }});
-
-__PACKAGE__->register_method ({
-    name => 'stopall', 
-    path => 'stopall', 
-    method => 'POST',
-    description => "Stop all virtual machines.",
-    parameters => {
-       additionalProperties => 0,
-       properties => {
-           timeout => {
-               description => "Timeout in seconds. Default is to wait 3 minutes.",
-               type => 'integer',
-               minimum => 1,
-               optional => 1,
-           }
-       },
-    },
-    returns => { type => 'null'},
-    code => sub {
-       my ($param) = @_;
-
-       my $timeout = $param->{timeout};
-
-       PVE::QemuServer::vm_stopall($timeout);
-
-       return undef;
-    }});
-
 __PACKAGE__->register_method ({
     name => 'wait', 
     path => 'wait', 
@@ -353,7 +294,7 @@ __PACKAGE__->register_method ({
            last if $input =~ m/^\s*q(uit)?\s*$/;
 
            eval {
-               print PVE::QemuServer::vm_monitor_command ($vmid, $input);
+               print PVE::QemuServer::vm_human_monitor_command ($vmid, $input);
            };
            print "ERROR: $@" if $@;
        }
@@ -362,6 +303,26 @@ __PACKAGE__->register_method ({
 
     }});
 
+__PACKAGE__->register_method ({
+    name => 'rescan', 
+    path => 'rescan', 
+    method => 'POST',
+    description => "Rescan all storages and update disk sizes and unused disk images.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           vmid => get_standard_option('pve-vmid', {optional => 1}),
+       },
+    },
+    returns => { type => 'null'},
+    code => sub {
+       my ($param) = @_;
+
+       PVE::QemuServer::rescan($param->{vmid});
+
+       return undef;
+    }});
+
 my $cmddef = {
     list => [ "PVE::API2::Qemu", 'vmlist', [],
             { node => $nodename }, sub {
@@ -383,19 +344,16 @@ my $cmddef = {
                 
              } ],
 
-    create => [ "PVE::API2::Qemu", 'create_vm', ['vmid'], { node => $nodename } ],
+    create => [ "PVE::API2::Qemu", 'create_vm', ['vmid'], { node => $nodename }, $upid_exit ],
 
-    destroy => [ "PVE::API2::Qemu", 'destroy_vm', ['vmid'], { node => $nodename } ],
+    destroy => [ "PVE::API2::Qemu", 'destroy_vm', ['vmid'], { node => $nodename }, $upid_exit ],
 
-    migrate => [ "PVE::API2::Qemu", 'migrate_vm', ['target', 'vmid'], { node => $nodename }, 
-                sub {
-                    my $upid = shift;
-                    my $status = PVE::Tools::upid_read_status($upid);
-                    exit($status eq 'OK' ? 0 : -1);
-                }],
+    migrate => [ "PVE::API2::Qemu", 'migrate_vm', ['vmid', 'target'], { node => $nodename }, $upid_exit ],
 
     set => [ "PVE::API2::Qemu", 'update_vm', ['vmid'], { node => $nodename } ],
 
+    resize => [ "PVE::API2::Qemu", 'resize_vm', ['vmid', 'disk', 'size'], { node => $nodename } ],
+
     unlink => [ "PVE::API2::Qemu", 'unlink', ['vmid', 'idlist'], { node => $nodename } ],
 
     config => [ "PVE::API2::Qemu", 'vm_config', ['vmid'], 
@@ -415,17 +373,25 @@ my $cmddef = {
 
     status => [ __PACKAGE__, 'status', ['vmid']],
 
-    start => [ "PVE::API2::Qemu", 'vm_start', ['vmid'], { node => $nodename } ],
+    snapshot => [ "PVE::API2::Qemu", 'snapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
+
+    delsnapshot => [ "PVE::API2::Qemu", 'delsnapshot', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
+
+    rollback => [ "PVE::API2::Qemu", 'rollback', ['vmid', 'snapname'], { node => $nodename } , $upid_exit ],
+
+    template => [ "PVE::API2::Qemu", 'template', ['vmid'], { node => $nodename }],
+
+    start => [ "PVE::API2::Qemu", 'vm_start', ['vmid'], { node => $nodename } , $upid_exit ],
 
-    stop => [ "PVE::API2::Qemu", 'vm_stop', ['vmid'], { node => $nodename } ],
+    stop => [ "PVE::API2::Qemu", 'vm_stop', ['vmid'], { node => $nodename }, $upid_exit ],
 
-    reset => [ "PVE::API2::Qemu", 'vm_reset', ['vmid'], { node => $nodename } ],
+    reset => [ "PVE::API2::Qemu", 'vm_reset', ['vmid'], { node => $nodename }, $upid_exit ],
 
-    shutdown => [ "PVE::API2::Qemu", 'vm_shutdown', ['vmid'], { node => $nodename } ],
+    shutdown => [ "PVE::API2::Qemu", 'vm_shutdown', ['vmid'], { node => $nodename }, $upid_exit ],
 
-    suspend => [ "PVE::API2::Qemu", 'vm_suspend', ['vmid'], { node => $nodename } ],
+    suspend => [ "PVE::API2::Qemu", 'vm_suspend', ['vmid'], { node => $nodename }, $upid_exit ],
 
-    resume => [ "PVE::API2::Qemu", 'vm_resume', ['vmid'], { node => $nodename } ],
+    resume => [ "PVE::API2::Qemu", 'vm_resume', ['vmid'], { node => $nodename }, $upid_exit ],
 
     sendkey => [ "PVE::API2::Qemu", 'vm_sendkey', ['vmid', 'key'], { node => $nodename } ],
 
@@ -435,17 +401,18 @@ my $cmddef = {
 
     unlock => [ __PACKAGE__, 'unlock', ['vmid']],
 
-    monitor  => [ __PACKAGE__, 'monitor', ['vmid']],
-
-    startall => [ __PACKAGE__, 'startall', []],
+    rescan  => [ __PACKAGE__, 'rescan', []],
 
-    stopall => [ __PACKAGE__, 'stopall', []],
+    monitor  => [ __PACKAGE__, 'monitor', ['vmid']],
 
     mtunnel => [ __PACKAGE__, 'mtunnel', []],  
 };
 
 my $cmd = shift;
 
+# Note: disable '+' prefix for Getopt::Long (for resize command)
+use Getopt::Long qw(:config no_getopt_compat); 
+
 PVE::CLIHandler::handle_cmd($cmddef, "qm", $cmd, \@ARGV, undef, $0);
 
 exit 0;