[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] vmstate_register_with_alias_id: Take an Error **
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 2/6] vmstate_register_with_alias_id: Take an Error ** |
Date: |
Mon, 6 Feb 2017 17:51:45 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
I'll be adding an error to it in a subsequent patch.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
hw/core/qdev.c | 3 ++-
hw/intc/apic_common.c | 2 +-
include/migration/vmstate.h | 5 +++--
migration/savevm.c | 3 ++-
stubs/vmstate.c | 3 ++-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 5783442..ea97b15 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -935,7 +935,8 @@ static void device_set_realized(Object *obj, bool value,
Error **errp)
if (qdev_get_vmsd(dev)) {
vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(dev), dev,
dev->instance_id_alias,
- dev->alias_required_for_version);
+ dev->alias_required_for_version,
+ NULL);
}
QLIST_FOREACH(bus, &dev->child_bus, sibling) {
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 17df24c..6ce8ef7 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -329,7 +329,7 @@ static void apic_common_realize(DeviceState *dev, Error
**errp)
instance_id = -1;
}
vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common,
- s, -1, 0);
+ s, -1, 0, NULL);
}
static void apic_common_unrealize(DeviceState *dev, Error **errp)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 3bbe3ed..c38b00a 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -988,14 +988,15 @@ bool vmstate_save_needed(const VMStateDescription *vmsd,
void *opaque);
int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
const VMStateDescription *vmsd,
void *base, int alias_id,
- int required_for_version);
+ int required_for_version,
+ Error **errp);
static inline int vmstate_register(DeviceState *dev, int instance_id,
const VMStateDescription *vmsd,
void *opaque)
{
return vmstate_register_with_alias_id(dev, instance_id, vmsd,
- opaque, -1, 0);
+ opaque, -1, 0, NULL);
}
void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd,
diff --git a/migration/savevm.c b/migration/savevm.c
index f3644ca..b11b4a2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -656,7 +656,8 @@ void unregister_savevm(DeviceState *dev, const char *idstr,
void *opaque)
int vmstate_register_with_alias_id(DeviceState *dev, int instance_id,
const VMStateDescription *vmsd,
void *opaque, int alias_id,
- int required_for_version)
+ int required_for_version,
+ Error **errp)
{
SaveStateEntry *se;
diff --git a/stubs/vmstate.c b/stubs/vmstate.c
index 6590627..bbe158f 100644
--- a/stubs/vmstate.c
+++ b/stubs/vmstate.c
@@ -8,7 +8,8 @@ int vmstate_register_with_alias_id(DeviceState *dev,
int instance_id,
const VMStateDescription *vmsd,
void *base, int alias_id,
- int required_for_version)
+ int required_for_version,
+ Error **errp)
{
return 0;
}
--
2.7.4
- [Qemu-devel] [PULL 0/6] Migration pull, Juan Quintela, 2017/02/06
- [Qemu-devel] [PULL 1/6] migration: create Migration Incoming State at init time, Juan Quintela, 2017/02/06
- [Qemu-devel] [PULL 2/6] vmstate_register_with_alias_id: Take an Error **,
Juan Quintela <=
- [Qemu-devel] [PULL 3/6] migration: Check for ID length, Juan Quintela, 2017/02/06
- [Qemu-devel] [PULL 4/6] vmstate registration: check return values, Juan Quintela, 2017/02/06
- [Qemu-devel] [PULL 5/6] Postcopy: Reset state to avoid cleanup assert, Juan Quintela, 2017/02/06
- [Qemu-devel] [PULL 6/6] postcopy: Recover block devices on early failure, Juan Quintela, 2017/02/06
- Re: [Qemu-devel] [PULL 0/6] Migration pull, Peter Maydell, 2017/02/06