1. Patchew
  2. Libvirt
  3. [libvirt] [PATCH 0/3] qemu: Fix formatting of (some) unsigned long long values to JSON (blockdev-add saga)
  4. View patch

[libvirt] [PATCH 2/3] tests: qemublock: Use bigger numbers as dummy capacity/physical

Peter Krempa posted 3 patches 6 years, 5 months ago
[libvirt] [PATCH 2/3] tests: qemublock: Use bigger numbers as dummy capacity/physical
Posted by Peter Krempa 6 years, 5 months ago 
Actually test that the full range is available.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemublocktest.c                                         | 4 ++--
 tests/qemublocktestdata/imagecreate/luks-encopts.json         | 4 ++--
 tests/qemublocktestdata/imagecreate/luks-noopts.json          | 4 ++--
 .../qemublocktestdata/imagecreate/network-gluster-qcow2.json  | 4 ++--
 tests/qemublocktestdata/imagecreate/network-rbd-qcow2.json    | 4 ++--
 .../qemublocktestdata/imagecreate/network-sheepdog-qcow2.json | 4 ++--
 tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json    | 4 ++--
 tests/qemublocktestdata/imagecreate/qcow2-backing-luks.json   | 4 ++--
 .../qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.json  | 4 ++--
 tests/qemublocktestdata/imagecreate/qcow2-backing-raw.json    | 4 ++--
 .../imagecreate/qcow2-luks-encopts-backing.json               | 4 ++--
 tests/qemublocktestdata/imagecreate/qcow2-luks-encopts.json   | 4 ++--
 tests/qemublocktestdata/imagecreate/qcow2-luks-noopts.json    | 4 ++--
 tests/qemublocktestdata/imagecreate/qcow2.json                | 4 ++--
 tests/qemublocktestdata/imagecreate/raw.json                  | 2 +-
 15 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 0bc4b65449..1bf72a4615 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -420,8 +420,8 @@ testQemuImageCreate(const void *opaque)
         return -1;

     /* fake some sizes */
-    src->capacity = 1337;
-    src->physical = 42;
+    src->capacity = UINT_MAX * 2ULL;
+    src->physical = UINT_MAX + 1ULL;

     if (qemuDomainValidateStorageSource(src, data->qemuCaps) < 0)
         return -1;
diff --git a/tests/qemublocktestdata/imagecreate/luks-encopts.json b/tests/qemublocktestdata/imagecreate/luks-encopts.json
index f065ad89a7..c5ca863f5b 100644
--- a/tests/qemublocktestdata/imagecreate/luks-encopts.json
+++ b/tests/qemublocktestdata/imagecreate/luks-encopts.json
@@ -2,7 +2,7 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.img",
-  "size": 42
+  "size": 4294967296
 }

 format:
@@ -15,5 +15,5 @@ format:
   "ivgen-hash-alg": "sha256",
   "driver": "luks",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/luks-noopts.json b/tests/qemublocktestdata/imagecreate/luks-noopts.json
index 1ea1948119..8a0944151d 100644
--- a/tests/qemublocktestdata/imagecreate/luks-noopts.json
+++ b/tests/qemublocktestdata/imagecreate/luks-noopts.json
@@ -2,7 +2,7 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.img",
-  "size": 42
+  "size": 4294967296
 }

 format:
@@ -10,5 +10,5 @@ format:
   "key-secret": "0123456789ABCDEF0123456789ABCDE-encalias",
   "driver": "luks",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/network-gluster-qcow2.json b/tests/qemublocktestdata/imagecreate/network-gluster-qcow2.json
