Deal with inactive virtual network in domain creation

diff --git a/ChangeLog b/ChangeLog
index 1e099d1cebb4e6af7247f44cb1d1e6ef2f0c3da1..ad9f0848c1bedb99455a8eda6bb15f08b7d39c2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 12 11:18:08 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/qemu_conf.c: Deal with failure due to inactive virtual
+       network when creating domain.
+
 Thu Jun 12 10:53:08 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/qemu_driver.c: patch from Kaitlin Rupert, changing vcpu or

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index dc03c9e281664b1e6db53afb30e1e567130de487..da7534e581b44bc884a90ccb71453f4283a075a1 100644 (file)
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -2679,8 +2679,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             switch (net->type) {
             case QEMUD_NET_NETWORK:
             case QEMUD_NET_BRIDGE:
-                ADD_ARG(qemudNetworkIfaceConnect(conn, driver, vm, net, vlan));
-                break;
+                {
+                    char *tap = qemudNetworkIfaceConnect(conn, driver, vm, net, vlan);
+                    if (tap == NULL)
+                        goto error;
+                    ADD_ARG(tap);
+                    break;
+                }
 
             case QEMUD_NET_ETHERNET:
                 {