clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-06-15 18:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: virtio-bln init/exit

Browse Source 
Make the init/exit of virtio-balloon self-contained, so the global init code
won't need to check if it was selected or not.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Sasha Levin
2012-09-05 10:31:53 +02:00
committed by Will Deacon
parent f16653ad5e
commit d06db2fd4b
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtin-run.c
+9 -2
View File
@@ -1136,8 +1136,11 @@ static int kvm_cmd_run_init(int argc, const char **argv)
goto fail;
}
if (kvm->cfg.balloon)
virtio_bln__init(kvm);
r = virtio_bln__init(kvm);
if (r < 0) {
pr_err("virtio_rng__init() failed with error %d\n", r);
goto fail;
}
if (!kvm->cfg.network)
kvm->cfg.network = DEFAULT_NETWORK;
@@ -1287,6 +1290,10 @@ static void kvm_cmd_run_exit(int guest_ret)
if (r < 0)
pr_warning("virtio_rng__exit() failed with error %d\n", r);
r = virtio_bln__exit(kvm);
if (r < 0)
pr_warning("virtio_bln__exit() failed with error %d\n", r);
r = virtio_console__exit(kvm);
if (r < 0)
pr_warning("virtio_console__exit() failed with error %d\n", r);
include/kvm/virtio-balloon.h
+2 -1
View File
@@ -3,6 +3,7 @@
struct kvm;
void virtio_bln__init(struct kvm *kvm);
int virtio_bln__init(struct kvm *kvm);
int virtio_bln__exit(struct kvm *kvm);
#endif /* KVM__BLN_VIRTIO_H */
virtio/balloon.c
+11 -1
View File
@@ -243,8 +243,11 @@ struct virtio_ops bln_dev_virtio_ops = (struct virtio_ops) {
.get_size_vq = get_size_vq,
};
void virtio_bln__init(struct kvm *kvm)
int virtio_bln__init(struct kvm *kvm)
{
if (!kvm->cfg.balloon)
return 0;
kvm_ipc__register_handler(KVM_IPC_BALLOON, handle_mem);
kvm_ipc__register_handler(KVM_IPC_STAT, virtio_bln__print_stats);
@@ -256,4 +259,11 @@ void virtio_bln__init(struct kvm *kvm)
if (compat_id == -1)
compat_id = virtio_compat_add_message("virtio-balloon", "CONFIG_VIRTIO_BALLOON");
return 0;
}
int virtio_bln__exit(struct kvm *kvm)
{
return 0;
}