kvm tools: Make kvm__arch_setup_firmware to return error code

If some of subsequent calls fails we better to return error
code instead of dying with a message. This is a first step
in getting rid of number of die() calls we have in code.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index fac274c233cca0633f4441b00f65bee7b674d6d0..01ff894ea0aaee95e7fa1eac91b61bafefa80837 100644 (file)
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -1123,7 +1123,9 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
 
        kvm__start_timer(kvm);
 
-       kvm__arch_setup_firmware(kvm);
+       exit_code = kvm__arch_setup_firmware(kvm);
+       if (exit_code)
+               goto err;
 
        for (i = 0; i < nrcpus; i++) {
                kvm_cpus[i] = kvm_cpu__init(kvm, i);
@@ -1153,6 +1155,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
                        exit_code = 1;
        }
 
+err:
        compat__print_all_messages();
 
        fb__stop();

diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h
index 75adb25e66c2211976f8e24f1f732e0053647591..a3ea1c953360e38bc345ab5494f984acf512aae9 100644 (file)
--- a/tools/kvm/include/kvm/kvm.h
+++ b/tools/kvm/include/kvm/kvm.h
@@ -56,7 +56,7 @@ void kvm__remove_socket(const char *name);
 
 void kvm__arch_set_cmdline(char *cmdline, bool video);
 void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_path, u64 ram_size, const char *name);
-void kvm__arch_setup_firmware(struct kvm *kvm);
+int kvm__arch_setup_firmware(struct kvm *kvm);
 bool kvm__arch_cpu_supports_vm(void);
 void kvm__arch_periodic_poll(struct kvm *kvm);
 

diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c
index d107de6d843368865053b163378448513ff9fe99..abab6223fc082bcac627fd3cc8acaa4c52ddee1d 100644 (file)
--- a/tools/kvm/powerpc/kvm.c
+++ b/tools/kvm/powerpc/kvm.c
@@ -175,7 +175,7 @@ static void setup_fdt(struct kvm *kvm)
 /**
  * kvm__arch_setup_firmware
  */
-void kvm__arch_setup_firmware(struct kvm *kvm)
+int kvm__arch_setup_firmware(struct kvm *kvm)
 {
        /* Load RTAS */
 
@@ -183,4 +183,6 @@ void kvm__arch_setup_firmware(struct kvm *kvm)
 
        /* Init FDT */
        setup_fdt(kvm);
+
+       return 0;
 }

diff --git a/tools/kvm/x86/include/kvm/mptable.h b/tools/kvm/x86/include/kvm/mptable.h
index 8557ae89445bd8f21b497decce7ff18010b0a080..8f04332f217dc49aa3b63967685a1f298e8c3d30 100644 (file)
--- a/tools/kvm/x86/include/kvm/mptable.h
+++ b/tools/kvm/x86/include/kvm/mptable.h
@@ -3,6 +3,6 @@
 
 struct kvm;
 
-void mptable_setup(struct kvm *kvm, unsigned int ncpus);
+int mptable_setup(struct kvm *kvm, unsigned int ncpus);
 
 #endif /* KVM_MPTABLE_H_ */

diff --git a/tools/kvm/x86/kvm.c b/tools/kvm/x86/kvm.c
index 129c4ff9fcce9d4b26fdf56b062fe72f9455ba27..e6cb621861e880a4f64aa77f456ce34dc0dc66f2 100644 (file)
--- a/tools/kvm/x86/kvm.c
+++ b/tools/kvm/x86/kvm.c
@@ -348,7 +348,7 @@ bool load_bzimage(struct kvm *kvm, int fd_kernel,
  * This function is a main routine where we poke guest memory
  * and install BIOS there.
  */
-void kvm__arch_setup_firmware(struct kvm *kvm)
+int kvm__arch_setup_firmware(struct kvm *kvm)
 {
        /* standart minimal configuration */
        setup_bios(kvm);
@@ -356,7 +356,7 @@ void kvm__arch_setup_firmware(struct kvm *kvm)
        /* FIXME: SMP, ACPI and friends here */
 
        /* MP table */
-       mptable_setup(kvm, kvm->nrcpus);
+       return mptable_setup(kvm, kvm->nrcpus);
 }
 
 void kvm__arch_periodic_poll(struct kvm *kvm)

diff --git a/tools/kvm/x86/mptable.c b/tools/kvm/x86/mptable.c
index 701605a764259c480071082b86c60f2cec21a331..c775829f090bb1b6792df9752c9b620c26826292 100644 (file)
--- a/tools/kvm/x86/mptable.c
+++ b/tools/kvm/x86/mptable.c
@@ -71,7 +71,7 @@ static void mptable_add_irq_src(struct mpc_intsrc *mpc_intsrc,
 /**
  * mptable_setup - create mptable and fill guest memory with it
  */
-void mptable_setup(struct kvm *kvm, unsigned int ncpus)
+int mptable_setup(struct kvm *kvm, unsigned int ncpus)
 {
        unsigned long real_mpc_table, real_mpf_intel, size;
        struct mpf_intel *mpf_intel;
@@ -264,8 +264,11 @@ void mptable_setup(struct kvm *kvm, unsigned int ncpus)
         */
 
        if (size > (unsigned long)(MB_BIOS_END - bios_rom_size) ||
-           size > MPTABLE_MAX_SIZE)
-               die("MP table is too big");
+           size > MPTABLE_MAX_SIZE) {
+               free(mpc_table);
+               pr_err("MP table is too big");
+               return -1;
+       }
 
        /*
         * OK, it is time to move it to guest memory.
@@ -273,4 +276,5 @@ void mptable_setup(struct kvm *kvm, unsigned int ncpus)
        memcpy(guest_flat_to_host(kvm, real_mpc_table), mpc_table, size);
 
        free(mpc_table);
+       return 0;
 }