[libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12

Andrea Bolognani posted 8 patches 7 years, 2 months ago
[libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by Andrea Bolognani 7 years, 2 months ago
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../caps_2.12.0-gicv2.aarch64.replies              | 17145 +++++++++++++++
 .../caps_2.12.0-gicv2.aarch64.xml                  |   318 +
 .../caps_2.12.0-gicv3.aarch64.replies              | 17145 +++++++++++++++
 .../caps_2.12.0-gicv3.aarch64.xml                  |   318 +
 .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21091 +++++++++++++++++++
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1093 +
 .../caps_2.12.0.x86_64.replies                     | 19113 +++++++++++++++++
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  1270 ++
 tests/qemucapabilitiestest.c                       |     4 +
 9 files changed, 77497 insertions(+)
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
 create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
new file mode 100644
index 0000000000..9b1ed887e9
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
@@ -0,0 +1,17145 @@
+{
+  "QMP": {
+    "version": {
+      "qemu": {
+        "micro": 50,
+        "minor": 11,
+        "major": 2
+      },
+      "package": " (v2.11.0-2110-gf6d81cd)"
+    },
+    "capabilities": [
+    ]
+  }
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
new file mode 100644
index 0000000000..c81dfcba43
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
@@ -0,0 +1,318 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
new file mode 100644
index 0000000000..9a12b14569
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
@@ -0,0 +1,17145 @@
+{
+  "QMP": {
+    "version": {
+      "qemu": {
+        "micro": 50,
+        "minor": 11,
+        "major": 2
+      },
+      "package": " (v2.11.0-2110-gf6d81cd)"
+    },
+    "capabilities": [
+    ]
+  }
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
new file mode 100644
index 0000000000..fae7c26538
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
@@ -0,0 +1,318 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
new file mode 100644
index 0000000000..0ccf0ad403
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@@ -0,0 +1,21091 @@
+{
+  "QMP": {
+    "version": {
+      "qemu": {
+        "micro": 50,
+        "minor": 11,
+        "major": 2
+      },
+      "package": " (v2.11.0-2110-gf6d81cd)"
+    },
+    "capabilities": [
+    ]
+  }
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
new file mode 100644
index 0000000000..e82a7cd5dd
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -0,0 +1,1093 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
new file mode 100644
index 0000000000..c161dd006b
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@@ -0,0 +1,19113 @@
+{
+  "QMP": {
+    "version": {
+      "qemu": {
+        "micro": 50,
+        "minor": 11,
+        "major": 2
+      },
+      "package": " (v2.11.0-2110-gf6d81cdec8-dirty)"
+    },
+    "capabilities": [
+    ]
+  }
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
new file mode 100644
index 0000000000..50b2ac52d3
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -0,0 +1,1270 @@
+<qemuCaps>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <usedQMP/>
[...]
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index f9e8e187c2..dcad02588c 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -177,13 +177,17 @@ mymain(void)
     DO_TEST("x86_64", "caps_2.8.0");
     DO_TEST("x86_64", "caps_2.9.0");
     DO_TEST("x86_64", "caps_2.10.0");
+    DO_TEST("x86_64", "caps_2.12.0");
     DO_TEST("aarch64", "caps_2.6.0-gicv2");
     DO_TEST("aarch64", "caps_2.6.0-gicv3");
     DO_TEST("aarch64", "caps_2.10.0-gicv2");
     DO_TEST("aarch64", "caps_2.10.0-gicv3");
+    DO_TEST("aarch64", "caps_2.12.0-gicv2");
+    DO_TEST("aarch64", "caps_2.12.0-gicv3");
     DO_TEST("ppc64", "caps_2.6.0");
     DO_TEST("ppc64", "caps_2.9.0");
     DO_TEST("ppc64", "caps_2.10.0");
+    DO_TEST("ppc64", "caps_2.12.0");
     DO_TEST("s390x", "caps_2.7.0");
     DO_TEST("s390x", "caps_2.8.0");
     DO_TEST("s390x", "caps_2.9.0");
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by John Ferlan 7 years, 1 month ago

On 03/09/2018 10:18 AM, Andrea Bolognani wrote:
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  .../caps_2.12.0-gicv2.aarch64.replies              | 17145 +++++++++++++++
>  .../caps_2.12.0-gicv2.aarch64.xml                  |   318 +
>  .../caps_2.12.0-gicv3.aarch64.replies              | 17145 +++++++++++++++
>  .../caps_2.12.0-gicv3.aarch64.xml                  |   318 +
>  .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21091 +++++++++++++++++++
>  tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1093 +
>  .../caps_2.12.0.x86_64.replies                     | 19113 +++++++++++++++++
>  tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  1270 ++
>  tests/qemucapabilitiestest.c                       |     4 +
>  9 files changed, 77497 insertions(+)
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
> 

What, not adventurous enough for s390 too?! :-)

While 2.12 isn't "complete" yet, we may as well update now and then try
to remember later on when 2.12 finalizes to do the final update. I was
off trying to recollect the process of generating the files ;-)

If you need to do an update w/ latest before pushing this, that's fine.

Doesn't seem like anyone else is putting up the not yet flag, so in
order to make progress...

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by Daniel P. Berrangé 7 years, 1 month ago
On Fri, Mar 16, 2018 at 10:33:30AM -0400, John Ferlan wrote:
> 
> 
> On 03/09/2018 10:18 AM, Andrea Bolognani wrote:
> > Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> > ---
> >  .../caps_2.12.0-gicv2.aarch64.replies              | 17145 +++++++++++++++
> >  .../caps_2.12.0-gicv2.aarch64.xml                  |   318 +
> >  .../caps_2.12.0-gicv3.aarch64.replies              | 17145 +++++++++++++++
> >  .../caps_2.12.0-gicv3.aarch64.xml                  |   318 +
> >  .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21091 +++++++++++++++++++
> >  tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1093 +
> >  .../caps_2.12.0.x86_64.replies                     | 19113 +++++++++++++++++
> >  tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  1270 ++
> >  tests/qemucapabilitiestest.c                       |     4 +
> >  9 files changed, 77497 insertions(+)
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
> >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
> > 
> 
> What, not adventurous enough for s390 too?! :-)
> 
> While 2.12 isn't "complete" yet, we may as well update now and then try
> to remember later on when 2.12 finalizes to do the final update. I was
> off trying to recollect the process of generating the files ;-)

We have hit feature freeze for QEMU. A few pull requests are still
pending to be merged, but if you wait until middle of next week,
the capabilities should not change again before release unless
bad bugs are found.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by John Ferlan 7 years, 1 month ago

On 03/16/2018 10:41 AM, Daniel P. Berrangé wrote:
> On Fri, Mar 16, 2018 at 10:33:30AM -0400, John Ferlan wrote:
>>
>>
>> On 03/09/2018 10:18 AM, Andrea Bolognani wrote:
>>> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
>>> ---
>>>  .../caps_2.12.0-gicv2.aarch64.replies              | 17145 +++++++++++++++
>>>  .../caps_2.12.0-gicv2.aarch64.xml                  |   318 +
>>>  .../caps_2.12.0-gicv3.aarch64.replies              | 17145 +++++++++++++++
>>>  .../caps_2.12.0-gicv3.aarch64.xml                  |   318 +
>>>  .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21091 +++++++++++++++++++
>>>  tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   |  1093 +
>>>  .../caps_2.12.0.x86_64.replies                     | 19113 +++++++++++++++++
>>>  tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  |  1270 ++
>>>  tests/qemucapabilitiestest.c                       |     4 +
>>>  9 files changed, 77497 insertions(+)
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
>>>
>>
>> What, not adventurous enough for s390 too?! :-)
>>
>> While 2.12 isn't "complete" yet, we may as well update now and then try
>> to remember later on when 2.12 finalizes to do the final update. I was
>> off trying to recollect the process of generating the files ;-)
> 
> We have hit feature freeze for QEMU. A few pull requests are still
> pending to be merged, but if you wait until middle of next week,
> the capabilities should not change again before release unless
> bad bugs are found.
> 

I see that 2.12 hit rc0... since there's a few series upstream that are
essentially waiting for the real 2.12 replies/xml files - perhaps it'd
be good to just update this patch and get it pushed...

Then of course wait for the rush on qemu_capabilities.{c,h} updates...

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by Andrea Bolognani 7 years, 1 month ago
On Wed, 2018-03-21 at 07:34 -0400, John Ferlan wrote:
> > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
> > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
> > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
> > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
> > > 
> > > What, not adventurous enough for s390 too?! :-)

I usually generate capabilities data on the native architecture,
as that makes a diffence at least for aarch64. I've never bothered
obtaining access to an s390x machine, but I guess it shouldn't be
too difficult :)

> > > While 2.12 isn't "complete" yet, we may as well update now and then try
> > > to remember later on when 2.12 finalizes to do the final update. I was
> > > off trying to recollect the process of generating the files ;-)
> > 
> > We have hit feature freeze for QEMU. A few pull requests are still
> > pending to be merged, but if you wait until middle of next week,
> > the capabilities should not change again before release unless
> > bad bugs are found.
> 
> I see that 2.12 hit rc0... since there's a few series upstream that are
> essentially waiting for the real 2.12 replies/xml files - perhaps it'd
> be good to just update this patch and get it pushed...

I was not aware of other series being held up by this, but if
there is indeed any I can definitely collect the data again using
v2.12.0-rc0 and push.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by John Ferlan 7 years, 1 month ago

