From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Corey Minyard" <cminyard@mvista.com>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Stefan Weil" <sw@weilnetz.de>,
"Jason Wang" <jasowang@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Richard Henderson" <rth@twiddle.net>,
"Stefan Berger" <stefanb@linux.ibm.com>
Subject: [PULL 27/29] migration: Change SaveStateEntry.instance_id into uint32_t
Date: Tue, 14 Jan 2020 10:26:04 +0100 [thread overview]
Message-ID: <20200114092606.1761-28-quintela@redhat.com> (raw)
In-Reply-To: <20200114092606.1761-1-quintela@redhat.com>
From: Peter Xu <peterx@redhat.com>
It was always used as 32bit, so define it as used to be clear.
Instead of using -1 as the auto-gen magic value, we switch to
UINT32_MAX. We also make sure that we don't auto-gen this value to
avoid overflowed instance IDs without being noticed.
Suggested-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
hw/intc/apic_common.c | 2 +-
include/migration/register.h | 2 +-
include/migration/vmstate.h | 2 +-
migration/savevm.c | 18 ++++++++++--------
stubs/vmstate.c | 2 +-
5 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index f2c3a7f309..54b8731fca 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -268,7 +268,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp)
APICCommonState *s = APIC_COMMON(dev);
APICCommonClass *info;
static DeviceState *vapic;
- int instance_id = s->id;
+ uint32_t instance_id = s->id;
info = APIC_COMMON_GET_CLASS(s);
info->realize(dev, errp);
diff --git a/include/migration/register.h b/include/migration/register.h
index 00c38ebe9f..c1dcff0f90 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -71,7 +71,7 @@ typedef struct SaveVMHandlers {
} SaveVMHandlers;
int register_savevm_live(const char *idstr,
- int instance_id,
+ uint32_t instance_id,
int version_id,
const SaveVMHandlers *ops,
void *opaque);
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index ed74dd5624..01790b8d9b 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -1160,7 +1160,7 @@ bool vmstate_save_needed(const VMStateDescription *vmsd, void *opaque);
#define VMSTATE_INSTANCE_ID_ANY -1
/* Returns: 0 on success, -1 on failure */
-int vmstate_register_with_alias_id(VMStateIf *obj, int instance_id,
+int vmstate_register_with_alias_id(VMStateIf *obj, uint32_t instance_id,
const VMStateDescription *vmsd,
void *base, int alias_id,
int required_for_version,
diff --git a/migration/savevm.c b/migration/savevm.c
index 8dab99efc4..adfdca26ac 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -233,7 +233,7 @@ typedef struct CompatEntry {
typedef struct SaveStateEntry {
QTAILQ_ENTRY(SaveStateEntry) entry;
char idstr[256];
- int instance_id;
+ uint32_t instance_id;
int alias_id;
int version_id;
/* version id read from the stream */
@@ -667,10 +667,10 @@ void dump_vmstate_json_to_file(FILE *out_file)
fclose(out_file);
}
-static int calculate_new_instance_id(const char *idstr)
+static uint32_t calculate_new_instance_id(const char *idstr)
{
SaveStateEntry *se;
- int instance_id = 0;
+ uint32_t instance_id = 0;
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (strcmp(idstr, se->idstr) == 0
@@ -678,6 +678,8 @@ static int calculate_new_instance_id(const char *idstr)
instance_id = se->instance_id + 1;
}
}
+ /* Make sure we never loop over without being noticed */
+ assert(instance_id != VMSTATE_INSTANCE_ID_ANY);
return instance_id;
}
@@ -755,7 +757,7 @@ static void savevm_state_handler_remove(SaveStateEntry *se)
Meanwhile pass -1 as instance_id if you do not already have a clearly
distinguishing id for all instances of your device class. */
int register_savevm_live(const char *idstr,
- int instance_id,
+ uint32_t instance_id,
int version_id,
const SaveVMHandlers *ops,
void *opaque)
@@ -809,7 +811,7 @@ void unregister_savevm(VMStateIf *obj, const char *idstr, void *opaque)
}
}
-int vmstate_register_with_alias_id(VMStateIf *obj, int instance_id,
+int vmstate_register_with_alias_id(VMStateIf *obj, uint32_t instance_id,
const VMStateDescription *vmsd,
void *opaque, int alias_id,
int required_for_version,
@@ -1625,7 +1627,7 @@ int qemu_save_device_state(QEMUFile *f)
return qemu_file_get_error(f);
}
-static SaveStateEntry *find_se(const char *idstr, int instance_id)
+static SaveStateEntry *find_se(const char *idstr, uint32_t instance_id)
{
SaveStateEntry *se;
@@ -2292,7 +2294,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis)
/* Find savevm section */
se = find_se(idstr, instance_id);
if (se == NULL) {
- error_report("Unknown savevm section or instance '%s' %d. "
+ error_report("Unknown savevm section or instance '%s' %"PRIu32". "
"Make sure that your current VM setup matches your "
"saved VM setup, including any hotplugged devices",
idstr, instance_id);
@@ -2316,7 +2318,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, MigrationIncomingState *mis)
ret = vmstate_load(f, se);
if (ret < 0) {
- error_report("error while loading state for instance 0x%x of"
+ error_report("error while loading state for instance 0x%"PRIx32" of"
" device '%s'", instance_id, idstr);
return ret;
}
diff --git a/stubs/vmstate.c b/stubs/vmstate.c
index 6951d9fdc5..cc4fe41dfc 100644
--- a/stubs/vmstate.c
+++ b/stubs/vmstate.c
@@ -4,7 +4,7 @@
const VMStateDescription vmstate_dummy = {};
int vmstate_register_with_alias_id(VMStateIf *obj,
- int instance_id,
+ uint32_t instance_id,
const VMStateDescription *vmsd,
void *base, int alias_id,
int required_for_version,
--
2.24.1
next prev parent reply other threads:[~2020-01-14 9:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 9:25 [PULL 00/29] Migration pull patches (second try) Juan Quintela
2020-01-14 9:25 ` [PULL 01/29] multifd: Initialize local variable Juan Quintela
2020-01-14 9:25 ` [PULL 02/29] migration-test: Add migration multifd test Juan Quintela
2020-01-14 9:25 ` [PULL 03/29] migration: Make sure that we don't call write() in case of error Juan Quintela
2020-01-14 9:25 ` [PULL 04/29] migration-test: introduce functions to handle string parameters Juan Quintela
2020-01-14 9:25 ` [PULL 05/29] migration-test: ppc64: fix FORTH test program Juan Quintela
2020-01-14 9:25 ` [PULL 06/29] runstate: ignore finishmigrate -> prelaunch transition Juan Quintela
2020-01-14 9:25 ` [PULL 07/29] ram.c: remove unneeded labels Juan Quintela
2020-01-14 9:25 ` [PULL 08/29] migration: Rate limit inside host pages Juan Quintela
2020-01-14 9:25 ` [PULL 09/29] migration: Fix incorrect integer->float conversion caught by clang Juan Quintela
2020-01-14 9:25 ` [PULL 10/29] migration: Fix the re-run check of the migrate-incoming command Juan Quintela
2020-01-14 9:25 ` [PULL 11/29] misc: use QEMU_IS_ALIGNED Juan Quintela
2020-01-14 9:25 ` [PULL 12/29] migration: add savevm_state_handler_remove() Juan Quintela
2020-01-14 9:25 ` [PULL 13/29] migration: savevm_state_handler_insert: constant-time element insertion Juan Quintela
2020-01-14 9:25 ` [PULL 14/29] migration/ram: Yield periodically to the main loop Juan Quintela
2020-01-14 9:25 ` [PULL 15/29] migration/postcopy: reduce memset when it is zero page and matches_target_page_size Juan Quintela
2020-01-14 9:25 ` [PULL 16/29] migration/postcopy: wait for decompress thread in precopy Juan Quintela
2020-01-14 9:25 ` [PULL 17/29] migration/postcopy: count target page number to decide the place_needed Juan Quintela
2020-01-14 9:25 ` [PULL 18/29] migration/postcopy: set all_zero to true on the first target page Juan Quintela
2020-01-14 9:25 ` [PULL 19/29] migration/postcopy: enable random order target page arrival Juan Quintela
2020-01-14 9:25 ` [PULL 20/29] migration/postcopy: enable compress during postcopy Juan Quintela
2020-01-14 9:25 ` [PULL 21/29] migration/multifd: clean pages after filling packet Juan Quintela
2020-01-14 9:25 ` [PULL 22/29] migration/multifd: not use multifd during postcopy Juan Quintela
2020-01-14 9:26 ` [PULL 23/29] migration/multifd: fix nullptr access in terminating multifd threads Juan Quintela
2020-01-14 9:26 ` [PULL 24/29] migration/multifd: fix destroyed mutex " Juan Quintela
2020-01-14 9:26 ` [PULL 25/29] Bug #1829242 correction Juan Quintela
2020-01-14 9:26 ` [PULL 26/29] migration: Define VMSTATE_INSTANCE_ID_ANY Juan Quintela
2020-01-14 9:26 ` Juan Quintela [this message]
2020-01-14 9:26 ` [PULL 28/29] apic: Use 32bit APIC ID for migration instance ID Juan Quintela
2020-01-14 9:26 ` [PULL 29/29] migration: Support QLIST migration Juan Quintela
2020-01-14 11:15 ` [PULL 00/29] Migration pull patches (second try) Peter Maydell
2020-01-14 11:22 ` Juan Quintela
2020-01-14 11:23 ` Peter Maydell
2020-01-14 11:26 ` Daniel P. Berrangé
2020-01-14 11:16 ` no-reply
2020-01-14 11:21 ` Peter Maydell
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=20200114092606.1761-28-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=berrange@redhat.com \
--cc=cminyard@mvista.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
--cc=stefanb@linux.ibm.com \
--cc=sw@weilnetz.de \
--cc=thuth@redhat.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).