conf: Introduce igb model for <interface>

igb is a new network device which will be introduced with QEMU 8.0.0.
It is a successor of e1000e so it has PCIe interface and is understands
virtio-net headers as e1000e does.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 27f83e254d66dcb9db3b87eb73c89673abd21db8..388c620221424ab5c18caf95bc2f8014f4fa3209 100644 (file)
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -5409,6 +5409,7 @@ Typical values for QEMU and KVM include: ne2k_isa i82551 i82557b i82559er
 ne2k_pci pcnet rtl8139 e1000 virtio. :since:`Since 5.2.0` ,
 ``virtio-transitional`` and ``virtio-non-transitional`` values are supported.
 See `Virtio transitional devices`_ for more details.
+:since:`Since 9.3.0` igb is also supported.
 
 Setting NIC driver-specific options
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4d446d7ec1a8ff7eb60e4b53dc98b07722c638a8..b03a3ff011b4df4026d5ef00c0fc9f40acc7612e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -588,6 +588,7 @@ VIR_ENUM_IMPL(virDomainNetModel,
               "virtio",
               "e1000",
               "e1000e",
+              "igb",
               "virtio-transitional",
               "virtio-non-transitional",
               "usb-net",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index bd6b7a1a19aaa2797c4f58b3e47962b9e67d4f2c..511067a0502a3f8ed4dd2de1ab6fbbf6438e9ec9 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -943,6 +943,7 @@ typedef enum {
     VIR_DOMAIN_NET_MODEL_VIRTIO,
     VIR_DOMAIN_NET_MODEL_E1000,
     VIR_DOMAIN_NET_MODEL_E1000E,
+    VIR_DOMAIN_NET_MODEL_IGB,
     VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL,
     VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL,
     VIR_DOMAIN_NET_MODEL_USB_NET,

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 165f975e2a1a3917158f61fc3f703282fee7e510..7d3d072d5a254a0add72d7599ebb82e46cb4e308 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -757,7 +757,8 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
         if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL)
             return pciFlags;
 
-        if (net->model == VIR_DOMAIN_NET_MODEL_E1000E)
+        if (net->model == VIR_DOMAIN_NET_MODEL_E1000E ||
+            net->model == VIR_DOMAIN_NET_MODEL_IGB)
             return pcieFlags;
 
         /* the only time model can be "unknown" is for type='hostdev'

diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
index faf7922f31e9c155148e0272898e4af3cdeff0df..e395bfcc5b47a2e8405174cbfbe841d6cc291f79 100644 (file)
--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
@@ -241,6 +241,7 @@ qemuInterfaceIsVnetCompatModel(const virDomainNetDef *net)
 {
     return (virDomainNetIsVirtioModel(net) ||
             net->model == VIR_DOMAIN_NET_MODEL_E1000E ||
+            net->model == VIR_DOMAIN_NET_MODEL_IGB ||
             net->model == VIR_DOMAIN_NET_MODEL_VMXNET3);
 }