[libvirt] [PATCH] networkDestroy: Report error if network is inactive

[Daniel P. Berrange]

On Thu, May 28, 2009 at 01:16:24PM -0400, Cole Robinson wrote:
> This follows the same convention as domain drivers.
> 
> Signed-off-by: Cole Robinson <crobinso at redhat.com>
> ---
>  src/network_driver.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
> 
> diff --git a/src/network_driver.c b/src/network_driver.c
> index 29652d1..3518e01 100644
> --- a/src/network_driver.c
> +++ b/src/network_driver.c
> @@ -1238,6 +1238,12 @@ static int networkDestroy(virNetworkPtr net) {
>          goto cleanup;
>      }
>  
> +    if (!virNetworkIsActive(network)) {
> +        networkReportError(net->conn, NULL, net, VIR_ERR_INTERNAL_ERROR,
> +                           "%s", _("network is not active"));
> +        goto cleanup;
> +    }
> +
>      ret = networkShutdownNetworkDaemon(net->conn, driver, network);
>      if (!network->persistent) {
>          virNetworkRemoveInactive(&driver->networks,

ACK

Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|