From patchwork Mon Jul 20 23:10:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 36422 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6KNARA6021865 for ; Mon, 20 Jul 2009 23:10:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753177AbZGTXK1 (ORCPT ); Mon, 20 Jul 2009 19:10:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754323AbZGTXKZ (ORCPT ); Mon, 20 Jul 2009 19:10:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53380 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753177AbZGTXKT (ORCPT ); Mon, 20 Jul 2009 19:10:19 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6KNAJKD029399 for ; Mon, 20 Jul 2009 19:10:19 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6KNAImf002970; Mon, 20 Jul 2009 19:10:18 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6KNAGkh028980; Mon, 20 Jul 2009 19:10:18 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH 4/9] use qemu version of kvm initialization Date: Mon, 20 Jul 2009 19:10:11 -0400 Message-Id: <1248131416-11272-5-git-send-email-glommer@redhat.com> In-Reply-To: <1248131416-11272-4-git-send-email-glommer@redhat.com> References: <1248131416-11272-1-git-send-email-glommer@redhat.com> <1248131416-11272-2-git-send-email-glommer@redhat.com> <1248131416-11272-3-git-send-email-glommer@redhat.com> <1248131416-11272-4-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Our code now looks like qemu's a lot. Remove ours, and leave just qemu's. Signed-off-by: Glauber Costa --- vl.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/vl.c b/vl.c index 86a6d70..ae9e0b4 100644 --- a/vl.c +++ b/vl.c @@ -5935,7 +5935,6 @@ int main(int argc, char **argv, char **envp) } } -#ifdef KVM_UPSTREAM if (kvm_enabled()) { int ret; @@ -5945,16 +5944,6 @@ int main(int argc, char **argv, char **envp) exit(1); } } -#endif - -#ifdef CONFIG_KVM - if (kvm_enabled()) { - if (kvm_init(smp_cpus) < 0) { - fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); - exit(1); - } - } -#endif if (monitor_device) { monitor_hd = qemu_chr_open("monitor", monitor_device, NULL);