qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 34f708: net: Move error reporting from net_in


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 34f708: net: Move error reporting from net_init_client/net...
Date: Mon, 05 Mar 2018 07:15:40 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 34f708b0b6bef9ac1e371879a47df5b5fb95726f
      
https://github.com/qemu/qemu/commit/34f708b0b6bef9ac1e371879a47df5b5fb95726f
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M include/net/net.h
    M net/net.c
    M vl.c

  Log Message:
  -----------
  net: Move error reporting from net_init_client/netdev to the calling site

It looks strange that net_init_client() and net_init_netdev() both
take an "Error **errp" parameter, but then do the error reporting
with "error_report_err(local_err)" on their own. Let's move the
error reporting to the calling site instead to simplify this code
a little bit.

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 547203ead4327b353c25753a3ebb0acdc0ed2cf5
      
https://github.com/qemu/qemu/commit/547203ead4327b353c25753a3ebb0acdc0ed2cf5
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: List available netdevs with "-netdev help"

Other options like "-chardev" or "-device" feature a nice help text
with the available devices when being called with "help" or "?".
Since it is quite useful, especially if you want to see which network
backends have been compiled into the QEMU binary, let's provide such
a help text for "-netdev", too.

Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 253dc14cadd00a3131b5a933e172236dd365f4bc
      
https://github.com/qemu/qemu/commit/253dc14cadd00a3131b5a933e172236dd365f4bc
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  net: Only show vhost-user in the help text if CONFIG_POSIX is defined

According to net/Makefile.objs we only link in the vhost-user code
if CONFIG_POSIX has been set. So the help screen should also only
show this information if CONFIG_POSIX has been defined.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: aa09a485c239b163701a70b8da257537c663f71f
      
https://github.com/qemu/qemu/commit/aa09a485c239b163701a70b8da257537c663f71f
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M include/net/net.h
    M net/net.c

  Log Message:
  -----------
  net: Make net_client_init() static

The function is only used within net.c, so there's no need that
this is a global function.

While we're at it, also remove the unused prototype compute_mcast_idx()
(the function has been removed in commit d9caeb09b107e91122d10ba4a08a).

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 857d20873d18b3e90c7e7141fe7822f25b707159
      
https://github.com/qemu/qemu/commit/857d20873d18b3e90c7e7141fe7822f25b707159
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M net/dump.c
    M net/net.c
    M qapi/net.json
    M qemu-doc.texi
    M qemu-options.hx

  Log Message:
  -----------
  net: Remove the deprecated way of dumping network packets

"-net dump" has been marked as deprecated since QEMU v2.10, since it
only works with the deprecated 'vlan' parameter (or hubs). Network
dumping should be done with "-object filter-dump" nowadays instead.
Since nobody complained so far about the deprecation message, let's
finally get rid of "-net dump" now.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 7cc28cb061040cb089d29de2d9a73f404b94bc66
      
https://github.com/qemu/qemu/commit/7cc28cb061040cb089d29de2d9a73f404b94bc66
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M hmp-commands.hx
    M hmp.h
    M monitor.c
    M net/net.c
    M qemu-doc.texi
    M tests/test-hmp.c

  Log Message:
  -----------
  net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands

They are deprecated since QEMU v2.10, and so far nobody complained that
these commands are still necessary for any reason - and since you can use
'netdev_add' and 'netdev_remove' instead, there also should not be any
real reason. Since they are also standing in the way for the upcoming
'vlan' clean-up, it's now time to remove them.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 78cd6f7bf6b196a96388a37e730706cf0c497fda
      
https://github.com/qemu/qemu/commit/78cd6f7bf6b196a96388a37e730706cf0c497fda
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M include/sysemu/sysemu.h
    M net/net.c
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  net: Add a new convenience option "--nic" to configure default/on-board NICs

The legacy "-net" option can be quite confusing for the users since most
people do not expect to get a "vlan" hub between their emulated guest
hardware and the host backend. But so far, we are also not able to get
rid of "-net" completely, since it is the only way to configure on-board
NICs that can not be instantiated via "-device" yet. It's also a little
bit shorter to type "-net nic -net tap" instead of "-device xyz,netdev=n1
-netdev tap,id=n1".

