mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
xend_internal: Use domain/status for shutdown check
On newer xend (v3.x and after) there is no state and domid reported for inactive domains. When initially creating connections this is handled in various places by assigning domain->id = -1. But once an instance has been running, the id is set to the current domain id. And it does not change when the instance is shut down. So when querying the domain info, the hypervisor driver, which gets asked first will indicate it cannot find information, then the xend driver is asked and will set the status to NOSTATE because it checks for the -1 domain id. Checking domain/status for 0 seems to be more reliable for that. One note: I am not sure whether the domain->id also should get set back to -1 whenever any sub-driver thinks the instance is no longer running. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=746007 BugLink: http://bugs.launchpad.net/bugs/929626 Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
parent
997366ca7d
commit
26e9ef4762
@ -989,9 +989,14 @@ sexpr_to_xend_domain_state(virDomainPtr domain, const struct sexpr *root)
|
||||
state = VIR_DOMAIN_BLOCKED;
|
||||
else if (strchr(flags, 'r'))
|
||||
state = VIR_DOMAIN_RUNNING;
|
||||
} else if (domain->id < 0) {
|
||||
/* Inactive domains don't have a state reported, so
|
||||
mark them SHUTOFF, rather than NOSTATE */
|
||||
} else if (domain->id < 0 || sexpr_int(root, "domain/status") == 0) {
|
||||
/* As far as I can see the domain->id is a bad sign for checking
|
||||
* inactive domains as this is inaccurate after the domain has
|
||||
* been running once. However domain/status from xend seems to
|
||||
* be always present and 0 for inactive domains.
|
||||
* (keeping the check for id < 0 to be extra safe about backward
|
||||
* compatibility)
|
||||
*/
|
||||
state = VIR_DOMAIN_SHUTOFF;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user