[Qemu-devel] RE : Re: Qemu-devel Digest, Vol 59, Issue 88

[Sylvain Petreolle <spetreolle@yahoo.fr>]

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

Look at pci.c.rej.
Because of the lines of the recent e1000 pci card inclusion,
patch refuses to apply it.

Its just a matter of resynch...

--- Clemens Kolbitsch <clemens.kol@gmx.at> a écrit :

> On Friday 29 February 2008 01:20:10 qemu-devel-request@nongnu.org wrote:
> > The emulation works beautifully on windows Xp Pro SP2 guest and official
> > Atheros drivers, no installation problems at all.
> >
> > Nice job !
> >
> > > Some infos about the patch:
> > >  - 2 lines added to pci.c
> >
> > you have to take recent e1000 inclusion to make it apply cleanly on CVS
> >
> > >  - added function declaration to pci.h
> > >  - patched Makefile.target (2 lines)
> >
> > VL_OBJS => OBJS, now VL_OBJS are gone
> >
> > >  - added files qemu/hw/atheros_wlan_.*.[ch]
> > >  - took 2 files from wireshark to generate CRC32 checksums
> > >  - took 3 files from ath5k
> > >  ---> licence people, please have a look if that is ok!!
> > >
> > > Enabling emulation:
> >
> > Keep up the good work !
> 
> I'd love to add it to CVS. Checked out the repository, but I don't really know 
> what you mean with take recenent e1000 inclusion. Could you clarify that a 
> little? Looked at (e.g.) ne2000.c and rtl8139.c and it's just like my code, I 
> guess...
> 

Kind regards,
Sylvain Petreolle (aka Usurp)

Support artists, not multinationals - http://Iwouldntsteal.net
Supportez les artistes, pas les multinationales - http://Iwouldntsteal.net

Free music you can listen to everywhere : http://www.jamendo.com

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 2366840769-pci.c.rej --]
[-- Type: text/x-diff; name="pci.c.rej", Size: 733 bytes --]

***************
*** 636,641 ****
          pci_i82559er_init(bus, nd, devfn);
      } else if (strcmp(nd->model, "rtl8139") == 0) {
          pci_rtl8139_init(bus, nd, devfn);
      } else if (strcmp(nd->model, "pcnet") == 0) {
          pci_pcnet_init(bus, nd, devfn);
      } else if (strcmp(nd->model, "?") == 0) {
--- 636,643 ----
          pci_i82559er_init(bus, nd, devfn);
      } else if (strcmp(nd->model, "rtl8139") == 0) {
          pci_rtl8139_init(bus, nd, devfn);
+     } else if (strncmp(nd->model, "atheros_wlan", 12) == 0) {
+         pci_Atheros_WLAN_init(bus, nd, devfn);
      } else if (strcmp(nd->model, "pcnet") == 0) {
          pci_pcnet_init(bus, nd, devfn);
      } else if (strcmp(nd->model, "?") == 0) {