Commit 4fe60423 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170628' into staging 



migration/next for 20170628

# gpg: Signature made Wed 28 Jun 2017 12:16:44 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170628:
  exec: fix access to ram_list.dirty_memory when sync dirty bitmap
  migration: add "return-path" capability
  vmstate: error hint for failed equal checks
  migration: add comment for TYPE_MIGRATE
  migration: hmp: dump globals
  migration: merge enforce_config_section somewhat
  migration: move skip_section_footers
  migration: move skip_configuration out
  migration: move only_migratable to MigrationState
  migration: move global_state.optional out
  migration: let MigrationState be a qdev
  vl: clean up global property registration
  accel: introduce AccelClass.global_props
  machine: export register_compat_prop()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 46458867 084140bd

accel/accel.c

+6 −0
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ void configure_accelerator(MachineState *ms) 
    }

}



void accel_register_compat_props(AccelState *accel)

{

    AccelClass *class = ACCEL_GET_CLASS(accel);

    register_compat_props_array(class->global_props);

}



static void register_accel_types(void)

{

    type_register_static(&accel_type);

hmp.c

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "exec/ramlist.h"

#include "hw/intc/intc.h"

#include "migration/snapshot.h"

#include "migration/misc.h"



#ifdef CONFIG_SPICE

#include <spice/enums.h>
@@ -164,6 +165,8 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) 
    info = qmp_query_migrate(NULL);

    caps = qmp_query_migrate_capabilities(NULL);



    migration_global_dump(mon);



    /* do not display parameters during setup */

    if (info->has_status && caps) {

        monitor_printf(mon, "capabilities: ");

hw/block/fdc.c

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ static const VMStateDescription vmstate_fdc = { 
        VMSTATE_UINT8(config, FDCtrl),

        VMSTATE_UINT8(lock, FDCtrl),

        VMSTATE_UINT8(pwrd, FDCtrl),

        VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl),

        VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl, NULL),

        VMSTATE_STRUCT_ARRAY(drives, FDCtrl, MAX_FD, 1,

                             vmstate_fdrive, FDrive),

        VMSTATE_END_OF_LIST()

hw/core/machine.c

+0 −13
Original line number Diff line number Diff line
@@ -770,19 +770,6 @@ static void machine_class_finalize(ObjectClass *klass, void *data) 
    g_free(mc->name);

}



static void register_compat_prop(const char *driver,

                                 const char *property,

                                 const char *value)

{

    GlobalProperty *p = g_new0(GlobalProperty, 1);

    /* Machine compat_props must never cause errors: */

    p->errp = &error_abort;

    p->driver = driver;

    p->property = property;

    p->value = value;

    qdev_prop_register_global(p);

}



static void machine_register_compat_for_subclass(ObjectClass *oc, void *opaque)

{

    GlobalProperty *p = opaque;

hw/core/qdev-properties.c

+21 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,27 @@ void qdev_prop_register_global(GlobalProperty *prop) 
    global_props = g_list_append(global_props, prop);

}



void register_compat_prop(const char *driver,

                          const char *property,

                          const char *value)

{

    GlobalProperty *p = g_new0(GlobalProperty, 1);



    /* Any compat_props must never cause error */

    p->errp = &error_abort;

    p->driver = driver;

    p->property = property;

    p->value = value;

    qdev_prop_register_global(p);

}



void register_compat_props_array(GlobalProperty *prop)

{

    for (; prop && prop->driver; prop++) {

        register_compat_prop(prop->driver, prop->property, prop->value);

    }

}



void qdev_prop_register_global_list(GlobalProperty *props)

{

    int i;