From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: dgilbert@redhat.com, peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH build fix] migration: do not doubly-define LoadStateHandler
Date: Thu, 15 Jun 2017 11:49:57 +0200 [thread overview]
Message-ID: <1497520197-56796-1-git-send-email-pbonzini@redhat.com> (raw)
As the simplest fix to un-confuse patchew, inline the type
in struct VMStateDescription. As there are no users of
LoadStateHandler anymore in e.g. function declarations,
there isn't much advantage in defining it as a type.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/migration/vmstate.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f3f3c2a..82d41fa 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -29,7 +29,6 @@
#include "migration/qjson.h"
-typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);
typedef struct VMStateInfo VMStateInfo;
typedef struct VMStateDescription VMStateDescription;
typedef struct VMStateField VMStateField;
@@ -176,7 +175,7 @@ struct VMStateDescription {
int minimum_version_id;
int minimum_version_id_old;
MigrationPriority priority;
- LoadStateHandler *load_state_old;
+ int (*load_state_old)(QEMUFile *f, void *opaque, int version_id);
int (*pre_load)(void *opaque);
int (*post_load)(void *opaque, int version_id);
void (*pre_save)(void *opaque);
--
1.8.3.1
next reply other threads:[~2017-06-15 9:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-15 9:49 Paolo Bonzini [this message]
2017-06-15 9:54 ` [Qemu-devel] [PATCH build fix] migration: do not doubly-define LoadStateHandler 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=1497520197-56796-1-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=dgilbert@redhat.com \
--cc=peter.maydell@linaro.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: 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).