[PATCH] xend: PV machines have no ioemu network

[Kevin Wolf <kwolf@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 2010 bytes --]

Jeremy Fitzhardinge schrieb:
> Keir Fraser wrote:
>> On 13/7/08 07:27, "Jeremy Fitzhardinge" <jeremy@goop.org> wrote:
>>
>>  
>>> Jeremy Fitzhardinge wrote:
>>>    
>>>> but other stuff is failing... tapdisk?
>>>>       
>>> No, pvfb.  Hm.
>>>     
>>
>> pvfb is built into qemu now?
>>   
> 
> Ah.  I compiled qemu with --disable-gcc-check --disable-slirp as had
> been discussed on the list.  But that causes qemu-dm to fail with
> "Unknown network device: user", because it always  uses "user" (slirp)
> if you don't define any other net conifg.
> 
> I did this:
> 
> --- a/vl.c
> +++ b/vl.c
> @@ -8598,9 +8598,10 @@ int main(int argc, char **argv)
>     /* init network clients */
>     if (nb_net_clients == 0) {
>         /* if no clients, we use a default config */
> -        net_clients[0] = "nic";
> -        net_clients[1] = "user";
> -        nb_net_clients = 2;
> +        net_clients[nb_net_clients++] = "nic";
> +#ifdef CONFIG_SLIRP
> +        net_clients[nb_net_clients++] = "user";
> +#endif
>     }
> 
>     for(i = 0;i < nb_net_clients; i++) {
> 
> to fix it.  The old qemu code put that whole default net configuration
> in #ifndef CONFIG_DM.  Ian, did you deliberately not do that in the new
> code, or is it an oversight?

Ians wants to keep changes from upstream qemu as small as possible in
those files shared with qemu. I think this is the main reason why he
didn't do it, and as long as slirp was compiled it just worked.

Additionally, specifying no -net parameter always meant -net nic -net
user for qemu, so we would not only change common code, but also the
semantics of the command line parameters. I think this is even worse.
The right thing to do is to specify -net none from xend, IMHO.

Kevin


xend: PV machines have no ioemu network

In the command line parameters of qemu-dm, xend should specify -net none
for PV machines. qemu-dm will assume -net nic -net user otherwise, which
fails now because slirp is no longer compiled in.

Signed-off-by: Kevin Wolf <kwolf@suse.de>

[-- Attachment #2: pv-ioemu-net-none.patch --]
[-- Type: text/x-patch, Size: 461 bytes --]

diff -r 54dec90cbea9 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py	Fri Jul 11 15:37:31 2008 +0100
+++ b/tools/python/xen/xend/image.py	Tue Jul 15 10:49:26 2008 +0200
@@ -658,6 +658,7 @@
         # Equivalent to old xenconsoled behaviour. Should make
         # it configurable in future
         ret = ret + ["-serial", "pty"]
+        ret = ret + ["-net", "none"]
         return ret
 
     def getDeviceModelArgs(self, restore = False):

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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