On 03/21/2018 09:03 AM, Andrea Bolognani wrote:
> On Wed, 2018-03-21 at 07:34 -0400, John Ferlan wrote:
>>>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
>>>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
>>>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
>>>>>  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
>>>>
>>>> What, not adventurous enough for s390 too?! :-)
> 
> I usually generate capabilities data on the native architecture,
> as that makes a diffence at least for aarch64. I've never bothered
> obtaining access to an s390x machine, but I guess it shouldn't be
> too difficult :)
> 
>>>> While 2.12 isn't "complete" yet, we may as well update now and then try
>>>> to remember later on when 2.12 finalizes to do the final update. I was
>>>> off trying to recollect the process of generating the files ;-)
>>>
>>> We have hit feature freeze for QEMU. A few pull requests are still
>>> pending to be merged, but if you wait until middle of next week,
>>> the capabilities should not change again before release unless
>>> bad bugs are found.
>>
>> I see that 2.12 hit rc0... since there's a few series upstream that are
>> essentially waiting for the real 2.12 replies/xml files - perhaps it'd
>> be good to just update this patch and get it pushed...
> 
> I was not aware of other series being held up by this, but if
> there is indeed any I can definitely collect the data again using
> v2.12.0-rc0 and push.
> 

Held up is perhaps a strong word, but there's a couple series where 2.12
is where a feature was added (sev - secure encrypted vms,
chardev-fd-pass, query-cpus-fast, and of course 'this' series).  Then
there's the virtio-gpu-ccw that'll be impacted by changes or merges w/
qemu_capabilities. I know I have an unposted series that will have merge
conflicts too...

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/8] tests: Add capabilities data for QEMU 2.12
Posted by Daniel P. Berrangé 7 years, 1 month ago
On Wed, Mar 21, 2018 at 02:03:18PM +0100, Andrea Bolognani wrote:
> On Wed, 2018-03-21 at 07:34 -0400, John Ferlan wrote:
> > > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies
> > > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies
> > > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
> > > > >  create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
> > > > 
> > > > What, not adventurous enough for s390 too?! :-)
> 
> I usually generate capabilities data on the native architecture,
> as that makes a diffence at least for aarch64. I've never bothered
> obtaining access to an s390x machine, but I guess it shouldn't be
> too difficult :)
> 
> > > > While 2.12 isn't "complete" yet, we may as well update now and then try
> > > > to remember later on when 2.12 finalizes to do the final update. I was
> > > > off trying to recollect the process of generating the files ;-)
> > > 
> > > We have hit feature freeze for QEMU. A few pull requests are still
> > > pending to be merged, but if you wait until middle of next week,
> > > the capabilities should not change again before release unless
> > > bad bugs are found.
> > 
> > I see that 2.12 hit rc0... since there's a few series upstream that are
> > essentially waiting for the real 2.12 replies/xml files - perhaps it'd
> > be good to just update this patch and get it pushed...
> 
> I was not aware of other series being held up by this, but if
> there is indeed any I can definitely collect the data again using
> v2.12.0-rc0 and push.

Yeah, that's fine with me.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

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