mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-25 12:40:08 +00:00
c4f26c9f37
Calling error_report() from within a function that takes an Error ** argument is suspicious. drive_new() calls error_report() even though it can run within drive_init_func(), which takes an Error ** argument. drive_init_func()'s caller main(), via qemu_opts_foreach(), is fine with it, but clean it up anyway: * Convert drive_new() to Error * Update add_init_drive() to report the error received from drive_new() * Make main() pass &error_fatal through qemu_opts_foreach(), drive_init_func() to drive_new() * Make default_drive() pass &error_abort through qemu_opts_foreach(), drive_init_func() to drive_new() Cc: Kevin Wolf <kwolf@redhat.com> Cc: Max Reitz <mreitz@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20181017082702.5581-34-armbru@redhat.com>
65 lines
1.9 KiB
C
65 lines
1.9 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 "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_NONE must be zero, because we want MachineClass member
|
|
* block_default_type to default-initialize to IF_NONE
|
|
*/
|
|
IF_NONE = 0,
|
|
IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
|
|
IF_COUNT
|
|
} BlockInterfaceType;
|
|
|
|
struct DriveInfo {
|
|
BlockInterfaceType type;
|
|
int bus;
|
|
int unit;
|
|
int auto_del; /* see blockdev_mark_auto_del() */
|
|
bool is_default; /* Added by default_drive() ? */
|
|
int media_cd;
|
|
QemuOpts *opts;
|
|
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);
|
|
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,
|
|
const char *optstr);
|
|
DriveInfo *drive_new(QemuOpts *arg, BlockInterfaceType block_default_type,
|
|
Error **errp);
|
|
|
|
/* device-hotplug */
|
|
|
|
void hmp_commit(Monitor *mon, const QDict *qdict);
|
|
void hmp_drive_del(Monitor *mon, const QDict *qdict);
|
|
#endif
|