kvm tools: use init/exit where possible

Switch to using init/exit calls instead of the repeating call blocks in builtin-run.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index 0e2fa6631db56177d346cf990e57311c0e2e6f75..d4b5eb39da8a03a55acebb357a78ba8b51945759 100644 (file)
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -84,6 +84,7 @@ OBJS  += net/uip/buf.o
 OBJS   += net/uip/csum.o
 OBJS   += net/uip/dhcp.o
 OBJS   += kvm-cmd.o
+OBJS   += util/init.o
 OBJS   += util/rbtree.o
 OBJS   += util/threadpool.o
 OBJS   += util/parse-options.o

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 5ddffaad57e240df1b76199d64e804544bcb43c6..bca91220523524911dcffaf66d367b36a5aeeb9d 100644 (file)
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -476,7 +476,6 @@ static int kvm_cmd_run_init(int argc, const char **argv)
 {
        static char real_cmdline[2048], default_name[20];
        unsigned int nr_online_cpus;
-       int r;
 
        kvm = kvm__new();
        if (IS_ERR(kvm))
@@ -646,160 +645,7 @@ static int kvm_cmd_run_init(int argc, const char **argv)
        printf("  # %s run -k %s -m %Lu -c %d --name %s\n", KVM_BINARY_NAME,
                kvm->cfg.kernel_filename, kvm->cfg.ram_size / 1024 / 1024, kvm->cfg.nrcpus, kvm->cfg.guest_name);
 
-       r = kvm__init(kvm);
-       if (r)
-               goto fail;
-
-       r = term_init(kvm);
-       if (r < 0) {
-               pr_err("term_init() failed with error %d\n", r);
-               goto fail;
-       }
-
-
-       r = ioeventfd__init(kvm);
-       if (r < 0) {
-               pr_err("ioeventfd__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = kvm_cpu__init(kvm);
-       if (r < 0) {
-               pr_err("kvm_cpu__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = irq__init(kvm);
-       if (r < 0) {
-               pr_err("irq__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = pci__init(kvm);
-       if (r < 0) {
-               pr_err("pci__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = ioport__init(kvm);
-       if (r < 0) {
-               pr_err("ioport__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = disk_image__init(kvm);
-       if (r < 0) {
-               pr_err("disk_image__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = symbol_init(kvm);
-       if (r < 0)
-               pr_debug("symbol_init() failed with error %d\n", r);
-
-       r = rtc__init(kvm);
-       if (r < 0) {
-               pr_err("rtc__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = serial8250__init(kvm);
-       if (r < 0) {
-               pr_err("serial__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_blk__init(kvm);
-       if (r < 0) {
-               pr_err("virtio_blk__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_scsi_init(kvm);
-       if (r < 0) {
-               pr_err("virtio_scsi_init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_console__init(kvm);
-       if (r < 0) {
-               pr_err("virtio_console__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_rng__init(kvm);
-       if (r < 0) {
-               pr_err("virtio_rng__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_bln__init(kvm);
-       if (r < 0) {
-               pr_err("virtio_rng__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_9p__init(kvm);
-       if (r < 0) {
-               pr_err("virtio_9p__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = virtio_net__init(kvm);
-       if (r < 0) {
-               pr_err("virtio_net__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = kbd__init(kvm);
-       if (r < 0) {
-               pr_err("kbd__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = pci_shmem__init(kvm);
-       if (r < 0) {
-               pr_err("pci_shmem__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = vnc__init(kvm);
-       if (r < 0) {
-               pr_err("vnc__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = sdl__init(kvm);
-       if (r < 0) {
-               pr_err("sdl__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = fb__init(kvm);
-       if (r < 0) {
-               pr_err("fb__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       /*
-        * Device init all done; firmware init must
-        * come after this (it may set up device trees etc.)
-        */
-
-       r = kvm_timer__init(kvm);
-       if (r < 0) {
-               pr_err("kvm_timer__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-       r = thread_pool__init(kvm);
-       if (r < 0) {
-               pr_err("thread_pool__init() failed with error %d\n", r);
-               goto fail;
-       }
-
-fail:
-       return r;
+       return init_list__init(kvm);
 }
 
 static int kvm_cmd_run_work(void)
@@ -818,97 +664,9 @@ static int kvm_cmd_run_work(void)
 
 static void kvm_cmd_run_exit(int guest_ret)
 {
-       int r = 0;
-
        compat__print_all_messages();
 
-       r = kvm_cpu__exit(kvm);
-       if (r < 0)
-               pr_warning("kvm_cpu__exit() failed with error %d\n", r);
-
-       r = symbol_exit(kvm);
-       if (r < 0)
-               pr_warning("symbol_exit() failed with error %d\n", r);
-
-       r = irq__exit(kvm);
-       if (r < 0)
-               pr_warning("irq__exit() failed with error %d\n", r);
-
-       r = kvm_timer__exit(kvm);
-       if (r < 0)
-               pr_warning("kvm_timer__exit() failed with error %d\n", r);
-
-       r = fb__exit(kvm);
-       if (r < 0)
-               pr_warning("kvm_timer__exit() failed with error %d\n", r);
-
-       r = virtio_net__exit(kvm);
-       if (r < 0)
-               pr_warning("virtio_net__exit() failed with error %d\n", r);
-
-       r = virtio_scsi_exit(kvm);
-       if (r < 0)
-               pr_warning("virtio_scsi_exit() failed with error %d\n", r);
-
-       r = virtio_blk__exit(kvm);
-       if (r < 0)
-               pr_warning("virtio_blk__exit() failed with error %d\n", r);
-
-       r = virtio_rng__exit(kvm);
-       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);
-
-       r = pci_shmem__exit(kvm);
-       if (r < 0)
-               pr_warning("pci_shmem__exit() failed with error %d\n", r);
-
-       r = disk_image__exit(kvm);
-       if (r < 0)
-               pr_warning("disk_image__exit() failed with error %d\n", r);
-
-       r = serial8250__exit(kvm);
-       if (r < 0)
-               pr_warning("serial8250__exit() failed with error %d\n", r);
-
-       r = rtc__exit(kvm);
-       if (r < 0)
-               pr_warning("rtc__exit() failed with error %d\n", r);
-
-       r = kvm__arch_free_firmware(kvm);
-       if (r < 0)
-               pr_warning("kvm__arch_free_firmware() failed with error %d\n", r);
-
-       r = ioport__exit(kvm);
-       if (r < 0)
-               pr_warning("ioport__exit() failed with error %d\n", r);
-
-       r = ioeventfd__exit(kvm);
-       if (r < 0)
-               pr_warning("ioeventfd__exit() failed with error %d\n", r);
-
-       r = pci__exit(kvm);
-       if (r < 0)
-               pr_warning("pci__exit() failed with error %d\n", r);
-
-       r = term_exit(kvm);
-       if (r < 0)
-               pr_warning("pci__exit() failed with error %d\n", r);
-
-       r = thread_pool__exit(kvm);
-       if (r < 0)
-               pr_warning("thread_pool__exit() failed with error %d\n", r);
-
-       r = kvm__exit(kvm);
-       if (r < 0)
-               pr_warning("pci__exit() failed with error %d\n", r);
+       init_list__exit(kvm);
 
        if (guest_ret == 0)
                printf("\n  # KVM session ended normally.\n");

diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c
index 639b7b30152f329ba55d77a0a44e59036324d3d5..b313b284683278eec9a89ecf77334f7562256e83 100644 (file)
--- a/tools/kvm/disk/core.c
+++ b/tools/kvm/disk/core.c
@@ -345,8 +345,10 @@ int disk_image__init(struct kvm *kvm)
 
        return 0;
 }
+dev_base_init(disk_image__init);
 
 int disk_image__exit(struct kvm *kvm)
 {
        return disk_image__close_all(kvm->disks, kvm->nr_disks);
 }
+dev_base_exit(disk_image__exit);

diff --git a/tools/kvm/framebuffer.c b/tools/kvm/framebuffer.c
index a9d6f75715c062b9b815d96bd58bd4b487a7600e..fb8f51dd1de7547fe959128c090d3fdf9eb7428d 100644 (file)
--- a/tools/kvm/framebuffer.c
+++ b/tools/kvm/framebuffer.c
@@ -1,4 +1,5 @@
 #include "kvm/framebuffer.h"
+#include "kvm/kvm.h"
 
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -58,6 +59,7 @@ int fb__init(struct kvm *kvm)
 
        return 0;
 }
+firmware_init(fb__init);
 
 int fb__exit(struct kvm *kvm)
 {
@@ -75,3 +77,4 @@ int fb__exit(struct kvm *kvm)
 
        return 0;
 }
+firmware_exit(fb__exit);

diff --git a/tools/kvm/hw/i8042.c b/tools/kvm/hw/i8042.c
index fac54ca1f3d51fb75ecf52e4c5c1199ab7fadd72..5893d1d31a13b9d16dcd4ba13756537c306a18d6 100644 (file)
--- a/tools/kvm/hw/i8042.c
+++ b/tools/kvm/hw/i8042.c
@@ -352,3 +352,4 @@ int kbd__init(struct kvm *kvm)
 
        return 0;
 }
+dev_init(kbd__init);

diff --git a/tools/kvm/hw/pci-shmem.c b/tools/kvm/hw/pci-shmem.c
index 47bb337f4476a78f63c7ee855e77dc25906a2851..0eefa4eeadecf81e880203470af1ac188a0ec8a9 100644 (file)
--- a/tools/kvm/hw/pci-shmem.c
+++ b/tools/kvm/hw/pci-shmem.c
@@ -396,8 +396,10 @@ int pci_shmem__init(struct kvm *kvm)
                          mem);
        return 0;
 }
+dev_init(pci_shmem__init);
 
 int pci_shmem__exit(struct kvm *kvm)
 {
        return 0;
 }
+dev_exit(pci_shmem__exit);

diff --git a/tools/kvm/hw/rtc.c b/tools/kvm/hw/rtc.c
index 4941dafcfe0b577f89ed154aaceb5dea3f3b8d54..dd6dca31901ebabaa9356d0d58791315250d52c4 100644 (file)
--- a/tools/kvm/hw/rtc.c
+++ b/tools/kvm/hw/rtc.c
@@ -126,6 +126,7 @@ int rtc__init(struct kvm *kvm)
 
        return r;
 }
+dev_init(rtc__init);
 
 int rtc__exit(struct kvm *kvm)
 {
@@ -135,3 +136,4 @@ int rtc__exit(struct kvm *kvm)
 
        return 0;
 }
+dev_exit(rtc__exit);

diff --git a/tools/kvm/hw/serial.c b/tools/kvm/hw/serial.c
index 63dedd0c7d7aaaf0167781e4b2caa0d7bc8aaee3..5348a9244a49a863d8030eb8fcb7e8143f486095 100644 (file)
--- a/tools/kvm/hw/serial.c
+++ b/tools/kvm/hw/serial.c
@@ -432,6 +432,7 @@ cleanup:
 
        return r;
 }
+dev_init(serial8250__init);
 
 int serial8250__exit(struct kvm *kvm)
 {
@@ -448,3 +449,4 @@ int serial8250__exit(struct kvm *kvm)
 
        return 0;
 }
+dev_exit(serial8250__exit);

diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h
index 2cd30e47d53b469e7a4c70593aeb5f05b9656f23..f009695fa09a6760264981d7a6f92e309ea8dfdc 100644 (file)
--- a/tools/kvm/include/kvm/kvm.h
+++ b/tools/kvm/include/kvm/kvm.h
@@ -3,6 +3,8 @@
 
 #include "kvm/kvm-arch.h"
 #include "kvm/kvm-config.h"
+#include "kvm/util-init.h"
+#include "kvm/kvm.h"
 
 #include <stdbool.h>
 #include <linux/types.h>

diff --git a/tools/kvm/ioeventfd.c b/tools/kvm/ioeventfd.c
index 742b00862f1ad715e6e1408d6eacebe9b8790d36..a68d8d0d2db39ddde5237f89003b50af6290eca5 100644 (file)
--- a/tools/kvm/ioeventfd.c
+++ b/tools/kvm/ioeventfd.c
@@ -93,6 +93,7 @@ cleanup:
 
        return r;
 }
+base_init(ioeventfd__init);
 
 int ioeventfd__exit(struct kvm *kvm)
 {
@@ -115,6 +116,7 @@ int ioeventfd__exit(struct kvm *kvm)
 
        return 0;
 }
+base_exit(ioeventfd__exit);
 
 int ioeventfd__add_event(struct ioevent *ioevent, bool is_pio, bool poll_in_userspace)
 {

diff --git a/tools/kvm/ioport.c b/tools/kvm/ioport.c
index f5fb246cb1d63edf0051059c87d222f6b547fcd4..8d6e382e61cd5f3a25439c16dc6e522ee056c9bb 100644 (file)
--- a/tools/kvm/ioport.c
+++ b/tools/kvm/ioport.c
@@ -188,9 +188,11 @@ int ioport__init(struct kvm *kvm)
 
        return 0;
 }
+dev_base_init(ioport__init);
 
 int ioport__exit(struct kvm *kvm)
 {
        ioport__unregister_all();
        return 0;
 }
+dev_base_exit(ioport__exit);

diff --git a/tools/kvm/kvm-cpu.c b/tools/kvm/kvm-cpu.c
index f712730cbdc50c9ebebfd45fbf6d906d6378776f..86d3b04014c3414549b2bef99723e19a2df6e805 100644 (file)
--- a/tools/kvm/kvm-cpu.c
+++ b/tools/kvm/kvm-cpu.c
@@ -212,6 +212,7 @@ fail_alloc:
                free(kvm->cpus[i]);
        return -ENOMEM;
 }
+base_init(kvm_cpu__init);
 
 int kvm_cpu__exit(struct kvm *kvm)
 {
@@ -238,3 +239,4 @@ int kvm_cpu__exit(struct kvm *kvm)
 
        return r;
 }
+late_exit(kvm_cpu__exit);

diff --git a/tools/kvm/kvm-ipc.c b/tools/kvm/kvm-ipc.c
index 70273c211a114479820debc20b8f3fe4d2e7899f..6b472705022995ab6a7e840e9191f467fccd77f1 100644 (file)
--- a/tools/kvm/kvm-ipc.c
+++ b/tools/kvm/kvm-ipc.c
@@ -477,6 +477,7 @@ err_epoll:
 err:
        return ret;
 }
+base_init(kvm_ipc__init);
 
 int kvm_ipc__exit(struct kvm *kvm)
 {
@@ -494,3 +495,4 @@ int kvm_ipc__exit(struct kvm *kvm)
 
        return ret;
 }
+base_exit(kvm_ipc__exit);

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index cca2e9361646ba23207362eedf2929b600442d52..20322a3375b23d1d005a101ffc92a81915c7ec62 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -140,6 +140,7 @@ int kvm__exit(struct kvm *kvm)
 
        return 0;
 }
+core_exit(kvm__exit);
 
 /*
  * Note: KVM_SET_USER_MEMORY_REGION assumes that we don't pass overlapping
@@ -274,6 +275,7 @@ err_free:
 err:
        return ret;
 }
+core_init(kvm__init);
 
 /* RFC 1952 */
 #define GZIP_ID1               0x1f
@@ -375,6 +377,7 @@ int kvm_timer__init(struct kvm *kvm)
 
        return 0;
 }
+firmware_init(kvm_timer__init);
 
 int kvm_timer__exit(struct kvm *kvm)
 {
@@ -386,6 +389,7 @@ int kvm_timer__exit(struct kvm *kvm)
 
        return 0;
 }
+firmware_exit(kvm_timer__exit);
 
 void kvm__dump_mem(struct kvm *kvm, unsigned long addr, unsigned long size)
 {

diff --git a/tools/kvm/pci.c b/tools/kvm/pci.c
index 38f47785a747921911916408614a00539ff1a059..fc4ad39f8985d495d60f3a958aeaa5d92474a263 100644 (file)
--- a/tools/kvm/pci.c
+++ b/tools/kvm/pci.c
@@ -203,6 +203,7 @@ int pci__init(struct kvm *kvm)
 
        return 0;
 }
+base_init(pci__init);
 
 int pci__exit(struct kvm *kvm)
 {
@@ -211,3 +212,4 @@ int pci__exit(struct kvm *kvm)
 
        return 0;
 }
+base_exit(pci__exit);

diff --git a/tools/kvm/symbol.c b/tools/kvm/symbol.c
index b76d98b1e5c7e5ae9f0fa126154ec2e7484e9a2a..07dd9d541065a30cca15fdfa1b2c97d961a12b39 100644 (file)
--- a/tools/kvm/symbol.c
+++ b/tools/kvm/symbol.c
@@ -15,7 +15,7 @@ int symbol_init(struct kvm *kvm)
        int ret = 0;
 
        if (!kvm->vmlinux)
-               return -EINVAL;
+               return 0;
 
        bfd_init();
 
@@ -38,6 +38,7 @@ int symbol_init(struct kvm *kvm)
 
        return ret;
 }
+late_init(symbol_init);
 
 static asymbol *lookup(asymbol **symbols, int nr_symbols, const char *symbol_name)
 {
@@ -129,3 +130,4 @@ int symbol_exit(struct kvm *kvm)
 
        return -EFAULT;
 }
+late_exit(symbol_exit);

diff --git a/tools/kvm/term.c b/tools/kvm/term.c
index 66f48040418f1b4fbde55e8890588a07d2d6b6bf..d47a75e55dbd2fc7f86dd97f5d350069bdac5cdc 100644 (file)
--- a/tools/kvm/term.c
+++ b/tools/kvm/term.c
@@ -163,8 +163,10 @@ int term_init(struct kvm *kvm)
 
        return 0;
 }
+dev_init(term_init);
 
 int term_exit(struct kvm *kvm)
 {
        return 0;
 }
+dev_exit(term_exit);

diff --git a/tools/kvm/ui/sdl.c b/tools/kvm/ui/sdl.c
index a041b3b84d54392e66b21fae423fdc9d7afaf839..172a12b768e404f3456e809d62ed2222e33bc50d 100644 (file)
--- a/tools/kvm/ui/sdl.c
+++ b/tools/kvm/ui/sdl.c
@@ -309,8 +309,13 @@ int sdl__init(struct kvm *kvm)
 
        return fb__attach(fb, &sdl_ops);
 }
+dev_init(sdl__init);
 
 int sdl__exit(struct kvm *kvm)
 {
-       return sdl__stop(NULL);
+       if (kvm->cfg.sdl)
+               return sdl__stop(NULL);
+
+       return 0;
 }
+dev_exit(sdl__exit);

diff --git a/tools/kvm/ui/vnc.c b/tools/kvm/ui/vnc.c
index d445059929b213fb37f65a54f5d57198cb951113..efdc0f42fb195a1edc44cb356f22673d16430450 100644 (file)
--- a/tools/kvm/ui/vnc.c
+++ b/tools/kvm/ui/vnc.c
@@ -236,8 +236,13 @@ int vnc__init(struct kvm *kvm)
 
        return fb__attach(fb, &vnc_ops);
 }
+dev_init(vnc__init);
 
 int vnc__exit(struct kvm *kvm)
 {
-       return vnc__stop(NULL);
+       if (kvm->cfg.vnc)
+               return vnc__stop(NULL);
+
+       return 0;
 }
+dev_exit(vnc__exit);

diff --git a/tools/kvm/util/threadpool.c b/tools/kvm/util/threadpool.c
index 9b91995b5f51e03346a44f8908246610233b5813..85ac7e7383130ec47d3e4002075edcd797ffc4d4 100644 (file)
--- a/tools/kvm/util/threadpool.c
+++ b/tools/kvm/util/threadpool.c
@@ -1,5 +1,6 @@
 #include "kvm/threadpool.h"
 #include "kvm/mutex.h"
+#include "kvm/kvm.h"
 
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -131,6 +132,7 @@ int thread_pool__init(struct kvm *kvm)
 
        return i;
 }
+late_init(thread_pool__init);
 
 int thread_pool__exit(struct kvm *kvm)
 {
@@ -151,6 +153,7 @@ int thread_pool__exit(struct kvm *kvm)
 
        return 0;
 }
+late_exit(thread_pool__exit);
 
 void thread_pool__do_job(struct thread_pool__job *job)
 {

diff --git a/tools/kvm/virtio/9p.c b/tools/kvm/virtio/9p.c
index 0705d79f32d7371a83e615cc85887cd81a9db74e..4864b2f8fa32fd266653c3ec789402dda0700d8c 100644 (file)
--- a/tools/kvm/virtio/9p.c
+++ b/tools/kvm/virtio/9p.c
@@ -1404,6 +1404,7 @@ int virtio_9p__init(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_init(virtio_9p__init);
 
 int virtio_9p__register(struct kvm *kvm, const char *root, const char *tag_name)
 {

diff --git a/tools/kvm/virtio/balloon.c b/tools/kvm/virtio/balloon.c
index b8192b5122ccb24f11c056cb45499eb982aa0e89..d6bde32e40e8f69f70040f1bc311d3e4b5203352 100644 (file)
--- a/tools/kvm/virtio/balloon.c
+++ b/tools/kvm/virtio/balloon.c
@@ -262,8 +262,10 @@ int virtio_bln__init(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_init(virtio_bln__init);
 
 int virtio_bln__exit(struct kvm *kvm)
 {
        return 0;
 }
+virtio_dev_exit(virtio_bln__exit);

diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index 98f17a23f549a5b00c5ebf58b6026233d2371fea..cff38aa68948a1fb871c72688c9f55e2819fbbc4 100644 (file)
--- a/tools/kvm/virtio/blk.c
+++ b/tools/kvm/virtio/blk.c
@@ -299,6 +299,7 @@ int virtio_blk__init(struct kvm *kvm)
 cleanup:
        return virtio_blk__exit(kvm);
 }
+virtio_dev_init(virtio_blk__init);
 
 int virtio_blk__exit(struct kvm *kvm)
 {
@@ -311,3 +312,4 @@ int virtio_blk__exit(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_exit(virtio_blk__exit);

diff --git a/tools/kvm/virtio/console.c b/tools/kvm/virtio/console.c
index a1cb8f4cb2d9ebb7a2736792f0838cf2c4326bee..b4c0463e7f279922124fb1b6fd97c9772626da7c 100644 (file)
--- a/tools/kvm/virtio/console.c
+++ b/tools/kvm/virtio/console.c
@@ -194,8 +194,10 @@ int virtio_console__init(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_init(virtio_console__init);
 
 int virtio_console__exit(struct kvm *kvm)
 {
        return 0;
 }
+virtio_dev_exit(virtio_console__exit);

diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c
index 4aca5818122e14a85f2aa96c0372ef34cdb24c5f..e6da7f819e963787cc4068896cf74b1f9e6a85de 100644 (file)
--- a/tools/kvm/virtio/net.c
+++ b/tools/kvm/virtio/net.c
@@ -663,8 +663,10 @@ int virtio_net__init(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_init(virtio_net__init);
 
 int virtio_net__exit(struct kvm *kvm)
 {
        return 0;
 }
+virtio_dev_exit(virtio_net__exit);

diff --git a/tools/kvm/virtio/rng.c b/tools/kvm/virtio/rng.c
index 91228e2fffb3d73e0a03e52f2923f9a024ce1a6e..b2616d84bbdf2d82525f6eb1f8877b2ccbb726da 100644 (file)
--- a/tools/kvm/virtio/rng.c
+++ b/tools/kvm/virtio/rng.c
@@ -176,6 +176,7 @@ cleanup:
 
        return r;
 }
+virtio_dev_init(virtio_rng__init);
 
 int virtio_rng__exit(struct kvm *kvm)
 {
@@ -189,3 +190,4 @@ int virtio_rng__exit(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_exit(virtio_rng__exit);

diff --git a/tools/kvm/virtio/scsi.c b/tools/kvm/virtio/scsi.c
index c445f08586fbf250f14e5dac8e58391411326f02..881898b43d64971fb02a11e1dba9a727aeea72e7 100644 (file)
--- a/tools/kvm/virtio/scsi.c
+++ b/tools/kvm/virtio/scsi.c
@@ -293,6 +293,7 @@ int virtio_scsi_init(struct kvm *kvm)
 cleanup:
        return virtio_scsi_exit(kvm);
 }
+virtio_dev_init(virtio_scsi_init);
 
 int virtio_scsi_exit(struct kvm *kvm)
 {
@@ -305,3 +306,4 @@ int virtio_scsi_exit(struct kvm *kvm)
 
        return 0;
 }
+virtio_dev_exit(virtio_scsi_exit);

diff --git a/tools/kvm/x86/irq.c b/tools/kvm/x86/irq.c
index e83df99e03703d8d3eb46547cfac0b05b3ab98c5..8dc90bf720abf1de918ad2af7c323b200fafaee9 100644 (file)
--- a/tools/kvm/x86/irq.c
+++ b/tools/kvm/x86/irq.c
@@ -172,6 +172,7 @@ int irq__init(struct kvm *kvm)
 
        return 0;
 }
+dev_base_init(irq__init);
 
 int irq__exit(struct kvm *kvm)
 {
@@ -195,6 +196,7 @@ int irq__exit(struct kvm *kvm)
 
        return 0;
 }
+dev_base_exit(irq__exit);
 
 int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg)
 {