[pve-devel] r4852 - qemu-server/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-06-29 06:49:41 +0000 (Tue, 29 Jun 2010)
New Revision: 4852

Modified:
   qemu-server/trunk/ChangeLog
   qemu-server/trunk/Makefile
   qemu-server/trunk/QemuServer.pm
   qemu-server/trunk/changelog.Debian
   qemu-server/trunk/qm
Log:


Modified: qemu-server/trunk/ChangeLog
===================================================================
--- qemu-server/trunk/ChangeLog	2010-06-29 06:14:25 UTC (rev 4851)
+++ qemu-server/trunk/ChangeLog	2010-06-29 06:49:41 UTC (rev 4852)
@@ -1,3 +1,8 @@
+2010-06-29  Proxmox Support Team  <support at proxmox.com>
+
+	* QemuServer.pm (parse_drive): add rerror/werror options (patch
+	from l.mierzwa)
+
 2010-06-25  Proxmox Support Team  <support at proxmox.com>
 
 	* utils.c (full_read): always try to read full blocks (fix vmtar

Modified: qemu-server/trunk/Makefile
===================================================================
--- qemu-server/trunk/Makefile	2010-06-29 06:14:25 UTC (rev 4851)
+++ qemu-server/trunk/Makefile	2010-06-29 06:49:41 UTC (rev 4852)
@@ -2,7 +2,7 @@
 
 VERSION=1.1
 PACKAGE=qemu-server
-PKGREL=15
+PKGREL=16
 
 DESTDIR=
 PREFIX=/usr

Modified: qemu-server/trunk/QemuServer.pm
===================================================================
--- qemu-server/trunk/QemuServer.pm	2010-06-29 06:14:25 UTC (rev 4851)
+++ qemu-server/trunk/QemuServer.pm	2010-06-29 06:49:41 UTC (rev 4852)
@@ -508,7 +508,7 @@
     foreach my $p (split (/,/, $data)) {
 	next if $p =~ m/^\s*$/;
 
-	if ($p =~ m/^(file|volume|cyls|heads|secs|trans|media|snapshot|cache|format)=(.+)$/) {
+	if ($p =~ m/^(file|volume|cyls|heads|secs|trans|media|snapshot|cache|format|rerror|werror)=(.+)$/) {
 	    my ($k, $v) = ($1, $2);
 
 	    $k = 'file' if $k eq 'volume';
@@ -536,6 +536,8 @@
     return undef if $res->{media} && $res->{media} !~ m/^(disk|cdrom)$/;
     return undef if $res->{trans} && $res->{trans} !~ m/^(none|lba|auto)$/;
     return undef if $res->{format} && $res->{format} !~ m/^(raw|cow|qcow|qcow2|vmdk|cloop)$/;
+    return undef if $res->{rerror} && $res->{rerror} !~ m/^(ignore|report|stop)$/;
+    return undef if $res->{werror} && $res->{werror} !~ m/^(enospc|ignore|report|stop)$/;
 
     if ($res->{media} && ($res->{media} eq 'cdrom')) {
 	return undef if $res->{snapshot} || $res->{trans} || $res->{format};
@@ -543,6 +545,11 @@
 	return undef if $res->{interface} eq 'virtio';
     }
 
+    # rerror does not work with scsi drives
+    if ($res->{rerror}) {
+	return undef if $res->{interface} eq 'scsi';
+    }
+
     return $res;
 }
 
@@ -550,7 +557,7 @@
     my ($drive) = @_;
 
     my $res = '';
-    foreach my $o (qw(heads secs cyls trans media format cache snapshot)) {
+    foreach my $o (qw(heads secs cyls trans media format cache snapshot rerror werror)) {
 	$res .= ",$o=$drive->{$o}" if $drive->{$o};
     }
 

Modified: qemu-server/trunk/changelog.Debian
===================================================================
--- qemu-server/trunk/changelog.Debian	2010-06-29 06:14:25 UTC (rev 4851)
+++ qemu-server/trunk/changelog.Debian	2010-06-29 06:49:41 UTC (rev 4852)
@@ -1,3 +1,9 @@
+qemu-server (1.1-16) unstable; urgency=low
+
+  * add rerror/werror options (patch from l.mierzwa)
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 29 Jun 2010 08:49:00 +0200
+
 qemu-server (1.1-15) unstable; urgency=low
 
   * fix vmtar bug (endless growing archive)

Modified: qemu-server/trunk/qm
===================================================================
--- qemu-server/trunk/qm	2010-06-29 06:14:25 UTC (rev 4851)
+++ qemu-server/trunk/qm	2010-06-29 06:49:41 UTC (rev 4852)
@@ -54,6 +54,8 @@
     print STDERR "\t                      [,cyls=c,heads=h,secs=s[,trans=t]]\n";
     print STDERR "\t                      [,cache=none|writethrough|writeback]\n";
     print STDERR "\t                      [,snapshot=on|off][,cache=on|off][,format=f]\n";
+    print STDERR "\t                      [,werror=enospc|ignore|report|stop]\n";
+    print STDERR "\t                      [,rerror=ignore|report|stop]\n";
     print STDERR "\t--ide<N> <GBYTES>     create new disk\n";
     print STDERR "\t--ide<N> delete       remove drive - destroy image\n";
     print STDERR "\t--ide<N> undef        remove drive - keep image\n";
@@ -65,6 +67,7 @@
     print STDERR "\t                      [,cyls=c,heads=h,secs=s[,trans=t]]\n";
     print STDERR "\t                      [,snapshot=on|off][,format=f]\n";
     print STDERR "\t                      [,cache=none|writethrough|writeback]\n";
+    print STDERR "\t                      [,werror=enospc|ignore|report|stop]\n";
     print STDERR "\t--scsi<N> <GBYTES>    create new disk\n";
     print STDERR "\t--scsi<N> delete      remove drive - destroy image\n";
     print STDERR "\t--scsi<N> undef       remove drive - keep image\n";
@@ -74,6 +77,8 @@
     print STDERR "\t                      [,cyls=c,heads=h,secs=s[,trans=t]]\n";
     print STDERR "\t                      [,snapshot=on|off][,format=f]\n";
     print STDERR "\t                      [,cache=none|writethrough|writeback]\n";
+    print STDERR "\t                      [,werror=enospc|ignore|report|stop]\n";
+    print STDERR "\t                      [,rerror=ignore|report|stop]\n";
     print STDERR "\t--virtio<N> <GBYTES>  create new disk\n";
     print STDERR "\t--virtio<N> delete    remove drive - destroy image\n";
     print STDERR "\t--virtio<N> undef     remove drive - keep image\n";