On 5/17/22 20:12, Jason Wang wrote:
> The following changes since commit eec398119fc6911d99412c37af06a6bc27871f85:
>
> Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2022-05-16 16:31:01 -0700)
>
> are available in the git repository at:
>
> https://github.com/jasowang/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 052c2579b89b0d87debe8b05594b5180f0fde87d:
>
> tulip: Assign default MAC address if not specified (2022-05-17 16:48:23 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Helge Deller (1):
> tulip: Assign default MAC address if not specified
>
> Vladislav Yaroshchuk (7):
> net/vmnet: add vmnet dependency and customizable option
> net/vmnet: add vmnet backends to qapi/net
> net/vmnet: implement shared mode (vmnet-shared)
> net/vmnet: implement host mode (vmnet-host)
> net/vmnet: implement bridged mode (vmnet-bridged)
> net/vmnet: update qemu-options.hx
> net/vmnet: update hmp-commands.hx
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> hmp-commands.hx | 6 +-
> hw/net/tulip.c | 4 +-
> meson.build | 16 +-
> meson_options.txt | 2 +
> net/clients.h | 11 ++
> net/meson.build | 7 +
> net/net.c | 10 ++
> net/vmnet-bridged.m | 152 +++++++++++++++++
> net/vmnet-common.m | 378 ++++++++++++++++++++++++++++++++++++++++++
> net/vmnet-host.c | 128 ++++++++++++++
> net/vmnet-shared.c | 114 +++++++++++++
> net/vmnet_int.h | 63 +++++++
> qapi/net.json | 133 ++++++++++++++-
> qemu-options.hx | 25 +++
> scripts/meson-buildoptions.sh | 1 +
> 15 files changed, 1044 insertions(+), 6 deletions(-)
> create mode 100644 net/vmnet-bridged.m
> create mode 100644 net/vmnet-common.m
> create mode 100644 net/vmnet-host.c
> create mode 100644 net/vmnet-shared.c
> create mode 100644 net/vmnet_int.h
>
>
>
>