diff options
| author | Michael S. Tsirkin | 2012-07-29 16:03:19 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2012-07-29 16:05:35 +0200 |
| commit | 5e59b024351f827f903f98ae522687ea53dc4f23 (patch) | |
| tree | 4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /hw/esp.c | |
| parent | x86: Fixed incorrect segment base address addition in 64-bits mode (diff) | |
| parent | msi/msix: added API to set MSI message address and data (diff) | |
| download | qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.gz qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.xz qemu-5e59b024351f827f903f98ae522687ea53dc4f23.zip | |
Merge branch pci into master
Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.
Conflicts:
hw/esp.c
Diffstat (limited to 'hw/esp.c')
| -rw-r--r-- | hw/esp.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1153,13 +1153,11 @@ static int esp_pci_scsi_init(PCIDevice *dev) return 0; } -static int esp_pci_scsi_uninit(PCIDevice *d) +static void esp_pci_scsi_uninit(PCIDevice *d) { PCIESPState *pci = DO_UPCAST(PCIESPState, dev, d); memory_region_destroy(&pci->io); - - return 0; } static void esp_pci_class_init(ObjectClass *klass, void *data) |