diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-05-17 21:32:37 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-05-17 21:32:37 -0700 |
| commit | bcf0a3a422cd5d1b1c3c09c0e161205837dbe131 (patch) | |
| tree | dc46ca7444d5c7d94ffc9d0a96c0dcc3c24ea464 /net/net.c | |
| parent | eec398119fc6911d99412c37af06a6bc27871f85 (diff) | |
| parent | 052c2579b89b0d87debe8b05594b5180f0fde87d (diff) | |
| download | focaccia-qemu-bcf0a3a422cd5d1b1c3c09c0e161205837dbe131.tar.gz focaccia-qemu-bcf0a3a422cd5d1b1c3c09c0e161205837dbe131.zip | |
Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging
# -----BEGIN PGP SIGNATURE----- # Version: GnuPG v1 # # iQEcBAABAgAGBQJig2G8AAoJEO8Ells5jWIR7ocH/j+bduaZwE9HM+a9CbemkdOz # 7iPPEq8eKPvLrcURa8DNmguwGul+NSXv1jonb1m1P/C5Lox/PagdC219irk43WGc # DJBzkAo+wOetmvVeCCQl4ovJbYF4PBftYaxkBfm8KbavnoD1aSUPL70QHVvGmuKi # kxmf9WMQgksw+LirSI4avZSJc1YIsjruEYDagbZmA5r/kTNbm4zobLe8/BV/2mgJ # j5bHbrPeci8feBFhjuBVgZKkbUU7HrJj9kLAzbObdQ8a9VDtaWWfQiwmpeAaItl0 # 5OHSD+tFsGt3MSZn+/LXP9emJeKDnLt+LCxvT0yzGw06iF9N0WFJlSUdd4eYkjI= # =5fRf # -----END PGP SIGNATURE----- # gpg: Signature made Tue 17 May 2022 01:50:04 AM PDT # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [undefined] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * tag 'net-pull-request' of https://github.com/jasowang/qemu: tulip: Assign default MAC address if not specified net/vmnet: update hmp-commands.hx net/vmnet: update qemu-options.hx net/vmnet: implement bridged mode (vmnet-bridged) net/vmnet: implement host mode (vmnet-host) net/vmnet: implement shared mode (vmnet-shared) net/vmnet: add vmnet backends to qapi/net net/vmnet: add vmnet dependency and customizable option Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/net.c b/net/net.c index a094cf1d29..2db160e063 100644 --- a/net/net.c +++ b/net/net.c @@ -1020,6 +1020,11 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])( #ifdef CONFIG_L2TPV3 [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3, #endif +#ifdef CONFIG_VMNET + [NET_CLIENT_DRIVER_VMNET_HOST] = net_init_vmnet_host, + [NET_CLIENT_DRIVER_VMNET_SHARED] = net_init_vmnet_shared, + [NET_CLIENT_DRIVER_VMNET_BRIDGED] = net_init_vmnet_bridged, +#endif /* CONFIG_VMNET */ }; @@ -1106,6 +1111,11 @@ void show_netdevs(void) #ifdef CONFIG_VHOST_VDPA "vhost-vdpa", #endif +#ifdef CONFIG_VMNET + "vmnet-host", + "vmnet-shared", + "vmnet-bridged", +#endif }; qemu_printf("Available netdev backend types:\n"); |