All QMP commands use the "new" handler interface (mhandler.cmd_new). Most HMP commands still use the traditional interface (mhandler.cmd), but a few use the "new" one. Complicates handle_user_command() for no gain, so I'm converting these to the traditional interface. For drive_del, that's easy: hmp_drive_del() sheds its unused last parameter, and its return value, which the caller ignored anyway. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
		
			
				
	
	
		
			71 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
		
			2.1 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 */
 | 
						|
 | 
						|
void qmp_change_blockdev(const char *device, const char *filename,
 | 
						|
                         const char *format, Error **errp);
 | 
						|
void hmp_commit(Monitor *mon, const QDict *qdict);
 | 
						|
void hmp_drive_del(Monitor *mon, const QDict *qdict);
 | 
						|
#endif
 |