提交 f73e62a1 编写于 作者: M Michal Privoznik

Revert "qemu: add socket datagram capability"

This reverts commit 0cebb642.

This capability is not used anywhere and also it is not contained
in any release so it's safe to just remove it.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 ccf41a4b
......@@ -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);
}
......
......@@ -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 */
......
......@@ -165,7 +165,6 @@
<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>
......
......@@ -170,7 +170,6 @@
<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>
......
......@@ -168,7 +168,6 @@
<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>
......
......@@ -168,7 +168,6 @@
<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>
......
......@@ -132,7 +132,6 @@
<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>
......
......@@ -207,7 +207,6 @@
<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>
......
......@@ -209,7 +209,6 @@
<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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册