[PATCH kvm-unit-tests 5/6] x86: api: use try_main throughout

[Paolo Bonzini <pbonzini@xxxxxxxxxx>]

Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
---
 api/dirty-log-perf.cc | 8 +++++++-
 api/dirty-log.cc      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/api/dirty-log-perf.cc b/api/dirty-log-perf.cc
index af0b27e..16990a6 100644
--- a/api/dirty-log-perf.cc
+++ b/api/dirty-log-perf.cc
@@ -1,4 +1,5 @@
 #include "kvmxx.hh"
+#include "exception.hh"
 #include "memmap.hh"
 #include "identity.hh"
 #include <boost/thread/thread.hpp>
@@ -111,7 +112,7 @@ void parse_options(int ac, char **av)
            nr_slot_pages, nr_total_pages);
 }
 
-int main(int ac, char **av)
+int test_main(int ac, char **av)
 {
     kvm::system sys;
     kvm::vm vm(sys);
@@ -142,3 +143,8 @@ int main(int ac, char **av)
     check_dirty_log(vcpu, slot, mem_head);
     return 0;
 }
+
+int main(int ac, char** av)
+{
+    return try_main(test_main, ac, av);
+}
diff --git a/api/dirty-log.cc b/api/dirty-log.cc
index b65bed7..4e4bfc9 100644
--- a/api/dirty-log.cc
+++ b/api/dirty-log.cc
@@ -1,4 +1,5 @@
 #include "kvmxx.hh"
+#include "exception.hh"
 #include "memmap.hh"
 #include "identity.hh"
 #include <boost/thread/thread.hpp>
@@ -48,7 +49,7 @@ void check_dirty_log(mem_slot& slot,
 using boost::ref;
 using std::tr1::bind;
 
-int main(int ac, char **av)
+int test_main(int ac, char **av)
 {
     kvm::system sys;
     kvm::vm vm(sys);
@@ -76,3 +77,8 @@ int main(int ac, char **av)
     printf("Dirty bitmap failures: %d\n", nr_fail);
     return nr_fail == 0 ? 0 : 1;
 }
+
+int main(int ac, char** av)
+{
+    return try_main(test_main, ac, av);
+}
-- 
2.1.0


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html