From patchwork Fri Jan 31 06:08:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 11359109 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 373C2921 for ; Fri, 31 Jan 2020 06:10:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0DC702082E for ; Fri, 31 Jan 2020 06:10:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="ikYEIpBq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DC702082E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixPVh-00006E-2i for patchwork-qemu-devel@patchwork.kernel.org; Fri, 31 Jan 2020 01:10:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59032) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixPUo-0006ag-6n for qemu-devel@nongnu.org; Fri, 31 Jan 2020 01:09:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixPUn-0000Iy-4z for qemu-devel@nongnu.org; Fri, 31 Jan 2020 01:09:37 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:52549 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixPUm-0008UT-6B; Fri, 31 Jan 2020 01:09:37 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4886Hr4mb5z9sNx; Fri, 31 Jan 2020 17:09:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1580450968; bh=Frx/1gy1/jdn+qDHBx3fnX2Xc/u691yGCivwHhSlhxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ikYEIpBqZig/hbRNMevfhO2ISKbe387ZMiJfPLypKS2ZK+IqbFQi0u1duLM0G1ATJ p9eW6YjtrAEfyowwM8KhER9tGZoarOTZrChGQZJ8Mf/yLEI1gBRbMgNVRXuC719ku0 UewX4PRhuFQe0vdy2qRIl95XdAcssmuUfF/ulfNA= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 01/34] ppc/pnv: use QEMU unit definition MiB Date: Fri, 31 Jan 2020 17:08:51 +1100 Message-Id: <20200131060924.147449-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131060924.147449-1-david@gibson.dropbear.id.au> References: <20200131060924.147449-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Cédric Le Goater Signed-off-by: Cédric Le Goater Message-Id: <20200108090348.21224-2-clg@kaod.org> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: David Gibson --- hw/ppc/pnv_pnor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c index f761d8dc26..060c6e6a31 100644 --- a/hw/ppc/pnv_pnor.c +++ b/hw/ppc/pnv_pnor.c @@ -11,6 +11,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/units.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/loader.h" @@ -111,7 +112,7 @@ static void pnv_pnor_realize(DeviceState *dev, Error **errp) } static Property pnv_pnor_properties[] = { - DEFINE_PROP_INT64("size", PnvPnor, size, 128 << 20), + DEFINE_PROP_INT64("size", PnvPnor, size, 128 * MiB), DEFINE_PROP_DRIVE("drive", PnvPnor, blk), DEFINE_PROP_END_OF_LIST(), };