index aee7bfd401..3e35beb088 100644
--- a/tests/qemublocktestdata/imagecreate/network-gluster-qcow2.json
+++ b/tests/qemublocktestdata/imagecreate/network-gluster-qcow2.json
@@ -17,12 +17,12 @@ protocol:
       }
     ]
   },
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/network-rbd-qcow2.json b/tests/qemublocktestdata/imagecreate/network-rbd-qcow2.json
index 56d9c0f1ed..67e2679dae 100644
--- a/tests/qemublocktestdata/imagecreate/network-rbd-qcow2.json
+++ b/tests/qemublocktestdata/imagecreate/network-rbd-qcow2.json
@@ -15,12 +15,12 @@ protocol:
       }
     ]
   },
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json b/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json
index b7272625a2..d86bef6bc8 100644
--- a/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json
+++ b/tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json
@@ -9,12 +9,12 @@ protocol:
     },
     "vdi": "asdf/i.qcow2"
   },
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json
index 31416ed4fc..d58054c081 100644
--- a/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json
+++ b/tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json
@@ -8,12 +8,12 @@ protocol:
       "port": "1234"
     }
   },
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-luks.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-luks.json
index 63ba35dc79..5f9a800c6c 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2-backing-luks.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-luks.json
@@ -2,14 +2,14 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337,
+  "size": 8589934590,
   "backing-file": "/var/lib/libvirt/images/i.img",
   "backing-fmt": "luks"
 }
diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.json
index b9d1d97302..c10ab98c8a 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.json
@@ -2,14 +2,14 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337,
+  "size": 8589934590,
   "backing-file": "nbd://example.com:1234",
   "backing-fmt": "raw"
 }
diff --git a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw.json b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw.json
index 8176c8dadd..eb9fb413f6 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2-backing-raw.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2-backing-raw.json
@@ -2,14 +2,14 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337,
+  "size": 8589934590,
   "backing-file": "/var/lib/libvirt/images/i.img",
   "backing-fmt": "raw"
 }
diff --git a/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts-backing.json b/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts-backing.json
index a57617dfac..641b5e04c9 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts-backing.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts-backing.json
@@ -2,14 +2,14 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337,
+  "size": 8589934590,
   "backing-file": "/var/lib/libvirt/images/i.qcow2",
   "backing-fmt": "qcow2",
   "encrypt": {
diff --git a/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts.json b/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts.json
index 8796726fcb..28c85ec90b 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2-luks-encopts.json
@@ -2,14 +2,14 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337,
+  "size": 8589934590,
   "encrypt": {
     "key-secret": "0123456789ABCDEF0123456789ABCDE-encalias",
     "cipher-alg": "serpent-256",
diff --git a/tests/qemublocktestdata/imagecreate/qcow2-luks-noopts.json b/tests/qemublocktestdata/imagecreate/qcow2-luks-noopts.json
index f9caaee6bb..b5063a846d 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2-luks-noopts.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2-luks-noopts.json
@@ -2,14 +2,14 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337,
+  "size": 8589934590,
   "encrypt": {
     "key-secret": "0123456789ABCDEF0123456789ABCDE-encalias",
     "format": "luks"
diff --git a/tests/qemublocktestdata/imagecreate/qcow2.json b/tests/qemublocktestdata/imagecreate/qcow2.json
index 7142cf67b6..732763b763 100644
--- a/tests/qemublocktestdata/imagecreate/qcow2.json
+++ b/tests/qemublocktestdata/imagecreate/qcow2.json
@@ -2,12 +2,12 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.qcow2",
-  "size": 42
+  "size": 4294967296
 }

 format:
 {
   "driver": "qcow2",
   "file": "0123456789ABCDEF0123456789ABCDE",
-  "size": 1337
+  "size": 8589934590
 }
diff --git a/tests/qemublocktestdata/imagecreate/raw.json b/tests/qemublocktestdata/imagecreate/raw.json
index 06abb25ab9..89a6c2d237 100644
--- a/tests/qemublocktestdata/imagecreate/raw.json
+++ b/tests/qemublocktestdata/imagecreate/raw.json
@@ -2,7 +2,7 @@ protocol:
 {
   "driver": "file",
   "filename": "/var/lib/libvirt/images/i.img",
-  "size": 42
+  "size": 4294967296
 }

 format:
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/3] tests: qemublock: Use bigger numbers as dummy capacity/physical
Posted by Ján Tomko 6 years, 5 months ago 
On Fri, Aug 30, 2019 at 04:45:04PM +0200, Peter Krempa wrote:
>Actually test that the full range is available.
>
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> tests/qemublocktest.c                                         | 4 ++--
> tests/qemublocktestdata/imagecreate/luks-encopts.json         | 4 ++--
> tests/qemublocktestdata/imagecreate/luks-noopts.json          | 4 ++--
> .../qemublocktestdata/imagecreate/network-gluster-qcow2.json  | 4 ++--
> tests/qemublocktestdata/imagecreate/network-rbd-qcow2.json    | 4 ++--
> .../qemublocktestdata/imagecreate/network-sheepdog-qcow2.json | 4 ++--
> tests/qemublocktestdata/imagecreate/network-ssh-qcow2.json    | 4 ++--
> tests/qemublocktestdata/imagecreate/qcow2-backing-luks.json   | 4 ++--
> .../qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.json  | 4 ++--
> tests/qemublocktestdata/imagecreate/qcow2-backing-raw.json    | 4 ++--
> .../imagecreate/qcow2-luks-encopts-backing.json               | 4 ++--
> tests/qemublocktestdata/imagecreate/qcow2-luks-encopts.json   | 4 ++--
> tests/qemublocktestdata/imagecreate/qcow2-luks-noopts.json    | 4 ++--
> tests/qemublocktestdata/imagecreate/qcow2.json                | 4 ++--
> tests/qemublocktestdata/imagecreate/raw.json                  | 2 +-
> 15 files changed, 29 insertions(+), 29 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/3] tests: qemublock: Use bigger numbers as dummy capacity/physical
Posted by Christophe de Dinechin 6 years, 5 months ago 
Peter Krempa writes:

