Skip to contentSkip to conversation

Remove BLOCK_OPT_NOCOW from VDI and VPC

PATCH Applied Jeff Cody 3 participants 7 messages Dec 3, 2014 – Dec 4, 2014 Block layer

lore
Share & tools
lore

Jeff Cody

author
#0 lore raw

cover Remove BLOCK_OPT_NOCOW from VDI and VPC

This removes the unneeded BLOCK_OPT_NOCOW options from vdi and vpc.

Jeff Cody (2):
block: remove BLOCK_OPT_NOCOW from vdi_create_opts
block: remove BLOCK_OPT_NOCOW from vpc_create_opts

 block/vdi.c | 5 -----
 block/vpc.c | 5 -----
 2 files changed, 10 deletions(-)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/2 block: remove BLOCK_OPT_NOCOW from vdi_create_opts

In commit 7074786, the need for NOCOW was removed from the vdi driver, as we removed the the posix calls. However, the BLOCK_OPT_NOCOW was not removed from vdi_create_opts. This was a mistake - remove the opt from there as well.

---
 block/vdi.c | 5 -----
 1 file changed, 5 deletions(-)
block/vdi.c +0 -5
index 39070b7..74030c6 100644
@@ -852,11 +852,6 @@ static QemuOptsList vdi_create_opts = {
             .def_value_str = "off"
         },
 #endif
-        {
-            .name = BLOCK_OPT_NOCOW,
-            .type = QEMU_OPT_BOOL,
-            .help = "Turn off copy-on-write (valid only on btrfs)"
-        },
         /* TODO: An additional option to set UUID values might be useful. */
         { /* end of list */ }
     }
Signature · 1 line
1.9.3
author
#2 lore raw

PATCH 2/2 block: remove BLOCK_OPT_NOCOW from vpc_create_opts

In reply to Jeff Cody

In commit fef6070, the need for NOCOW was removed from the vpc driver, as we removed the the posix calls. However, the BLOCK_OPT_NOCOW was not removed from vpc_create_opts. This was a mistake - remove the opt from there as well.

---
 block/vpc.c | 5 -----
 1 file changed, 5 deletions(-)
block/vpc.c +0 -5
index 38c4f02..46803b1 100644
@@ -893,11 +893,6 @@ static QemuOptsList vpc_create_opts = {
                 "Type of virtual hard disk format. Supported formats are "
                 "{dynamic (default) | fixed} "
         },
-        {
-            .name = BLOCK_OPT_NOCOW,
-            .type = QEMU_OPT_BOOL,
-            .help = "Turn off copy-on-write (valid only on btrfs)"
-        },
         { /* end of list */ }
     }
 };
Signature · 1 line
1.9.3
Reviewed-by on the v1 series
#3 lore raw
In reply to Jeff Cody
Quoted 10 lines · Jeff Cody

This removes the unneeded BLOCK_OPT_NOCOW options from vdi and vpc.

Jeff Cody (2):
block: remove BLOCK_OPT_NOCOW from vdi_create_opts
block: remove BLOCK_OPT_NOCOW from vpc_create_opts

  block/vdi.c | 5 -----
  block/vpc.c | 5 -----
  2 files changed, 10 deletions(-)
Applied
#4 lore raw
In reply to Jeff Cody
Quoted 10 lines · Jeff Cody

This removes the unneeded BLOCK_OPT_NOCOW options from vdi and vpc.

Jeff Cody (2):
block: remove BLOCK_OPT_NOCOW from vdi_create_opts
block: remove BLOCK_OPT_NOCOW from vpc_create_opts

  block/vdi.c | 5 -----
  block/vpc.c | 5 -----
  2 files changed, 10 deletions(-)

Thanks, applied to my block-next tree:

https://github.com/XanClic/qemu/commits/block-next

Reviewed-by
#5 lore raw

Am 03.12.2014 um 17:50 schrieb Max Reitz:

Quoted 8 lines · Jeff Cody
Quoted 7 lines

This removes the unneeded BLOCK_OPT_NOCOW options from vdi and vpc.

Jeff Cody (2):
block: remove BLOCK_OPT_NOCOW from vdi_create_opts
block: remove BLOCK_OPT_NOCOW from vpc_create_opts

Quoted 7 lines
Quoted 3 lines
  block/vdi.c | 5 -----
  block/vpc.c | 5 -----
  2 files changed, 10 deletions(-)

Thanks, applied to my block-next tree:

https://github.com/XanClic/qemu/commits/block-next

You might add this, too, to both patches:

#6 lore raw
Quoted 12 lines · Stefan Weil

Am 03.12.2014 um 17:50 schrieb Max Reitz:

Quoted 11 lines · Jeff Cody
Quoted 10 lines

This removes the unneeded BLOCK_OPT_NOCOW options from vdi and vpc.

Jeff Cody (2):
block: remove BLOCK_OPT_NOCOW from vdi_create_opts
block: remove BLOCK_OPT_NOCOW from vpc_create_opts

   block/vdi.c | 5 -----
   block/vpc.c | 5 -----
   2 files changed, 10 deletions(-)
Quoted 7 lines
Quoted 3 lines

Thanks, applied to my block-next tree:

https://github.com/XanClic/qemu/commits/block-next

You might add this, too, to both patches:

Done, thanks.

Max