|
 |
5544c1 |
From 7544abf3b783fc82b031d40d0685d2047709492a Mon Sep 17 00:00:00 2001
|
|
|
5544c1 |
From: Jason Baron <jbaron@redhat.com>
|
|
|
5544c1 |
Date: Wed, 8 Aug 2012 14:29:12 -0400
|
|
|
5544c1 |
Subject: [PATCH] pcie: drop version_id field for live migration
|
|
|
5544c1 |
|
|
|
5544c1 |
While testing q35 live migration, I found that the migration would abort with
|
|
|
5544c1 |
the following error: "Unknown savevm section type 76".
|
|
|
5544c1 |
|
|
|
5544c1 |
The error is due to this check failing in 'vmstate_load_state()':
|
|
|
5544c1 |
|
|
|
5544c1 |
while(field->name) {
|
|
|
5544c1 |
if ((field->field_exists &&
|
|
|
5544c1 |
field->field_exists(opaque, version_id)) ||
|
|
|
5544c1 |
(!field->field_exists &&
|
|
|
5544c1 |
field->version_id <= version_id)) {
|
|
|
5544c1 |
|
|
|
5544c1 |
The VMSTATE_PCIE_DEVICE() currently has a 'version_id' set to 2. However,
|
|
|
5544c1 |
'version_id' in the above check is 1. And thus we fail to load the pcie device
|
|
|
5544c1 |
field. Further the code returns to 'qemu_loadvm_state()' which produces the
|
|
|
5544c1 |
error that I saw.
|
|
|
5544c1 |
|
|
|
5544c1 |
I'm proposing to fix this by simply dropping the 'version_id' field from
|
|
|
5544c1 |
VMSTATE_PCIE_DEVICE(). VMSTATE_PCI_DEVICE() defines no such field and further
|
|
|
5544c1 |
the vmstate_pcie_device that VMSTATE_PCI_DEVICE() refers to is already
|
|
|
5544c1 |
versioned. Thus, any versioning issues could be detected at the vmsd level.
|
|
|
5544c1 |
|
|
|
5544c1 |
Taking a step back, I think that the 'field->version_id' should be compared
|
|
|
5544c1 |
against a saved version number for the field not the 'version_id'. Futhermore,
|
|
|
5544c1 |
once vmstate_load_state() is called recursively on another vmsd, the check of:
|
|
|
5544c1 |
|
|
|
5544c1 |
if (version_id > vmsd->version_id) {
|
|
|
5544c1 |
return -EINVAL;
|
|
|
5544c1 |
}
|
|
|
5544c1 |
|
|
|
5544c1 |
Will never fail since version_id is always equal to vmsd->version_id. So I'm
|
|
|
5544c1 |
wondering why we aren't storing the vmsd version id of the source in the
|
|
|
5544c1 |
migration stream?
|
|
|
5544c1 |
|
|
|
5544c1 |
This patch also renames the 'name' field of vmstate_pcie_device from:
|
|
|
5544c1 |
PCIDevice -> PCIEDevice to differentiate it from vmstate_pci_device.
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Jason Baron <jbaron@redhat.com>
|
|
|
5544c1 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
5544c1 |
(cherry picked from commit 1de53459272d89c52bb21b45d5d970de40fbb642)
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1 |
---
|
|
|
5544c1 |
hw/pci.c | 2 +-
|
|
|
5544c1 |
hw/pcie.h | 1 -
|
|
|
5544c1 |
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
5544c1 |
|
|
|
5544c1 |
diff --git a/hw/pci.c b/hw/pci.c
|
|
|
5544c1 |
index 4d95984..f855cf3 100644
|
|
|
5544c1 |
--- a/hw/pci.c
|
|
|
5544c1 |
+++ b/hw/pci.c
|
|
|
5544c1 |
@@ -439,7 +439,7 @@ const VMStateDescription vmstate_pci_device = {
|
|
|
5544c1 |
};
|
|
|
5544c1 |
|
|
|
5544c1 |
const VMStateDescription vmstate_pcie_device = {
|
|
|
5544c1 |
- .name = "PCIDevice",
|
|
|
5544c1 |
+ .name = "PCIEDevice",
|
|
|
5544c1 |
.version_id = 2,
|
|
|
5544c1 |
.minimum_version_id = 1,
|
|
|
5544c1 |
.minimum_version_id_old = 1,
|
|
|
5544c1 |
diff --git a/hw/pcie.h b/hw/pcie.h
|
|
|
5544c1 |
index b8ab0c7..4889194 100644
|
|
|
5544c1 |
--- a/hw/pcie.h
|
|
|
5544c1 |
+++ b/hw/pcie.h
|
|
|
5544c1 |
@@ -133,7 +133,6 @@ extern const VMStateDescription vmstate_pcie_device;
|
|
|
5544c1 |
|
|
|
5544c1 |
#define VMSTATE_PCIE_DEVICE(_field, _state) { \
|
|
|
5544c1 |
.name = (stringify(_field)), \
|
|
|
5544c1 |
- .version_id = 2, \
|
|
|
5544c1 |
.size = sizeof(PCIDevice), \
|
|
|
5544c1 |
.vmsd = &vmstate_pcie_device, \
|
|
|
5544c1 |
.flags = VMS_STRUCT, \
|
|
|
5544c1 |
--
|
|
|
5544c1 |
1.7.12.1
|
|
|
5544c1 |
|