Commit 05b656dc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181011a' into staging 



Migration pull 2018-10-11

With one bonus HMP fix.

# gpg: Signature made Thu 11 Oct 2018 20:23:12 BST
# gpg:                using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20181011a:
  migration-test: Only generate a single target architecture
  qmp, hmp: make subsystem/system-vendor identities optional
  vhost-user: Don't ask for reply on postcopy mem table set
  vhost-user: Fix userfaultfd leak
  migration: Stop postcopy fault thread before notifying
  tests/migration: Enable the migration test on s390x, too
  tests: Add migration test for aarch64

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 75e50c80 36bd9e3c

hmp.c

+4 −2
Original line number Diff line number Diff line
@@ -837,8 +837,10 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) 


    monitor_printf(mon, ": PCI device %04" PRIx64 ":%04" PRIx64 "\n",

                   dev->id->vendor, dev->id->device);

    if (dev->id->has_subsystem_vendor && dev->id->has_subsystem) {

        monitor_printf(mon, "      PCI subsystem %04" PRIx64 ":%04" PRIx64 "\n",

                       dev->id->subsystem_vendor, dev->id->subsystem);

    }



    if (dev->has_irq) {

        monitor_printf(mon, "      IRQ %" PRId64 ".\n", dev->irq);

hw/pci/pci.c

+10 −3
Original line number Diff line number Diff line
@@ -1737,9 +1737,6 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, 
    info->id = g_new0(PciDeviceId, 1);

    info->id->vendor = pci_get_word(dev->config + PCI_VENDOR_ID);

    info->id->device = pci_get_word(dev->config + PCI_DEVICE_ID);

    info->id->subsystem = pci_get_word(dev->config + PCI_SUBSYSTEM_ID);

    info->id->subsystem_vendor =

        pci_get_word(dev->config + PCI_SUBSYSTEM_VENDOR_ID);

    info->regions = qmp_query_pci_regions(dev);

    info->qdev_id = g_strdup(dev->qdev.id ? dev->qdev.id : "");
@@ -1752,6 +1749,16 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, 
    if (type == PCI_HEADER_TYPE_BRIDGE) {

        info->has_pci_bridge = true;

        info->pci_bridge = qmp_query_pci_bridge(dev, bus, bus_num);

    } else if (type == PCI_HEADER_TYPE_NORMAL) {

        info->id->has_subsystem = info->id->has_subsystem_vendor = true;

        info->id->subsystem = pci_get_word(dev->config + PCI_SUBSYSTEM_ID);

        info->id->subsystem_vendor =

            pci_get_word(dev->config + PCI_SUBSYSTEM_VENDOR_ID);

    } else if (type == PCI_HEADER_TYPE_CARDBUS) {

        info->id->has_subsystem = info->id->has_subsystem_vendor = true;

        info->id->subsystem = pci_get_word(dev->config + PCI_CB_SUBSYSTEM_ID);

        info->id->subsystem_vendor =

            pci_get_word(dev->config + PCI_CB_SUBSYSTEM_VENDOR_ID);

    }



    return info;

hw/virtio/vhost-user.c

+8 −12
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, 
    int fds[VHOST_MEMORY_MAX_NREGIONS];

    int i, fd;

    size_t fd_num = 0;

    bool reply_supported = virtio_has_feature(dev->protocol_features,

                                              VHOST_USER_PROTOCOL_F_REPLY_ACK);

    VhostUserMsg msg_reply;

    int region_i, msg_i;
@@ -384,10 +382,6 @@ static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, 
        .hdr.flags = VHOST_USER_VERSION,

    };



    if (reply_supported) {

        msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;

    }



    if (u->region_rb_len < dev->mem->nregions) {

        u->region_rb = g_renew(RAMBlock*, u->region_rb, dev->mem->nregions);

        u->region_rb_offset = g_renew(ram_addr_t, u->region_rb_offset,
@@ -503,10 +497,6 @@ static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, 
        return -1;

    }



    if (reply_supported) {

        return process_message_reply(dev, &msg);

    }



    return 0;

}
@@ -519,8 +509,7 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev, 
    size_t fd_num = 0;

    bool do_postcopy = u->postcopy_listen && u->postcopy_fd.handler;

    bool reply_supported = virtio_has_feature(dev->protocol_features,

                                          VHOST_USER_PROTOCOL_F_REPLY_ACK) &&

                                          !do_postcopy;

                                              VHOST_USER_PROTOCOL_F_REPLY_ACK);



    if (do_postcopy) {

        /* Postcopy has enough differences that it's best done in it's own
@@ -1291,6 +1280,7 @@ static int vhost_user_postcopy_end(struct vhost_dev *dev, Error **errp) 
        return ret;

    }

    postcopy_unregister_shared_ufd(&u->postcopy_fd);

    close(u->postcopy_fd.fd);

    u->postcopy_fd.handler = NULL;



    trace_vhost_user_postcopy_end_exit();
@@ -1430,6 +1420,12 @@ static int vhost_user_backend_cleanup(struct vhost_dev *dev) 
        postcopy_remove_notifier(&u->postcopy_notifier);

        u->postcopy_notifier.notify = NULL;

    }

    u->postcopy_listen = false;

    if (u->postcopy_fd.handler) {

        postcopy_unregister_shared_ufd(&u->postcopy_fd);

        close(u->postcopy_fd.fd);

        u->postcopy_fd.handler = NULL;

    }

    if (u->slave_fd >= 0) {

        qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL);

        close(u->slave_fd);

migration/postcopy-ram.c

+6 −5
Original line number Diff line number Diff line
@@ -533,6 +533,12 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis) 
    if (mis->have_fault_thread) {

        Error *local_err = NULL;



        /* Let the fault thread quit */

        atomic_set(&mis->fault_thread_quit, 1);

        postcopy_fault_thread_notify(mis);

        trace_postcopy_ram_incoming_cleanup_join();

        qemu_thread_join(&mis->fault_thread);



        if (postcopy_notify(POSTCOPY_NOTIFY_INBOUND_END, &local_err)) {

            error_report_err(local_err);

            return -1;
@@ -541,11 +547,6 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis) 
        if (qemu_ram_foreach_migratable_block(cleanup_range, mis)) {

            return -1;

        }

        /* Let the fault thread quit */

        atomic_set(&mis->fault_thread_quit, 1);

        postcopy_fault_thread_notify(mis);

        trace_postcopy_ram_incoming_cleanup_join();

        qemu_thread_join(&mis->fault_thread);



        trace_postcopy_ram_incoming_cleanup_closeuf();

        close(mis->userfault_fd);

qapi/misc.json

+2 −2
Original line number Diff line number Diff line
@@ -839,8 +839,8 @@ 
# Since: 2.4

##

{ 'struct': 'PciDeviceId',

  'data': {'device': 'int', 'vendor': 'int', 'subsystem': 'int',

            'subsystem-vendor': 'int'} }

  'data': {'device': 'int', 'vendor': 'int', '*subsystem': 'int',

            '*subsystem-vendor': 'int'} }



##

# @PciDeviceInfo: