From patchwork Mon Dec 3 22:08:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 203487 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 209252C008A for ; Tue, 4 Dec 2012 10:15:40 +1100 (EST) Received: from localhost ([::1]:48236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeJG-0008Qo-Vu for incoming@patchwork.ozlabs.org; Mon, 03 Dec 2012 17:16:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIT-0006oz-0P for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:15:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfeIR-000311-T9 for qemu-devel@nongnu.org; Mon, 03 Dec 2012 17:15:28 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:43922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfeIP-0002tM-JA; Mon, 03 Dec 2012 17:15:25 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so4875430iej.4 for ; Mon, 03 Dec 2012 14:15:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=NrjuehaMTFSIxNLWIcU08EiFcnLJkbAR/nctXFnGkK0=; b=a7a05jARIqHxMpKk1ZQsptRr1cBIict48YviSIAFPd3TCA4d3AqJuaIaHBhinJgrl1 g5Ppah+FlNmzbD5+uW75AmIoUiYMzmen58kuSkmMGS4Fjd/MWE1kYOx4mhg+feewcgPM rV0HayuZbOGC0lbMVAqKJddE84RPKXK1RklNyQRL4gGUXx4Kq7ykPlmeqXjBWPMHK06H 5lu585ZSGhlWz2Nn25x3BDPTVgX7UWN0D3eBMMLch7NCvED8PJJxmc89v1Q761V1SVty DSmM1Fey0HLNEWo1K9MTvHY26PKr004+XXYlK4M65iEXQuw0uIO5Jam+35F73xwWzpo/ APLA== Received: by 10.42.74.73 with SMTP id v9mr9150169icj.37.1354572925255; Mon, 03 Dec 2012 14:15:25 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id 10sm8173436ign.5.2012.12.03.14.15.24 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Dec 2012 14:15:24 -0800 (PST) From: Michael Roth To: qemu-stable@nongnu.org Date: Mon, 3 Dec 2012 16:08:37 -0600 Message-Id: <1354572547-21271-14-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1354572547-21271-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 13/43] s390x: fix -initrd in virtio machine 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: Alexander Graf When using -initrd in the virtio machine, we need to indicate the initrd start and size inside the kernel image. These parameters need to be stored in native endianness. Signed-off-by: Alexander Graf Acked-by: Richard Henderson Acked-by: Christian Borntraeger (cherry picked from commit 235a3f0bed3584fe65079ffa07c7a842971f261e) Signed-off-by: Michael Roth --- hw/s390-virtio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 47eed35..12ae612 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -284,8 +284,8 @@ static void s390_init(ram_addr_t my_ram_size, } /* we have to overwrite values in the kernel image, which are "rom" */ - memcpy(rom_ptr(INITRD_PARM_START), &initrd_offset, 8); - memcpy(rom_ptr(INITRD_PARM_SIZE), &initrd_size, 8); + stq_p(rom_ptr(INITRD_PARM_START), initrd_offset); + stq_p(rom_ptr(INITRD_PARM_SIZE), initrd_size); } if (rom_ptr(KERN_PARM_AREA)) {