1. Patchew
  2. Libvirt
  3. [libvirt PATCH 0/2] Revert mdev autostart support
  4. View patch

[libvirt PATCH 1/2] Partial Revert of "tests: nodedevxml2xmltest: test more mdev files"

Jonathon Jongsma posted 2 patches 4 years, 8 months ago
[libvirt PATCH 1/2] Partial Revert of "tests: nodedevxml2xmltest: test more mdev files"
Posted by Jonathon Jongsma 4 years, 8 months ago 
This reverts parts of commit bb8c3b61208ed0f29dcbeca857529600f04b3146
that added tests for autostart functionality (which will be reverted in
the following commit)
---
 tests/nodedevschemadata/mdev_autostart.xml            | 10 ----------
 tests/nodedevschemadata/mdev_manual.xml               | 10 ----------
 tests/nodedevxml2xmlout/mdev_autostart.xml            | 11 -----------
 .../mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml     |  1 -
 .../mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml     |  1 -
 .../mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml     |  1 -
 tests/nodedevxml2xmlout/mdev_manual.xml               | 11 -----------
 tests/nodedevxml2xmltest.c                            |  2 --
 8 files changed, 47 deletions(-)
 delete mode 100644 tests/nodedevschemadata/mdev_autostart.xml
 delete mode 100644 tests/nodedevschemadata/mdev_manual.xml
 delete mode 100644 tests/nodedevxml2xmlout/mdev_autostart.xml
 delete mode 100644 tests/nodedevxml2xmlout/mdev_manual.xml

diff --git a/tests/nodedevschemadata/mdev_autostart.xml b/tests/nodedevschemadata/mdev_autostart.xml
deleted file mode 100644
index 7f2f341648..0000000000
--- a/tests/nodedevschemadata/mdev_autostart.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<device>
-  <name>mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100</name>
-  <parent>pci_0000_00_02_0</parent>
-  <capability type='mdev'>
-    <type id='i915-GVTg_V5_8'/>
-    <attr name='example-attribute' value='attribute-value'/>
-    <start type='auto'/>
-    <uuid>9c4954d2-fa39-4973-9d66-d61c6c4d0100</uuid>
-  </capability>
-</device>
diff --git a/tests/nodedevschemadata/mdev_manual.xml b/tests/nodedevschemadata/mdev_manual.xml
deleted file mode 100644
index 9001588c24..0000000000
--- a/tests/nodedevschemadata/mdev_manual.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<device>
-  <name>mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100</name>
-  <parent>pci_0000_00_02_0</parent>
-  <capability type='mdev'>
-    <type id='i915-GVTg_V5_8'/>
-    <attr name='example-attribute' value='attribute-value'/>
-    <start type='manual'/>
-    <uuid>9c4954d2-fa39-4973-9d66-d61c6c4d0100</uuid>
-  </capability>
-</device>
diff --git a/tests/nodedevxml2xmlout/mdev_autostart.xml b/tests/nodedevxml2xmlout/mdev_autostart.xml
deleted file mode 100644
index 4313c4a145..0000000000
--- a/tests/nodedevxml2xmlout/mdev_autostart.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<device>
-  <name>mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100</name>
-  <parent>pci_0000_00_02_0</parent>
-  <capability type='mdev'>
-    <type id='i915-GVTg_V5_8'/>
-    <uuid>9c4954d2-fa39-4973-9d66-d61c6c4d0100</uuid>
-    <start type='auto'/>
-    <iommuGroup number='0'/>
-    <attr name='example-attribute' value='attribute-value'/>
-  </capability>
-</device>
diff --git a/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml b/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
index bff95b015b..4f9d491981 100644
--- a/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
+++ b/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
@@ -4,7 +4,6 @@
   <capability type='mdev'>
     <type id='i915-GVTg_V5_8'/>
     <uuid>d069d019-36ea-4111-8f0a-8c9a70e21366</uuid>
-    <start type='manual'/>
     <iommuGroup number='0'/>
   </capability>
 </device>
diff --git a/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml b/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
index beb25b1989..1aa0afe085 100644
--- a/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
+++ b/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
@@ -3,7 +3,6 @@
   <parent>pci_0000_00_02_0</parent>
   <capability type='mdev'>
     <type id='i915-GVTg_V5_8'/>
-    <start type='manual'/>
     <iommuGroup number='0'/>
     <attr name='example-attribute-1' value='attribute-value-1'/>
     <attr name='example-attribute-2' value='attribute-value-2'/>
