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/ide/via.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/ide/via.c')
| -rw-r--r-- | hw/ide/via.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ide/via.c b/hw/ide/via.c index a17f2e2dd5..b20e4f094e 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -190,7 +190,7 @@ static int vt82c686b_ide_initfn(PCIDevice *dev) return 0; } -static int vt82c686b_ide_exitfn(PCIDevice *dev) +static void vt82c686b_ide_exitfn(PCIDevice *dev) { PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); unsigned i; @@ -202,8 +202,6 @@ static int vt82c686b_ide_exitfn(PCIDevice *dev) memory_region_destroy(&d->bmdma[i].addr_ioport); } memory_region_destroy(&d->bmdma_bar); - - return 0; } void vt82c686b_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) |