shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

qemu: Adapt to new log format

Browse Source 
Since 586502189edf9fd0f89a83de96717a2ea826fdb0 qemu commit, the log
lines reporting chardev's path has changed from:

$ ./x86_64-softmmu/qemu-system-x86_64 -serial pty -serial pty -monitor pty
char device redirected to /dev/pts/5
char device redirected to /dev/pts/6
char device redirected to /dev/pts/7

to:

$ ./x86_64-softmmu/qemu-system-x86_64 -serial pty -serial pty -monitor pty
char device compat_monitor0 redirected to /dev/pts/5
char device serial0 redirected to /dev/pts/6
char device serial1 redirected to /dev/pts/7

However, with current code we are not prepared for such change, which
results in us being unable to start any domain.
This commit is contained in:
Michal Privoznik 2012-12-29 09:44:33 +01:00
parent ce753ec5d6
commit 28224c4d2a
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qemu/qemu_process.c
View File

@ -1431,22 +1431,45 @@ cleanup:
*
* char device redirected to /dev/pts/3
*
* However, since 1.4 the line we are looking for has changed to:
*
* char device <alias> redirected to /some/path
*
* Returns -1 for error, 0 success, 1 continue reading
*/
static int
qemuProcessExtractTTYPath(const char *haystack,
size_t *offset,
const char *alias,
char **path)
{
static const char needle[] = "char device redirected to";
char *tmp, *dev;
static const char *needle[] = {"char device", "redirected to"};
const char *tmp, *dev;
VIR_FREE(*path);
/* First look for our magic string */
if (!(tmp = strstr(haystack + *offset, needle))) {
if (!(tmp = strstr(haystack + *offset, needle[0])))
return 1;
tmp += strlen(needle[0]);
virSkipSpaces(&tmp);
/* We prepend character devices IDs with 'char' prefix,
* hence full device ID is 'charalias0' */
if (STRPREFIX(tmp, "char")) {
/* we are dealing with new style */
tmp += strlen("char");
if (!STRPREFIX(tmp, alias))
return 1;
tmp += strlen(alias);
virSkipSpaces(&tmp);
}
tmp += sizeof(needle);
if (!STRPREFIX(tmp, needle[1]))
return 1;
tmp += strlen(needle[1]);
dev = tmp;
/*
@ -1569,6 +1592,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
virDomainChrDefPtr chr = vm->def->serials[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
chr->info.alias,
&chr->source.data.file.path)) != 0)
return ret;
}
@ -1579,6 +1603,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
virDomainChrDefPtr chr = vm->def->parallels[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
chr->info.alias,
&chr->source.data.file.path)) != 0)
return ret;
}
@ -1589,6 +1614,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
virDomainChrDefPtr chr = vm->def->channels[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
chr->info.alias,
&chr->source.data.file.path)) != 0)
return ret;
}
@ -1608,6 +1634,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY &&
chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
chr->info.alias,
&chr->source.data.file.path)) != 0)
return ret;
}