Commit-ID: 10e48a8b0d54800f48e77d55945d7bd1c01e74f5
Gitweb: http://git.kernel.org/tip/10e48a8b0d54800f48e77d55945d7bd1c01e74f5
Author: Pekka Enberg <penberg@xxxxxxxxxx>
AuthorDate: Thu, 26 Jan 2012 14:23:40 +0200
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Tue, 31 Jan 2012 08:58:12 +0200
kvm tools: Fix <linux/msi.h> kobject build breakage
Commit b50cac5 ("PCI/sysfs: add per pci device msi[x] irq listing (v5)") added
"struct kobject" dependency to <linux/msi.h> which breaks KVM tool build. As
the header file is no longer about MSI hardware, make a new header file for
"struct msi_ms".
Reported-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/include/kvm/irq.h | 3 ++-
tools/kvm/include/kvm/msi.h | 10 ++++++++++
tools/kvm/include/kvm/pci.h | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/tools/kvm/include/kvm/irq.h b/tools/kvm/include/kvm/irq.h
index 4461c45..43fecaf 100644
--- a/tools/kvm/include/kvm/irq.h
+++ b/tools/kvm/include/kvm/irq.h
@@ -5,7 +5,8 @@
#include <linux/rbtree.h>
#include <linux/list.h>
#include <linux/kvm.h>
-#include <linux/msi.h>
+
+#include "kvm/msi.h"
struct kvm;
diff --git a/tools/kvm/include/kvm/msi.h b/tools/kvm/include/kvm/msi.h
new file mode 100644
index 0000000..885eb5b
--- /dev/null
+++ b/tools/kvm/include/kvm/msi.h
@@ -0,0 +1,10 @@
+#ifndef LKVM_MSI_H
+#define LKVM_MSI_H
+
+struct msi_msg {
+ u32 address_lo; /* low 32 bits of msi message address */
+ u32 address_hi; /* high 32 bits of msi message address */
+ u32 data; /* 16 bits of msi message data */
+};
+
+#endif /* LKVM_MSI_H */
diff --git a/tools/kvm/include/kvm/pci.h b/tools/kvm/include/kvm/pci.h
index 64e42f5..7903723 100644
--- a/tools/kvm/include/kvm/pci.h
+++ b/tools/kvm/include/kvm/pci.h
@@ -4,10 +4,10 @@
#include <linux/types.h>
#include <linux/kvm.h>
#include <linux/pci_regs.h>
-#include <linux/msi.h>
#include <endian.h>
#include "kvm/kvm.h"
+#include "kvm/msi.h"
#define PCI_MAX_DEVICES 256
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|