diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9b1993096446cb1ae97ee3f0f86726c1bc9c3397..a7575fcd8b2ce82db1b5bb8ecc860b8e5e2a7614 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -537,7 +537,6 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 335 */ "bochs-display", "migration-file-drop-cache", - "net-socket-dgram", "dbus-vmstate", ); @@ -4394,10 +4393,6 @@ 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); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 54f91151c6912dd2a1e6eea983773ce3201912c6..fe80fb53919e68434919a0d7b5743a1a9bc58750 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -518,7 +518,6 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 335 */ QEMU_CAPS_DEVICE_BOCHS_DISPLAY, /* -device bochs-display */ QEMU_CAPS_MIGRATION_FILE_DROP_CACHE, /* migration with disk cache on is safe for type='file' disks */ - QEMU_CAPS_NET_SOCKET_DGRAM, /* -net socket,fd= with dgram socket */ QEMU_CAPS_DBUS_VMSTATE, /* -object dbus-vmstate */ QEMU_CAPS_LAST /* this must always be the last item */ diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 1627b2cb5ef2e9160ce875887065a586b5b042e3..20f119665b9e1bc5f3c622cf502f896a6ac0eb25 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -165,7 +165,6 @@ - 4000000 0 61700758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 73859becab9a76b33a4ea32b88fe6e4f211606af..9ea6f4d0464915305dcae0f71ccec7be3984cbae 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -170,7 +170,6 @@ - 4000000 0 42900758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index ab6a774c3faff90341d781ed405c83a1fb953ee5..7503c2dbcdc5d2f8c72a5dce30974d31f4f17edd 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -168,7 +168,6 @@ - 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index f731e7b4faa3f0ecd2897bbbb81c09ce460c47f1..4a94179ee7ace2ecdb56506071aff62e5ca85e10 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -168,7 +168,6 @@ - 4000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 6cad000a114dbe76003946d971a27f50cd709f2d..ef802f3d1f4219723b9a101f6869cd7351a28f2a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -132,7 +132,6 @@ - 4000000 0 39100758 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 79593c467a84ce8176d49830d36c5afba4b6da64..87c95f4d189380d5ca45335a9bb1c456b7b2f141 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -207,7 +207,6 @@ - 4000000 0 43100758 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 05e6538e37b5ebe90bfcc8bf3248ded84176a70f..f4583d7fe7d28387b154788037435dc733112206 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -209,7 +209,6 @@ - 4000050 0 43100759