aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2010-01-11 17:57:41 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-12 13:30:08 -0600
commit348af56faea99631c4326ac389945799b6539295 (patch)
treea6fe400f0074e6881f4e8bdee9f4dd2661043c8a /hw
parent09866b9baa1ff30c67ef79b6045578894812446e (diff)
virtio-pci: thinko fix
Since patch ed757e140c0ada220f213036e4497315d24ca8bct, virtio will sometimes clear all status registers on bus master disable, which loses information such as VIRTIO_CONFIG_S_FAILED bit. This is a result of a patch being misapplied: code uses ! instead of ~ for bit operations as in Yan's original patch. This obviously does not make sense. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 49e75cf38848e6da70c0e9ddb4d994e9d71a9625)
Diffstat (limited to 'hw')
-rw-r--r--hw/virtio-pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 62b46bd484..3594152267 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -372,7 +372,7 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address,
if (PCI_COMMAND == address) {
if (!(val & PCI_COMMAND_MASTER)) {
- proxy->vdev->status &= !VIRTIO_CONFIG_S_DRIVER_OK;
+ proxy->vdev->status &= ~VIRTIO_CONFIG_S_DRIVER_OK;
}
}