da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
71 lines
1.8 KiB
C
71 lines
1.8 KiB
C
/*
|
|
* QEMU live migration
|
|
*
|
|
* Copyright IBM, Corp. 2008
|
|
* Copyright Dell MessageOne 2008
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
* Charles Duffy <charles_duffy@messageone.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the COPYING file in the top-level directory.
|
|
*
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "qemu/sockets.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "migration/migration.h"
|
|
#include "migration/qemu-file.h"
|
|
#include "block/block.h"
|
|
#include <sys/wait.h>
|
|
|
|
//#define DEBUG_MIGRATION_EXEC
|
|
|
|
#ifdef DEBUG_MIGRATION_EXEC
|
|
#define DPRINTF(fmt, ...) \
|
|
do { printf("migration-exec: " fmt, ## __VA_ARGS__); } while (0)
|
|
#else
|
|
#define DPRINTF(fmt, ...) \
|
|
do { } while (0)
|
|
#endif
|
|
|
|
void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
|
|
{
|
|
s->to_dst_file = qemu_popen_cmd(command, "w");
|
|
if (s->to_dst_file == NULL) {
|
|
error_setg_errno(errp, errno, "failed to popen the migration target");
|
|
return;
|
|
}
|
|
|
|
migrate_fd_connect(s);
|
|
}
|
|
|
|
static void exec_accept_incoming_migration(void *opaque)
|
|
{
|
|
QEMUFile *f = opaque;
|
|
|
|
qemu_set_fd_handler(qemu_get_fd(f), NULL, NULL, NULL);
|
|
process_incoming_migration(f);
|
|
}
|
|
|
|
void exec_start_incoming_migration(const char *command, Error **errp)
|
|
{
|
|
QEMUFile *f;
|
|
|
|
DPRINTF("Attempting to start an incoming migration\n");
|
|
f = qemu_popen_cmd(command, "r");
|
|
if(f == NULL) {
|
|
error_setg_errno(errp, errno, "failed to popen the migration source");
|
|
return;
|
|
}
|
|
|
|
qemu_set_fd_handler(qemu_get_fd(f), exec_accept_incoming_migration, NULL,
|
|
f);
|
|
}
|