[Qemu-commits] [qemu/qemu] e9bbc8: MAINTAINERS: Add qemu-bridge-helper.c to "Network ...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e9bbc8bd8a7a02b8a7d8e90cfef56b49e739f64c
      
https://github.com/qemu/qemu/commit/e9bbc8bd8a7a02b8a7d8e90cfef56b49e739f64c
  Author: Markus Armbruster <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Add qemu-bridge-helper.c to "Network device backends"

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 436e3530763cb1e9c65d9575a9809f29ca3ef7e5
      
https://github.com/qemu/qemu/commit/436e3530763cb1e9c65d9575a9809f29ca3ef7e5
  Author: Markus Armbruster <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M qemu-bridge-helper.c

  Log Message:
  -----------
  qemu-bridge-helper: Document known shortcomings

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 59377b4a4b6830b71ea937aaf25bfca941cad264
      
https://github.com/qemu/qemu/commit/59377b4a4b6830b71ea937aaf25bfca941cad264
  Author: Cédric Le Goater <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/ftgmac100.c

  Log Message:
  -----------
  ftgmac100: do not link to netdev

qdev_set_nic_properties() is already used in the Aspeed SoC level to
bind the ftgmac100 device to the netdev.

This is fixing support for multiple net devices.

Signed-off-by: Cédric Le Goater <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 21c520d0c1ab64770f09f6fbf5952807e856e903
      
https://github.com/qemu/qemu/commit/21c520d0c1ab64770f09f6fbf5952807e856e903
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: fix assertion failure when ipv6-prefixlen is not a number

