[Qemu-devel] [PATCH V5 for 3.1 2/5] net: hub: suppress warnings of no host network for qtest

Jason Wang posted 5 patches 7 years, 2 months ago
[Qemu-devel] [PATCH V5 for 3.1 2/5] net: hub: suppress warnings of no host network for qtest
Posted by Jason Wang 7 years, 2 months ago
If we want to qtest through hub, it would be much more simpler and
safer to configure the hub without host network. So silent this
warnings for qtest.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/hub.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/hub.c b/net/hub.c
index 78b671ed95..5795a678ed 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -20,6 +20,7 @@
 #include "hub.h"
 #include "qemu/iov.h"
 #include "qemu/error-report.h"
+#include "sysemu/qtest.h"
 
 /*
  * A hub broadcasts incoming packets to all its ports except the source port.
@@ -346,7 +347,7 @@ void net_hub_check_clients(void)
         if (has_host_dev && !has_nic) {
             warn_report("hub %d with no nics", hub->id);
         }
-        if (has_nic && !has_host_dev) {
+        if (has_nic && !has_host_dev && !qtest_enabled()) {
             warn_report("hub %d is not connected to host network", hub->id);
         }
     }
-- 
2.17.1


Re: [Qemu-devel] [PATCH V5 for 3.1 2/5] net: hub: suppress warnings of no host network for qtest
Posted by Thomas Huth 7 years, 2 months ago
On 2018-12-04 04:53, Jason Wang wrote:
> If we want to qtest through hub, it would be much more simpler and
> safer to configure the hub without host network. So silent this
> warnings for qtest.
> 
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
>  net/hub.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/hub.c b/net/hub.c
> index 78b671ed95..5795a678ed 100644
> --- a/net/hub.c
> +++ b/net/hub.c
> @@ -20,6 +20,7 @@
>  #include "hub.h"
>  #include "qemu/iov.h"
>  #include "qemu/error-report.h"
> +#include "sysemu/qtest.h"
>  
>  /*
>   * A hub broadcasts incoming packets to all its ports except the source port.
> @@ -346,7 +347,7 @@ void net_hub_check_clients(void)
>          if (has_host_dev && !has_nic) {
>              warn_report("hub %d with no nics", hub->id);
>          }
> -        if (has_nic && !has_host_dev) {
> +        if (has_nic && !has_host_dev && !qtest_enabled()) {
>              warn_report("hub %d is not connected to host network", hub->id);
>          }
>      }

Sounds fine to me.

Reviewed-by: Thomas Huth <thuth@redhat.com>