Re: [PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create

[Eric Blake]

On 3/26/20 8:22 AM, Maxim Levitsky wrote:

On Thu, 2020-03-26 at 08:18 -0500, Eric Blake wrote:

On 3/25/20 8:12 PM, Maxim Levitsky wrote:

This will allow to reuse a single generic .bdrv_co_create


"allow to ${verb}" is not idiomatic, better is "allow ${subject} to
${verb}" or "allow ${verb}ing".  In this case, I'd go with:

This will allow the reuse of a single...

I agree! This commit will probably go as is but next time I'll keep it in mind!


Max hasn't sent the pull request yet; there's still time for him to 
amend his staging queue if he wants.  But yeah, it's not a huge deal if 
the patch goes in without spelling/grammar polish.


--
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create

[Maxim Levitsky]

On Thu, 2020-03-26 at 08:18 -0500, Eric Blake wrote:
> On 3/25/20 8:12 PM, Maxim Levitsky wrote:
> > This will allow to reuse a single generic .bdrv_co_create
> 
> "allow to ${verb}" is not idiomatic, better is "allow ${subject} to 
> ${verb}" or "allow ${verb}ing".  In this case, I'd go with:
> 
> This will allow the reuse of a single...
I agree! This commit will probably go as is but next time I'll keep it in mind!

Best regards,
Maxim Levitsky

> 
> > implementation for several drivers.
> > No functional changes.
> > 
> > Signed-off-by: Maxim Levitsky 
> > ---

Re: [PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create

[Eric Blake]

On 3/25/20 8:12 PM, Maxim Levitsky wrote:

This will allow to reuse a single generic .bdrv_co_create


"allow to ${verb}" is not idiomatic, better is "allow ${subject} to 
${verb}" or "allow ${verb}ing".  In this case, I'd go with:


This will allow the reuse of a single...


implementation for several drivers.
No functional changes.

Signed-off-by: Maxim Levitsky 
---

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

[PATCH 1/2] block: pass BlockDriver reference to the .bdrv_co_create

[Maxim Levitsky]

This will allow to reuse a single generic .bdrv_co_create
implementation for several drivers.
No functional changes.

Signed-off-by: Maxim Levitsky 
---
 block.c   | 3 ++-
 block/crypto.c| 3 ++-
 block/file-posix.c| 4 +++-
 block/file-win32.c| 4 +++-
 block/gluster.c   | 3 ++-
 block/nfs.c   | 4 +++-
 block/parallels.c | 3 ++-
 block/qcow.c  | 3 ++-
 block/qcow2.c | 4 +++-
 block/qed.c   | 3 ++-
 block/raw-format.c| 4 +++-
 block/rbd.c   | 3 ++-
 block/sheepdog.c  | 4 +++-
 block/ssh.c   | 4 +++-
 block/vdi.c   | 4 +++-
 block/vhdx.c  | 3 ++-
 block/vmdk.c  | 4 +++-
 block/vpc.c   | 6 --
 include/block/block_int.h | 3 ++-
 19 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/block.c b/block.c
index cccae5add9..ff23e20443 100644
--- a/block.c
+++ b/block.c
@@ -483,7 +483,8 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque)
 CreateCo *cco = opaque;
 assert(cco->drv);
 
-ret = cco->drv->bdrv_co_create_opts(cco->filename, cco->opts, _err);
+ret = cco->drv->bdrv_co_create_opts(cco->drv,
+cco->filename, cco->opts, _err);
 error_propagate(>err, local_err);
 cco->ret = ret;
 }
diff --git a/block/crypto.c b/block/crypto.c
index 4425ebeb47..d577f89659 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -601,7 +601,8 @@ fail:
 return ret;
 }
 
-static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename,
+static int coroutine_fn block_crypto_co_create_opts_luks(BlockDriver *drv,
+ const char *filename,
  QemuOpts *opts,
  Error **errp)
 {
diff --git a/block/file-posix.c b/block/file-posix.c
index 9bc3838b2a..65bc980bc4 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2405,7 +2405,9 @@ out:
 return result;
 }
 
-static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts 
*opts,
+static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
+   const char *filename,
+   QemuOpts *opts,
Error **errp)
 {
 BlockdevCreateOptions options;
diff --git a/block/file-win32.c b/block/file-win32.c
index 77e8ff7b68..15859839a1 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -588,7 +588,9 @@ static int raw_co_create(BlockdevCreateOptions *options, 
Error **errp)
 return 0;
 }
 
-static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts 
*opts,
+static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
+   const char *filename,
+   QemuOpts *opts,
Error **errp)
 {
 BlockdevCreateOptions options;
diff --git a/block/gluster.c b/block/gluster.c
index 4fa4a77a47..0aa1f2cda4 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -1130,7 +1130,8 @@ out:
 return ret;
 }
 
-static int coroutine_fn qemu_gluster_co_create_opts(const char *filename,
+static int coroutine_fn qemu_gluster_co_create_opts(BlockDriver *drv,
+const char *filename,
 QemuOpts *opts,
 Error **errp)
 {
diff --git a/block/nfs.c b/block/nfs.c
index 9a6311e270..cc2413d5ab 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -662,7 +662,9 @@ out:
 return ret;
 }
 
-static int coroutine_fn nfs_file_co_create_opts(const char *url, QemuOpts 
*opts,
+static int coroutine_fn nfs_file_co_create_opts(BlockDriver *drv,
+const char *url,
+QemuOpts *opts,
 Error **errp)
 {
 BlockdevCreateOptions *create_options;
diff --git a/block/parallels.c b/block/parallels.c
index 7a01997659..6d4ed77f16 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -609,7 +609,8 @@ exit:
 goto out;
 }
 
-static int coroutine_fn parallels_co_create_opts(const char *filename,
+static int coroutine_fn parallels_co_create_opts(BlockDriver *drv,
+ const char *filename,
  QemuOpts *opts,
  Error **errp)
 {
diff --git a/block/qcow.c b/block/qcow.c
index fce8989868..8973e4e565 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -934,7 +934,8 @@ exit:
 return ret;
 }
 
-static int coroutine_fn qcow_co_create_opts(const char *filename,
+static int coroutine_fn