mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 02:51:16 +00:00
qemu_driver.c: s/strerror/virStrerror.../
Perform most changs automatically, with this: perl -pi -e 's/\bstrerror *\((.+?)\)/virStrerror($1, ebuf, sizeof ebuf)/' Then, declare ebuf, as needed
This commit is contained in:
parent
b0d49913d5
commit
e60430be53
@ -1,3 +1,10 @@
|
|||||||
|
Thu Feb 5 17:03:35 +0100 2009 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
|
qemu_driver.c: s/strerror/virStrerror.../
|
||||||
|
Perform most changs automatically, with this:
|
||||||
|
perl -pi -e 's/\bstrerror *\((.+?)\)/virStrerror($1, ebuf, sizeof ebuf)/'
|
||||||
|
Then, declare ebuf, as needed
|
||||||
|
|
||||||
Thu Feb 5 17:03:35 +0100 2009 Jim Meyering <meyering@redhat.com>
|
Thu Feb 5 17:03:35 +0100 2009 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
remove duplicate *SetCloseExec and *SetNonBlock functions
|
remove duplicate *SetCloseExec and *SetNonBlock functions
|
||||||
|
@ -419,8 +419,9 @@ qemudStartup(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (virFileMakePath(qemu_driver->stateDir) < 0) {
|
if (virFileMakePath(qemu_driver->stateDir) < 0) {
|
||||||
|
char ebuf[1024];
|
||||||
qemudLog(QEMUD_ERROR, _("Failed to create state dir '%s': %s\n"),
|
qemudLog(QEMUD_ERROR, _("Failed to create state dir '%s': %s\n"),
|
||||||
qemu_driver->stateDir, strerror(errno));
|
qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -844,9 +845,11 @@ static int qemudWaitForMonitor(virConnectPtr conn,
|
|||||||
ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf),
|
ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf),
|
||||||
qemudFindCharDevicePTYs,
|
qemudFindCharDevicePTYs,
|
||||||
"console", 3000);
|
"console", 3000);
|
||||||
if (close(logfd) < 0)
|
if (close(logfd) < 0) {
|
||||||
|
char ebuf[1024];
|
||||||
qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
|
}
|
||||||
|
|
||||||
if (ret == 1) /* Success */
|
if (ret == 1) /* Success */
|
||||||
return 0;
|
return 0;
|
||||||
@ -1098,6 +1101,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
|
|||||||
const char *emulator;
|
const char *emulator;
|
||||||
pid_t child;
|
pid_t child;
|
||||||
int pos = -1;
|
int pos = -1;
|
||||||
|
char ebuf[1024];
|
||||||
|
|
||||||
FD_ZERO(&keepfd);
|
FD_ZERO(&keepfd);
|
||||||
|
|
||||||
@ -1169,29 +1173,29 @@ static int qemudStartVMDaemon(virConnectPtr conn,
|
|||||||
while (*tmp) {
|
while (*tmp) {
|
||||||
if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0)
|
if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0)
|
||||||
qemudLog(QEMUD_WARN, _("Unable to write envv to logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to write envv to logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
if (safewrite(vm->logfile, " ", 1) < 0)
|
if (safewrite(vm->logfile, " ", 1) < 0)
|
||||||
qemudLog(QEMUD_WARN, _("Unable to write envv to logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to write envv to logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
tmp++;
|
tmp++;
|
||||||
}
|
}
|
||||||
tmp = argv;
|
tmp = argv;
|
||||||
while (*tmp) {
|
while (*tmp) {
|
||||||
if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0)
|
if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0)
|
||||||
qemudLog(QEMUD_WARN, _("Unable to write argv to logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to write argv to logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
if (safewrite(vm->logfile, " ", 1) < 0)
|
if (safewrite(vm->logfile, " ", 1) < 0)
|
||||||
qemudLog(QEMUD_WARN, _("Unable to write argv to logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to write argv to logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
tmp++;
|
tmp++;
|
||||||
}
|
}
|
||||||
if (safewrite(vm->logfile, "\n", 1) < 0)
|
if (safewrite(vm->logfile, "\n", 1) < 0)
|
||||||
qemudLog(QEMUD_WARN, _("Unable to write argv to logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to write argv to logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
|
|
||||||
if ((pos = lseek(vm->logfile, 0, SEEK_END)) < 0)
|
if ((pos = lseek(vm->logfile, 0, SEEK_END)) < 0)
|
||||||
qemudLog(QEMUD_WARN, _("Unable to seek to end of logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to seek to end of logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
|
|
||||||
for (i = 0 ; i < ntapfds ; i++)
|
for (i = 0 ; i < ntapfds ; i++)
|
||||||
FD_SET(tapfds[i], &keepfd);
|
FD_SET(tapfds[i], &keepfd);
|
||||||
@ -1278,9 +1282,11 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
vm->monitor_watch = -1;
|
vm->monitor_watch = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (close(vm->logfile) < 0)
|
if (close(vm->logfile) < 0) {
|
||||||
|
char ebuf[1024];
|
||||||
qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
|
}
|
||||||
if (vm->monitor != -1)
|
if (vm->monitor != -1)
|
||||||
close(vm->monitor);
|
close(vm->monitor);
|
||||||
vm->logfile = -1;
|
vm->logfile = -1;
|
||||||
@ -1446,9 +1452,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Log, but ignore failures to write logfile for VM */
|
/* Log, but ignore failures to write logfile for VM */
|
||||||
if (safewrite(vm->logfile, buf, strlen(buf)) < 0)
|
if (safewrite(vm->logfile, buf, strlen(buf)) < 0) {
|
||||||
|
char ebuf[1024];
|
||||||
qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
|
}
|
||||||
|
|
||||||
*reply = buf;
|
*reply = buf;
|
||||||
return 0;
|
return 0;
|
||||||
@ -1456,9 +1464,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
|
|||||||
error:
|
error:
|
||||||
if (buf) {
|
if (buf) {
|
||||||
/* Log, but ignore failures to write logfile for VM */
|
/* Log, but ignore failures to write logfile for VM */
|
||||||
if (safewrite(vm->logfile, buf, strlen(buf)) < 0)
|
if (safewrite(vm->logfile, buf, strlen(buf)) < 0) {
|
||||||
|
char ebuf[1024];
|
||||||
qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s\n"),
|
qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s\n"),
|
||||||
strerror(errno));
|
virStrerror(errno, ebuf, sizeof ebuf));
|
||||||
|
}
|
||||||
VIR_FREE(buf);
|
VIR_FREE(buf);
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user