From patchwork Mon Nov 26 19:17:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 202013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 066762C0085 for ; Tue, 27 Nov 2012 06:18:05 +1100 (EST) Received: from localhost ([::1]:60760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td4Bu-0003Re-Ul for incoming@patchwork.ozlabs.org; Mon, 26 Nov 2012 14:18:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:48074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td4Bg-0003P7-PR for qemu-devel@nongnu.org; Mon, 26 Nov 2012 14:17:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Td4Be-0001Cm-La for qemu-devel@nongnu.org; Mon, 26 Nov 2012 14:17:48 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36820 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td4Be-0001Ca-FZ for qemu-devel@nongnu.org; Mon, 26 Nov 2012 14:17:46 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id C3E62A43B9; Mon, 26 Nov 2012 20:17:45 +0100 (CET) From: Alexander Graf To: "qemu-devel@nongnu.org qemu-devel" Date: Mon, 26 Nov 2012 20:17:41 +0100 Message-Id: <1353957462-27603-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1353957462-27603-1-git-send-email-agraf@suse.de> References: <1353957462-27603-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Blue Swirl , Christian Borntraeger , Heinz Graalfs , Aurelien Jarno Subject: [Qemu-devel] [PATCH 1/2] s390: Fix ram_size updating in machine init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Heinz Graalfs The global variable 'ram_size' is hidden by the local variable declaration in s390_init(). Since we want to update the global ram size in certain cases we must not use a local ram_size variable. - This fixes booting with unusual ram sizes like -m 67001 - This changes behaviour back to the situation before commit 5f072e1f3075bd869e0ace9f2545a85992ac0084 (create struct for machine initialization arguments) Signed-off-by: Heinz Graalfs Reviewed-by: Eduardo Habkost Signed-off-by: Christian Borntraeger Signed-off-by: Alexander Graf --- hw/s390-virtio.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 685cb54..ca1bb09 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -155,7 +155,6 @@ unsigned s390_del_running_cpu(CPUS390XState *env) static void s390_init(QEMUMachineInitArgs *args) { ram_addr_t my_ram_size = args->ram_size; - ram_addr_t ram_size = args->ram_size; const char *cpu_model = args->cpu_model; const char *kernel_filename = args->kernel_filename; const char *kernel_cmdline = args->kernel_cmdline;