Re: [PATCH] pci-assign: Fix transition MSI-INTx

2011-01-07 Thread Marcelo Tosatti
On Tue, Jan 04, 2011 at 10:04:30PM +0100, Jan Kiszka wrote:
 From: Jan Kiszka jan.kis...@siemens.com
 
 Make sure to re-register the IRQ of an assigned device as INTx when the
 guest disables MSI[X] mode again.
 
 Signed-off-by: Jan Kiszka jan.kis...@siemens.com
 ---
  hw/device-assignment.c |6 ++
  1 files changed, 6 insertions(+), 0 deletions(-)

Applied, thanks.

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


Re: [PATCH] pci-assign: Fix transition MSI-INTx

2011-01-06 Thread Avi Kivity

On 01/04/2011 11:04 PM, Jan Kiszka wrote:

From: Jan Kiszkajan.kis...@siemens.com

Make sure to re-register the IRQ of an assigned device as INTx when the
guest disables MSI[X] mode again.

Signed-off-by: Jan Kiszkajan.kis...@siemens.com


Cc: More Reviewers


---
  hw/device-assignment.c |6 ++
  1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index f6410f8..fce7567 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, 
unsigned int ctrl_pos)
  if (kvm_assign_irq(kvm_context,assigned_irq_data)  0)
  perror(assigned_dev_enable_msi: assign irq);

+assigned_dev-girq = -1;
  assigned_dev-irq_requested_type = assigned_irq_data.flags;
+} else {
+assign_irq(assigned_dev);
  }
  }
  #endif
@@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, 
unsigned int ctrl_pos)
  perror(assigned_dev_enable_msix: assign irq);
  return;
  }
+assigned_dev-girq = -1;
  assigned_dev-irq_requested_type = assigned_irq_data.flags;
+} else {
+assign_irq(assigned_dev);
  }
  }
  #endif



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

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


Re: [PATCH] pci-assign: Fix transition MSI-INTx

2011-01-06 Thread Alex Williamson
On Thu, 2011-01-06 at 15:40 +0200, Avi Kivity wrote:
 On 01/04/2011 11:04 PM, Jan Kiszka wrote:
  From: Jan Kiszkajan.kis...@siemens.com
 
  Make sure to re-register the IRQ of an assigned device as INTx when the
  guest disables MSI[X] mode again.
 
  Signed-off-by: Jan Kiszkajan.kis...@siemens.com
 
 Cc: More Reviewers

Looks fine to me.

Acked-by: Alex Williamson alex.william...@redhat.com

  ---
hw/device-assignment.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
 
  diff --git a/hw/device-assignment.c b/hw/device-assignment.c
  index f6410f8..fce7567 100644
  --- a/hw/device-assignment.c
  +++ b/hw/device-assignment.c
  @@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice 
  *pci_dev, unsigned int ctrl_pos)
if (kvm_assign_irq(kvm_context,assigned_irq_data)  0)
perror(assigned_dev_enable_msi: assign irq);
 
  +assigned_dev-girq = -1;
assigned_dev-irq_requested_type = assigned_irq_data.flags;
  +} else {
  +assign_irq(assigned_dev);
}
}
#endif
  @@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice 
  *pci_dev, unsigned int ctrl_pos)
perror(assigned_dev_enable_msix: assign irq);
return;
}
  +assigned_dev-girq = -1;
assigned_dev-irq_requested_type = assigned_irq_data.flags;
  +} else {
  +assign_irq(assigned_dev);
}
}
#endif
 
 



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


Re: [PATCH] pci-assign: Fix transition MSI-INTx

2011-01-06 Thread Michael S. Tsirkin
On Tue, Jan 04, 2011 at 10:04:30PM +0100, Jan Kiszka wrote:
 From: Jan Kiszka jan.kis...@siemens.com
 
 Make sure to re-register the IRQ of an assigned device as INTx when the
 guest disables MSI[X] mode again.
 
 Signed-off-by: Jan Kiszka jan.kis...@siemens.com

Acked-by: Michael S. Tsirkin m...@redhat.com

 ---
  hw/device-assignment.c |6 ++
  1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/hw/device-assignment.c b/hw/device-assignment.c
 index f6410f8..fce7567 100644
 --- a/hw/device-assignment.c
 +++ b/hw/device-assignment.c
 @@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice 
 *pci_dev, unsigned int ctrl_pos)
  if (kvm_assign_irq(kvm_context, assigned_irq_data)  0)
  perror(assigned_dev_enable_msi: assign irq);
  
 +assigned_dev-girq = -1;
  assigned_dev-irq_requested_type = assigned_irq_data.flags;
 +} else {
 +assign_irq(assigned_dev);
  }
  }
  #endif
 @@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice 
 *pci_dev, unsigned int ctrl_pos)
  perror(assigned_dev_enable_msix: assign irq);
  return;
  }
 +assigned_dev-girq = -1;
  assigned_dev-irq_requested_type = assigned_irq_data.flags;
 +} else {
 +assign_irq(assigned_dev);
  }
  }
  #endif
 -- 
 1.7.1
 --
 To unsubscribe from this list: send the line unsubscribe kvm in
 the body of a message to majord...@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] pci-assign: Fix transition MSI-INTx

2011-01-04 Thread Jan Kiszka
From: Jan Kiszka jan.kis...@siemens.com

Make sure to re-register the IRQ of an assigned device as INTx when the
guest disables MSI[X] mode again.

Signed-off-by: Jan Kiszka jan.kis...@siemens.com
---
 hw/device-assignment.c |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index f6410f8..fce7567 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1192,7 +1192,10 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, 
unsigned int ctrl_pos)
 if (kvm_assign_irq(kvm_context, assigned_irq_data)  0)
 perror(assigned_dev_enable_msi: assign irq);
 
+assigned_dev-girq = -1;
 assigned_dev-irq_requested_type = assigned_irq_data.flags;
+} else {
+assign_irq(assigned_dev);
 }
 }
 #endif
@@ -1332,7 +1335,10 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev, 
unsigned int ctrl_pos)
 perror(assigned_dev_enable_msix: assign irq);
 return;
 }
+assigned_dev-girq = -1;
 assigned_dev-irq_requested_type = assigned_irq_data.flags;
+} else {
+assign_irq(assigned_dev);
 }
 }
 #endif
-- 
1.7.1
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html