diff --git a/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml b/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
index 1d6dbb6118..da2a702304 100644
--- a/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
+++ b/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
@@ -3,7 +3,6 @@
   <parent>pci_0000_00_02_0</parent>
   <capability type='mdev'>
     <type id='i915-GVTg_V5_8'/>
-    <start type='manual'/>
     <iommuGroup number='0'/>
     <attr name='example-attribute' value='attribute-value'/>
   </capability>
diff --git a/tests/nodedevxml2xmlout/mdev_manual.xml b/tests/nodedevxml2xmlout/mdev_manual.xml
deleted file mode 100644
index 0735f29e1e..0000000000
--- a/tests/nodedevxml2xmlout/mdev_manual.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<device>
-  <name>mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100</name>
-  <parent>pci_0000_00_02_0</parent>
-  <capability type='mdev'>
-    <type id='i915-GVTg_V5_8'/>
-    <uuid>9c4954d2-fa39-4973-9d66-d61c6c4d0100</uuid>
-    <start type='manual'/>
-    <iommuGroup number='0'/>
-    <attr name='example-attribute' value='attribute-value'/>
-  </capability>
-</device>
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index 7bd508f750..e9716726d7 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -135,8 +135,6 @@ mymain(void)
     DO_TEST("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366");
     DO_TEST("mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9");
     DO_TEST("mdev_fedc4916_1ca8_49ac_b176_871d16c13076");
-    DO_TEST("mdev_autostart");
-    DO_TEST("mdev_manual");
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-- 
2.31.1
Re: [libvirt PATCH 1/2] Partial Revert of "tests: nodedevxml2xmltest: test more mdev files"
Posted by Michal Prívozník 4 years, 8 months ago 
On 5/26/21 5:40 PM, Jonathon Jongsma wrote:
> This reverts parts of commit bb8c3b61208ed0f29dcbeca857529600f04b3146
> that added tests for autostart functionality (which will be reverted in
> the following commit)
> ---
>  tests/nodedevschemadata/mdev_autostart.xml            | 10 ----------
>  tests/nodedevschemadata/mdev_manual.xml               | 10 ----------
>  tests/nodedevxml2xmlout/mdev_autostart.xml            | 11 -----------
>  .../mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml     |  1 -
>  .../mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml     |  1 -
>  .../mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml     |  1 -
>  tests/nodedevxml2xmlout/mdev_manual.xml               | 11 -----------
>  tests/nodedevxml2xmltest.c                            |  2 --
>  8 files changed, 47 deletions(-)
>  delete mode 100644 tests/nodedevschemadata/mdev_autostart.xml
>  delete mode 100644 tests/nodedevschemadata/mdev_manual.xml
>  delete mode 100644 tests/nodedevxml2xmlout/mdev_autostart.xml
>  delete mode 100644 tests/nodedevxml2xmlout/mdev_manual.xml

> diff --git a/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml b/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
> index bff95b015b..4f9d491981 100644
> --- a/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
> +++ b/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml
> @@ -4,7 +4,6 @@
>    <capability type='mdev'>
>      <type id='i915-GVTg_V5_8'/>
>      <uuid>d069d019-36ea-4111-8f0a-8c9a70e21366</uuid>
> -    <start type='manual'/>

This ..

>      <iommuGroup number='0'/>
>    </capability>
>  </device>
> diff --git a/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml b/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
> index beb25b1989..1aa0afe085 100644
> --- a/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
> +++ b/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml
> @@ -3,7 +3,6 @@
>    <parent>pci_0000_00_02_0</parent>
>    <capability type='mdev'>
>      <type id='i915-GVTg_V5_8'/>
> -    <start type='manual'/>

and this ...

>      <iommuGroup number='0'/>
>      <attr name='example-attribute-1' value='attribute-value-1'/>
>      <attr name='example-attribute-2' value='attribute-value-2'/>
> diff --git a/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml b/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
> index 1d6dbb6118..da2a702304 100644
> --- a/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
> +++ b/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml
> @@ -3,7 +3,6 @@
>    <parent>pci_0000_00_02_0</parent>
>    <capability type='mdev'>
>      <type id='i915-GVTg_V5_8'/>
> -    <start type='manual'/>

.. and this needs to stay and should be removed in the next commit,
because otherwise xml2xml test fails. Rightfully, as the input XMLs
still have them. I'll fix that before pushing.

>      <iommuGroup number='0'/>
>      <attr name='example-attribute' value='attribute-value'/>
>    </capability>

Michal

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.