Commit 8ef53cdb authored by Peter Maydell's avatar Peter Maydell
Browse files

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) <jasowang@redhat.com>" [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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f4af8473 0e8818f0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1944,6 +1944,7 @@ M: Jason Wang <jasowang@redhat.com> 
S: Maintained

F: net/

F: include/net/

F: qemu-bridge-helper.c

T: git https://github.com/jasowang/qemu.git net

F: qapi/net.json

hmp-commands.hx

+5 −2
Original line number Diff line number Diff line
@@ -955,8 +955,8 @@ ETEXI 


    {

        .name       = "announce_self",

        .args_type  = "",

        .params     = "",

        .args_type  = "interfaces:s?,id:s?",

        .params     = "[interfaces] [id]",

        .help       = "Trigger GARP/RARP announcements",

        .cmd        = hmp_announce_self,

    },
@@ -967,6 +967,9 @@ STEXI 
Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating the

network infrastructure after a reconfiguration or some forms of migration.

The timings of the round are set by the migration announce parameters.

An optional comma separated @var{interfaces} list restricts the announce to the

named set of interfaces. An optional @var{id} can be used to start a separate announce

timer and to change the parameters of it later.

ETEXI



    {

hw/net/ftgmac100.c

+0 −2
Original line number Diff line number Diff line
@@ -1017,8 +1017,6 @@ static void ftgmac100_realize(DeviceState *dev, Error **errp) 
    sysbus_init_irq(sbd, &s->irq);

    qemu_macaddr_default_if_unset(&s->conf.macaddr);



    s->conf.peers.ncs[0] = nd_table[0].netdev;



    s->nic = qemu_new_nic(&net_ftgmac100_info, &s->conf,

                          object_get_typename(OBJECT(dev)), DEVICE(dev)->id,

                          s);

hw/net/virtio-net.c

+2 −2
Original line number Diff line number Diff line
@@ -2360,7 +2360,7 @@ static int virtio_net_post_load_device(void *opaque, int version_id) 
            timer_mod(n->announce_timer.tm,

                      qemu_clock_get_ms(n->announce_timer.type));

        } else {

            qemu_announce_timer_del(&n->announce_timer);

            qemu_announce_timer_del(&n->announce_timer, false);

        }

    }
@@ -2784,7 +2784,7 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp) 
        virtio_net_del_queue(n, i);

    }



    qemu_announce_timer_del(&n->announce_timer);

    qemu_announce_timer_del(&n->announce_timer, false);

    g_free(n->vqs);

    qemu_del_nic(n->nic);

    virtio_net_rsc_cleanup(n);

include/net/announce.h

+6 −2
Original line number Diff line number Diff line
@@ -22,8 +22,12 @@ struct AnnounceTimer { 
/* Returns: update the timer to the next time point */

int64_t qemu_announce_timer_step(AnnounceTimer *timer);



/* Delete the underlying timer */

void qemu_announce_timer_del(AnnounceTimer *timer);

/*

 * Delete the underlying timer and other data

 * If 'free_named' true and the timer is a named timer, then remove

 * it from the list of named timers and free the AnnounceTimer itself.

 */

void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named);



/*

 * Under BQL/main thread