diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-02 14:50:41 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-02 14:50:41 +0200 |
| commit | a22c235c3f4bf90e6faf873a4ba6fcaeed8857f1 (patch) | |
| tree | 289aa14ace9c466bbb8fe22099e28070d73bc81d /hw/pci.c | |
| parent | Merge branch 'upstream-merge' (diff) | |
| download | qemu-kvm-a22c235c3f4bf90e6faf873a4ba6fcaeed8857f1.tar.gz qemu-kvm-a22c235c3f4bf90e6faf873a4ba6fcaeed8857f1.tar.bz2 qemu-kvm-a22c235c3f4bf90e6faf873a4ba6fcaeed8857f1.zip | |
Revert "Disable generic pci reset"
This reverts commit f0c728d09728825f7f8b6896adcf6e4fd58dc7ef. Seabios pci
init changes fix the issue.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -108,12 +108,9 @@ static int pci_bar(PCIDevice *d, int reg) static void pci_device_reset(PCIDevice *dev) { -#ifdef THIS_BREAKS_WINXP_SUSPEND int r; -#endif memset(dev->irq_state, 0, sizeof dev->irq_state); -#ifdef THIS_BREAKS_WINXP_SUSPEND dev->config[PCI_COMMAND] &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); dev->config[PCI_CACHE_LINE_SIZE] = 0x0; @@ -125,7 +122,6 @@ static void pci_device_reset(PCIDevice *dev) pci_set_long(dev->config + pci_bar(dev, r), dev->io_regions[r].type); } pci_update_mappings(dev); -#endif } static void pci_bus_reset(void *opaque) |