From: Cam Macdonell <cam@cs.ualberta.ca> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Cam Macdonell <cam@cs.ualberta.ca> Subject: [PATCH v8 4/5] Support marking a device as non-migratable Date: Mon, 26 Jul 2010 18:11:00 -0600 [thread overview] Message-ID: <1280189461-1929-5-git-send-email-cam@cs.ualberta.ca> (raw) In-Reply-To: <1280189461-1929-4-git-send-email-cam@cs.ualberta.ca> A non-migratable device should be removed before migration and re-added after. Signed-off-by: Cam Macdonell <cam@cs.ualberta.ca> --- 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 c2de6fe..28b4204 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -264,6 +264,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 ee27989..6d55d28 100644 --- a/savevm.c +++ b/savevm.c @@ -1005,6 +1005,7 @@ typedef struct SaveStateEntry { const VMStateDescription *vmsd; void *opaque; CompatEntry *compat; + int no_migrate; } SaveStateEntry; @@ -1068,6 +1069,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); @@ -1131,6 +1133,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_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque, int alias_id, @@ -1323,13 +1350,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 @@ -1423,6 +1456,7 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) { SaveStateEntry *se; + int r; cpu_synchronize_all_states(); @@ -1455,7 +1489,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.6.3.2.198.g6096d
WARNING: multiple messages have this Message-ID (diff)
From: Cam Macdonell <cam@cs.ualberta.ca> To: qemu-devel@nongnu.org Cc: Cam Macdonell <cam@cs.ualberta.ca>, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v8 4/5] Support marking a device as non-migratable Date: Mon, 26 Jul 2010 18:11:00 -0600 [thread overview] Message-ID: <1280189461-1929-5-git-send-email-cam@cs.ualberta.ca> (raw) In-Reply-To: <1280189461-1929-4-git-send-email-cam@cs.ualberta.ca> A non-migratable device should be removed before migration and re-added after. Signed-off-by: Cam Macdonell <cam@cs.ualberta.ca> --- 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 c2de6fe..28b4204 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -264,6 +264,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 ee27989..6d55d28 100644 --- a/savevm.c +++ b/savevm.c @@ -1005,6 +1005,7 @@ typedef struct SaveStateEntry { const VMStateDescription *vmsd; void *opaque; CompatEntry *compat; + int no_migrate; } SaveStateEntry; @@ -1068,6 +1069,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); @@ -1131,6 +1133,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_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque, int alias_id, @@ -1323,13 +1350,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 @@ -1423,6 +1456,7 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) { SaveStateEntry *se; + int r; cpu_synchronize_all_states(); @@ -1455,7 +1489,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.6.3.2.198.g6096d
next prev parent reply other threads:[~2010-07-27 0:11 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-07-27 0:10 [PATCH v8 0/5] Inter-VM Shared Memory Device Cam Macdonell 2010-07-27 0:10 ` [Qemu-devel] " Cam Macdonell 2010-07-27 0:10 ` [PATCH v8 1/5] Add qemu_ram_alloc_from_ptr function Cam Macdonell 2010-07-27 0:10 ` [Qemu-devel] " Cam Macdonell 2010-07-27 0:10 ` [PATCH v8 2/5] Device specification for shared memory PCI device Cam Macdonell 2010-07-27 0:10 ` [Qemu-devel] " Cam Macdonell 2010-07-27 0:10 ` [PATCH v8 3/5] Add function to assign ioeventfd to MMIO Cam Macdonell 2010-07-27 0:10 ` [Qemu-devel] " Cam Macdonell 2010-07-27 0:11 ` Cam Macdonell [this message] 2010-07-27 0:11 ` [Qemu-devel] [PATCH v8 4/5] Support marking a device as non-migratable Cam Macdonell 2010-07-27 0:11 ` [PATCH v8 5/5] Inter-VM shared memory PCI device Cam Macdonell 2010-07-27 0:11 ` [Qemu-devel] " Cam Macdonell 2010-07-27 16:54 ` [PATCH v8 5/5] RESEND: " Cam Macdonell 2010-07-27 16:54 ` [Qemu-devel] " Cam Macdonell 2010-08-11 8:35 ` Stefan Weil 2010-08-11 8:35 ` Stefan Weil 2010-08-11 15:49 ` Cam Macdonell 2010-08-11 17:07 ` Paolo Bonzini 2010-08-11 17:07 ` Paolo Bonzini 2010-08-11 18:22 ` Stefan Weil 2010-08-11 18:22 ` Stefan Weil 2010-08-10 21:28 ` [Qemu-devel] [PATCH v8 1/5] Add qemu_ram_alloc_from_ptr function Anthony Liguori
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1280189461-1929-5-git-send-email-cam@cs.ualberta.ca \ --to=cam@cs.ualberta.ca \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.