mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
qemu: clean out unused migrate to unix
This commit is contained in:
parent
fee0547799
commit
9f08b76631
@ -4355,7 +4355,6 @@ qemuMigrationConfirm(virConnectPtr conn,
|
|||||||
enum qemuMigrationDestinationType {
|
enum qemuMigrationDestinationType {
|
||||||
MIGRATION_DEST_HOST,
|
MIGRATION_DEST_HOST,
|
||||||
MIGRATION_DEST_CONNECT_HOST,
|
MIGRATION_DEST_CONNECT_HOST,
|
||||||
MIGRATION_DEST_UNIX,
|
|
||||||
MIGRATION_DEST_FD,
|
MIGRATION_DEST_FD,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4375,11 +4374,6 @@ struct _qemuMigrationSpec {
|
|||||||
int port;
|
int port;
|
||||||
} host;
|
} host;
|
||||||
|
|
||||||
struct {
|
|
||||||
char *file;
|
|
||||||
int sock;
|
|
||||||
} unix_socket;
|
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
int qemu;
|
int qemu;
|
||||||
int local;
|
int local;
|
||||||
@ -4816,11 +4810,6 @@ qemuMigrationRun(virQEMUDriverPtr driver,
|
|||||||
/* handled above and transformed into MIGRATION_DEST_FD */
|
/* handled above and transformed into MIGRATION_DEST_FD */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIGRATION_DEST_UNIX:
|
|
||||||
ret = qemuMonitorMigrateToUnix(priv->mon, migrate_flags,
|
|
||||||
spec->dest.unix_socket.file);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case MIGRATION_DEST_FD:
|
case MIGRATION_DEST_FD:
|
||||||
if (spec->fwdType != MIGRATION_FWD_DIRECT) {
|
if (spec->fwdType != MIGRATION_FWD_DIRECT) {
|
||||||
fd = spec->dest.fd.local;
|
fd = spec->dest.fd.local;
|
||||||
@ -4840,25 +4829,6 @@ qemuMigrationRun(virQEMUDriverPtr driver,
|
|||||||
/* From this point onwards we *must* call cancel to abort the
|
/* From this point onwards we *must* call cancel to abort the
|
||||||
* migration on source if anything goes wrong */
|
* migration on source if anything goes wrong */
|
||||||
|
|
||||||
if (spec->destType == MIGRATION_DEST_UNIX) {
|
|
||||||
/* It is also possible that the migrate didn't fail initially, but
|
|
||||||
* rather failed later on. Check its status before waiting for a
|
|
||||||
* connection from qemu which may never be initiated.
|
|
||||||
*/
|
|
||||||
if (qemuMigrationCheckJobStatus(driver, vm,
|
|
||||||
QEMU_ASYNC_JOB_MIGRATION_OUT,
|
|
||||||
false) < 0)
|
|
||||||
goto cancel;
|
|
||||||
|
|
||||||
while ((fd = accept(spec->dest.unix_socket.sock, NULL, NULL)) < 0) {
|
|
||||||
if (errno == EAGAIN || errno == EINTR)
|
|
||||||
continue;
|
|
||||||
virReportSystemError(errno, "%s",
|
|
||||||
_("failed to accept connection from qemu"));
|
|
||||||
goto cancel;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (spec->fwdType != MIGRATION_FWD_DIRECT) {
|
if (spec->fwdType != MIGRATION_FWD_DIRECT) {
|
||||||
if (!(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd)))
|
if (!(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd)))
|
||||||
goto cancel;
|
goto cancel;
|
||||||
@ -5081,7 +5051,6 @@ static int doTunnelMigrate(virQEMUDriverPtr driver,
|
|||||||
qemuMigrationCompressionPtr compression,
|
qemuMigrationCompressionPtr compression,
|
||||||
qemuMonitorMigrationParamsPtr migParams)
|
qemuMonitorMigrationParamsPtr migParams)
|
||||||
{
|
{
|
||||||
virNetSocketPtr sock = NULL;
|
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
qemuMigrationSpec spec;
|
qemuMigrationSpec spec;
|
||||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||||
@ -5120,13 +5089,8 @@ static int doTunnelMigrate(virQEMUDriverPtr driver,
|
|||||||
compression, migParams);
|
compression, migParams);
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
if (spec.destType == MIGRATION_DEST_FD) {
|
VIR_FORCE_CLOSE(spec.dest.fd.qemu);
|
||||||
VIR_FORCE_CLOSE(spec.dest.fd.qemu);
|
VIR_FORCE_CLOSE(spec.dest.fd.local);
|
||||||
VIR_FORCE_CLOSE(spec.dest.fd.local);
|
|
||||||
} else {
|
|
||||||
virObjectUnref(sock);
|
|
||||||
VIR_FREE(spec.dest.unix_socket.file);
|
|
||||||
}
|
|
||||||
|
|
||||||
virObjectUnref(cfg);
|
virObjectUnref(cfg);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -2621,30 +2621,6 @@ qemuMonitorMigrateToCommand(qemuMonitorPtr mon,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
qemuMonitorMigrateToUnix(qemuMonitorPtr mon,
|
|
||||||
unsigned int flags,
|
|
||||||
const char *unixfile)
|
|
||||||
{
|
|
||||||
char *dest = NULL;
|
|
||||||
int ret = -1;
|
|
||||||
VIR_DEBUG("unixfile=%s flags=%x", unixfile, flags);
|
|
||||||
|
|
||||||
QEMU_CHECK_MONITOR(mon);
|
|
||||||
|
|
||||||
if (virAsprintf(&dest, "unix:%s", unixfile) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (mon->json)
|
|
||||||
ret = qemuMonitorJSONMigrate(mon, flags, dest);
|
|
||||||
else
|
|
||||||
ret = qemuMonitorTextMigrate(mon, flags, dest);
|
|
||||||
|
|
||||||
VIR_FREE(dest);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
qemuMonitorMigrateCancel(qemuMonitorPtr mon)
|
qemuMonitorMigrateCancel(qemuMonitorPtr mon)
|
||||||
{
|
{
|
||||||
|
@ -682,10 +682,6 @@ int qemuMonitorMigrateToCommand(qemuMonitorPtr mon,
|
|||||||
unsigned int flags,
|
unsigned int flags,
|
||||||
const char * const *argv);
|
const char * const *argv);
|
||||||
|
|
||||||
int qemuMonitorMigrateToUnix(qemuMonitorPtr mon,
|
|
||||||
unsigned int flags,
|
|
||||||
const char *unixfile);
|
|
||||||
|
|
||||||
int qemuMonitorMigrateCancel(qemuMonitorPtr mon);
|
int qemuMonitorMigrateCancel(qemuMonitorPtr mon);
|
||||||
|
|
||||||
int qemuMonitorGetDumpGuestMemoryCapability(qemuMonitorPtr mon,
|
int qemuMonitorGetDumpGuestMemoryCapability(qemuMonitorPtr mon,
|
||||||
|
Loading…
Reference in New Issue
Block a user