提交 b3c6ec03 编写于 作者: J Jiri Denemark

qemu: Rename qemuMonitorCommandWithHandler as qemuMonitorText*

To make it more obvious that it is only used for text monitor. The
naming also matches the style of qemuMonitorTextCommandWithFd.
上级 39b4f4aa
...@@ -206,12 +206,13 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED, ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册