aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2021-11-17 17:34:09 +0100
committerMarkus Armbruster <armbru@redhat.com>2021-12-15 14:56:14 +0100
commit95fd260f0a3663ed229b8e0d2ef111a9f8bd93ad (patch)
treed084871d1762db94f372bedcfc36628aea1e31a5
parent8ec239f2d80bed82ad5a361ddfb9ca3560a45ad8 (diff)
downloadqemu-95fd260f0a3663ed229b8e0d2ef111a9f8bd93ad.zip
qemu-95fd260f0a3663ed229b8e0d2ef111a9f8bd93ad.tar.gz
qemu-95fd260f0a3663ed229b8e0d2ef111a9f8bd93ad.tar.bz2
blockdev: Drop unused drive_get_next()
drive_get_next() is basically a bad idea. It returns the "next" block backend of a certain interface type. "Next" means bus=0,unit=N, where subsequent calls count N up from zero, per interface type. This lets you define unit numbers implicitly by execution order. If the order changes, or new calls appear "in the middle", unit numbers change. ABI break. Hard to spot in review. The previous commits eliminated all uses. Drop the function. Cc: Kevin Wolf <kwolf@redhat.com> Cc: Hanna Reitz <hreitz@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20211117163409.3587705-14-armbru@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com>
-rw-r--r--blockdev.c10
-rw-r--r--include/sysemu/blockdev.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/blockdev.c b/blockdev.c
index b350726..0eb2823 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -303,16 +303,6 @@ int drive_get_max_bus(BlockInterfaceType type)
return max_bus;
}
-/* Get a block device. This should only be used for single-drive devices
- (e.g. SD/Floppy/MTD). Multi-disk devices (scsi/ide) should use the
- appropriate bus. */
-DriveInfo *drive_get_next(BlockInterfaceType type)
-{
- static int next_block_unit[IF_COUNT];
-
- return drive_get(type, 0, next_block_unit[type]++);
-}
-
static void bdrv_format_print(void *opaque, const char *name)
{
qemu_printf(" %s", name);
diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h
index 32c2d60..a750f99 100644
--- a/include/sysemu/blockdev.h
+++ b/include/sysemu/blockdev.h
@@ -50,7 +50,6 @@ void drive_check_orphaned(void);
DriveInfo *drive_get_by_index(BlockInterfaceType type, int index);
int drive_get_max_bus(BlockInterfaceType type);
int drive_get_max_devs(BlockInterfaceType type);
-DriveInfo *drive_get_next(BlockInterfaceType type);
QemuOpts *drive_def(const char *optstr);
QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,