diff options
| author | Michael S. Tsirkin | 2011-05-05 15:39:47 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-05-05 15:39:47 +0200 |
| commit | 5300f1a5487f67f0bde8ee1081b799108668cb1d (patch) | |
| tree | 5274ff496f2665487736a4eec23bf76601e4da44 /hw/ide.h | |
| parent | CPUPhysMemoryClient: Pass guest physical address not region offset (diff) | |
| parent | NBD: Avoid leaking a couple of strings when the NBD device is closed (diff) | |
| download | qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.gz qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.xz qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.zip | |
Merge remote branch 'origin/master' into pci
Conflicts:
exec.c
Diffstat (limited to 'hw/ide.h')
| -rw-r--r-- | hw/ide.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -28,4 +28,7 @@ void mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, void ide_get_bs(BlockDriverState *bs[], BusState *qbus); +/* ide/core.c */ +void ide_drive_get(DriveInfo **hd, int max_bus); + #endif /* HW_IDE_H */ |