diff options
| author | Jan Beulich <jbeulich@suse.com> | 2015-06-02 15:07:01 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2015-06-02 15:07:01 +0000 |
| commit | c4ff1e68c621928abc680266cad0a451686c403b (patch) | |
| tree | 70a66b388c63f9fcd7589411c25adb78bfe477c7 | |
| parent | d61bb2482dc0c7426f451f23ba7e2748ae2cc06d (diff) | |
| download | qemu-c4ff1e68c621928abc680266cad0a451686c403b.zip qemu-c4ff1e68c621928abc680266cad0a451686c403b.tar.gz qemu-c4ff1e68c621928abc680266cad0a451686c403b.tar.bz2 | |
xen/pt: correctly handle PM status bit
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>
| -rw-r--r-- | hw/xen/xen_pt_config_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 516236a..027ac32 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -948,7 +948,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; } |