Commit 37301a8d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-04-02' into staging 



Miscellaneous patches for 2019-04-02

# gpg: Signature made Tue 02 Apr 2019 12:54:27 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2019-04-02:
  accel: Unbreak accelerator fallback
  vl: Document dependencies hiding in global and compat props
  migration: Support adding migration blockers earlier
  Revert "migration: move only_migratable to MigrationState"
  Revert "vl: Fix to create migration object before block backends again"
  qapi/migration.json: Rename COLOStatus last_mode to last-mode
  qapi/migration.json: Fix ColoStatus member last_mode's version
  vl: Fix error location of positional arguments

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 436960c9 79b9d4bd

accel/accel.c

+2 −1
Original line number Diff line number Diff line
@@ -65,8 +65,9 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) 
        ms->accelerator = NULL;

        *(acc->allowed) = false;

        object_unref(OBJECT(accel));

    }

    } else {

        object_set_accelerator_compat_props(acc->compat_props);

    }

    return ret;

}

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
/* vl.c */



extern const char *bios_name;

extern int only_migratable;

extern const char *qemu_name;

extern QemuUUID qemu_uuid;

extern bool qemu_uuid_set;

migration/migration.c

+7 −4
Original line number Diff line number Diff line
@@ -1646,7 +1646,11 @@ bool migration_in_postcopy_after_devices(MigrationState *s) 


bool migration_is_idle(void)

{

    MigrationState *s = migrate_get_current();

    MigrationState *s = current_migration;



    if (!s) {

        return true;

    }



    switch (s->state) {

    case MIGRATION_STATUS_NONE:
@@ -1707,7 +1711,7 @@ static GSList *migration_blockers; 


int migrate_add_blocker(Error *reason, Error **errp)

{

    if (migrate_get_current()->only_migratable) {

    if (only_migratable) {

        error_propagate_prepend(errp, error_copy(reason),

                                "disallowing migration blocker "

                                "(--only_migratable) for: ");
@@ -3337,7 +3341,7 @@ void migration_global_dump(Monitor *mon) 
    monitor_printf(mon, "store-global-state: %s\n",

                   ms->store_global_state ? "on" : "off");

    monitor_printf(mon, "only-migratable: %s\n",

                   ms->only_migratable ? "on" : "off");

                   only_migratable ? "on" : "off");

    monitor_printf(mon, "send-configuration: %s\n",

                   ms->send_configuration ? "on" : "off");

    monitor_printf(mon, "send-section-footer: %s\n",
@@ -3352,7 +3356,6 @@ void migration_global_dump(Monitor *mon) 
static Property migration_properties[] = {

    DEFINE_PROP_BOOL("store-global-state", MigrationState,

                     store_global_state, true),

    DEFINE_PROP_BOOL("only-migratable", MigrationState, only_migratable, false),

    DEFINE_PROP_BOOL("send-configuration", MigrationState,

                     send_configuration, true),

    DEFINE_PROP_BOOL("send-section-footer", MigrationState,

migration/migration.h

+0 −3
Original line number Diff line number Diff line
@@ -219,9 +219,6 @@ struct MigrationState 
     */

    bool store_global_state;



    /* Whether the VM is only allowing for migratable devices */

    bool only_migratable;



    /* Whether we send QEMU_VM_CONFIGURATION during migration */

    bool send_configuration;

    /* Whether we send section footer during migration */

migration/savevm.c

+1 −1
Original line number Diff line number Diff line
@@ -2844,7 +2844,7 @@ void vmstate_register_ram_global(MemoryRegion *mr) 
bool vmstate_check_only_migratable(const VMStateDescription *vmsd)

{

    /* check needed if --only-migratable is specified */

    if (!migrate_get_current()->only_migratable) {

    if (!only_migratable) {

        return true;

    }