fix: Enable networkInterfaceMultiqueue only if sockets > 1

Enable networkInterfaceMultiqueue only if the amount of sockets is greater than one, since networkInterfaceMultiqueue requires at least two sockets. Signed-off-by: Felix Matouschek <[email protected]>
kubevirt · Jun 20, 2024 · 3f64e24 · 3f64e24
1 parent 439a454
commit 3f64e24
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 6 deletions.
diff --git a/templates/centos-stream8.tpl.yaml b/templates/centos-stream8.tpl.yaml
@@ -112,7 +112,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/centos-stream9.tpl.yaml b/templates/centos-stream9.tpl.yaml
@@ -112,7 +112,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/centos6.tpl.yaml b/templates/centos6.tpl.yaml
@@ -101,7 +101,9 @@ objects:
           memory:
             guest: {{ item.memsize }}
           devices:
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
             useVirtioTransitional: true
             rng: {}
 {% if item.tablet %}

diff --git a/templates/centos7.tpl.yaml b/templates/centos7.tpl.yaml
@@ -112,7 +112,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/fedora.tpl.yaml b/templates/fedora.tpl.yaml
@@ -123,7 +123,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/opensuse.tpl.yaml b/templates/opensuse.tpl.yaml
@@ -106,7 +106,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/rhel7.tpl.yaml b/templates/rhel7.tpl.yaml
@@ -112,7 +112,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/rhel8.tpl.yaml b/templates/rhel8.tpl.yaml
@@ -114,7 +114,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/rhel9.tpl.yaml b/templates/rhel9.tpl.yaml
@@ -114,7 +114,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/ubuntu.tpl.yaml b/templates/ubuntu.tpl.yaml
@@ -112,7 +112,9 @@ objects:
             guest: {{ item.memsize }}
           devices:
             rng: {}
+{% if item.cpus > 1 %}
             networkInterfaceMultiqueue: true
+{% endif %}
 {% if item.tablet %}
             inputs:
               - type: tablet

diff --git a/templates/windows10.tpl.yaml b/templates/windows10.tpl.yaml
@@ -149,7 +149,7 @@ objects:
               efi:
                 secureBoot: true
           devices:
-{% if item.multiqueue %}
+{% if item.multiqueue and item.cpus > 1 %}
             networkInterfaceMultiqueue: True
 {% endif %}
             disks:

diff --git a/templates/windows11.tpl.yaml b/templates/windows11.tpl.yaml
@@ -155,7 +155,7 @@ objects:
               efi:
                 secureBoot: true
           devices:
-{% if item.multiqueue %}
+{% if item.multiqueue and item.cpus > 1 %}
             networkInterfaceMultiqueue: True
 {% endif %}
             disks:

diff --git a/templates/windows2k12.tpl.yaml b/templates/windows2k12.tpl.yaml
@@ -150,7 +150,7 @@ objects:
               efi:
                 secureBoot: true
           devices:
-{% if item.multiqueue %}
+{% if item.multiqueue and item.cpus > 1 %}
             networkInterfaceMultiqueue: True
 {% endif %}
             disks:

diff --git a/templates/windows2k16.tpl.yaml b/templates/windows2k16.tpl.yaml
@@ -149,7 +149,7 @@ objects:
               efi:
                 secureBoot: true
           devices:
-{% if item.multiqueue %}
+{% if item.multiqueue and item.cpus > 1 %}
             networkInterfaceMultiqueue: True
 {% endif %}
             disks:

diff --git a/templates/windows2k19.tpl.yaml b/templates/windows2k19.tpl.yaml
@@ -149,7 +149,7 @@ objects:
               efi:
                 secureBoot: true
           devices:
-{% if item.multiqueue %}
+{% if item.multiqueue and item.cpus > 1 %}
             networkInterfaceMultiqueue: True
 {% endif %}
             disks:

diff --git a/templates/windows2k22.tpl.yaml b/templates/windows2k22.tpl.yaml
@@ -149,7 +149,7 @@ objects:
               efi:
                 secureBoot: true
           devices:
-{% if item.multiqueue %}
+{% if item.multiqueue and item.cpus > 1 %}
             networkInterfaceMultiqueue: True
 {% endif %}
             disks: