From d6a839b20aff9564eecebb301fb0d0f0c58052ad Mon Sep 17 00:00:00 2001 From: Jose Donizetti Date: Wed, 26 Jun 2019 22:36:52 -0300 Subject: [PATCH] Fix kvm2 vm driver remove domain --- pkg/drivers/kvm/kvm.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/drivers/kvm/kvm.go b/pkg/drivers/kvm/kvm.go index 4f2ccd3c2..24cc914a3 100644 --- a/pkg/drivers/kvm/kvm.go +++ b/pkg/drivers/kvm/kvm.go @@ -459,12 +459,13 @@ func (d *Driver) Remove() error { } func (d *Driver) destroyRunningDomain(dom *libvirt.Domain) error { - state, reason, err := dom.GetState() + state, _, err := dom.GetState() if err != nil { return errors.Wrap(err, "getting domain state") } - if state == libvirt.DOMAIN_SHUTOFF && reason == int(libvirt.DOMAIN_SHUTOFF_DESTROYED) { + // if the domain is not running, we don't destroy it + if state != libvirt.DOMAIN_RUNNING { log.Warnf("Domain %s already destroyed, skipping...", d.MachineName) return nil } -- GitLab