From f2567a9c3bffae77795bbd75aa117c3abdee25ff Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Thu, 28 Feb 2013 09:05:41 -0500 Subject: [PATCH] --- yaml --- r: 360729 b: refs/heads/master c: 884ac2978a295b7df3c4a686d3bff6932bbbb460 h: refs/heads/master i: 360727: f5f960947ef7cae17c7bc3c49fbe509ed1213dc1 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/xen.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a69fcc5a0b49..501f5716c870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c79c49826270b8b0061b2fca840fc3f013c8a78a +refs/heads/master: 884ac2978a295b7df3c4a686d3bff6932bbbb460 diff --git a/trunk/arch/x86/pci/xen.c b/trunk/arch/x86/pci/xen.c index 56ab74989cf1..94e76620460f 100644 --- a/trunk/arch/x86/pci/xen.c +++ b/trunk/arch/x86/pci/xen.c @@ -162,6 +162,9 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) struct msi_desc *msidesc; int *v; + if (type == PCI_CAP_ID_MSI && nvec > 1) + return 1; + v = kzalloc(sizeof(int) * max(1, nvec), GFP_KERNEL); if (!v) return -ENOMEM; @@ -220,6 +223,9 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) struct msi_desc *msidesc; struct msi_msg msg; + if (type == PCI_CAP_ID_MSI && nvec > 1) + return 1; + list_for_each_entry(msidesc, &dev->msi_list, list) { __read_msi_msg(msidesc, &msg); pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) | @@ -263,6 +269,9 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) int ret = 0; struct msi_desc *msidesc; + if (type == PCI_CAP_ID_MSI && nvec > 1) + return 1; + list_for_each_entry(msidesc, &dev->msi_list, list) { struct physdev_map_pirq map_irq; domid_t domid;