commit 415bbca86dd671fd766cdb24f40add3fda70c38a
author Alberto Garcia <berto@igalia.com> Wed Oct 03 13:23:13 2018 +0300
committer Kevin Wolf <kwolf@redhat.com> Mon Nov 05 15:09:54 2018 +0100
tree 717fe0b74a948c4b683f3a8760eebe8bc5c24d9c
parent a2b83a5165c567bb81fe4303d97a3cca5ccc8a15

block: replace "discard" literal with BDRV_OPT_DISCARD macro

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block.c

diff --git a/block.c b/block.c
index 95d8635..9d2adf7 100644
--- a/block.c
+++ b/block.c
@@ -1327,7 +1327,7 @@
             .help = "try to optimize zero writes (off, on, unmap)",
         },
         {
-            .name = "discard",
+            .name = BDRV_OPT_DISCARD,
             .type = QEMU_OPT_STRING,
             .help = "discard operation (ignore/off, unmap/on)",
         },
@@ -1432,7 +1432,7 @@
         }
     }
 
-    discard = qemu_opt_get(opts, "discard");
+    discard = qemu_opt_get(opts, BDRV_OPT_DISCARD);
     if (discard != NULL) {
         if (bdrv_parse_discard_flags(discard, &bs->open_flags) != 0) {
             error_setg(errp, "Invalid discard option");
@@ -3186,7 +3186,7 @@
 
     update_flags_from_options(&reopen_state->flags, opts);
 
-    discard = qemu_opt_get_del(opts, "discard");
+    discard = qemu_opt_get_del(opts, BDRV_OPT_DISCARD);
     if (discard != NULL) {
         if (bdrv_parse_discard_flags(discard, &reopen_state->flags) != 0) {
             error_setg(errp, "Invalid discard option");