mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 19:41:16 +00:00
virt-aa-helper: add unix channels for nserials as well
Commit 03d7462d
added it for channels, but it is also needed for serials. Add
it for serials, parallels, and consoles as well.
This solves https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1015154
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
parent
f92f31213a
commit
56ba2f99a5
@ -951,8 +951,10 @@ get_files(vahControl * ctl)
|
|||||||
(ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
|
(ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
|
||||||
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
|
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
|
||||||
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE ||
|
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE ||
|
||||||
|
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX ||
|
||||||
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) &&
|
ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) &&
|
||||||
ctl->def->serials[i]->source.data.file.path)
|
ctl->def->serials[i]->source.data.file.path &&
|
||||||
|
ctl->def->serials[i]->source.data.file.path[0] != '\0')
|
||||||
if (vah_add_file_chardev(&buf,
|
if (vah_add_file_chardev(&buf,
|
||||||
ctl->def->serials[i]->source.data.file.path,
|
ctl->def->serials[i]->source.data.file.path,
|
||||||
"rw",
|
"rw",
|
||||||
@ -964,8 +966,10 @@ get_files(vahControl * ctl)
|
|||||||
(ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
|
(ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
|
||||||
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
|
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
|
||||||
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE ||
|
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE ||
|
||||||
|
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX ||
|
||||||
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) &&
|
ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) &&
|
||||||
ctl->def->consoles[i]->source.data.file.path)
|
ctl->def->consoles[i]->source.data.file.path &&
|
||||||
|
ctl->def->consoles[i]->source.data.file.path[0] != '\0')
|
||||||
if (vah_add_file(&buf,
|
if (vah_add_file(&buf,
|
||||||
ctl->def->consoles[i]->source.data.file.path, "rw") != 0)
|
ctl->def->consoles[i]->source.data.file.path, "rw") != 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -975,8 +979,10 @@ get_files(vahControl * ctl)
|
|||||||
(ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
|
(ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
|
||||||
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
|
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
|
||||||
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE ||
|
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE ||
|
||||||
|
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX ||
|
||||||
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) &&
|
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) &&
|
||||||
ctl->def->parallels[i]->source.data.file.path)
|
ctl->def->parallels[i]->source.data.file.path &&
|
||||||
|
ctl->def->parallels[i]->source.data.file.path[0] != '\0')
|
||||||
if (vah_add_file_chardev(&buf,
|
if (vah_add_file_chardev(&buf,
|
||||||
ctl->def->parallels[i]->source.data.file.path,
|
ctl->def->parallels[i]->source.data.file.path,
|
||||||
"rw",
|
"rw",
|
||||||
|
Loading…
Reference in New Issue
Block a user