26f8b3a847
blockdev_init() always creates a DriveInfo, but only drive_new() fills
it in. qmp_blockdev_add() leaves it blank. This results in a drive
with type = IF_IDE, bus = 0, unit = 0. Screwed up in commit ee13ed1c.
Board initialization code looking for IDE drive (0,0) can pick up one
of these bogus drives. The QMP command has to execute really early to
be visible. Not sure how likely that is in practice.
Fix by creating DriveInfo in drive_new(). Block backends created by
blockdev-add don't get one.
Breaks the test for "has been created by qmp_blockdev_add()" in
blockdev_mark_auto_del() and do_drive_del(), because it changes the
value of dinfo && !dinfo->enable_auto_del from true to false. Simply
test !dinfo instead.
Leaves DriveInfo member enable_auto_del unused. Drop it.
A few places assume a block backend always has a DriveInfo. Fix them
up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
73 lines
2.2 KiB
C
73 lines
2.2 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(BlockBackend *blk);
|
|
void blockdev_auto_del(BlockBackend *blk);
|
|
|
|
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 {
|
|
const char *devaddr;
|
|
BlockInterfaceType type;
|
|
int bus;
|
|
int unit;
|
|
int auto_del; /* see blockdev_mark_auto_del() */
|
|
bool is_default; /* Added by default_drive() ? */
|
|
int media_cd;
|
|
int cyls, heads, secs, trans;
|
|
QemuOpts *opts;
|
|
char *serial;
|
|
QTAILQ_ENTRY(DriveInfo) next;
|
|
};
|
|
|
|
DriveInfo *blk_legacy_dinfo(BlockBackend *blk);
|
|
DriveInfo *blk_set_legacy_dinfo(BlockBackend *blk, DriveInfo *dinfo);
|
|
BlockBackend *blk_by_legacy_dinfo(DriveInfo *dinfo);
|
|
|
|
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);
|
|
|
|
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);
|
|
|
|
/* 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
|