External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 23:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename qemuMonitorCommandWithHandler as qemuMonitorText*

Browse Source 
To make it more obvious that it is only used for text monitor. The
naming also matches the style of qemuMonitorTextCommandWithFd.
This commit is contained in:
Jiri Denemark 2011-03-10 09:37:08 +01:00
parent 39b4f4aab2
commit b3c6ec03b8
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_monitor_text.c
View File

@ -206,12 +206,13 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
} }
static int static int
qemuMonitorCommandWithHandler(qemuMonitorPtr mon, qemuMonitorTextCommandWithHandler(qemuMonitorPtr mon,
const char *cmd, const char *cmd,
qemuMonitorPasswordHandler passwordHandler, qemuMonitorPasswordHandler passwordHandler,
void *passwordOpaque, void *passwordOpaque,
int scm_fd, int scm_fd,
char **reply) { char **reply)
{
int ret; int ret;
qemuMonitorMessage msg; qemuMonitorMessage msg;
@ -265,7 +266,8 @@ qemuMonitorTextCommandWithFd(qemuMonitorPtr mon,
int scm_fd, int scm_fd,
char **reply) char **reply)
{ {
return qemuMonitorCommandWithHandler(mon, cmd, NULL, NULL, scm_fd, reply); return qemuMonitorTextCommandWithHandler(mon, cmd, NULL, NULL,
scm_fd, reply);
} }
@ -345,10 +347,10 @@ qemuMonitorTextStartCPUs(qemuMonitorPtr mon,
virConnectPtr conn) { virConnectPtr conn) {
char *reply; char *reply;
if (qemuMonitorCommandWithHandler(mon, "cont", if (qemuMonitorTextCommandWithHandler(mon, "cont",
qemuMonitorSendDiskPassphrase, qemuMonitorSendDiskPassphrase,
conn, conn,
-1, &reply) < 0) -1, &reply) < 0)
return -1; return -1;
VIR_FREE(reply); VIR_FREE(reply);
@ -750,10 +752,10 @@ int qemuMonitorTextSetVNCPassword(qemuMonitorPtr mon,
{ {
char *info = NULL; char *info = NULL;
if (qemuMonitorCommandWithHandler(mon, "change vnc password", if (qemuMonitorTextCommandWithHandler(mon, "change vnc password",
qemuMonitorSendVNCPassphrase, qemuMonitorSendVNCPassphrase,
(char *)password, (char *)password,
-1, &info) < 0) { -1, &info) < 0) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, qemuReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("setting VNC password failed")); "%s", _("setting VNC password failed"));
return -1; return -1;