[libvirt] [PATCH 2/2] virsh: Use inactive definition when removing disk from config

[Eric Blake]

On 01/07/2014 10:12 AM, Peter Krempa wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1049529
> 
> The 'detach-disk' command in virsh used the active XML definition of a
> domain even when attempting to remove a disk from the config only. If
> the disk was only in the inactive definition the operation failed. Fix
> this by using the inactive XML in case that only the config is affected.
> ---
>  tools/virsh-domain.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

ACK.

> 
> -    if (!(doc = virDomainGetXMLDesc(dom, 0)))
> +    if (flags == VIR_DOMAIN_AFFECT_CONFIG)

Might be a bit more robust as:
(flags & (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG)) ==
VIR_DOMAIN_AFFECT_CONFIG
in case we have other flags set for other reasons; but right now we
don't so this works.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140107/7d7cb002/attachment-0001.sig>