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

Disable QEMU monitor IO debugging by default

Browse Source
This commit is contained in:
Daniel P. Berrange 2010-02-01 16:28:27 +00:00
parent 16478459da
commit db0b9e7d52
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_monitor_text.c
View File

@ -44,6 +44,8 @@
#define QEMU_CMD_PROMPT "\n(qemu) " #define QEMU_CMD_PROMPT "\n(qemu) "
#define QEMU_PASSWD_PROMPT "Password: " #define QEMU_PASSWD_PROMPT "Password: "
#define DEBUG_IO 0
/* Return -1 for error, 0 for success */ /* Return -1 for error, 0 for success */
typedef int qemuMonitorExtraPromptHandler(qemuMonitorPtr mon, typedef int qemuMonitorExtraPromptHandler(qemuMonitorPtr mon,
const char *buf, const char *buf,
@ -67,7 +69,7 @@ typedef int qemuMonitorExtraPromptHandler(qemuMonitorPtr mon,
int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED, int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
const char *data, const char *data,
size_t len, size_t len ATTRIBUTE_UNUSED,
qemuMonitorMessagePtr msg) qemuMonitorMessagePtr msg)
{ {
int used = 0; int used = 0;
@ -79,18 +81,24 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
/* We see the greeting prefix, but not postfix, so pretend we've /* We see the greeting prefix, but not postfix, so pretend we've
not consumed anything. We'll restart when more data arrives. */ not consumed anything. We'll restart when more data arrives. */
if (!offset) { if (!offset) {
#if DEBUG_IO
VIR_DEBUG0("Partial greeting seen, getting out & waiting for more"); VIR_DEBUG0("Partial greeting seen, getting out & waiting for more");
#endif
return 0; return 0;
} }
used = offset - data + strlen(GREETING_POSTFIX); used = offset - data + strlen(GREETING_POSTFIX);
#if DEBUG_IO
VIR_DEBUG0("Discarded monitor greeting"); VIR_DEBUG0("Discarded monitor greeting");
#endif
} }
/* Don't print raw data in debug because its full of control chars */ /* Don't print raw data in debug because its full of control chars */
/*VIR_DEBUG("Process data %d byts of data [%s]", len - used, data + used);*/ /*VIR_DEBUG("Process data %d byts of data [%s]", len - used, data + used);*/
#if DEBUG_IO
VIR_DEBUG("Process data %d byts of data", (int)(len - used)); VIR_DEBUG("Process data %d byts of data", (int)(len - used));
#endif
/* Look for a non-zero reply followed by prompt */ /* Look for a non-zero reply followed by prompt */
if (msg && !msg->finished) { if (msg && !msg->finished) {
@ -138,7 +146,9 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
/* We might get a prompt for a password before the (qemu) prompt */ /* We might get a prompt for a password before the (qemu) prompt */
passwd = strstr(start, PASSWORD_PROMPT); passwd = strstr(start, PASSWORD_PROMPT);
if (passwd) { if (passwd) {
#if DEBUG_IO
VIR_DEBUG("Seen a passwowrd prompt [%s]", data + used); VIR_DEBUG("Seen a passwowrd prompt [%s]", data + used);
#endif
if (msg->passwordHandler) { if (msg->passwordHandler) {
int i; int i;
/* Try and handle the prompt */ /* Try and handle the prompt */
@ -176,9 +186,11 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
memcpy(msg->rxBuffer + msg->rxLength, start, want); memcpy(msg->rxBuffer + msg->rxLength, start, want);
msg->rxLength += want; msg->rxLength += want;
msg->rxBuffer[msg->rxLength] = '\0'; msg->rxBuffer[msg->rxLength] = '\0';
#if DEBUG_IO
VIR_DEBUG("Finished %d byte reply [%s]", want, msg->rxBuffer); VIR_DEBUG("Finished %d byte reply [%s]", want, msg->rxBuffer);
} else { } else {
VIR_DEBUG0("Finished 0 byte reply"); VIR_DEBUG0("Finished 0 byte reply");
#endif
} }
msg->finished = 1; msg->finished = 1;
used += end - (data + used); used += end - (data + used);
@ -186,7 +198,9 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
} }
} }
#if DEBUG_IO
VIR_DEBUG("Total used %d", used); VIR_DEBUG("Total used %d", used);
#endif
return used; return used;
} }