From patchwork Wed Apr 29 21:20:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 20835 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 n3TLLj83009941 for ; Wed, 29 Apr 2009 21:21:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760199AbZD2VVk (ORCPT ); Wed, 29 Apr 2009 17:21:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758250AbZD2VVj (ORCPT ); Wed, 29 Apr 2009 17:21:39 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:54644 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242AbZD2VVh (ORCPT ); Wed, 29 Apr 2009 17:21:37 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e6.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n3TLNd2V009032 for ; Wed, 29 Apr 2009 17:23:39 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n3TLLbce125618 for ; Wed, 29 Apr 2009 17:21:37 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n3TLLawF003142 for ; Wed, 29 Apr 2009 17:21:37 -0400 Received: from localhost.localdomain (sig-9-65-58-151.mts.ibm.com [9.65.58.151]) by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n3TLKdgW031204; Wed, 29 Apr 2009 17:21:35 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Anthony Liguori , Avi Kivity Subject: [PATCH 21/21] Leave upstream QEMU comments intact Date: Wed, 29 Apr 2009 16:20:38 -0500 Message-Id: <1241040038-17183-22-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> References: <1241040038-17183-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Anthony Liguori --- vl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index a38379b..3d6ebd9 100644 --- a/vl.c +++ b/vl.c @@ -5483,10 +5483,10 @@ int main(int argc, char **argv, char **envp) if (bt_parse(bt_opts[i])) exit(1); + /* init the memory */ if (ram_size == 0) ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; - /* init the memory */ if (kvm_enabled()) { if (kvm_qemu_create_context() < 0) { fprintf(stderr, "Could not create KVM context\n");