summaryrefslogtreecommitdiff
path: root/hw/ide/cmd646.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2012-07-29 17:03:19 +0300
committerMichael S. Tsirkin <mst@redhat.com>2012-07-29 17:05:35 +0300
commit5e59b024351f827f903f98ae522687ea53dc4f23 (patch)
tree4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /hw/ide/cmd646.c
parent7162ab21fe8e82f924002951cd8e87f69358f8b5 (diff)
parent932d4a42afa28829fadf3cbfbb0507cc09aafd8b (diff)
downloadqemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.gz
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/cmd646.c')
-rw-r--r--hw/ide/cmd646.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 087b4f922d..e0b9443496 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -295,7 +295,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
return 0;
}
-static int pci_cmd646_ide_exitfn(PCIDevice *dev)
+static void pci_cmd646_ide_exitfn(PCIDevice *dev)
{
PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev);
unsigned i;
@@ -309,8 +309,6 @@ static int pci_cmd646_ide_exitfn(PCIDevice *dev)
memory_region_destroy(&d->cmd646_bar[i].data);
}
memory_region_destroy(&d->bmdma_bar);
-
- return 0;
}
void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table,