Revert "Temporarily disable bla"

This reverts commit 385543a5.

I've mistakenly pushed wrong branch.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>

src/qemu/qemu_capabilities.c

@@ -4393,6 +4393,10 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
         ARCH_IS_PPC64(qemuCaps->arch)) {
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
     }
+
+    /* -net socket,fd= with dgram socket (for ex, with slirp helper) */
+    if (qemuCaps->version >= 4000000)
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_NET_SOCKET_DGRAM);
 }
 
 

tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml

@@ -165,6 +165,7 @@
   <flag name='nbd-bitmap'/>
   <flag name='bochs-display'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700758</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml

@@ -170,6 +170,7 @@
   <flag name='nbd-bitmap'/>
   <flag name='bochs-display'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900758</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml

@@ -168,6 +168,7 @@
   <flag name='nbd-bitmap'/>
   <flag name='bochs-display'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml

@@ -168,6 +168,7 @@
   <flag name='nbd-bitmap'/>
   <flag name='bochs-display'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml

@@ -132,6 +132,7 @@
   <flag name='bitmap-merge'/>
   <flag name='nbd-bitmap'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100758</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

@@ -207,6 +207,7 @@
   <flag name='x86-max-cpu'/>
   <flag name='bochs-display'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100758</microcodeVersion>

tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml

@@ -209,6 +209,7 @@
   <flag name='canonical-cpu-features'/>
   <flag name='bochs-display'/>
   <flag name='migration-file-drop-cache'/>
+  <flag name='net-socket-dgram'/>
   <version>4000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100759</microcodeVersion>

tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args

@@ -29,7 +29,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--netdev user,id=hostnet0 \
+-netdev socket,fd=42,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\
 addr=0x2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\