If 'ipv6-prefixlen' is not a number, the current behaviour
produces an assertion failure:
    $ qemu-system-x86_64 -net user,ipv6-net=feca::0/a
    qemu-system-x86_64: qemu/util/qemu-option.c:1175: qemu_opts_foreach:
    Assertion `!errp || !*errp' failed.
    Aborted (core dumped)

This patch fixes it, jumping to the end of the function when
'ipv6-prefixlen' is not a number, and printing the more friendly
message:
    $ qemu-system-x86_64 -net user,ipv6-net=feca::0/a
    qemu-system-x86_64: Parameter 'ipv6-prefixlen' expects a number

Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: c1112b2d3dfb2c4102f73eea8198c4fe9ff50883
      
https://github.com/qemu/qemu/commit/c1112b2d3dfb2c4102f73eea8198c4fe9ff50883
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: avoid using variable length array in net_client_init()

net_client_init() uses a variable length array to store the prefix
of 'ipv6-net' parameter (e.g. if ipv6-net=fec0::0/64, the prefix
is 'fec0::0').
This patch introduces g_strsplit() to split the 'ipv6-net' parameter,
so we can remove the variable length array.

Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: add993477bb2bc17e547912c6530745d1dd58ddc
      
https://github.com/qemu/qemu/commit/add993477bb2bc17e547912c6530745d1dd58ddc
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: use g_strsplit() for parsing host address and port

Use the glib function to split host address and port in
the parse_host_port() function.

Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 4623027d866d56677b70449837accf07df693f4d
      
https://github.com/qemu/qemu/commit/4623027d866d56677b70449837accf07df693f4d
  Author: Stefano Garzarella <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: remove unused get_str_sep() function

Since the get_str_sep() function is no longer used in
net/net.c, we can remove it.

Signed-off-by: Stefano Garzarella <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ef2fdbfb4d1e492d8e94aa1a92c7a40a3f96c2ac
      
https://github.com/qemu/qemu/commit/ef2fdbfb4d1e492d8e94aa1a92c7a40a3f96c2ac
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M include/net/announce.h
    M net/announce.c
    M net/trace-events
    M qapi/net.json

  Log Message:
  -----------
  net/announce: Allow optional list of interfaces

Allow the caller to restrict the set of interfaces that announces are
sent on.  The default is still to send on all interfaces.

e.g.

  { "execute": "announce-self", "arguments": { "initial": 50, "max": 550, 
"rounds": 5, "step": 50, "interfaces": ["vn2", "vn1"] } }

This doesn't affect the behaviour of migraiton announcments.

Note: There's still only one timer for the qmp command, so that
performing an 'announce-self' on one list of interfaces followed
by another 'announce-self' on another list will stop the announces
on the existing set.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 08528271152ee76cf860168b41109e2a661e6260
      
https://github.com/qemu/qemu/commit/08528271152ee76cf860168b41109e2a661e6260
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hmp-commands.hx
    M monitor/hmp-cmds.c

  Log Message:
  -----------
  net/announce: Add HMP optional interface list

Add the optional interface list to the HMP command.

i.e.

   All interfaces
        announce_self

   Just the named interfaces:
        announce_self vn1,vn2

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 944458b659fb348834cebbc15b9ad772be28f284
      
https://github.com/qemu/qemu/commit/944458b659fb348834cebbc15b9ad772be28f284
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/virtio-net.c
    M include/net/announce.h
    M net/announce.c
    M net/trace-events
    M qapi/net.json

  Log Message:
  -----------
  net/announce: Add optional ID

Previously there was a single instance of the timer used by
monitor triggered announces, that's OK, but when combined with the
previous change that lets you have announces for subsets of interfaces
it's a bit restrictive if you want to do different things to different
interfaces.

Add an 'id' field to the announce, and maintain a list of the
timers based on id.

This allows you to for example:
    a) Start an announce going on interface eth0 for a long time
    b) Start an announce going on interface eth1 for a long time
    c) Kill the announce on eth0 while leaving eth1 going.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: c6644548c7f7b0e312ceea1440c2c6921f10e676
      
https://github.com/qemu/qemu/commit/c6644548c7f7b0e312ceea1440c2c6921f10e676
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hmp-commands.hx
    M monitor/hmp-cmds.c

  Log Message:
  -----------
  net/announce: Add HMP optional ID

Add the optional ID to the HMP command.

e.g.
   # start an announce for a long time on eth1
   migrate_set_parameter announce-rounds 1000
   announce_self "eth1" e1

   # start an announce on eth2
   announce_self "eth2" e2

   # Change e1 to be announcing on eth1 and eth3
   announce_self "eth1,eth3" e1

   # Cancel e1
   migrate_set_parameter announce-rounds 0
   announce_self "" e1

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: aa9c6fa757e1ea4c109eb5cf38d1bdac6e1a3650
      
https://github.com/qemu/qemu/commit/aa9c6fa757e1ea4c109eb5cf38d1bdac6e1a3650
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M tests/virtio-net-test.c

  Log Message:
  -----------
  net/announce: Expand test for stopping self announce

Expand self-announce test to check we can stop an announce timer.
We set it up to send 300 packets, but after we receive
the first one we tell it to stop.

We error if:
   a) We receive more than 30 of the packets
   b) We're still receiving packets after a lot longer than the
      30 seconds should have arrived

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: cf6af766f49c5ebeab131287601c1c7f4a13cbec
      
https://github.com/qemu/qemu/commit/cf6af766f49c5ebeab131287601c1c7f4a13cbec
  Author: Zhang Chen <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/colo-compare.c
    M qemu-options.hx

  Log Message:
  -----------
  COLO-compare: Add new parameter to communicate with remote colo-frame

We add the "notify_dev=chardevID" parameter. After that colo-compare can 
connect with
remote(currently just for Xen, KVM-COLO didn't need it.) colo-frame through 
chardev socket,
it can notify remote(Xen) colo-frame to handle checkpoint event.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 13025fee7fddba454daa166b06ae3511b6c419ce
      
https://github.com/qemu/qemu/commit/13025fee7fddba454daa166b06ae3511b6c419ce
  Author: Zhang Chen <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  COLO-compare: Add remote notification chardev handler frame

Add chardev handler to send notification to remote(current from Xen) colo-frame.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 30685c000ccd0c70cd7f1c79eceaba28421cfbc5
      
https://github.com/qemu/qemu/commit/30685c000ccd0c70cd7f1c79eceaba28421cfbc5
  Author: Zhang Chen <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  COLO-compare: Make the compare_chr_send() can send notification message.

We need use this function to send notification message for remote 
colo-frame(Xen).
So we add new parameter for this job.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 1d09f7008b76de6892613f5e0eebf95c90cc05da
      
https://github.com/qemu/qemu/commit/1d09f7008b76de6892613f5e0eebf95c90cc05da
  Author: Zhang Chen <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  COLO-compare: Add colo-compare remote notify support

This patch make colo-compare can send message to remote COLO frame(Xen) when 
occur checkpoint.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 0e8818f023616677416840d6ddc880db8de3c967
      
https://github.com/qemu/qemu/commit/0e8818f023616677416840d6ddc880db8de3c967
  Author: Zhang Chen <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M migration/colo.c

  Log Message:
  -----------
  migration/colo.c: Add missed filter notify for Xen COLO.

We need to notify net filter to do checkpoint for Xen COLO, like KVM side.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 8ef53cdb5079823cf41d1867b2ff5d9bc1f7abb0
      
https://github.com/qemu/qemu/commit/8ef53cdb5079823cf41d1867b2ff5d9bc1f7abb0
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M MAINTAINERS
    M hmp-commands.hx
    M hw/net/ftgmac100.c
    M hw/net/virtio-net.c
    M include/net/announce.h
    M migration/colo.c
    M monitor/hmp-cmds.c
    M net/announce.c
    M net/colo-compare.c
    M net/net.c
    M net/trace-events
    M qapi/net.json
    M qemu-bridge-helper.c
    M qemu-options.hx
    M tests/virtio-net-test.c

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

# gpg: Signature made Tue 02 Jul 2019 03:21:54 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>" 
[marginal]
# 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:
  migration/colo.c: Add missed filter notify for Xen COLO.
  COLO-compare: Add colo-compare remote notify support
  COLO-compare: Make the compare_chr_send() can send notification message.
  COLO-compare: Add remote notification chardev handler frame
  COLO-compare: Add new parameter to communicate with remote colo-frame
  net/announce: Expand test for stopping self announce
  net/announce: Add HMP optional ID
  net/announce: Add optional ID
  net/announce: Add HMP optional interface list
  net/announce: Allow optional list of interfaces
  net: remove unused get_str_sep() function
  net: use g_strsplit() for parsing host address and port
  net: avoid using variable length array in net_client_init()
  net: fix assertion failure when ipv6-prefixlen is not a number
  ftgmac100: do not link to netdev
  qemu-bridge-helper: Document known shortcomings
  MAINTAINERS: Add qemu-bridge-helper.c to "Network device backends"

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


Compare: https://github.com/qemu/qemu/compare/f4af847316ec...8ef53cdb5079