diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 08:51:06 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 08:51:06 -0500 |
| commit | 5c20f4e54a311620861c659dec29d0ee402e8b93 (patch) | |
| tree | 4e35db5155d8539650df69e629cc1a009ae54579 /arch_init.c | |
| parent | 46a5801d0cb5f5ed01a4d31c0e7cc581237ed5ce (diff) | |
| parent | e1c37d0e94048502f9874e6356ce7136d4b05bdb (diff) | |
| download | focaccia-qemu-5c20f4e54a311620861c659dec29d0ee402e8b93.tar.gz focaccia-qemu-5c20f4e54a311620861c659dec29d0ee402e8b93.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: qapi: Convert migrate Purge migration of (almost) everything to do with monitors Error: Introduce error_copy() QError: Introduce new errors for the migration command
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c index a95ef495fe..595badf50f 100644 --- a/arch_init.c +++ b/arch_init.c @@ -260,7 +260,7 @@ static void sort_ram_list(void) g_free(blocks); } -int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) +int ram_save_live(QEMUFile *f, int stage, void *opaque) { ram_addr_t addr; uint64_t bytes_transferred_last; |