Kqemu patch for 2.6.17-rc2
PATCH 1/1 Kqemu patch for 2.6.17-rc2
Hi,
On 2.6.17-rc2, the MODULE_PARM() way of declaring module parameters seems to have disappeared (it is anyway deprecated since the beginning of the 2.6 series). As such, kqemu-1.3.0pre7 doesn't compile.
/home/thomas/kqemu-1.3.0pre7/kqemu-linux.c:52: error: syntax error before string constant /home/thomas/kqemu-1.3.0pre7/kqemu-linux.c:52: warning: type defaults to ‘int’ in declaration of ‘MODULE_PARM’ /home/thomas/kqemu-1.3.0pre7/kqemu-linux.c:52: warning: function declaration isn’t a prototype /home/thomas/kqemu-1.3.0pre7/kqemu-linux.c:52: warning: data definition has no type or storage class
The attached patch fixes it.
Sincerly,
Thomas
Signature · 4 lines
PETAZZONI Thomas - [email protected] http://{thomas,sos,kos}.enix.org - Jabber: [email protected] http://{agenda,livret}dulibre.org - http://www.toulibre.org Fingerprint : 0BE1 4CF3 CEA4 AC9D CC6E 1624 F653 CB30 98D3 F7A7
kqemu-linux.c +1 -1
@@ -49,7 +49,7 @@/* if 0 is used, then devfs/udev is used to automatically create the device */ int major =250 ; -MODULE_PARM (major,"i" ); +module_param (major, int,0 );/* Lock the page at virtual address 'user_addr' and return its physical address (page index). Return a host OS private user page
Hi,
I'm attaching a small update to Thomas's patch which conditionally enables this based on kernel version. As far as I can tell (from very brief research), module_param became available very late in 2.4. Also, the old version (MODULE_PARM) is supported in most 2.6 kernels as well.
I picked arbitrarily 2.6.10 as the break-off point - it's really easy
to change that to be something else. In any case, Fabrice, can you think about applying this, or something very similar, as it looks like MODULE_PARM has been finally abandoned in the latest kernels.
Regards,
Leo Reiter
Quoted 5 lines · Thomas Petazzoni
Hi,
On 2.6.17-rc2, the
MODULE_PARM()way of declaring module parameters seems to have disappeared (it is anyway deprecated since the beginning of the 2.6 series). As such, kqemu-1.3.0pre7 doesn't compile.
Signature · 8 lines
Leonardo E. Reiter Vice President of Product Development, CTO Win4Lin, Inc. Virtual Computing that means Business Main: +1 512 339 7979 Fax: +1 512 532 6501 http://www.win4lin.com
kqemu-linux.c renamed from kqemu-linux.c.orig +4 -0
@@ -49,7 +49,11 @@/* if 0 is used, then devfs/udev is used to automatically create the device */ int major =250 ; +#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,10 )MODULE_PARM (major,"i" ); +#else +module_param (major, int,0 ); +#endif /* Lock the page at virtual address 'user_addr' and return its physical address (page index). Return a host OS private user page
Leonardo E. Reiter wrote: Hi,
I'm attaching a small update to Thomas's patch which conditionally enables this based on kernel version. As far as I can tell (from very brief research), module_param became available very late in 2.4. Also, the old version (MODULE_PARM) is supported in most 2.6 kernels as well. I picked arbitrarily 2.6.10 as the break-off point - it's really easy to change that to be something else. In any case, Fabrice, can you think about applying this, or something very similar, as it looks like MODULE_PARM has been finally abandoned in the latest kernels.
Regards,
Leo Reiter
Thomas Petazzoni wrote:
Hi,
On 2.6.17-rc2, the MODULE_PARM() way of declaring module parameters seems to have disappeared (it is anyway deprecated since the beginning of the 2.6 series). As such, kqemu-1.3.0pre7 doesn't compile.
--- kqemu-linux.c.orig 2006-06-06 10:06:03.000000000 -0400 +++ kqemu-linux.c 2006-06-06 10:09:41.000000000 -0400 @@ -49,7 +49,11 @@ /* if 0 is used, then devfs/udev is used to automatically create the device */ int major = 250; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) MODULE_PARM(major,"i"); +#else +module_param(major, int, 0); +#endif /* Lock the page at virtual address 'user_addr' and return its physical address (page index). Return a host OS private user page I have just had to apply this fix to get kqemu to work with the latest FC6 Development kernel 2.6.16-1.2252_FC6. ALl working fine now.
Nigel