]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
xen/pt: correctly handle PM status bit
authorJan Beulich <jbeulich@suse.com>
Tue, 2 Jun 2015 15:43:08 +0000 (15:43 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Tue, 9 Jun 2015 10:28:43 +0000 (10:28 +0000)
xen_pt_pmcsr_reg_write() needs an adjustment to deal with the RW1C
nature of the not passed through bit 15 (PCI_PM_CTRL_PME_STATUS).

This is a preparatory patch for XSA-131.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
hw/xen/xen_pt_config_init.c

index e07f645f94a672446dc1f22bec0017e830684c9b..026a7daae86bf43973f7f9675314e5df329adfbc 100644 (file)
@@ -950,7 +950,8 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s,
 
     /* create value for writing to I/O device register */
     throughable_mask = ~reg->emu_mask & valid_mask;
-    *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask);
+    *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS,
+                              throughable_mask);
 
     return 0;
 }