From patchwork Fri Dec 12 13:41:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 5482351 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF5D29F1D4 for ; Fri, 12 Dec 2014 13:42:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A1BC20115 for ; Fri, 12 Dec 2014 13:42:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83CA8201D3 for ; Fri, 12 Dec 2014 13:42:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968055AbaLLNlo (ORCPT ); Fri, 12 Dec 2014 08:41:44 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:55608 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968050AbaLLNlm (ORCPT ); Fri, 12 Dec 2014 08:41:42 -0500 Received: by mail-wi0-f170.google.com with SMTP id bs8so4524863wib.5 for ; Fri, 12 Dec 2014 05:41:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=+iBV0UTY7J9YizgVg9k0HlTsK4KtjovI9imsa16LTYo=; b=rqxyb+Zsmfhp2TSu03sqKai+AJCXjjCLZKqXHXglMh5mYvPNbDisgfuv7ll3P9m/qy PG/5BD4Wa7qor0ktOwB6txqiyqG6nFvlxM1d2qEjyMx0Ydu9MSUR0I/MPfckUmH4o8+F BXESab7e4ATyZA3CM0AJdfXHgggWKlnSdfL3yx/C/wkNERjqXwMbslC7nB5geFc+1yGU t1deRMtmcIvRoWg53AohC9MPMX72hq7EsxrYLeZypY/wV4r8Q6DDtCr67mTR+F7I2iOt NL2IPMURFs0rQfQQ2Pbpx22z4R7oI9WcXNl9/emC0OIKGLPka+UYrf8OvjcQc69ozuGT fDtQ== X-Received: by 10.181.13.42 with SMTP id ev10mr7691222wid.78.1418391701385; Fri, 12 Dec 2014 05:41:41 -0800 (PST) Received: from donizetti.redhat.com (net-2-35-193-40.cust.vodafonedsl.it. [2.35.193.40]) by mx.google.com with ESMTPSA id wx3sm1893725wjc.19.2014.12.12.05.41.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Dec 2014 05:41:40 -0800 (PST) From: Paolo Bonzini To: kvm@vger.kernel.org Subject: [PATCH kvm-unit-tests 5/6] x86: api: use try_main throughout Date: Fri, 12 Dec 2014 14:41:24 +0100 Message-Id: <1418391685-29153-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1418391685-29153-1-git-send-email-pbonzini@redhat.com> References: <1418391685-29153-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Paolo Bonzini --- 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 @@ -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 @@ -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); +}