From patchwork Mon Oct 19 15:17:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 55237 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 0CE7622F11 for ; Mon, 19 Oct 2015 15:25:44 +0000 (UTC) Received: by wibhd5 with SMTP id hd5sf1025510wib.0 for ; Mon, 19 Oct 2015 08:25:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=lZx2NkkTtHaT/fWRxnJEBlvNIWLrrWeI60vukUcO/9g=; b=HvzbGVRwPs8GmzREOi13cCgxBf8S7Jd1Efiq/riPz+tzCz+UV+pYWXVJHRY9xtsiSj CsuL43tKs8ys5kgf4raI4Z8Y4Zs/xsmWDG1pBwB9F59HtHEuBp2dNKzfCLxtLlqUJqbP aD2HAS0VcaW38qr4hPmY99OQtgpqhidOqABpu7YGbb8T9gkNFOKVATdfQcAvwHm0Eo8O xNJDhrkyctHrVtDarVZWviIrCchLbbbWw01gyl14BnWIHsU04JX40AjxZ7M7YHJwwSx3 JZAa2Ob+9qf35QS0bPSwAZwE1a6sM92/2DoOGqAxxg3d4zNMCnVANbuIiOuOS1Fwh5jW mogA== X-Gm-Message-State: ALoCoQkWrTYUHmCHd5S/Yb32lZdOXQJJMPjH2vEVmM6WehFSa0UXAiWUKOOua/N6114z1OT7wlw8 X-Received: by 10.112.63.165 with SMTP id h5mr6970859lbs.18.1445268343049; Mon, 19 Oct 2015 08:25:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.40.133 with SMTP id o127ls532136lfo.38.gmail; Mon, 19 Oct 2015 08:25:42 -0700 (PDT) X-Received: by 10.112.78.100 with SMTP id a4mr14977525lbx.115.1445268342860; Mon, 19 Oct 2015 08:25:42 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id g5si23257475lbs.7.2015.10.19.08.25.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 08:25:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbes7 with SMTP id es7so57082308lbb.2 for ; Mon, 19 Oct 2015 08:25:42 -0700 (PDT) X-Received: by 10.112.168.228 with SMTP id zz4mr15236558lbb.73.1445268342585; Mon, 19 Oct 2015 08:25:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1537576lbq; Mon, 19 Oct 2015 08:25:41 -0700 (PDT) X-Received: by 10.55.221.139 with SMTP id u11mr36474479qku.50.1445268341627; Mon, 19 Oct 2015 08:25:41 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t92si30559611qgt.101.2015.10.19.08.25.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 19 Oct 2015 08:25:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:40163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoCJh-0001h6-3j for patch@linaro.org; Mon, 19 Oct 2015 11:25:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoCBa-0007f4-TH for qemu-devel@nongnu.org; Mon, 19 Oct 2015 11:17:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoCBY-0004qN-4d for qemu-devel@nongnu.org; Mon, 19 Oct 2015 11:17:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoCBX-0004q2-Th for qemu-devel@nongnu.org; Mon, 19 Oct 2015 11:17:16 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id C800E2E1214; Mon, 19 Oct 2015 15:17:14 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-143.phx2.redhat.com [10.3.113.143]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9JFHDdQ008765; Mon, 19 Oct 2015 11:17:13 -0400 References: <1445246284-21137-1-git-send-email-kraxel@redhat.com> To: =?UTF-8?Q?Marc_Mar=c3=ad?= From: Laszlo Ersek Message-ID: <56250978.3090606@redhat.com> Date: Mon, 19 Oct 2015 17:17:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Gerd Hoffmann , QEMU Developers Subject: Re: [Qemu-devel] [PULL 0/7] fw_cfg: add dma interface, add strings via cmdline. 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On 10/19/15 13:12, Peter Maydell wrote: > On 19 October 2015 at 10:17, Gerd Hoffmann wrote: >> Hi, >> >> As promised last week I've picked up the fw_cfg patches which are ready >> to go, so here comes the pull request for them. Headline feature is >> the fw_cfg dam support fo course, enabled for arm and x86. Also small >> fixes and an option to add string fw_cfg entries via command line. >> >> please pull, >> Gerd >> >> The following changes since commit 40fe17bea478793fc9106a630fa3610dad51f939: >> >> hw/ide/ahci.c: Fix shift left into sign bit (2015-10-18 11:00:40 +0100) >> >> are available in the git repository at: >> >> git://git.kraxel.org/qemu tags/pull-fw_cfg-20151019-1 >> >> for you to fetch changes up to 7b0eec285d447057405df73beae78c8e8aeb9793: >> >> fw_cfg: Define a static signature to be returned on DMA port reads (2015-10-19 11:00:50 +0200) >> >> ---------------------------------------------------------------- >> fw_cfg: add dma interface, add strings via cmdline. >> >> ---------------------------------------------------------------- > > Hi. I'm afraid this fails 'make check': > > TEST: tests/fw_cfg-test... (pid=17533) > /i386/fw_cfg/signature: OK > /i386/fw_cfg/id: ** > ERROR:/home/petmay01/qemu/tests/fw_cfg-test.c:40:test_fw_cfg_id: > assertion failed (qfw_cfg_get_u32(fw_cfg, FW_CFG_ID) == 1): (3 == 1) > FAIL > > (same failure on 64-bit ARM, ppc64be, OSX, 32-bit ARM). Heh, tests. We have tests to keep fixing them. :) Marc, can you add a hunk to patch "Implement fw_cfg DMA interface" that changes the above test to mask out everything but bit 0? I don't think we need to test DMA in the test suite right now (can be done in another series I guess), but DMA's presence shouldn't break the current test. I guess something like this would suffice: (Sorry if this has been suggested already, trying to catch up with my mailbox...) Thanks Laszlo > > Windows fails to compile: > /home/petmay01/linaro/qemu-for-merges/hw/nvram/fw_cfg.c: In function > ‘fw_cfg_dma_mem_read’: > /home/petmay01/linaro/qemu-for-merges/hw/nvram/fw_cfg.c:406: warning: > integer constant is too large for ‘long’ type > > thanks > -- PMM > diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 9be78e9..27f115d 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -37,7 +37,7 @@ static void test_fw_cfg_signature(void) static void test_fw_cfg_id(void) { - g_assert_cmpint(qfw_cfg_get_u32(fw_cfg, FW_CFG_ID), ==, 1); + g_assert_cmpint(qfw_cfg_get_u32(fw_cfg, FW_CFG_ID) & 1, ==, 1); } static void test_fw_cfg_uuid(void)