kvm tools: disk image related cleanup

Move io debug delay into kvm_config, the parser out of builtin-run into the disk code
and make the init/exit functions match the rest of the code in style.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Sasha Levin
2015-06-01 16:39:52 +01:00
committed by Will Deacon
parent 1dc24dcc72
commit 3b55dcde7f
4 changed files with 92 additions and 64 deletions
+5 -4
View File
@@ -3,6 +3,7 @@
#include "kvm/read-write.h"
#include "kvm/util.h"
#include "kvm/parse-options.h"
#include <linux/types.h>
#include <linux/fs.h> /* for BLKGETSIZE64 */
@@ -65,13 +66,13 @@ struct disk_image {
#endif
const char *wwpn;
const char *tpgt;
int debug_iodelay;
};
struct disk_image *disk_image__open(const char *filename, bool readonly, bool direct);
struct disk_image **disk_image__open_all(struct disk_image_params *params, int count);
int disk_img_name_parser(const struct option *opt, const char *arg, int unset);
int disk_image__init(struct kvm *kvm);
int disk_image__exit(struct kvm *kvm);
struct disk_image *disk_image__new(int fd, u64 size, struct disk_image_operations *ops, int mmap);
int disk_image__close(struct disk_image *disk);
int disk_image__close_all(struct disk_image **disks, int count);
int disk_image__flush(struct disk_image *disk);
ssize_t disk_image__read(struct disk_image *disk, u64 sector, const struct iovec *iov,
int iovcount, void *param);
+1
View File
@@ -23,6 +23,7 @@ struct kvm_config {
u8 num_net_devices;
bool virtio_rng;
int active_console;
int debug_iodelay;
const char *kernel_cmdline;
const char *kernel_filename;
const char *vmlinux_filename;