From patchwork Wed Sep 5 08:32:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1406691 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C2673DF264 for ; Wed, 5 Sep 2012 08:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758217Ab2IEIgq (ORCPT ); Wed, 5 Sep 2012 04:36:46 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:40454 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758162Ab2IEIg1 (ORCPT ); Wed, 5 Sep 2012 04:36:27 -0400 Received: by mail-we0-f174.google.com with SMTP id x8so223930wey.19 for ; Wed, 05 Sep 2012 01:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Yy+dCFKb1or5JwZ9JO/E9ULK1CWK4+tX198cK9YnWDY=; b=JSe8aqfuaLosSIa/RVmWTVoFSbTnPFwdkLR23WYJDqelcrTfiDnMUsGBmRuW1Tm/VA Rmd5i9qF7RPq9+1EoMeOncC5qJE8CZAwbwaKyyzh2VcwqmE4Mwkqn0nLhlBqN/NuqQzu orKowqXsRb4CU9A/OmL8NwS0saB7Mj4bgHj9B49XWfphTFwcRNlcYqqLRzRGV2rcS5NY e5vNgMiALOm6dYoY42POl763EeKZ+pqJsGmxTtX8/9IwQFGbVPSeibZ9wzNvpDQ3OkyH RTef/YOsBmosHFMjccKPwq+gKTwS3Q2f9LE9DTMBNccS9uTq0cBa/feYlp9ZgrwQSXPd 8Pvg== Received: by 10.216.195.229 with SMTP id p79mr12594284wen.109.1346834186251; Wed, 05 Sep 2012 01:36:26 -0700 (PDT) Received: from lappy.capriciverd.com (20.Red-80-59-140.staticIP.rima-tde.net. [80.59.140.20]) by mx.google.com with ESMTPS id q4sm27971068wix.9.2012.09.05.01.36.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Sep 2012 01:36:25 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: asias.hejun@gmail.com, mingo@elte.hu, gorcunov@openvz.org, kvm@vger.kernel.org, Sasha Levin Subject: [PATCH 26/33] kvm tools: ioport arch init Date: Wed, 5 Sep 2012 10:32:00 +0200 Message-Id: <1346833927-15740-27-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1346833927-15740-1-git-send-email-levinsasha928@gmail.com> References: <1346833927-15740-1-git-send-email-levinsasha928@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Move ioport arch init into ioport init, which is the logical place for that instead of a random place in the global init code. Signed-off-by: Sasha Levin --- tools/kvm/builtin-run.c | 2 -- tools/kvm/ioport.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index ba1cf41..66bba44 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -747,8 +747,6 @@ static int kvm_cmd_run_init(int argc, const char **argv) if (r < 0) pr_debug("symbol_init() failed with error %d\n", r); - ioport__setup_arch(); - r = rtc__init(kvm); if (r < 0) { pr_err("rtc__init() failed with error %d\n", r); diff --git a/tools/kvm/ioport.c b/tools/kvm/ioport.c index 2208c15..f5fb246 100644 --- a/tools/kvm/ioport.c +++ b/tools/kvm/ioport.c @@ -184,6 +184,8 @@ error: int ioport__init(struct kvm *kvm) { + ioport__setup_arch(); + return 0; }