From b84ec0ede41e3bc308550071665ef30f31fb8b16 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Thu, 9 Dec 2010 21:21:49 -0200 Subject: [RHEL6 qemu-kvm PATCH 7/8] Support marking a device as non-migratable RH-Author: Alex Williamson Message-id: <20101209212144.10949.50050.stgit@s20.home> Patchwork-id: 14515 O-Subject: [RHEL6.1 qemu-kvm PATCH 1/2] Support marking a device as non-migratable Bugzilla: 635954 RH-Acked-by: Don Dutile RH-Acked-by: Jes Sorensen RH-Acked-by: Juan Quintela From: Cam Macdonell Upstream commit: 2431296806bc7a40c29b7775e16f36dc1cda4d06 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=635954 Brew build: https://brewweb.devel.redhat.com/taskinfo?taskID=2963354 A non-migratable device should be removed before migration and re-added after. Signed-off-by: Cam Macdonell Signed-off-by: Anthony Liguori --- hw/hw.h | 2 ++ savevm.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) Signed-off-by: Eduardo Habkost --- hw/hw.h | 2 ++ savevm.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index a1bd644..2a89865 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -267,6 +267,8 @@ int register_savevm_live(DeviceState *dev, void *opaque); void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque); +void register_device_unmigratable(DeviceState *dev, const char *idstr, + void *opaque); typedef void QEMUResetHandler(void *opaque); diff --git a/savevm.c b/savevm.c index a5f1559..3e0c4af 100644 --- a/savevm.c +++ b/savevm.c @@ -1064,6 +1064,7 @@ typedef struct SaveStateEntry { const VMStateDescription *vmsd; void *opaque; CompatEntry *compat; + int no_migrate; } SaveStateEntry; @@ -1127,6 +1128,7 @@ int register_savevm_live(DeviceState *dev, se->load_state = load_state; se->opaque = opaque; se->vmsd = NULL; + se->no_migrate = 0; if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { char *id = dev->parent_bus->info->get_dev_path(dev); @@ -1193,6 +1195,31 @@ void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) } } +/* mark a device as not to be migrated, that is the device should be + unplugged before migration */ +void register_device_unmigratable(DeviceState *dev, const char *idstr, + void *opaque) +{ + SaveStateEntry *se; + char id[256] = ""; + + if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { + char *path = dev->parent_bus->info->get_dev_path(dev); + if (path) { + pstrcpy(id, sizeof(id), path); + pstrcat(id, sizeof(id), "/"); + qemu_free(path); + } + } + pstrcat(id, sizeof(id), idstr); + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + if (strcmp(se->idstr, id) == 0 && se->opaque == opaque) { + se->no_migrate = 1; + } + } +} + int vmstate_register(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque) { @@ -1389,13 +1416,19 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se, int version_id) return vmstate_load_state(f, se->vmsd, se->opaque, version_id); } -static void vmstate_save(QEMUFile *f, SaveStateEntry *se) +static int vmstate_save(QEMUFile *f, SaveStateEntry *se) { + if (se->no_migrate) { + return -1; + } + if (!se->vmsd) { /* Old style */ se->save_state(f, se->opaque); - return; + return 0; } vmstate_save_state(f,se->vmsd, se->opaque); + + return 0; } #define QEMU_VM_FILE_MAGIC 0x5145564d @@ -1490,6 +1523,7 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) { SaveStateEntry *se; + int r; QTAILQ_FOREACH(se, &savevm_handlers, entry) { if (se->save_live_state == NULL) @@ -1520,7 +1554,11 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) qemu_put_be32(f, se->instance_id); qemu_put_be32(f, se->version_id); - vmstate_save(f, se); + r = vmstate_save(f, se); + if (r < 0) { + monitor_printf(mon, "cannot migrate with device '%s'\n", se->idstr); + return r; + } } qemu_put_byte(f, QEMU_VM_EOF); -- 1.7.3.2