[06/30] storagefile: Drop now unused isQCow2 argument

Message ID eb91e4127cd3c94628d588742219b15900eccf40.1570482718.git.crobinso@redhat.com
State Accepted
Commit 6017e7b3b875a747c2e49356e2fa8096b59dd180
Headers show
Series
  • storagefile, security: qcow2 data_file support
Related show

Commit Message

Cole Robinson Oct. 7, 2019, 9:49 p.m.
Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 src/util/virstoragefile.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Daniel Henrique Barboza Oct. 9, 2019, 8:52 p.m. | #1
On 10/7/19 6:49 PM, Cole Robinson wrote:
> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> ---


Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>


>   src/util/virstoragefile.c | 7 +++----

>   1 file changed, 3 insertions(+), 4 deletions(-)

>

> diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c

> index 9bf4c1178b..14551af4d2 100644

> --- a/src/util/virstoragefile.c

> +++ b/src/util/virstoragefile.c

> @@ -485,8 +485,7 @@ static int

>   qcowXGetBackingStore(char **res,

>                        int *format,

>                        const char *buf,

> -                     size_t buf_size,

> -                     bool isQCow2 ATTRIBUTE_UNUSED)

> +                     size_t buf_size)

>   {

>       unsigned long long offset;

>       unsigned int size;

> @@ -572,7 +571,7 @@ qcow1GetBackingStore(char **res,

>                        const char *buf,

>                        size_t buf_size)

>   {

> -    return qcowXGetBackingStore(res, format, buf, buf_size, false);

> +    return qcowXGetBackingStore(res, format, buf, buf_size);

>   }

>   

>   static int

> @@ -581,7 +580,7 @@ qcow2GetBackingStore(char **res,

>                        const char *buf,

>                        size_t buf_size)

>   {

> -    return qcowXGetBackingStore(res, format, buf, buf_size, true);

> +    return qcowXGetBackingStore(res, format, buf, buf_size);

>   }

>   

>   


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patch

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 9bf4c1178b..14551af4d2 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -485,8 +485,7 @@  static int
 qcowXGetBackingStore(char **res,
                      int *format,
                      const char *buf,
-                     size_t buf_size,
-                     bool isQCow2 ATTRIBUTE_UNUSED)
+                     size_t buf_size)
 {
     unsigned long long offset;
     unsigned int size;
@@ -572,7 +571,7 @@  qcow1GetBackingStore(char **res,
                      const char *buf,
                      size_t buf_size)
 {
-    return qcowXGetBackingStore(res, format, buf, buf_size, false);
+    return qcowXGetBackingStore(res, format, buf, buf_size);
 }
 
 static int
@@ -581,7 +580,7 @@  qcow2GetBackingStore(char **res,
                      const char *buf,
                      size_t buf_size)
 {
-    return qcowXGetBackingStore(res, format, buf, buf_size, true);
+    return qcowXGetBackingStore(res, format, buf, buf_size);
 }