X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FCLI%2Fqm.pm;h=e70c56a46e01744b86d81f4f74b830cdf797460c;hb=f6306646d817717856e37fa52462f268bf5b1560;hp=6abf6dbc3db12de840729f2aa26348ede168a939;hpb=788a6a35da73e350fbc06d20ff889bb0bd76523b;p=qemu-server.git

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 6abf6db..e70c56a 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -17,10 +17,13 @@ use PVE::SafeSyslog;
 use PVE::INotify;
 use PVE::RPCEnvironment;
 use PVE::QemuServer;
+use PVE::QemuServer::ImportDisk;
+use PVE::QemuServer::OVF;
 use PVE::API2::Qemu;
 use JSON;
 use PVE::JSONSchema qw(get_standard_option);
 use Term::ReadLine;
+use Data::Dumper;
 
 use PVE::CLIHandler;
 
@@ -34,6 +37,10 @@ my $upid_exit = sub {
 
 my $nodename = PVE::INotify::nodename();
 
+sub setup_environment {
+    PVE::RPCEnvironment->setup_default_cli_env();
+}
+
 sub run_vnc_proxy {
     my ($path) = @_;
 
@@ -220,6 +227,28 @@ __PACKAGE__->register_method ({
 	return undef;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'nbdstop',
+    path => 'nbdstop',
+    method => 'PUT',
+    description => "Stop embedded nbd server.",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }),
+	},
+    },
+    returns => { type => 'null'},
+    code => sub {
+	my ($param) = @_;
+
+	my $vmid = $param->{vmid};
+
+	PVE::QemuServer::nbd_stop($vmid);
+
+	return undef;
+    }});
+
 __PACKAGE__->register_method ({
     name => 'mtunnel',
     path => 'mtunnel',
@@ -238,12 +267,34 @@ __PACKAGE__->register_method ({
 	    return undef;
 	}
 
-	print "tunnel online\n";
-	*STDOUT->flush();
+	my $tunnel_write = sub {
+	    my $text = shift;
+	    chomp $text;
+	    print "$text\n";
+	    *STDOUT->flush();
+	};
+
+	$tunnel_write->("tunnel online");
+	$tunnel_write->("ver 1");
 
 	while (my $line = <>) {
 	    chomp $line;
-	    last if $line =~ m/^quit$/;
+	    if ($line =~ /^quit$/) {
+		$tunnel_write->("OK");
+		last;
+	    } elsif ($line =~ /^resume (\d+)$/) {
+		my $vmid = $1;
+		if (PVE::QemuServer::check_running($vmid, 1)) {
+		    eval { PVE::QemuServer::vm_resume($vmid, 1, 1); };
+		    if ($@) {
+			$tunnel_write->("ERR: resume failed - $@");
+		    } else {
+			$tunnel_write->("OK");
+		    }
+		} else {
+		    $tunnel_write->("ERR: resume failed - VM $vmid not running");
+		}
+	    }
 	}
 
 	return undef;
@@ -353,6 +404,60 @@ __PACKAGE__->register_method ({
 	return undef;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'importdisk',
+    path => 'importdisk',
+    method => 'POST',
+    description => "Import an external disk image as an unused disk in a VM. The
+ image format has to be supported by qemu-img(1).",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    vmid => get_standard_option('pve-vmid', {completion => \&PVE::QemuServer::complete_vmid}),
+	    source => {
+		description => 'Path to the disk image to import',
+		type => 'string',
+		optional => 0,
+	    },
+            storage => get_standard_option('pve-storage-id', {
+		description => 'Target storage ID',
+		completion => \&PVE::QemuServer::complete_storage,
+		optional => 0,
+            }),
+	    format => {
+		type => 'string',
+		description => 'Target format',
+		enum => [ 'raw', 'qcow2', 'vmdk' ],
+		optional => 1,
+	    },
+	},
+    },
+    returns => { type => 'null'},
+    code => sub {
+	my ($param) = @_;
+
+	my $vmid = extract_param($param, 'vmid');
+	my $source = extract_param($param, 'source');
+	my $storeid = extract_param($param, 'storage');
+	my $format = extract_param($param, 'format');
+
+	my $vm_conf = PVE::QemuConfig->load_config($vmid);
+	PVE::QemuConfig->check_lock($vm_conf);
+	die "$source: non-existent or non-regular file\n" if (! -f $source);
+
+	my $storecfg = PVE::Storage::config();
+	PVE::Storage::storage_check_enabled($storecfg, $storeid);
+
+	my $target_storage_config =
+	    PVE::Storage::storage_config($storecfg, $storeid);
+	die "storage $storeid does not support vm images\n"
+	    if !$target_storage_config->{content}->{images};
+
+	PVE::QemuServer::ImportDisk::do_import($source, $vmid, $storeid, { format => $format });
+
+	return undef;
+    }});
+
 __PACKAGE__->register_method ({
     name => 'terminal',
     path => 'terminal',
@@ -406,6 +511,99 @@ __PACKAGE__->register_method ({
 	return undef;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'importovf',
+    path => 'importovf',
+    description => "Create a new VM using parameters read from an OVF manifest",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    vmid => get_standard_option('pve-vmid', { completion => \&PVE::Cluster::complete_next_vmid }),
+	    manifest => {
+		type => 'string',
+		description => 'path to the ovf file',
+		},
+	    storage => get_standard_option('pve-storage-id', {
+		description => 'Target storage ID',
+		completion => \&PVE::QemuServer::complete_storage,
+		optional => 0,
+	    }),
+	    format => {
+		type => 'string',
+		description => 'Target format',
+		enum => [ 'raw', 'qcow2', 'vmdk' ],
+		optional => 1,
+	    },
+	    dryrun => {
+		type => 'boolean',
+		description => 'Print a parsed representation of the extracted OVF parameters, but do not create a VM',
+		optional => 1,
+	    }
+	},
+    },
+    returns => { type => 'string'},
+    code => sub {
+	my ($param) = @_;
+
+	my $vmid = PVE::Tools::extract_param($param, 'vmid');
+	my $ovf_file = PVE::Tools::extract_param($param, 'manifest');
+	my $storeid = PVE::Tools::extract_param($param, 'storage');
+	my $format = PVE::Tools::extract_param($param, 'format');
+	my $dryrun = PVE::Tools::extract_param($param, 'dryrun');
+
+	die "$ovf_file: non-existent or non-regular file\n" if (! -f $ovf_file);
+	my $storecfg = PVE::Storage::config();
+	PVE::Storage::storage_check_enabled($storecfg, $storeid);
+
+	my $parsed = PVE::QemuServer::OVF::parse_ovf($ovf_file);
+
+	if ($dryrun) {
+	    print Dumper($parsed);
+	    exit(0);
+	}
+
+	$param->{name} = $parsed->{qm}->{name} if defined($parsed->{qm}->{name});
+	$param->{memory} = $parsed->{qm}->{memory} if defined($parsed->{qm}->{memory});
+	$param->{cores} = $parsed->{qm}->{cores} if defined($parsed->{qm}->{cores});
+
+	my $importfn = sub {
+
+	    PVE::Cluster::check_vmid_unused($vmid);
+
+	    my $conf = $param;
+
+	    eval {
+		# order matters, as do_import() will load_config() internally
+		$conf->{smbios1} = PVE::QemuServer::generate_smbios1_uuid();
+		PVE::QemuConfig->write_config($vmid, $conf);
+
+		foreach my $disk (@{ $parsed->{disks} }) {
+		    my ($file, $drive) = ($disk->{backing_file}, $disk->{disk_address});
+		    PVE::QemuServer::ImportDisk::do_import($file, $vmid, $storeid,
+			{ drive_name => $drive, format => $format });
+		}
+
+		# reload after disks entries have been created
+		$conf = PVE::QemuConfig->load_config($vmid);
+		PVE::QemuConfig->check_lock($conf);
+		my $firstdisk = PVE::QemuServer::resolve_first_disk($conf);
+		$conf->{bootdisk} = $firstdisk if $firstdisk;
+		PVE::QemuConfig->write_config($vmid, $conf);
+	    };
+
+	    my $err = $@;
+	    if ($err) {
+		my $skiplock = 1;
+		eval { PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock); };
+		die "import failed - $err";
+	    }
+	};
+
+	my $wait_for_lock = 1;
+	return PVE::QemuConfig->lock_config_full($vmid, $wait_for_lock, $importfn);
+
+    }
+});
 
 my $print_agent_result = sub {
     my ($data) = @_;
@@ -553,12 +751,19 @@ our $cmddef = {
 
     monitor  => [ __PACKAGE__, 'monitor', ['vmid']],
 
-    agent  => [ "PVE::API2::Qemu", 'agent', ['vmid'],
+    agent  => [ "PVE::API2::Qemu", 'agent', ['vmid', 'command'],
 		{ node => $nodename }, $print_agent_result ],
 
     mtunnel => [ __PACKAGE__, 'mtunnel', []],
 
+    nbdstop => [ __PACKAGE__, 'nbdstop', ['vmid']],
+
     terminal => [ __PACKAGE__, 'terminal', ['vmid']],
+
+    importdisk => [ __PACKAGE__, 'importdisk', ['vmid', 'source', 'storage']],
+
+    importovf => [ __PACKAGE__, 'importovf', ['vmid', 'manifest', 'storage']],
+
 };
 
 1;