* [Qemu-devel] [PATCH] xen/pass-through: fold host PCI command register writes
@ 2015-05-15 12:46 Jan Beulich
2015-06-01 6:55 ` [Qemu-devel] Ping: " Jan Beulich
2015-06-05 11:05 ` [Qemu-devel] " Stefano Stabellini
0 siblings, 2 replies; 3+ messages in thread
From: Jan Beulich @ 2015-05-15 12:46 UTC (permalink / raw)
To: qemu-devel; +Cc: xen-devel, Stefano Stabellini
The code introduced to address XSA-126 allows simplification of other
code in xen_pt_initfn(): All we need to do is update "cmd" suitably,
as it'll be written back to the host register near the end of the
function anyway.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -698,10 +698,7 @@ static int xen_pt_initfn(PCIDevice *d)
machine_irq, pirq, rc);
/* Disable PCI intx assertion (turn on bit10 of devctl) */
- xen_host_pci_set_word(&s->real_device,
- PCI_COMMAND,
- pci_get_word(s->dev.config + PCI_COMMAND)
- | PCI_COMMAND_INTX_DISABLE);
+ cmd |= PCI_COMMAND_INTX_DISABLE;
machine_irq = 0;
s->machine_irq = 0;
} else {
@@ -723,9 +720,7 @@ static int xen_pt_initfn(PCIDevice *d)
e_intx, rc);
/* Disable PCI intx assertion (turn on bit10 of devctl) */
- xen_host_pci_set_word(&s->real_device, PCI_COMMAND,
- *(uint16_t *)(&s->dev.config[PCI_COMMAND])
- | PCI_COMMAND_INTX_DISABLE);
+ cmd |= PCI_COMMAND_INTX_DISABLE;
xen_pt_mapped_machine_irq[machine_irq]--;
if (xen_pt_mapped_machine_irq[machine_irq] == 0) {
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] Ping: [PATCH] xen/pass-through: fold host PCI command register writes
2015-05-15 12:46 [Qemu-devel] [PATCH] xen/pass-through: fold host PCI command register writes Jan Beulich
@ 2015-06-01 6:55 ` Jan Beulich
2015-06-05 11:05 ` [Qemu-devel] " Stefano Stabellini
1 sibling, 0 replies; 3+ messages in thread
From: Jan Beulich @ 2015-06-01 6:55 UTC (permalink / raw)
To: Stefano Stabellini, qemu-devel; +Cc: xen-devel
Ping?
>>> On 15.05.15 at 14:46, <JBeulich@suse.com> wrote:
> The code introduced to address XSA-126 allows simplification of other
> code in xen_pt_initfn(): All we need to do is update "cmd" suitably,
> as it'll be written back to the host register near the end of the
> function anyway.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>
> --- a/hw/xen/xen_pt.c
> +++ b/hw/xen/xen_pt.c
> @@ -698,10 +698,7 @@ static int xen_pt_initfn(PCIDevice *d)
> machine_irq, pirq, rc);
>
> /* Disable PCI intx assertion (turn on bit10 of devctl) */
> - xen_host_pci_set_word(&s->real_device,
> - PCI_COMMAND,
> - pci_get_word(s->dev.config + PCI_COMMAND)
> - | PCI_COMMAND_INTX_DISABLE);
> + cmd |= PCI_COMMAND_INTX_DISABLE;
> machine_irq = 0;
> s->machine_irq = 0;
> } else {
> @@ -723,9 +720,7 @@ static int xen_pt_initfn(PCIDevice *d)
> e_intx, rc);
>
> /* Disable PCI intx assertion (turn on bit10 of devctl) */
> - xen_host_pci_set_word(&s->real_device, PCI_COMMAND,
> - *(uint16_t *)(&s->dev.config[PCI_COMMAND])
> - | PCI_COMMAND_INTX_DISABLE);
> + cmd |= PCI_COMMAND_INTX_DISABLE;
> xen_pt_mapped_machine_irq[machine_irq]--;
>
> if (xen_pt_mapped_machine_irq[machine_irq] == 0) {
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] xen/pass-through: fold host PCI command register writes
2015-05-15 12:46 [Qemu-devel] [PATCH] xen/pass-through: fold host PCI command register writes Jan Beulich
2015-06-01 6:55 ` [Qemu-devel] Ping: " Jan Beulich
@ 2015-06-05 11:05 ` Stefano Stabellini
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Stabellini @ 2015-06-05 11:05 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel, qemu-devel, Stefano Stabellini
On Fri, 15 May 2015, Jan Beulich wrote:
> The code introduced to address XSA-126 allows simplification of other
> code in xen_pt_initfn(): All we need to do is update "cmd" suitably,
> as it'll be written back to the host register near the end of the
> function anyway.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
I'll add it to my queue.
> --- a/hw/xen/xen_pt.c
> +++ b/hw/xen/xen_pt.c
> @@ -698,10 +698,7 @@ static int xen_pt_initfn(PCIDevice *d)
> machine_irq, pirq, rc);
>
> /* Disable PCI intx assertion (turn on bit10 of devctl) */
> - xen_host_pci_set_word(&s->real_device,
> - PCI_COMMAND,
> - pci_get_word(s->dev.config + PCI_COMMAND)
> - | PCI_COMMAND_INTX_DISABLE);
> + cmd |= PCI_COMMAND_INTX_DISABLE;
> machine_irq = 0;
> s->machine_irq = 0;
> } else {
> @@ -723,9 +720,7 @@ static int xen_pt_initfn(PCIDevice *d)
> e_intx, rc);
>
> /* Disable PCI intx assertion (turn on bit10 of devctl) */
> - xen_host_pci_set_word(&s->real_device, PCI_COMMAND,
> - *(uint16_t *)(&s->dev.config[PCI_COMMAND])
> - | PCI_COMMAND_INTX_DISABLE);
> + cmd |= PCI_COMMAND_INTX_DISABLE;
> xen_pt_mapped_machine_irq[machine_irq]--;
>
> if (xen_pt_mapped_machine_irq[machine_irq] == 0) {
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-05 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-15 12:46 [Qemu-devel] [PATCH] xen/pass-through: fold host PCI command register writes Jan Beulich
2015-06-01 6:55 ` [Qemu-devel] Ping: " Jan Beulich
2015-06-05 11:05 ` [Qemu-devel] " Stefano Stabellini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).