[Xen-changelog] [xen-unstable] libxl: Specify no nics to qemu when no emulated nics

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1277741623 -3600
# Node ID 408b0b6768fc7a789c032d40d48cd7ecb2042904
# Parent  dcb1cd697788a647d392b5d0bb581976c978abb8
libxl: Specify no nics to qemu when no emulated nics

qemu will default to one emulated NIC if no network configuration is
specified on the command-line.  If there are no emualted NICs (i.e.,
no NICs or all NICs are PV), specify no nics to avoid getting an
emulated NIC by default.

Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
---
 tools/libxl/libxl.c |    8 ++++++++
 1 files changed, 8 insertions(+)

diff -r dcb1cd697788 -r 408b0b6768fc tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Mon Jun 28 17:10:38 2010 +0100
+++ b/tools/libxl/libxl.c       Mon Jun 28 17:13:43 2010 +0100
@@ -858,6 +858,8 @@ static char ** libxl_build_device_model_
         flexarray_set(dm_args, num++, info->serial);
     }
     if (info->type == XENFV) {
+        int ioemu_vifs = 0;
+
         if (info->videoram) {
             flexarray_set(dm_args, num++, "-videoram");
             flexarray_set(dm_args, num++, libxl_sprintf(ctx, "%d", 
info->videoram));
@@ -901,7 +903,13 @@ static char ** libxl_build_device_model_
                 flexarray_set(dm_args, num++, "-net");
                 flexarray_set(dm_args, num++, libxl_sprintf(ctx, 
"tap,vlan=%d,ifname=%s,bridge=%s",
                             vifs[i].devid, vifs[i].ifname, vifs[i].bridge));
+                ioemu_vifs++;
             }
+        }
+        /* If we have no emulated nics, tell qemu not to create any */
+        if ( ioemu_vifs == 0 ) {
+            flexarray_set(dm_args, num++, "-net");
+            flexarray_set(dm_args, num++, "none");
         }
     }
     if (info->saved_state) {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog