[PATCH] [KVM-userspace] remove compatibility code related to CONFIG_DMAR

[PATCH] [KVM-userspace] remove compatibility code related to CONFIG_DMAR

[Mike Day]

Compatibility code for intel_iommu no longer needed when
dependency on CONFIG_DMAR removed from kvm kernel build.

Signed-off-by: Mike D. Day <ncmike@ncultra.org>
---
 external-module-compat.c |   11 -----------
 1 file changed, 11 deletions(-)

diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c
index 4b9a9f2..71429c7 100644
--- a/kernel/external-module-compat.c
+++ b/kernel/external-module-compat.c
@@ -265,14 +265,3 @@ struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn)
 }
 
 #endif
-
-#include <linux/intel-iommu.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-
-int intel_iommu_found()
-{
-	return 0;
-}
-
-#endif

-- 
Mike Day
http://www.ncultra.org
AIM: ncmikeday |  Yahoo IM: ultra.runner
PGP key: http://www.ncultra.org/ncmike/pubkey.asc

RE: [PATCH] [KVM-userspace] remove compatibility code related toCONFIG_DMAR

[Han, Weidong]

This compatibility code for intel_iommu makes VT-d cannot work in
current code (version < 2.6.28), due to intel_iommu_found() returns 0.
Why add this limitation?

Randy (Weidong)

Mike Day wrote:
> Compatibility code for intel_iommu no longer needed when
> dependency on CONFIG_DMAR removed from kvm kernel build.
> 
> Signed-off-by: Mike D. Day <ncmike@ncultra.org>
> ---
>  external-module-compat.c |   11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/kernel/external-module-compat.c
> b/kernel/external-module-compat.c 
> index 4b9a9f2..71429c7 100644
> --- a/kernel/external-module-compat.c
> +++ b/kernel/external-module-compat.c
> @@ -265,14 +265,3 @@ struct pci_dev *pci_get_bus_and_slot(unsigned
>  int bus, unsigned int devfn) }
> 
>  #endif
> -
> -#include <linux/intel-iommu.h>
> -
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
> -
> -int intel_iommu_found()
> -{
> -	return 0;
> -}
> -
> -#endif
> 
> --
> Mike Day
> http://www.ncultra.org
> AIM: ncmikeday |  Yahoo IM: ultra.runner
> PGP key: http://www.ncultra.org/ncmike/pubkey.asc

Re: remove compatibility code related toCONFIG_DMAR

[Mike Day]

On 18/09/08 22:07 +0800, Han, Weidong wrote:
The previous patch I sent out (for the kvm kernel tree) changes
intel-iommu.h so this compatibility code is no longer needed.

Mike

> This compatibility code for intel_iommu makes VT-d cannot work in
> current code (version < 2.6.28), due to intel_iommu_found() returns 0.
> Why add this limitation?
> 
> Randy (Weidong)
> 
> Mike Day wrote:
> > Compatibility code for intel_iommu no longer needed when
> > dependency on CONFIG_DMAR removed from kvm kernel build.
> > 
> > Signed-off-by: Mike D. Day <ncmike@ncultra.org>
> > ---
> >  external-module-compat.c |   11 -----------
> >  1 file changed, 11 deletions(-)
> > 
> > diff --git a/kernel/external-module-compat.c
> > b/kernel/external-module-compat.c 
> > index 4b9a9f2..71429c7 100644
> > --- a/kernel/external-module-compat.c
> > +++ b/kernel/external-module-compat.c
> > @@ -265,14 +265,3 @@ struct pci_dev *pci_get_bus_and_slot(unsigned
> >  int bus, unsigned int devfn) }
> > 
> >  #endif
> > -
> > -#include <linux/intel-iommu.h>
> > -
> > -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
> > -
> > -int intel_iommu_found()
> > -{
> > -	return 0;
> > -}
> > -
> > -#endif
> > 
> > --
> > Mike Day
> > http://www.ncultra.org
> > AIM: ncmikeday |  Yahoo IM: ultra.runner
> > PGP key: http://www.ncultra.org/ncmike/pubkey.asc

-- 
Mike Day
http://www.ncultra.org
AIM: ncmikeday |  Yahoo IM: ultra.runner
PGP key: http://www.ncultra.org/ncmike/pubkey.asc

RE: remove compatibility code related toCONFIG_DMAR

[Han, Weidong]

Mike,

I saw your patch. It's good.

Randy (Weidong)

Mike Day wrote:
> On 18/09/08 22:07 +0800, Han, Weidong wrote:
> The previous patch I sent out (for the kvm kernel tree) changes
> intel-iommu.h so this compatibility code is no longer needed.
> 
> Mike
> 
>> This compatibility code for intel_iommu makes VT-d cannot work in
>> current code (version < 2.6.28), due to intel_iommu_found() returns
>> 0. Why add this limitation? 
>> 
>> Randy (Weidong)
>> 
>> Mike Day wrote:
>>> Compatibility code for intel_iommu no longer needed when
>>> dependency on CONFIG_DMAR removed from kvm kernel build.
>>> 
>>> Signed-off-by: Mike D. Day <ncmike@ncultra.org>
>>> ---
>>>  external-module-compat.c |   11 -----------
>>>  1 file changed, 11 deletions(-)
>>> 
>>> diff --git a/kernel/external-module-compat.c
>>> b/kernel/external-module-compat.c
>>> index 4b9a9f2..71429c7 100644
>>> --- a/kernel/external-module-compat.c
>>> +++ b/kernel/external-module-compat.c
>>> @@ -265,14 +265,3 @@ struct pci_dev *pci_get_bus_and_slot(unsigned
>>>  int bus, unsigned int devfn) }
>>> 
>>>  #endif
>>> -
>>> -#include <linux/intel-iommu.h>
>>> -
>>> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
>>> -
>>> -int intel_iommu_found()
>>> -{
>>> -	return 0;
>>> -}
>>> -
>>> -#endif
>>> 
>>> --
>>> Mike Day
>>> http://www.ncultra.org
>>> AIM: ncmikeday |  Yahoo IM: ultra.runner
>>> PGP key: http://www.ncultra.org/ncmike/pubkey.asc

Re: [PATCH] [KVM-userspace] remove compatibility code related to CONFIG_DMAR

[Avi Kivity]

Mike Day wrote:
> Compatibility code for intel_iommu no longer needed when
> dependency on CONFIG_DMAR removed from kvm kernel build.
>
> Signed-off-by: Mike D. Day <ncmike@ncultra.org>
> ---
>  external-module-compat.c |   11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/kernel/external-module-compat.c b/kernel/external-module-compat.c
> index 4b9a9f2..71429c7 100644
> --- a/kernel/external-module-compat.c
> +++ b/kernel/external-module-compat.c
> @@ -265,14 +265,3 @@ struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn)
>  }
>  
>  #endif
> -
> -#include <linux/intel-iommu.h>
> -
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
> -
> -int intel_iommu_found()
> -{
> -	return 0;
> -}
> -
> -#endif
>
>   

Older kernels won't have intel_iommu_found() even with your other patch, 
so this code is still needed.

We can't compile the external module on a 2.6.27 tree that has the iommu 
patched in; we can probably make this work by renaming 
intel_iommu_found() to kvm_intel_iommu_found() in hack-module.awk.

-- 
error compiling committee.c: too many arguments to function