diff options
Diffstat (limited to 'emulators/qemu/files/pcap-patch')
| -rw-r--r-- | emulators/qemu/files/pcap-patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/emulators/qemu/files/pcap-patch b/emulators/qemu/files/pcap-patch index 1565a2416c0f..39114c65d591 100644 --- a/emulators/qemu/files/pcap-patch +++ b/emulators/qemu/files/pcap-patch @@ -1,6 +1,6 @@ ---- qapi-schema.json.orig 2017-07-24 12:07:10 UTC -+++ qapi-schema.json -@@ -3882,6 +3882,19 @@ +--- qapi/net.json.orig 2018-04-24 16:30:47 UTC ++++ qapi/net.json +@@ -388,6 +388,19 @@ '*helper': 'str' } } ## @@ -20,37 +20,37 @@ # @NetdevHubPortOptions: # # Connect two or more net clients through a software hub. -@@ -3944,7 +3957,7 @@ +@@ -454,7 +467,7 @@ ## { 'enum': 'NetClientDriver', - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', 'dump', + 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', - 'bridge', 'hubport', 'netmap', 'vhost-user' ] } + 'bridge', 'hubport', 'netmap', 'vhost-user', 'pcap' ] } ## # @Netdev: -@@ -3967,6 +3980,7 @@ - 'nic': 'NetLegacyNicOptions', +@@ -478,6 +491,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', -+ 'pcap': 'NetdevPcapOptions', 'l2tpv3': 'NetdevL2TPv3Options', ++ 'pcap': 'NetdevPcapOptions', 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', -@@ -4005,7 +4019,7 @@ + 'bridge': 'NetdevBridgeOptions', +@@ -514,7 +528,7 @@ ## { 'enum': 'NetLegacyOptionsType', 'data': ['none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde', -- 'dump', 'bridge', 'netmap', 'vhost-user'] } -+ 'dump', 'bridge', 'netmap', 'vhost-user', 'pcap' ] } +- 'bridge', 'netmap', 'vhost-user'] } ++ 'bridge', 'netmap', 'vhost-user', 'pcap'] } ## # @NetLegacyOptions: -@@ -4022,6 +4036,7 @@ - 'nic': 'NetLegacyNicOptions', +@@ -532,6 +546,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', -+ 'pcap': 'NetdevPcapOptions', 'l2tpv3': 'NetdevL2TPv3Options', ++ 'pcap': 'NetdevPcapOptions', 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', + 'bridge': 'NetdevBridgeOptions', |