External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: Fix virsh console doesn't work after restarting libvirtd

Browse Source 
Because tty path is unexpectedly not saved in the live configuration
file of a domain, libvirtd cannot get the console of the domain back
after restarting.

The reason why the tty path isn't saved is that, to save the tty path,
the save function, virDomainSaveConfig, requires that the target domain
is running (pid != -1), however, lxc driver calls the function before
starting the domain to pass the configuration to controller.

To ensure to save the tty path, the patch lets lxc driver call the save
function again after starting the domain.
This commit is contained in:
Ryota Ozaki 2010-06-27 22:07:00 +09:00 committed by Eric Blake
parent df8225ac54
commit 1c46f4cc03
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/lxc_driver.c
View File

@ -1284,7 +1284,7 @@ static int lxcVmStart(virConnectPtr conn,
if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths) != 0)
goto cleanup;
/* Persist the live configuration now we have veth & tty info */
/* Save the configuration for the controller */
if (virDomainSaveConfig(driver->stateDir, vm->def) < 0)
goto cleanup;
@ -1328,6 +1328,13 @@ static int lxcVmStart(virConnectPtr conn,
goto cleanup;
}
/*
* Again, need to save the live configuration, because the function
* requires vm->def->id != -1 to save tty info surely.
*/
if (virDomainSaveConfig(driver->stateDir, vm->def) < 0)
goto cleanup;
rc = 0;
cleanup: