Commit a5f80c16 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 Mon 25 Nov 2019 15:30:56 GMT
# 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:
  net/virtio: return error when device_opts arg is NULL
  net/virtio: fix re-plugging of primary device
  net/virtio: return early when failover primary alread added
  net/virtio: fix dev_unplug_pending

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 65e05c82 4d0e59ac

hw/net/virtio-net.c

+38 −20
Original line number Diff line number Diff line
@@ -759,6 +759,10 @@ static void failover_add_primary(VirtIONet *n, Error **errp) 
{

    Error *err = NULL;



    if (n->primary_dev) {

        return;

    }



    n->primary_device_opts = qemu_opts_find(qemu_find_opts("device"),

            n->primary_device_id);

    if (n->primary_device_opts) {
@@ -2801,10 +2805,20 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) 
        n->primary_device_opts = qemu_opts_from_qdict(

                qemu_find_opts("device"),

                n->primary_device_dict, errp);

        if (!n->primary_device_opts) {

            error_setg(errp, "virtio_net: couldn't find primary device opts");

            goto out;

        }

    if (n->primary_device_opts) {

        if (n->primary_dev) {

    }

    if (!n->primary_dev) {

            error_setg(errp, "virtio_net: couldn't find primary device");

            goto out;

    }



    n->primary_bus = n->primary_dev->parent_bus;

    if (!n->primary_bus) {

        error_setg(errp, "virtio_net: couldn't find primary bus");

        goto out;

    }

    qdev_set_parent_bus(n->primary_dev, n->primary_bus);

    n->primary_should_be_hidden = false;
@@ -2815,11 +2829,9 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) 
        hotplug_handler_pre_plug(hotplug_ctrl, n->primary_dev, errp);

        hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp);

    }

        if (!n->primary_dev) {

            error_setg(errp, "virtio_net: couldn't find primary device");

        }

    }

    return *errp != NULL;



out:

    return *errp == NULL;

}



static void virtio_net_handle_migration_primary(VirtIONet *n,
@@ -2848,7 +2860,7 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, 
            warn_report("couldn't unplug primary device");

        }

    } else if (migration_has_failed(s)) {

        /* We already unplugged the device let's plugged it back */

        /* We already unplugged the device let's plug it back */

        if (!failover_replug_primary(n, &err)) {

            if (err) {

                error_report_err(err);
@@ -2868,9 +2880,12 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener, 
            QemuOpts *device_opts)

{

    VirtIONet *n = container_of(listener, VirtIONet, primary_listener);

    bool match_found;

    bool hide;

    bool match_found = false;

    bool hide = false;



    if (!device_opts) {

        return -1;

    }

    n->primary_device_dict = qemu_opts_to_qdict(device_opts,

            n->primary_device_dict);

    if (n->primary_device_dict) {
@@ -2878,7 +2893,7 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener, 
        n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,

                    "failover_pair_id"));

    }

    if (device_opts && g_strcmp0(n->standby_id, n->netclient_name) == 0) {

    if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {

        match_found = true;

    } else {

        match_found = false;
@@ -3124,6 +3139,9 @@ static bool primary_unplug_pending(void *opaque) 
    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    VirtIONet *n = VIRTIO_NET(vdev);



    if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_STANDBY)) {

        return false;

    }

    return n->primary_dev ? n->primary_dev->pending_deleted_event : false;

}

migration/savevm.c

+2 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,8 @@ int qemu_savevm_nr_failover_devices(void) 
    int n = 0;



    QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {

        if (se->vmsd && se->vmsd->dev_unplug_pending) {

        if (se->vmsd && se->vmsd->dev_unplug_pending &&

            se->vmsd->dev_unplug_pending(se->opaque)) {

            n++;

        }

    }