External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorOpenUnix: Remove 'retry' argument

Browse Source 
All callers now pass false for 'retry' we are guaranteed to have a
monitor socket present. This means that the retry code can be removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-03 13:48:09 +01:00
parent 13320bf77e
commit 31699d3914
4 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/qemu/qemu_monitor.c
View File

@ -223,16 +223,12 @@ qemuMonitorDispose(void *obj)
g_free(mon->domainName); g_free(mon->domainName);
} }
#define QEMU_DEFAULT_MONITOR_WAIT 30
static int static int
qemuMonitorOpenUnix(const char *monitor, qemuMonitorOpenUnix(const char *monitor)
pid_t cpid,
bool retry)
{ {
struct sockaddr_un addr; struct sockaddr_un addr;
VIR_AUTOCLOSE monfd = -1; VIR_AUTOCLOSE monfd = -1;
virTimeBackOffVar timebackoff;
int ret = -1; int ret = -1;
if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
@ -249,39 +245,11 @@ qemuMonitorOpenUnix(const char *monitor,
return -1; return -1;
} }
if (retry) { ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
if (virTimeBackOffStart(&timebackoff, 1, QEMU_DEFAULT_MONITOR_WAIT * 1000) < 0) if (ret < 0) {
return -1; virReportSystemError(errno, "%s",
while (virTimeBackOffWait(&timebackoff)) { _("failed to connect to monitor socket"));
ret = connect(monfd, (struct sockaddr *)&addr, sizeof(addr)); return -1;
if (ret == 0)
break;
if ((errno == ENOENT || errno == ECONNREFUSED) &&
(!cpid || virProcessKill(cpid, 0) == 0)) {
/* ENOENT : Socket may not have shown up yet
* ECONNREFUSED : Leftover socket hasn't been removed yet */
continue;
}
virReportSystemError(errno, "%s",
_("failed to connect to monitor socket"));
return -1;
}
if (ret != 0) {
virReportSystemError(errno, "%s",
_("monitor socket did not show up"));
return -1;
}
} else {
ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr));
if (ret < 0) {
virReportSystemError(errno, "%s",
_("failed to connect to monitor socket"));
return -1;
}
} }
ret = monfd; ret = monfd;
@ -707,7 +675,6 @@ qemuMonitorOpenInternal(virDomainObj *vm,
qemuMonitor * qemuMonitor *
qemuMonitorOpen(virDomainObj *vm, qemuMonitorOpen(virDomainObj *vm,
virDomainChrSourceDef *config, virDomainChrSourceDef *config,
bool retry,
GMainContext *context, GMainContext *context,
qemuMonitorCallbacks *cb) qemuMonitorCallbacks *cb)
{ {
@ -722,7 +689,7 @@ qemuMonitorOpen(virDomainObj *vm,
} }
virObjectUnlock(vm); virObjectUnlock(vm);
fd = qemuMonitorOpenUnix(config->data.nix.path, vm->pid, retry); fd = qemuMonitorOpenUnix(config->data.nix.path);
virObjectLock(vm); virObjectLock(vm);
if (fd < 0) if (fd < 0)

1
src/qemu/qemu_monitor.h
View File

@ -408,7 +408,6 @@ struct _qemuMonitorCallbacks {
qemuMonitor *qemuMonitorOpen(virDomainObj *vm, qemuMonitor *qemuMonitorOpen(virDomainObj *vm,
virDomainChrSourceDef *config, virDomainChrSourceDef *config,
bool retry,
GMainContext *context, GMainContext *context,
qemuMonitorCallbacks *cb) qemuMonitorCallbacks *cb)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4);

3
src/qemu/qemu_process.c
View File

@ -1899,7 +1899,6 @@ qemuConnectMonitor(virQEMUDriver *driver,
mon = qemuMonitorOpen(vm, mon = qemuMonitorOpen(vm,
priv->monConfig, priv->monConfig,
false,
virEventThreadGetContext(priv->eventThread), virEventThreadGetContext(priv->eventThread),
&monitorCallbacks); &monitorCallbacks);
@ -9493,7 +9492,7 @@ qemuProcessQMPConnectMonitor(qemuProcessQMP *proc)
proc->vm->pid = proc->pid; proc->vm->pid = proc->pid;
if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig, false, if (!(proc->mon = qemuMonitorOpen(proc->vm, &monConfig,
virEventThreadGetContext(proc->eventThread), virEventThreadGetContext(proc->eventThread),
&callbacks))) &callbacks)))
return -1; return -1;

1
tests/qemumonitortestutils.c
View File

@ -1109,7 +1109,6 @@ qemuMonitorTestNew(virDomainXMLOption *xmlopt,
test->qapischema = schema; test->qapischema = schema;
if (!(test->mon = qemuMonitorOpen(test->vm, if (!(test->mon = qemuMonitorOpen(test->vm,
&src, &src,
false,
virEventThreadGetContext(test->eventThread), virEventThreadGetContext(test->eventThread),
&qemuMonitorTestCallbacks))) &qemuMonitorTestCallbacks)))
goto error; goto error;