Merge pull request #1127 from FengYang/update7

Some update and fix master tree - Update7

qemu/cfg/host-kernel.cfg

@@ -95,6 +95,7 @@ variants:
                     query_cmd = "cat /sys/kernel/mm/ksm/pages_sharing"
                 virtio_net:
                     vhost = "vhost=on"
+                    nettype = bridge
                     # enable_vhostfd only works with vhost=on
                     enable_vhostfd = yes
                 Win2008, Win2008r2, Win7:
@@ -141,6 +142,7 @@ variants:
                     cpu_model_flags += ",hv_relaxed"
                 virtio_net:
                     vhost = "vhost=on"
+                    nettype = birdge
                     # enable_vhostfd only works with vhost=on
                     enable_vhostfd = yes
                 monitor_cmds_check.qmp:

qemu/tests/cfg/virtual_nic_send_buffer.cfg

@@ -11,10 +11,10 @@
     hostpasswd = redhat
     message_size_range = 580 590 1
     netperf_files = netperf-2.6.0.tar.bz2
-    netperf_download_link = ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2
+    netperf_links = deps/netperf-2.6.0.tar.bz2
     pkg_md5sum = 9654ffdfd4c4f2c93ce3733cd9ed9236
-    netperf_files = netperf-2.6.0.tar.bz2
-    setup_cmd = "cd /home && rm -rf netperf-2.6.0 && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --enable-burst --enable-demo=yes && make"
+    remote_dir = /var/tmp
+    setup_cmd = "cd %s && rm -rf netperf-2.6.0 && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --enable-burst --enable-demo=yes && make"
     netserver_cmd = src/netserver
     sub_test_name = netperf_udp
     netperf_cmd = src/netperf -l 10 -H %s -t %s -- -m %s -b 64 -D