qemu: Change values of disk discard

QEMU might support more values for "-drive discard", so using Bi-state
values (on/off) for it doesn't make sense.

"on" maps to "unmap", "off" maps to "ignore":

<...>
@var{discard} is one of "ignore" (or "off") or "unmap" (or "on") and
controls whether @dfn{discard} (also known as @dfn{trim} or @dfn{unmap})
requests are ignored or passed to the filesystem.  Some machine types
may not support discard requests.
</...>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index a71c4846715e75396b781425c1ca9d05e5c85158..9284534adc138465081500c19085d1d48119fbfd 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1745,8 +1745,8 @@
             The optional <code>discard</code> attribute controls whether
             to discard (also known as "trim" or "unmap") requests are
             ignored or passed to the filesystem. The value can be either
-            "on" (allow the discard request to be passed) or "off" (ingore
-            the discard request).
+            "unmap" (allow the discard request to be passed) or "ignore"
+            (ignore the discard request).
             <span class='since'>Since 1.0.6 (QEMU and KVM only)</span>
           </li>
         </ul>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 018ca0b6beb99f674eff4270ea7d08b9cb134a0a..b53099b005ed4dfbbc134633bbcae73cffbdc914 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1418,8 +1418,8 @@
   <define name="discard">
     <attribute name='discard'>
       <choice>
-        <value>on</value>
-        <value>off</value>
+        <value>unmap</value>
+        <value>ignore</value>
       </choice>
     </attribute>
   </define>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b5e5d4d050d84e6393fb98f3bcf01cd44e43b6ac..e7a03810aa0beaa7c9901238794c0ab8a2fc4a61 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -745,8 +745,8 @@ VIR_ENUM_IMPL(virDomainTPMBackend, VIR_DOMAIN_TPM_TYPE_LAST,
 
 VIR_ENUM_IMPL(virDomainDiskDiscard, VIR_DOMAIN_DISK_DISCARD_LAST,
               "default",
-              "on",
-              "off")
+              "unmap",
+              "ignore")
 
 #define VIR_DOMAIN_XML_WRITE_FLAGS  VIR_DOMAIN_XML_SECURE
 #define VIR_DOMAIN_XML_READ_FLAGS   VIR_DOMAIN_XML_INACTIVE

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a10b2abd33e626e29a4e966ef7f586434056ea7b..e74da1cf60cfdd43d3c9166174ee4f8c70414ffe 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -629,8 +629,8 @@ enum virDomainDeviceSGIO {
 
 enum virDomainDiskDiscard {
     VIR_DOMAIN_DISK_DISCARD_DEFAULT = 0,
-    VIR_DOMAIN_DISK_DISCARD_ON,
-    VIR_DOMAIN_DISK_DISCARD_OFF,
+    VIR_DOMAIN_DISK_DISCARD_UNMAP,
+    VIR_DOMAIN_DISK_DISCARD_IGNORE,
 
     VIR_DOMAIN_DISK_DISCARD_LAST
 };

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
index 02e2ddb15159777b5fdb4b5e494cf45461fffd2e..3c4687e763e7309a8ef7ecf6e734f6ee8e14269a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
@@ -1,8 +1,8 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
 /usr/bin/qemu -S -M pc-0.13 -m 1024 -smp 1 -nographic -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dc -usb \
--drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=on \
+-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,discard=unmap \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \
--drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=off \
+-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,id=drive-ide0-1-0,discard=ignore \
 -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
index a6a8135a67043e6ea3fee98f2173cf6436f21dbc..f01312f5339215c622abc36d360bf9ae93dde4bb 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml
@@ -17,13 +17,13 @@
   <devices>
     <emulator>/usr/bin/qemu</emulator>
     <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' discard='on'/>
+      <driver name='qemu' type='qcow2' discard='unmap'/>
       <source file='/var/lib/libvirt/images/f14.img'/>
       <target dev='vda' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
     <disk type='file' device='cdrom'>
-      <driver name='qemu' type='raw' discard='off'/>
+      <driver name='qemu' type='raw' discard='ignore'/>
       <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>