openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Factor qemudMonitorSend() out of qemudMonitorCommandExtra() 

Add a little helper function to write the monitor command followed by
carriage return in a single write.

This doesn't make any real difference, but allows us to more easily
switch to using sendmsg() when using the monitor over a unix socket.

* src/qemu_conf.c: split qemudMonitorSend() out
This commit is contained in:
Mark McLoughlin 2009-07-22 20:17:14 +01:00
parent be44cabd7f
commit 9de2972c30
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/qemu_driver.c
View File

@ -2213,6 +2213,27 @@ qemuMonitorDiscardPendingData(virDomainObjPtr vm) {
} while (ret > 0);
}
static int
qemudMonitorSend(const virDomainObjPtr vm,
const char *cmd)
{
char *full;
size_t len;
int ret = -1;
if (virAsprintf(&full, "%s\r", cmd) < 0)
return -1;
len = strlen(full);
if (safewrite(vm->monitor, full, len) != len)
goto out;
ret = 0;
out:
VIR_FREE(full);
return ret;
}
static int
qemudMonitorCommandExtra(const virDomainObjPtr vm,
@ -2222,14 +2243,10 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
char **reply) {
int size = 0;
char *buf = NULL;
size_t cmdlen = strlen(cmd);
size_t extralen = extra ? strlen(extra) : 0;
qemuMonitorDiscardPendingData(vm);
if (safewrite(vm->monitor, cmd, cmdlen) != cmdlen)
return -1;
if (safewrite(vm->monitor, "\r", 1) != 1)
if (qemudMonitorSend(vm, cmd) < 0)
return -1;
*reply = NULL;
@ -2264,9 +2281,7 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
if (buf) {
if (extra) {
if (strstr(buf, extraPrompt) != NULL) {
if (safewrite(vm->monitor, extra, extralen) != extralen)
return -1;
if (safewrite(vm->monitor, "\r", 1) != 1)
if (qemudMonitorSend(vm, extra) < 0)
return -1;
extra = NULL;
}