So what we need is a new convenience option that is shorter to type than
the full -device + -netdev stuff, and which can be used to configure the
on-board NICs that can not be handled via -device yet. Thus this patch now
provides such a new option "--nic": It adds an entry in the nd_table to
configure a on-board / default NIC, creates a host backend and connects
the two directly, without a confusing "vlan" hub inbetween.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: b20219b6451546b9664ceae471b2622b54f0a4bd
      
https://github.com/qemu/qemu/commit/b20219b6451546b9664ceae471b2622b54f0a4bd
  Author: Thomas Huth <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M hw/net/e1000.c
    M hw/net/lance.c
    M hw/net/ne2000.c
    M hw/net/pcnet-pci.c
    M hw/net/pcnet.c
    M hw/net/rtl8139.c
    M hw/net/xgmac.c

  Log Message:
  -----------
  hw/net: Remove unnecessary header includes

Headers like "hw/loader.h" and "qemu/sockets.h" are not needed in
the hw/net/*.c files. And Some other headers are included via other
headers already, so we can drop them, too.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 46d4d36d0bf2b24b205f2f604f0905db80264eef
      
https://github.com/qemu/qemu/commit/46d4d36d0bf2b24b205f2f604f0905db80264eef
  Author: Jay Zhou <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M include/net/vhost_net.h
    M net/tap.c

  Log Message:
  -----------
  tap: setting error appropriately when calling net_init_tap_one()

If netdev_add tap,id=net0,...,vhost=on failed in net_init_tap_one(),
the followed up device_add virtio-net-pci,netdev=net0 will fail
too, prints:

   TUNSETOFFLOAD ioctl() failed: Bad file descriptor TUNSETOFFLOAD
   ioctl() failed: Bad file descriptor

The reason is that the fd of tap is closed when error occured after
calling net_init_tap_one().

The fd should be closed when calling net_init_tap_one failed:
   - if tap_set_sndbuf() failed
   - if tap_set_sndbuf() succeeded but vhost failed to open or
     initialize with vhostforce flag on
   - with wrong vhost command line parameter
The fd should not be closed just because vhost failed to open or
initialize but without vhostforce flag. So the followed up
device_add can fall back to userspace virtio successfully.

Suggested-by: Michael S. Tsirkin <address@hidden>
Suggested-by: Igor Mammedov <address@hidden>
Suggested-by: Jason Wang <address@hidden>
Signed-off-by: Jay Zhou <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 41dfc0dc55f0b338ab3c1d29a1721441b76ebd03
      
https://github.com/qemu/qemu/commit/41dfc0dc55f0b338ab3c1d29a1721441b76ebd03
  Author: Peter Maydell <address@hidden>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M hmp-commands.hx
    M hmp.h
    M hw/net/e1000.c
    M hw/net/lance.c
    M hw/net/ne2000.c
    M hw/net/pcnet-pci.c
    M hw/net/pcnet.c
    M hw/net/rtl8139.c
    M hw/net/xgmac.c
    M include/net/net.h
    M include/net/vhost_net.h
    M include/sysemu/sysemu.h
    M monitor.c
    M net/dump.c
    M net/net.c
    M net/tap.c
    M qapi/net.json
    M qemu-doc.texi
    M qemu-options.hx
    M tests/test-hmp.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Mon 05 Mar 2018 03:06:59 GMT
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  tap: setting error appropriately when calling net_init_tap_one()
  hw/net: Remove unnecessary header includes
  net: Add a new convenience option "--nic" to configure default/on-board NICs
  net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands
  net: Remove the deprecated way of dumping network packets
  net: Make net_client_init() static
  net: Only show vhost-user in the help text if CONFIG_POSIX is defined
  net: List available netdevs with "-netdev help"
  net: Move error reporting from net_init_client/netdev to the calling site

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4a22592e3286...41dfc0dc55f0

reply via email to

[Prev in Thread] Current Thread [Next in Thread]