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

Fix parsing of QEMU stdout looking for serial device PTY with Xenner

This commit is contained in:
Daniel P. Berrange 2008-07-11 09:48:51 +00:00
parent 915b86d29b
commit 1d86fca433
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jul 11 10:46:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_driver.c: Fix parsing of QEMU stdout looking for
serial device PTY with Xenner
Fri Jul 11 10:53:59 CEST 2008 Daniel Veillard <veillard@redhat.com> Fri Jul 11 10:53:59 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/openvz_conf.c: cleanup OpenVZ config file accesses, patch * src/openvz_conf.c: cleanup OpenVZ config file accesses, patch

4
src/qemu_driver.c
View File

@ -528,6 +528,9 @@ static int qemudExtractMonitorPath(const char *haystack,
strncpy(path, tmp+sizeof(needle), pathmax-1); strncpy(path, tmp+sizeof(needle), pathmax-1);
path[pathmax-1] = '\0'; path[pathmax-1] = '\0';
/* Update offset to point to where we found the needle..*/
*offset = tmp - haystack;
/* /*
* And look for first whitespace character and nul terminate * And look for first whitespace character and nul terminate
* to mark end of the pty path * to mark end of the pty path
@ -536,6 +539,7 @@ static int qemudExtractMonitorPath(const char *haystack,
while (*tmp) { while (*tmp) {
if (c_isspace(*tmp)) { if (c_isspace(*tmp)) {
*tmp = '\0'; *tmp = '\0';
/* ... now further update offset till we get EOL */
*offset += (sizeof(needle)-1) + strlen(path); *offset += (sizeof(needle)-1) + strlen(path);
return 0; return 0;
} }