d8f94e1bb2
Instead of duplicating the logic for the if_ide (bus,unit) mappings, rely on the blockdev layer for managing those mappings for us, and use the drive_get_by_index call instead. This allows ide_drive_get to work for AHCI HBAs as well, and can be used in the Q35 initialization. Lastly, change the nature of the argument to ide_drive_get so that represents the number of total drives we can support, and not the total number of buses. This will prevent array overflows if the units-per-default-bus property ever needs to be adjusted for compatibility reasons. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 1412187569-23452-5-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
75 lines
2.3 KiB
C
75 lines
2.3 KiB
C
/*
|
|
* QEMU host block devices
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
* later. See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef BLOCKDEV_H
|
|
#define BLOCKDEV_H
|
|
|
|
#include "block/block.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/queue.h"
|
|
|
|
void blockdev_mark_auto_del(BlockDriverState *bs);
|
|
void blockdev_auto_del(BlockDriverState *bs);
|
|
|
|
typedef enum {
|
|
IF_DEFAULT = -1, /* for use with drive_add() only */
|
|
/*
|
|
* IF_IDE must be zero, because we want QEMUMachine member
|
|
* block_default_type to default-initialize to IF_IDE
|
|
*/
|
|
IF_IDE = 0,
|
|
IF_NONE,
|
|
IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
|
|
IF_COUNT
|
|
} BlockInterfaceType;
|
|
|
|
struct DriveInfo {
|
|
BlockDriverState *bdrv;
|
|
char *id;
|
|
const char *devaddr;
|
|
BlockInterfaceType type;
|
|
int bus;
|
|
int unit;
|
|
int auto_del; /* see blockdev_mark_auto_del() */
|
|
bool enable_auto_del; /* Only for legacy drive_new() */
|
|
bool is_default; /* Added by default_drive() ? */
|
|
int media_cd;
|
|
int cyls, heads, secs, trans;
|
|
QemuOpts *opts;
|
|
char *serial;
|
|
QTAILQ_ENTRY(DriveInfo) next;
|
|
};
|
|
|
|
void override_max_devs(BlockInterfaceType type, int max_devs);
|
|
|
|
DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);
|
|
bool 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);
|
|
DriveInfo *drive_get_by_blockdev(BlockDriverState *bs);
|
|
|
|
QemuOpts *drive_def(const char *optstr);
|
|
QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,
|
|
const char *optstr);
|
|
DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type);
|
|
void drive_del(DriveInfo *dinfo);
|
|
void drive_info_del(DriveInfo *dinfo);
|
|
|
|
/* device-hotplug */
|
|
|
|
DriveInfo *add_init_drive(const char *opts);
|
|
|
|
void qmp_change_blockdev(const char *device, const char *filename,
|
|
const char *format, Error **errp);
|
|
void do_commit(Monitor *mon, const QDict *qdict);
|
|
int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
|
#endif
|