diff mbox

[kvm-kmod] Provide pci_enable_msix_exact() for kernels < 3.15

Message ID 20140506183427.GI5644@ERROL.INI.CMU.EDU (mailing list archive)
State New, archived
Headers show

Commit Message

Gabriel L. Somlo May 6, 2014, 6:35 p.m. UTC
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
---

Jan,

After today's pull from kvm, I also need this to build against my
Fedora 20 kernel (3.13.10-200.fc20.x86_64).

Thanks,
  Gabriel

 x86/external-module-compat.h | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Jan Kiszka May 7, 2014, 6:29 a.m. UTC | #1
On 2014-05-06 20:35, gsomlo@gmail.com wrote:
> Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
> ---
> 
> Jan,
> 
> After today's pull from kvm, I also need this to build against my
> Fedora 20 kernel (3.13.10-200.fc20.x86_64).

Which version did you pull? Neither next nor queue contain this change yet.

> 
> Thanks,
>   Gabriel
> 
>  x86/external-module-compat.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h
> index dde9463..e62486b 100644
> --- a/x86/external-module-compat.h
> +++ b/x86/external-module-compat.h
> @@ -1480,6 +1480,11 @@ static inline int __register_hotcpu_notifier(struct notifier_block *nb)
>  {
>  	return 0;
>  }
> +static inline int pci_enable_msix_exact(struct pci_dev *dev,
> +		      struct msix_entry *entries, int nvec)
> +{
> +	return -ENOSYS;
> +}

First, this is not x86-specific, thus should go to
external-module-compat-comm.h. Second, pci_enable_msix_exact was
introduced with 3.14. And then I think we can (and should) provide the
original content of this wrapper once it is needed, not a stub.

Right now I'm seeing different build problems:

http://buildbot.kiszka.org/kvm-kmod/builders/4-latest-kvm/builds/1788/steps/3.11-x86-64/logs/stdio

Didn't look into details yet.

Jan
Paolo Bonzini May 7, 2014, 6:54 a.m. UTC | #2
Il 07/05/2014 08:29, Jan Kiszka ha scritto:
> On 2014-05-06 20:35, gsomlo@gmail.com wrote:
>> Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
>> ---
>>
>> Jan,
>>
>> After today's pull from kvm, I also need this to build against my
>> Fedora 20 kernel (3.13.10-200.fc20.x86_64).
>
> Which version did you pull? Neither next nor queue contain this change yet.

It went in via kvm/master.  It was submitted before 3.15, but I didn't 
send it during the merge window because: 1) we had to wait for the 
function itself to get in via the PCI tree; 2) Marcelo didn't know about 
this patch.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h
index dde9463..e62486b 100644
--- a/x86/external-module-compat.h
+++ b/x86/external-module-compat.h
@@ -1480,6 +1480,11 @@  static inline int __register_hotcpu_notifier(struct notifier_block *nb)
 {
 	return 0;
 }
+static inline int pci_enable_msix_exact(struct pci_dev *dev,
+		      struct msix_entry *entries, int nvec)
+{
+	return -ENOSYS;
+}
 #endif
 
 #ifndef MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS