Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into…

… staging

# -----BEGIN PGP SIGNATURE-----
# Version: GnuPG v1
#
# iQEcBAABAgAGBQJjadbSAAoJEO8Ells5jWIRrIkIAIsEauqUvco04qk2Xejm1ZbE
# 2Ix+wgQ1kzdff/lyZHRspZVYye3jHZi7irCVZBySJkjg36j3hEIHz9TmZyYTPnA3
# qLn8cNnBcFiDHrlmQV8iFzryuGsHPkxn1oiRTiCrgyyiyRCCyWnz5j+KlvG6aK+n
# 9f8sUW624xs+qd1i8R1cZA51ie2R1nXylOzUWCtfs9UXDXri/3NAhYTXrYk9IfZQ
# TQcGJvsJZEOEvNP8uqaXER6vs5V+ik9++No/eeQ79aL/1QQ3G9ZpVPOlkmrbPtZ4
# DuWZ3TwQwVS1RsC8ObCxtbDR5J0AtrOySj/8czqJBBiYZ7fDt2h4Ix6Z9XI9a5c=
# =wdhb
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 07 Nov 2022 23:10:58 EST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [full]
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* tag 'net-pull-request' of https://github.com/jasowang/qemu:
  tests/qtest: netdev: test stream and dgram backends
  vhost-vdpa: fix assert !virtio_net_get_subqueue(nc)->async_tx.elem in virtio_net_reset

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

net/vhost-vdpa.c

@@ -210,7 +210,7 @@ static bool vhost_vdpa_check_peer_type(NetClientState *nc, ObjectClass *oc,
 static ssize_t vhost_vdpa_receive(NetClientState *nc, const uint8_t *buf,
                                   size_t size)
 {
-    return 0;
+    return size;
 }
 
 static NetClientInfo net_vhost_vdpa_info = {

tests/qtest/meson.build

@@ -27,6 +27,7 @@ qtests_generic = [
   'test-hmp',
   'qos-test',
   'readconfig-test',
+  'netdev-socket',
 ]
 if config_host.has_key('CONFIG_MODULES')
   qtests_generic += [ 'modules-test' ]
@@ -304,6 +305,7 @@ qtests = {
   'tpm-tis-device-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'],
   'tpm-tis-device-test': [io, tpmemu_files, 'tpm-tis-util.c'],
   'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
+  'netdev-socket': files('netdev-socket.c', '../unit/socket-helpers.c'),
 }
 
 gvnc = dependency('gvnc-1.0', required: false)