> Actually test that the full range is available.
>
[...]
>          return -1;
> diff --git a/tests/qemublocktestdata/imagecreate/luks-encopts.json b/tests/qemublocktestdata/imagecreate/luks-encopts.json
> index f065ad89a7..c5ca863f5b 100644
> --- a/tests/qemublocktestdata/imagecreate/luks-encopts.json
> +++ b/tests/qemublocktestdata/imagecreate/luks-encopts.json
> @@ -2,7 +2,7 @@ protocol:
>  {
>    "driver": "file",
>    "filename": "/var/lib/libvirt/images/i.img",
> -  "size": 42
> +  "size": 4294967296
>  }

Does any of these tests actually require that much space to run?
If so, what is the impact on QE teams?

--
Cheers,
Christophe de Dinechin (IRC c3d)

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/3] tests: qemublock: Use bigger numbers as dummy capacity/physical
Posted by Ján Tomko 6 years, 5 months ago 
On Fri, Aug 30, 2019 at 05:30:35PM +0200, Christophe de Dinechin wrote:
>
>Peter Krempa writes:
>
>> Actually test that the full range is available.
>>
>[...]
>>          return -1;
>> diff --git a/tests/qemublocktestdata/imagecreate/luks-encopts.json b/tests/qemublocktestdata/imagecreate/luks-encopts.json
>> index f065ad89a7..c5ca863f5b 100644
>> --- a/tests/qemublocktestdata/imagecreate/luks-encopts.json
>> +++ b/tests/qemublocktestdata/imagecreate/luks-encopts.json
>> @@ -2,7 +2,7 @@ protocol:
>>  {
>>    "driver": "file",
>>    "filename": "/var/lib/libvirt/images/i.img",
>> -  "size": 42
>> +  "size": 4294967296
>>  }
>
>Does any of these tests actually require that much space to run?

No, parsing a four hundred byte json file does not really take much
space.

Jano

>If so, what is the impact on QE teams?
>
>--
>Cheers,
>Christophe de Dinechin (IRC c3d)
>
>--
>libvir-list mailing list
>libvir-list@redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.