From patchwork Sat Jun 30 06:09:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hTmmWwwz"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HjwY39t2z9s1B for ; Sat, 30 Jun 2018 16:17:15 +1000 (AEST) Received: from localhost ([::1]:45696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9C4-0000xD-Ob for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:17:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95t-0003yJ-KS for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95o-0001cU-Uy for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:49 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:55236) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95o-0001bV-Mo for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:44 -0400 Received: by mail-wm0-x235.google.com with SMTP id i139-v6so4085130wmf.4 for ; Fri, 29 Jun 2018 23:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tx1tiV+3OJWMuc2iLZHcW5Gg4tsz2NNHw88L4AhFUL0=; b=hTmmWwwzYdxuXPM5sChqqxuqRkwPTurx3U3jmFgfbi3e276aHXb9//3Wfk0nB/vlDX PmTVO0ZnX2/vOZLK91speZsjneqA8a+rwd0Kyzraiu4ZI2hVSrpDHQPIdVBeDBoRyVTf mTqx7BBxor/Jl5kvRm6Go/HtwcD4xxJvWB0OmF3uBXp9844n7QI6q64u9lmjGb2Keq/u DDeIGePgecIiVDoTpmxtmMlCJP9gokiZxjP67T5CELXT8Qhz9sGixNndpNoAZ/7uEMay 7RzlXsRIaKfK9We1dW3yBoALJ5g58TWIWLPV+dlyhMF9drz6BUOXlSq2uHlEGfke4YC7 UrQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tx1tiV+3OJWMuc2iLZHcW5Gg4tsz2NNHw88L4AhFUL0=; b=iuZEHuAniNaaRfh4Xdfa7hlv8/osgMVEvd4EYYYuD5eOJvuvLINSsN74rsQF+73njd R7uKUkT/+aydlC+YVZ8xdsAEY2wqc7IQcsLYjBfcc1f2NjXJ3ndjJTG3yjR3NbzM69tQ iMXtg/bbE8bSMg/jyHIxcjaXntK58s5SBPkPMU+bVCv+pvcgpZoo6Ae6gcCSLxXJb9/c YAwlM9nau3aoYJr5kAlB4yOrNBHffFTHLTwK5GNaSBAmOdG1tlXWepAcSrbUv7s+V2Zx LWVuvmwNYHx5wV6rm/7kM1HkcCm7XRk1hAq9/4w8X0ty/Y4CTAgIL9Ba8MFLscZoQGAx x56Q== X-Gm-Message-State: APt69E0kD356w1ZEyLb8edMkpkrfyNDK9aWiW3ZwBUqR/DtKCiKdIcOH mN/o1t0nTRuYZLjKfUFon3MUICpL X-Google-Smtp-Source: AAOMgpc+UcJaNg2zs67CaboOKLui/3LBrxUe8aLAK/rUuCuY4KrDVrGxGgB1HLXovCXPMOtdJS9EJg== X-Received: by 2002:a1c:c241:: with SMTP id s62-v6mr3669491wmf.146.1530339043466; Fri, 29 Jun 2018 23:10:43 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:09:54 +0200 Message-Id: <20180630061040.6018-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PULL 01/47] i386/kvm: add support for Hyper-V TLB flush X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vitaly Kuznetsov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Vitaly Kuznetsov Add support for Hyper-V TLB flush which recently got added to KVM. Just like regular Hyper-V we announce HV_EX_PROCESSOR_MASKS_RECOMMENDED regardless of how many vCPUs we have. Windows is 'smart' and uses less expensive non-EX Hypercall whenever possible (when it wants to flush TLB for all vCPUs or the maximum vCPU index in the vCPU set requires flushing is less than 64). Signed-off-by: Vitaly Kuznetsov Message-Id: <20180610184927.19309-1-vkuznets@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 1 + target/i386/cpu.h | 1 + target/i386/hyperv-proto.h | 1 + target/i386/kvm.c | 15 ++++++++++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1e6a7d0..d57f310 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5415,6 +5415,7 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("hv-stimer", X86CPU, hyperv_stimer, false), DEFINE_PROP_BOOL("hv-frequencies", X86CPU, hyperv_frequencies, false), DEFINE_PROP_BOOL("hv-reenlightenment", X86CPU, hyperv_reenlightenment, false), + DEFINE_PROP_BOOL("hv-tlbflush", X86CPU, hyperv_tlbflush, false), DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8eaefee..8b1ddfe 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1367,6 +1367,7 @@ struct X86CPU { bool hyperv_stimer; bool hyperv_frequencies; bool hyperv_reenlightenment; + bool hyperv_tlbflush; bool check_cpuid; bool enforce_cpuid; bool expose_kvm; diff --git a/target/i386/hyperv-proto.h b/target/i386/hyperv-proto.h index 93352eb..d6d5a79 100644 --- a/target/i386/hyperv-proto.h +++ b/target/i386/hyperv-proto.h @@ -58,6 +58,7 @@ #define HV_APIC_ACCESS_RECOMMENDED (1u << 3) #define HV_SYSTEM_RESET_RECOMMENDED (1u << 4) #define HV_RELAXED_TIMING_RECOMMENDED (1u << 5) +#define HV_EX_PROCESSOR_MASKS_RECOMMENDED (1u << 11) /* * Basic virtualized MSRs diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 032f0ad..ebb2d23 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -601,7 +601,8 @@ static bool hyperv_enabled(X86CPU *cpu) cpu->hyperv_runtime || cpu->hyperv_synic || cpu->hyperv_stimer || - cpu->hyperv_reenlightenment); + cpu->hyperv_reenlightenment || + cpu->hyperv_tlbflush); } static int kvm_arch_set_tsc_khz(CPUState *cs) @@ -839,6 +840,18 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cpu->hyperv_vapic) { c->eax |= HV_APIC_ACCESS_RECOMMENDED; } + if (cpu->hyperv_tlbflush) { + if (kvm_check_extension(cs->kvm_state, + KVM_CAP_HYPERV_TLBFLUSH) <= 0) { + fprintf(stderr, "Hyper-V TLB flush support " + "(requested by 'hv-tlbflush' cpu flag) " + " is not supported by kernel\n"); + return -ENOSYS; + } + c->eax |= HV_REMOTE_TLB_FLUSH_RECOMMENDED; + c->eax |= HV_EX_PROCESSOR_MASKS_RECOMMENDED; + } + c->ebx = cpu->hyperv_spinlock_attempts; c = &cpuid_data.entries[cpuid_i++]; From patchwork Sat Jun 30 06:09:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ChWxa9KF"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjp01kQLz9s1B for ; Sat, 30 Jun 2018 16:11:34 +1000 (AEST) Received: from localhost ([::1]:45668 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96a-0003zI-3H for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95t-0003yK-KU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95q-0001dH-0j for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:49 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:32913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95p-0001cg-Pn for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:45 -0400 Received: by mail-wr0-x233.google.com with SMTP id k7-v6so7155239wrq.0 for ; Fri, 29 Jun 2018 23:10:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=coHajTCOCs23/c7nuCpHVys0kHiQe1h4+kDa2qCsFXU=; b=ChWxa9KF8XcQVWCWzAuDQucnRA8ySlPv8ss2Bsugy8bG6kqeS5nwmZywowZUDcdoYB GO2O7mJ8FzSqmdq7w/x/Fi97xhrvXaFPWqyxlH6KDUjKPVx/C/oxSguRBh9U7DX3wflR Fzl+++CQTJ3QikZQ5c8q7YNrKhIAd6gmFPd+8LDxYK1Fx5cdwk3ttsRmZ5vkea96o4Yh g5n92qWL/TFLzsphkxk/JRWUDvWr9455Xxz0lPPA/YEeoBTzjlvIEbjzMbQ9jZM67v3B drYW2koTy5Xf8IoyJWnkVJzC3iomlW8oYchX/pCGPYthL10rVS5aOXDKNVZoT4Izw+A/ VyOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=coHajTCOCs23/c7nuCpHVys0kHiQe1h4+kDa2qCsFXU=; b=aFDsIRqDgldpXeswpYKZkMH4KGX3rV65NBHEdLGTDXW4AMGU4JZ4+chfQE3sEVXIEG r6gdSZeyX3AB5AHEYyAQu5k62MqaCN5Ayg9aWCZCjg+DshXV33Q5wTWaY904cLbebypc EffVGUjMwn/XCugMn2Kpo/MhWnoHSOYD5Keodk+2k8M88Bh+HCXzkrSQZVh5DRtLfMMu ufJYkfeSzninZOT9SeSF9rN+p30XtNtlZ3cMMmKANfYdl6IlxQpDQH6GtYO3IKHHjTFI bfWK6bczQqEFmtBAik8OOpMORjr6O5ddsgboBYgQ/PgszEkGw2xXqkUPr9ZdlBvfQ8g7 lj3g== X-Gm-Message-State: APt69E1gOroRyGbEDVaUWV4WcmIQW4+YwlE0hhwjGMaTAJojehjrbGI0 tHixrn5IZNoDPoVMs7bHPXqkQSOq X-Google-Smtp-Source: AAOMgpchcgV37XY0MZ8O/fINGL3WKhd5kG+PSqx2qRwazqHhsyb/pDiTo1EID0pEve9WNB1hseN5MA== X-Received: by 2002:adf:8345:: with SMTP id 63-v6mr14439725wrd.37.1530339044579; Fri, 29 Jun 2018 23:10:44 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:09:55 +0200 Message-Id: <20180630061040.6018-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::233 Subject: [Qemu-devel] [PULL 02/47] configure: add sanity check to catch builds from "git archive" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: Daniel P. Berrangé The "git archive" feature creates tarballs which are missing all submodule content. GitHub unhelpfully provides users with "Download" links that claim to give them valid source release tarballs. These GitHub archives will not be buildable as they are created by the "git archive" feature and so are missing content. The user gets unhelpful messages from make such as: fatal error: ui/input-keymap-atset1-to-qcode.c: No such file or directory By adding a sanity check we can give users an informative message about what they've done wrong. Signed-off-by: Daniel P. Berrangé Message-Id: <20180418171151.5263-1-berrange@redhat.com> Reviewed-by: Cornelia Huck Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- configure | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure b/configure index ca7de4f..4b489fe 100755 --- a/configure +++ b/configure @@ -300,6 +300,24 @@ then else git_update=no git_submodules="" + + if ! test -f "$source_path/ui/keycodemapdb/README" + then + echo + echo "ERROR: missing file $source_path/ui/keycodemapdb/README" + echo + echo "This is not a GIT checkout but module content appears to" + echo "be missing. Do not use 'git archive' or GitHub download links" + echo "to acquire QEMU source archives. Non-GIT builds are only" + echo "supported with source archives linked from:" + echo + echo " https://www.qemu.org/download/" + echo + echo "Developers working with GIT can use scripts/archive-source.sh" + echo "if they need to create valid source archives." + echo + exit 1 + fi fi git="git" From patchwork Sat Jun 30 06:09:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GnRtJYcV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjp01kRSz9s29 for ; Sat, 30 Jun 2018 16:11:34 +1000 (AEST) Received: from localhost ([::1]:45667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96Z-0003ym-GB for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:11:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95t-0003yL-Kg for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95q-0001dy-SS for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:49 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:42114) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95q-0001dF-LE for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:46 -0400 Received: by mail-wr0-x22f.google.com with SMTP id p1-v6so10653404wrs.9 for ; Fri, 29 Jun 2018 23:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UAOgnF3CHVSY0dh67txUBvv0jEAHDsCZhi+c1EG0wQs=; b=GnRtJYcVxgwFFmEZnj+CT4yg/yaZgfZLD6XxhkAGbCWdX4vff4ABMlunxnqym2IHXH 5+HFJl3FbuNoBsGnivmlnp7AE3F302pn3ZPhf+5gZMedUFi8TyhpteqyJTf4rtRhCnxx Syh8mA+LTv7J+i4/DtPqq7ASZ3GqPA3NY2njcRX3C/x4sBbGrWJ7n91f5q5P4i68X8EN 6Owl3kS333Jo77c4vY8v+OqgwBNi6w9B+/eGBlU3AiSNRCfn0TiWNPMDD4HJiMF2IxpN 8CLqbuAP7hMvP/8PukGRWjaf4ffiP8ExItFM+0eIXB26+VS4TGSM59ZognzFlTG9N8da DPVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UAOgnF3CHVSY0dh67txUBvv0jEAHDsCZhi+c1EG0wQs=; b=oWS8zSDH5lputRGklGJm5fgB6daEwzvfvTJvJhoPwq25unllJXbrTPt0Abdl8ffqTY CLTJHAfyPIQ+s2lr3OHUAmYvVedzWgtxtAQzvaK6kQDsB2X2VqI6DD7SkR8n2A6b4O/U HaKtnjQHQK3bbxRH1A4xBo0G1nYeu3Dlc2BIvk3U59+qAZExaP2SizDvQjibg+UkJm5I W3yKEeB4thhuS4NzuUOf3s/ozZWfwJv/AoV34jTSqwghCjGiXiI4SNtXVB1bD5ESmTr9 +xs+6D5K6UTzZthOv67x/IZZOxBXQc/LiMJboSNJmbSnHlQTCsUeob1sfow/DbL3OIx4 BdAA== X-Gm-Message-State: APt69E3lbEeJAsTRYJR5oyaare3IhvggdyfwM6II9r4nAIqhegUfQwCm 8+ybJi3Hg2I1NcP0qlr+44ZHZZ4l X-Google-Smtp-Source: AAOMgpfdRUpZPeYO3WpR/GvGM2dtl6IJI5u8C55yYrRxb54EFNlhZL2CBxFNLjcVw7zV846s+LVcug== X-Received: by 2002:adf:ab14:: with SMTP id q20-v6mr3155378wrc.239.1530339045452; Fri, 29 Jun 2018 23:10:45 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:09:56 +0200 Message-Id: <20180630061040.6018-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PULL 03/47] include: Add IEC binary prefixes in "qemu/units.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Loosely based on 076b35b5a56. Suggested-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-2-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- include/qemu/units.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 include/qemu/units.h diff --git a/include/qemu/units.h b/include/qemu/units.h new file mode 100644 index 0000000..692db3f --- /dev/null +++ b/include/qemu/units.h @@ -0,0 +1,20 @@ +/* + * IEC binary prefixes definitions + * + * Copyright (C) 2015 Nikunj A Dadhania, IBM Corporation + * Copyright (C) 2018 Philippe Mathieu-Daudé + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_UNITS_H +#define QEMU_UNITS_H + +#define KiB (INT64_C(1) << 10) +#define MiB (INT64_C(1) << 20) +#define GiB (INT64_C(1) << 30) +#define TiB (INT64_C(1) << 40) +#define PiB (INT64_C(1) << 50) +#define EiB (INT64_C(1) << 60) + +#endif From patchwork Sat Jun 30 06:09:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qnh8SVSY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjs61kPhz9s1B for ; Sat, 30 Jun 2018 16:14:18 +1000 (AEST) Received: from localhost ([::1]:45678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ99D-0006R1-OR for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:14:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95t-0003yI-KF for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95r-0001ek-Q0 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:49 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33544) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95r-0001e7-J0 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:47 -0400 Received: by mail-wm0-x244.google.com with SMTP id z6-v6so3516657wma.0 for ; Fri, 29 Jun 2018 23:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G8ufWk35s1tRLTTAXkQJ4Zg57uMlmDzF8ei6TX2yzC0=; b=qnh8SVSYdYrAq8zHztMjBqU5XXt73y4rLkrGLt++S6E/6hGcqlHawleqGDhSQGRp0S 61MJEBnWXLyC9xt1MQR2L6DVfPOkatJQep/geEBLooOxZ4goALqGB3H79StMge7AEVSL Teop+1/mWWpySPPQZV+CxiSIKEBi/+N0sTjCoaKgfaA55Kji1JcGDHfHPszZ1qqAkak5 rcDUrgMyZztfpWvYESSZpIW8GhF4O4KoABRK5bxWhuKaJM007YsE+HFohRGTiBhFdrFc 3yE/duORqQUgSDX/AmWVdvd/DUpqGQEbDt7x6dzKgm4qXeSuEIFdatfEgYExHeUXulOx RZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=G8ufWk35s1tRLTTAXkQJ4Zg57uMlmDzF8ei6TX2yzC0=; b=YRa6QyeDlEZErSYxaevTGousUf+Vf46awc++kTXbxUDHQsfwgdPQig2aSQb/aLMAfh mQM3cN9e3NGvW0a6wDABT1OH8D3ngkCT0sr/M+FlpbIcOPkxliCJk1Ta9O+G329cZknf JhPXnNtOBUyJwQalJxV9JK6UbjjbLkUkhQC6s0wcnLifKHV0KTFQD26KRc20eAbCGre7 0YU5CHa8MB/UIgYYC63t3aHuA+xjkKt4nfR81s+/XI+87z1FrHAv4WPv8edtRwVugBkc B1ZqGhgGFfl6321JQS+92lUf+j6DryahIXWzb4CE9m7qVCRB/CIG+8zAImYAbhJc/mKu q7dA== X-Gm-Message-State: APt69E3YXIvPUlsnwaEJyMxTiVTOziwMhDbByvDINfbjPcKiwNaFbKJg /z05ASQqGFNE+Ojj+X2bU0/UFF+g X-Google-Smtp-Source: AAOMgpcF2cmXTfO5nAEVHSi5EnUMVf0xIbm3wmi4uy1kwxlKBGeICg/svfue2JwvPpQFqvTnSaiyRA== X-Received: by 2002:a1c:d92:: with SMTP id 140-v6mr3360890wmn.32.1530339046389; Fri, 29 Jun 2018 23:10:46 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:09:57 +0200 Message-Id: <20180630061040.6018-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 04/47] vdi: Use definitions from "qemu/units.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil Message-Id: <20180625124238.25339-3-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- block/vdi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 1d8ed67..6555cff 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -50,6 +50,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h" @@ -83,9 +84,6 @@ /* Command line option for static images. */ #define BLOCK_OPT_STATIC "static" -#define KiB 1024 -#define MiB (KiB * KiB) - #define SECTOR_SIZE 512 #define DEFAULT_CLUSTER_SIZE (1 * MiB) @@ -434,7 +432,8 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } else if (header.block_size != DEFAULT_CLUSTER_SIZE) { error_setg(errp, "unsupported VDI image (block size %" PRIu32 - " is not %u)", header.block_size, DEFAULT_CLUSTER_SIZE); + " is not %" PRIu64 ")", + header.block_size, DEFAULT_CLUSTER_SIZE); ret = -ENOTSUP; goto fail; } else if (header.disk_size > From patchwork Sat Jun 30 06:09:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dI+5UjTd"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjs83FTVz9s29 for ; Sat, 30 Jun 2018 16:14:20 +1000 (AEST) Received: from localhost ([::1]:45679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ99F-0006S6-Fc for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:14:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95u-0003yM-2X for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95s-0001fm-N1 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:49 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:39759) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95s-0001eo-Ef for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:48 -0400 Received: by mail-wr0-x241.google.com with SMTP id b8-v6so10640013wro.6 for ; Fri, 29 Jun 2018 23:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fEP1tsduHKAjeevzyItEKMUS4tf76oGcJy6Ga2WV3Vs=; b=dI+5UjTdT0Klj8dLKSjzCIEwlEjDAs1JhCASZul7d2BRPKPGqIFgG5i9RBIct1pJqz g7ONTPie39i9/aG6fE0QDutQcwioI3xNYbp5pw1yL0o8wvDhIW6pngkzPD1pgerFn0KS 2nuYxdZeRab4T7htMIZtARPNeIdTZmXdgNEk5/70sHVIIV2V2NReMh0R58ug4EqhuWgq oADS47ax0kK5qHiMRsAr3Kn1/52J7iBv0L9ZcEeIf/BB54+2rB5s3Se70N1iDQ3DB47G 7Hmencux3iQ46QQh3z1oebpr4m0hLkfZFsaw3imYg0qrYHO7aMPqB8PivuJqm64ktas0 BRWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fEP1tsduHKAjeevzyItEKMUS4tf76oGcJy6Ga2WV3Vs=; b=qqwlZDs6fGM+qgYSgy5tiQxVZ7PYXfEmre3qimqYnX4EP755tkthfqcsOrX7qScfrn /QTtzWMpSLNCVI7ISa95fPrS51DxnpzEaWAms8q3FmSmqV2K3J5wxVkoTdexug5plb8J m0vRuupvJfwm7pLuQzK85sJbhRp76yYR41x96++r2PywHGqxgGyAiZ69zv6ZF4XHOYVp Hcbt7+2URzqmwt75lmAF8RnpU0l01YFWdMFG1cNhqlemaRMNdp34hbmRbg4Nwly+CuCn Vjizp75bW9pa1IONvlgyFGTFbabX3NWNpiISj/ICehCXnPoGFVPRbJojAlfzf+fDz38z sIyQ== X-Gm-Message-State: APt69E0Di/QAGUzFHQ4msCt8gnbO52GzEiVXgnJXgJUpF5BRXWbWPUVO r0bjZmvbqXWbvWAzO2pKhUX9xS+r X-Google-Smtp-Source: AAOMgpeT2icJA/xjnXn5crmC6i8V/Jm/roNZXWBVoQhUNQoWp++cPXOiI1qOlWY0ZniHWcOkx6dRQQ== X-Received: by 2002:adf:9aeb:: with SMTP id a98-v6mr5848416wrc.110.1530339047307; Fri, 29 Jun 2018 23:10:47 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:09:58 +0200 Message-Id: <20180630061040.6018-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 05/47] x86/cpu: Use definitions from "qemu/units.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Acked-by: Eduardo Habkost Message-Id: <20180625124238.25339-4-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d57f310..bdbd446 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/cutils.h" #include "qemu/bitops.h" @@ -65,9 +66,6 @@ struct CPUID2CacheDescriptorInfo { int associativity; }; -#define KiB 1024 -#define MiB (1024 * 1024) - /* * Known CPUID 2 cache descriptors. * From Intel SDM Volume 2A, CPUID instruction From patchwork Sat Jun 30 06:10:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bbfoneRQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HjwZ5fPBz9s2B for ; Sat, 30 Jun 2018 16:17:18 +1000 (AEST) Received: from localhost ([::1]:45698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9C8-0000y0-Cg for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:17:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95y-00041j-I1 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95v-0001kb-ST for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:54 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95v-0001j5-H2 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:51 -0400 Received: by mail-wm0-x244.google.com with SMTP id z137-v6so3958248wmc.0 for ; Fri, 29 Jun 2018 23:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UKq3JvifZUFhdYQomVhAyew3R+729ji4SohrR+BRHnE=; b=bbfoneRQqFsRGMzaLFtSHn2wJemuyoMFWoTxdt343MVBSkkMVETRT1+tPxFmT5ZexM plXB7wzBX2xlojG1zofey3z/ZK43XsSsRck+ha8l+bwdyzfHDSPZDoqu6Ftuuno3nCyX yinrGZlhBi3f/bR9x+v7nJm/Gfl8L3FUVZfIaRG0njgc250xcSdWR9+QkHZnWXFa2bkm t5ucVqLXTpZHDtnr+SUqsxLV+/947TZmrmc9BRukC2M/dvn3ONtOR0X4hL5k768WqEGg +x3dzmxM053RCb1kwJURsSvhG8pQhOeBICWMgK9+P+5qLjMWPOoGSNQHGUi/og88b4Sl 5Tcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UKq3JvifZUFhdYQomVhAyew3R+729ji4SohrR+BRHnE=; b=M/tZKK6EArRSy8ZPjAC9PRiKLFLCKyhkFyKmO734DYL1JqV+WnwevPH+CUwW+78Ba0 AkI3elqWUB7DYKn/SvC08hC0Z7gt7AceddyudMJSKJWILYSZIztPXM1l1S+crho9QZ/R iEK8kb3u3pcPsjO0wPc+cRuyhN41IxNv4GLZSK9ObZpPSn7AKCbflpmfmLrUJmnD8YNQ VLRlWjl6D/p6Ocig40CVblAKtbwWlmkOJu66WVZlzWH+23OoRys9zrV1kAtg1jasZwcj iShmi1zxS3y/IL4tZeLO0YOnLBqFwhSmWm9SYEFHMdURQDTpILvUAKS0e5/n+0eiRrFt bUEw== X-Gm-Message-State: APt69E0JpwvzLEQS2f9/8H4lqHLzSl0s5gINc2X/D2YL8qtvJzjtXuH1 GmUZyg5SXnt5I6vzlQmjfV0sOcX8 X-Google-Smtp-Source: AAOMgpcCRzT1OxnfwmeyYU13CMvSI8phAd8N7RfldceNOzKKMMiEpiDk144XI2q1JnutyuzqWPTsjA== X-Received: by 2002:a1c:7d47:: with SMTP id y68-v6mr3368788wmc.62.1530339050074; Fri, 29 Jun 2018 23:10:50 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:00 +0200 Message-Id: <20180630061040.6018-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 07/47] hw: Use IEC binary prefix definitions from "qemu/units.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Code change produced with: $ git ls-files | egrep '\.[ch]$' | \ xargs sed -i -e 's/\(\W[KMGTPE]\)_BYTE/\1iB/g' Suggested-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson (ppc parts) Message-Id: <20180625124238.25339-6-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/arm/msf2-soc.c | 4 ++-- hw/arm/msf2-som.c | 6 +++--- hw/core/loader-fit.c | 3 ++- hw/core/machine.c | 2 +- hw/display/sm501.c | 14 +++++++------- hw/hppa/machine.c | 2 +- hw/mips/boston.c | 28 ++++++++++++++-------------- hw/ppc/pnv.c | 4 ++-- hw/ppc/ppc440_uc.c | 26 +++++++++++++------------- hw/ppc/prep.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr.c | 10 +++++----- hw/ppc/spapr_rtas.c | 2 +- hw/sd/sd.c | 4 ++-- hw/sd/sdhci.c | 2 +- include/qemu/cutils.h | 8 +------- tests/test-cutils.c | 19 ++++++++++--------- tests/test-keyval.c | 6 +++--- tests/test-qemu-opts.c | 7 +++---- 19 files changed, 73 insertions(+), 78 deletions(-) diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 75c44ad..530e461 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -40,14 +40,14 @@ #define SRAM_BASE_ADDRESS 0x20000000 -#define MSF2_ENVM_MAX_SIZE (512 * K_BYTE) +#define MSF2_ENVM_MAX_SIZE (512 * KiB) /* * eSRAM max size is 80k without SECDED(Single error correction and * dual error detection) feature and 64k with SECDED. * We do not support SECDED now. */ -#define MSF2_ESRAM_MAX_SIZE (80 * K_BYTE) +#define MSF2_ESRAM_MAX_SIZE (80 * KiB) static const uint32_t spi_addr[MSF2_NUM_SPIS] = { 0x40001000 , 0x40011000 }; static const uint32_t uart_addr[MSF2_NUM_UARTS] = { 0x40000000 , 0x40010000 }; diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 0795a3a..ed533bb 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -33,10 +33,10 @@ #include "cpu.h" #define DDR_BASE_ADDRESS 0xA0000000 -#define DDR_SIZE (64 * M_BYTE) +#define DDR_SIZE (64 * MiB) -#define M2S010_ENVM_SIZE (256 * K_BYTE) -#define M2S010_ESRAM_SIZE (64 * K_BYTE) +#define M2S010_ENVM_SIZE (256 * KiB) +#define M2S010_ESRAM_SIZE (64 * KiB) static void emcraft_sf2_s2s010_init(MachineState *machine) { diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 6387854..447f608 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "exec/memory.h" #include "hw/loader.h" #include "hw/loader-fit.h" @@ -194,7 +195,7 @@ static int fit_load_fdt(const struct fit_loader *ldr, const void *itb, err = fit_image_addr(itb, img_off, "load", &load_addr); if (err == -ENOENT) { - load_addr = ROUND_UP(kernel_end, 64 * K_BYTE) + (10 * M_BYTE); + load_addr = ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB); } else if (err) { ret = err; goto out; diff --git a/hw/core/machine.c b/hw/core/machine.c index 617e5f8..ccf3a4b 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -522,7 +522,7 @@ static void machine_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); /* Default 128 MB as guest ram size */ - mc->default_ram_size = 128 * M_BYTE; + mc->default_ram_size = 128 * MiB; mc->rom_file_has_mr = true; /* numa node memory size aligned on 8MB by default. diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 8206ae8..3bd8716 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -452,12 +452,12 @@ /* SM501 local memory size taken from "linux/drivers/mfd/sm501.c" */ static const uint32_t sm501_mem_local_size[] = { - [0] = 4 * M_BYTE, - [1] = 8 * M_BYTE, - [2] = 16 * M_BYTE, - [3] = 32 * M_BYTE, - [4] = 64 * M_BYTE, - [5] = 2 * M_BYTE, + [0] = 4 * MiB, + [1] = 8 * MiB, + [2] = 16 * MiB, + [3] = 32 * MiB, + [4] = 64 * MiB, + [5] = 2 * MiB, }; #define get_local_mem_size(s) sm501_mem_local_size[(s)->local_mem_size_index] @@ -1829,7 +1829,7 @@ static void sm501_realize_pci(PCIDevice *dev, Error **errp) } static Property sm501_pci_properties[] = { - DEFINE_PROP_UINT32("vram-size", SM501PCIState, vram_size, 64 * M_BYTE), + DEFINE_PROP_UINT32("vram-size", SM501PCIState, vram_size, 64 * MiB), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index aba269b..2ba2696 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -275,7 +275,7 @@ static void machine_hppa_machine_init(MachineClass *mc) mc->max_cpus = HPPA_MAX_CPUS; mc->default_cpus = 1; mc->is_default = 1; - mc->default_ram_size = 512 * M_BYTE; + mc->default_ram_size = 512 * MiB; mc->default_boot_order = "cd"; } diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 14e6f95..939cef5 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -200,7 +200,7 @@ static uint64_t boston_platreg_read(void *opaque, hwaddr addr, val |= PLAT_BUILD_CFG_PCIE2_EN; return val; case PLAT_DDR_CFG: - val = s->mach->ram_size / G_BYTE; + val = s->mach->ram_size / GiB; assert(!(val & ~PLAT_DDR_CFG_SIZE)); val |= PLAT_DDR_CFG_MHZ; return val; @@ -355,7 +355,7 @@ static const void *boston_fdt_filter(void *opaque, const void *fdt_orig, return NULL; } - ram_low_sz = MIN(256 * M_BYTE, machine->ram_size); + ram_low_sz = MIN(256 * MiB, machine->ram_size); ram_high_sz = machine->ram_size - ram_low_sz; qemu_fdt_setprop_sized_cells(fdt, "/memory@0", "reg", 1, 0x00000000, 1, ram_low_sz, @@ -436,8 +436,8 @@ static void boston_mach_init(MachineState *machine) int fw_size, fit_err; bool is_64b; - if ((machine->ram_size % G_BYTE) || - (machine->ram_size > (2 * G_BYTE))) { + if ((machine->ram_size % GiB) || + (machine->ram_size > (2 * GiB))) { error_report("Memory size must be 1GB or 2GB"); exit(1); } @@ -471,7 +471,7 @@ static void boston_mach_init(MachineState *machine) sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1); flash = g_new(MemoryRegion, 1); - memory_region_init_rom(flash, NULL, "boston.flash", 128 * M_BYTE, &err); + memory_region_init_rom(flash, NULL, "boston.flash", 128 * MiB, &err); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); ddr = g_new(MemoryRegion, 1); @@ -481,22 +481,22 @@ static void boston_mach_init(MachineState *machine) ddr_low_alias = g_new(MemoryRegion, 1); memory_region_init_alias(ddr_low_alias, NULL, "boston_low.ddr", - ddr, 0, MIN(machine->ram_size, (256 * M_BYTE))); + ddr, 0, MIN(machine->ram_size, (256 * MiB))); memory_region_add_subregion_overlap(sys_mem, 0, ddr_low_alias, 0); xilinx_pcie_init(sys_mem, 0, - 0x10000000, 32 * M_BYTE, - 0x40000000, 1 * G_BYTE, + 0x10000000, 32 * MiB, + 0x40000000, 1 * GiB, get_cps_irq(s->cps, 2), false); xilinx_pcie_init(sys_mem, 1, - 0x12000000, 32 * M_BYTE, - 0x20000000, 512 * M_BYTE, + 0x12000000, 32 * MiB, + 0x20000000, 512 * MiB, get_cps_irq(s->cps, 1), false); pcie2 = xilinx_pcie_init(sys_mem, 2, - 0x14000000, 32 * M_BYTE, - 0x16000000, 1 * M_BYTE, + 0x14000000, 32 * MiB, + 0x16000000, 1 * MiB, get_cps_irq(s->cps, 0), true); platreg = g_new(MemoryRegion, 1); @@ -526,7 +526,7 @@ static void boston_mach_init(MachineState *machine) if (machine->firmware) { fw_size = load_image_targphys(machine->firmware, - 0x1fc00000, 4 * M_BYTE); + 0x1fc00000, 4 * MiB); if (fw_size == -1) { error_printf("unable to load firmware image '%s'\n", machine->firmware); @@ -552,7 +552,7 @@ static void boston_mach_class_init(MachineClass *mc) mc->desc = "MIPS Boston"; mc->init = boston_mach_init; mc->block_default_type = IF_IDE; - mc->default_ram_size = 1 * G_BYTE; + mc->default_ram_size = 1 * GiB; mc->max_cpus = 16; mc->default_cpu_type = MIPS_CPU_TYPE_NAME("I6400"); } diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 7401ffe..5fdac62 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -556,7 +556,7 @@ static void pnv_init(MachineState *machine) char *chip_typename; /* allocate RAM */ - if (machine->ram_size < (1 * G_BYTE)) { + if (machine->ram_size < (1 * GiB)) { warn_report("skiboot may not work with < 1GB of RAM"); } @@ -1174,7 +1174,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) * storage */ mc->no_parallel = 1; mc->default_boot_order = NULL; - mc->default_ram_size = 1 * G_BYTE; + mc->default_ram_size = 1 * GiB; xic->icp_get = pnv_icp_get; xic->ics_get = pnv_ics_get; xic->ics_resend = pnv_ics_resend; diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 123f4ac..b5b31b4 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -215,13 +215,13 @@ void ppc4xx_l2sram_init(CPUPPCState *env) l2sram = g_malloc0(sizeof(*l2sram)); /* XXX: Size is 4*64kB for 460ex, cf. U-Boot, ppc4xx-isram.h */ memory_region_init_ram(&l2sram->bank[0], NULL, "ppc4xx.l2sram_bank0", - 64 * K_BYTE, &error_abort); + 64 * KiB, &error_abort); memory_region_init_ram(&l2sram->bank[1], NULL, "ppc4xx.l2sram_bank1", - 64 * K_BYTE, &error_abort); + 64 * KiB, &error_abort); memory_region_init_ram(&l2sram->bank[2], NULL, "ppc4xx.l2sram_bank2", - 64 * K_BYTE, &error_abort); + 64 * KiB, &error_abort); memory_region_init_ram(&l2sram->bank[3], NULL, "ppc4xx.l2sram_bank3", - 64 * K_BYTE, &error_abort); + 64 * KiB, &error_abort); qemu_register_reset(&l2sram_reset, l2sram); ppc_dcr_register(env, DCR_L2CACHE_CFG, l2sram, &dcr_read_l2sram, &dcr_write_l2sram); @@ -513,28 +513,28 @@ static uint32_t sdram_bcr(hwaddr ram_base, hwaddr ram_size) uint32_t bcr; switch (ram_size) { - case (8 * M_BYTE): + case (8 * MiB): bcr = 0xffc0; break; - case (16 * M_BYTE): + case (16 * MiB): bcr = 0xff80; break; - case (32 * M_BYTE): + case (32 * MiB): bcr = 0xff00; break; - case (64 * M_BYTE): + case (64 * MiB): bcr = 0xfe00; break; - case (128 * M_BYTE): + case (128 * MiB): bcr = 0xfc00; break; - case (256 * M_BYTE): + case (256 * MiB): bcr = 0xf800; break; - case (512 * M_BYTE): + case (512 * MiB): bcr = 0xf000; break; - case (1 * G_BYTE): + case (1 * GiB): bcr = 0xe000; break; default: @@ -561,7 +561,7 @@ static target_ulong sdram_size(uint32_t bcr) if (sh == 0) { size = -1; } else { - size = 8 * M_BYTE * sh; + size = 8 * MiB * sh; } return size; diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 5ed0bcd..25ae533 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -884,7 +884,7 @@ static void ibm_40p_machine_init(MachineClass *mc) mc->desc = "IBM RS/6000 7020 (40p)", mc->init = ibm_40p_init; mc->max_cpus = 1; - mc->default_ram_size = 128 * M_BYTE; + mc->default_ram_size = 128 * MiB; mc->block_default_type = IF_SCSI; mc->default_boot_order = "c"; mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604"); diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index bdc53d2..2a98c10 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -597,7 +597,7 @@ static void sam460ex_machine_init(MachineClass *mc) mc->desc = "aCube Sam460ex"; mc->init = sam460ex_init; mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("460exb"); - mc->default_ram_size = 512 * M_BYTE; + mc->default_ram_size = 512 * MiB; } DEFINE_MACHINE("sam460ex", sam460ex_machine_init) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index b32b971..7dbdb4e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2324,7 +2324,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) error_setg(errp, "Memory size 0x" RAM_ADDR_FMT " is not aligned to %llu MiB", machine->ram_size, - SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); + SPAPR_MEMORY_BLOCK_SIZE / MiB); return; } @@ -2332,7 +2332,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) error_setg(errp, "Maximum memory size 0x" RAM_ADDR_FMT " is not aligned to %llu MiB", machine->ram_size, - SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); + SPAPR_MEMORY_BLOCK_SIZE / MiB); return; } @@ -2342,7 +2342,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) "Node %d memory size 0x%" PRIx64 " is not aligned to %llu MiB", i, numa_info[i].node_mem, - SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); + SPAPR_MEMORY_BLOCK_SIZE / MiB); return; } } @@ -3209,7 +3209,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, if (size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Hotplugged memory size must be a multiple of " - "%lld MB", SPAPR_MEMORY_BLOCK_SIZE / M_BYTE); + "%lld MB", SPAPR_MEMORY_BLOCK_SIZE / MiB); return; } @@ -3961,7 +3961,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = 1024; mc->no_parallel = 1; mc->default_boot_order = ""; - mc->default_ram_size = 512 * M_BYTE; + mc->default_ram_size = 512 * MiB; mc->kvm_type = spapr_kvm_type; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE); mc->pci_allow_0_address = true; diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 7f9738d..f32740b 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -241,7 +241,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, "DesProcs=%d," "MaxPlatProcs=%d", max_cpus, - current_machine->ram_size / M_BYTE, + current_machine->ram_size / MiB, smp_cpus, max_cpus); ret = sysparm_st(buffer, length, param_val, strlen(param_val) + 1); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 540bccb..9a16b76 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -305,7 +305,7 @@ static void sd_ocr_powerup(void *opaque) /* card power-up OK */ sd->ocr = FIELD_DP32(sd->ocr, OCR, CARD_POWER_UP, 1); - if (sd->size > 1 * G_BYTE) { + if (sd->size > 1 * GiB) { sd->ocr = FIELD_DP32(sd->ocr, OCR, CARD_CAPACITY, 1); } } @@ -377,7 +377,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) uint32_t sectsize = (1 << (SECTOR_SHIFT + 1)) - 1; uint32_t wpsize = (1 << (WPGROUP_SHIFT + 1)) - 1; - if (size <= 1 * G_BYTE) { /* Standard Capacity SD */ + if (size <= 1 * GiB) { /* Standard Capacity SD */ sd->csd[0] = 0x00; /* CSD structure */ sd->csd[1] = 0x26; /* Data read access-time-1 */ sd->csd[2] = 0x00; /* Data read access-time-2 */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 3017e5a..a11e802 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -414,7 +414,7 @@ static void sdhci_end_transfer(SDHCIState *s) /* * Programmed i/o data transfer */ -#define BLOCK_SIZE_MASK (4 * K_BYTE - 1) +#define BLOCK_SIZE_MASK (4 * KiB - 1) /* Fill host controller's read buffer with BLKSIZE bytes of data from card */ static void sdhci_read_block_from_card(SDHCIState *s) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index a663340..056e662 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -2,6 +2,7 @@ #define QEMU_CUTILS_H #include "qemu/fprintf-fn.h" +#include "qemu/units.h" /** * pstrcpy: @@ -147,13 +148,6 @@ int qemu_strtosz(const char *nptr, char **end, uint64_t *result); int qemu_strtosz_MiB(const char *nptr, char **end, uint64_t *result); int qemu_strtosz_metric(const char *nptr, char **end, uint64_t *result); -#define K_BYTE (1ULL << 10) -#define M_BYTE (1ULL << 20) -#define G_BYTE (1ULL << 30) -#define T_BYTE (1ULL << 40) -#define P_BYTE (1ULL << 50) -#define E_BYTE (1ULL << 60) - /* used to print char* safely */ #define STR_OR_NULL(str) ((str) ? (str) : "null") diff --git a/tests/test-cutils.c b/tests/test-cutils.c index 64a489c..a6e5fe4 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/units.h" static void test_parse_uint_null(void) { @@ -2022,7 +2023,7 @@ static void test_qemu_strtosz_units(void) /* default is M */ err = qemu_strtosz_MiB(none, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, M_BYTE); + g_assert_cmpint(res, ==, MiB); g_assert(endptr == none + 1); err = qemu_strtosz(b, &endptr, &res); @@ -2032,32 +2033,32 @@ static void test_qemu_strtosz_units(void) err = qemu_strtosz(k, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, K_BYTE); + g_assert_cmpint(res, ==, KiB); g_assert(endptr == k + 2); err = qemu_strtosz(m, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, M_BYTE); + g_assert_cmpint(res, ==, MiB); g_assert(endptr == m + 2); err = qemu_strtosz(g, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, G_BYTE); + g_assert_cmpint(res, ==, GiB); g_assert(endptr == g + 2); err = qemu_strtosz(t, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, T_BYTE); + g_assert_cmpint(res, ==, TiB); g_assert(endptr == t + 2); err = qemu_strtosz(p, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, P_BYTE); + g_assert_cmpint(res, ==, PiB); g_assert(endptr == p + 2); err = qemu_strtosz(e, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, E_BYTE); + g_assert_cmpint(res, ==, EiB); g_assert(endptr == e + 2); } @@ -2070,7 +2071,7 @@ static void test_qemu_strtosz_float(void) err = qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, ==, 0); - g_assert_cmpint(res, ==, 12.345 * M_BYTE); + g_assert_cmpint(res, ==, 12.345 * MiB); g_assert(endptr == str + 7); } @@ -2106,7 +2107,7 @@ static void test_qemu_strtosz_trailing(void) str = "123xxx"; err = qemu_strtosz_MiB(str, &endptr, &res); - g_assert_cmpint(res, ==, 123 * M_BYTE); + g_assert_cmpint(res, ==, 123 * MiB); g_assert(endptr == str + 3); err = qemu_strtosz(str, NULL, &res); diff --git a/tests/test-keyval.c b/tests/test-keyval.c index 63cb146..92d8e9f 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -457,11 +457,11 @@ static void test_keyval_visit_size(void) visit_type_size(v, "sz2", &sz, &error_abort); g_assert_cmpuint(sz, ==, 1536); visit_type_size(v, "sz3", &sz, &error_abort); - g_assert_cmphex(sz, ==, 2 * M_BYTE); + g_assert_cmphex(sz, ==, 2 * MiB); visit_type_size(v, "sz4", &sz, &error_abort); - g_assert_cmphex(sz, ==, G_BYTE / 10); + g_assert_cmphex(sz, ==, GiB / 10); visit_type_size(v, "sz5", &sz, &error_abort); - g_assert_cmphex(sz, ==, 16777215 * T_BYTE); + g_assert_cmphex(sz, ==, 16777215 * TiB); visit_check_struct(v, &error_abort); visit_end_struct(v, NULL); visit_free(v); diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 7092e21..fd4d848 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -704,13 +704,12 @@ static void test_opts_parse_size(void) g_assert_cmpuint(opts_count(opts), ==, 3); g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, 8); g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 1536); - g_assert_cmphex(qemu_opt_get_size(opts, "size3", 0), ==, 2 * M_BYTE); + g_assert_cmphex(qemu_opt_get_size(opts, "size3", 0), ==, 2 * MiB); opts = qemu_opts_parse(&opts_list_02, "size1=0.1G,size2=16777215T", false, &error_abort); g_assert_cmpuint(opts_count(opts), ==, 2); - g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, G_BYTE / 10); - g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), - ==, 16777215 * T_BYTE); + g_assert_cmphex(qemu_opt_get_size(opts, "size1", 0), ==, GiB / 10); + g_assert_cmphex(qemu_opt_get_size(opts, "size2", 0), ==, 16777215U * TiB); /* Beyond limit with suffix */ opts = qemu_opts_parse(&opts_list_02, "size1=16777216T", From patchwork Sat Jun 30 06:10:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WS+3ZfNk"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjp41J79z9s1B for ; Sat, 30 Jun 2018 16:11:40 +1000 (AEST) Received: from localhost ([::1]:45670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96f-00043g-MQ for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:11:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95x-00040i-O9 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95w-0001lq-Ij for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:53 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:34561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95w-0001kF-Ay for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:52 -0400 Received: by mail-wm0-x233.google.com with SMTP id l15-v6so3502204wmc.1 for ; Fri, 29 Jun 2018 23:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ayVfJATC9D7cE3CyFev9DH6OP661t60g3phDr+oPi6Y=; b=WS+3ZfNkBJvvKgIb9i1WhyIu1t64c1cZtPGI58TMsU6nxnGWZGwByz5dS1kdLH/Cxr 76nITMLrxo0sU2Yr0vprJN4wTjzrBmgbyNrxhDYA60SwQ7L/xLM+8d3Kx9TPzbFYgg+C d6tZ+HEMZWc9lW3svtBhZ811lg+efx2u8PAekFDV1yd7QNOpYslyO7PAvPx1WPdCxIMF ZKvPnh1QktMtOM1ihgN4QBnndLFLq3vl5Q/uOiSHfzPw8ImLIBMlawlFTnbae2Ffygjs yHO5mSvtm1R2JynRrbvznT2fn6+f10aVryI/aFAiH7UYlCq64CrZyX/gYUiXudqtolvY HN0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ayVfJATC9D7cE3CyFev9DH6OP661t60g3phDr+oPi6Y=; b=pnZRFnfpaU6dinF0YgVomm94zC/kX1WWFEHvwbsGMO+JLWDeGOoJ3oTd+xfnA2x6nY DGzU8/0Hg2Sb/VGpB5r13feuSqv2Gp/9W8wAPlSMZ/+qjbzhEDPMFO/eoXeznWS7DvV4 SVk1jVayNH5Lzo17MrxDLNECk7qHiuJtsApZ6vH8fm+WprYptTQclILdOKCKcVvu4kv2 D8gqITO8C9kFqs3IvmxuP4h4oPH1Jv6KqTFG0eW8VqIHUluMrhO62evqVTrnBHPgmjKx dmPsPgfH6qQol9/Nm21s43rO5D0qi4M56CSDIZ8Td7EMJ4jnVEgE2zYFYnsWcw/0SSED obrQ== X-Gm-Message-State: APt69E2D+hfoHgKnjVSghoswgDSEZNwnSlpo001hegm8HnHnivR5s8nP Wj8tLhqBsffxoJpltVGMoTzryJPl X-Google-Smtp-Source: AAOMgpczvkzeCB0SfmjeB1l3OvdIw07eMkoUSUvlgtZEhP8Nk9sjm2P4DGHhViSuKMgdWpMTmzDY9Q== X-Received: by 2002:a1c:ee5d:: with SMTP id m90-v6mr3568549wmh.113.1530339051097; Fri, 29 Jun 2018 23:10:51 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:01 +0200 Message-Id: <20180630061040.6018-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL 08/47] hw: Directly use "qemu/units.h" instead of "qemu/cutils.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé These files don't use anything exposed by "qemu/cutils.h", simplify preprocessing including directly "qemu/units.h". Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson (ppc parts) Message-Id: <20180625124238.25339-7-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/arm/msf2-soc.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/core/machine.c | 2 +- hw/display/sm501.c | 2 +- hw/mips/boston.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/ppc440_uc.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 530e461..edb3ba8 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -23,13 +23,13 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "hw/arm/arm.h" #include "exec/address-spaces.h" #include "hw/char/serial.h" #include "hw/boards.h" -#include "qemu/cutils.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index ed533bb..2432b5e 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -23,12 +23,12 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/boards.h" #include "hw/arm/arm.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #include "hw/arm/msf2-soc.h" #include "cpu.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index ccf3a4b..2077328 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-visit-common.h" @@ -19,7 +20,6 @@ #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "qemu/error-report.h" -#include "qemu/cutils.h" #include "sysemu/qtest.h" static char *machine_get_accel(Object *obj, Error **errp) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 3bd8716..9dec0d3 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" -#include "qemu/cutils.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 939cef5..6c9c20a 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "exec/address-spaces.h" @@ -32,7 +33,6 @@ #include "hw/mips/cpudevs.h" #include "hw/pci-host/xilinx-pcie.h" #include "qapi/error.h" -#include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "chardev/char.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 5fdac62..346f5e7 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" @@ -31,7 +32,6 @@ #include "hw/ppc/pnv_core.h" #include "hw/loader.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #include "qapi/visitor.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index b5b31b4..1ab2235 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -9,8 +9,8 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" -#include "qemu/cutils.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "cpu.h" From patchwork Sat Jun 30 06:10:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RMBpMBP/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjs76Gf5z9s1B for ; Sat, 30 Jun 2018 16:14:19 +1000 (AEST) Received: from localhost ([::1]:45680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ99F-0006Si-EW for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:14:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95y-00041h-GK for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95x-0001nd-Il for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:54 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:38910) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95x-0001mD-BR for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:53 -0400 Received: by mail-wm0-x243.google.com with SMTP id 69-v6so3925485wmf.3 for ; Fri, 29 Jun 2018 23:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kde6edmnulJz8r8tSmaMrj2J/rMMQeyv2Ln8F/41JDY=; b=RMBpMBP/Cex2ZZ5VLpNWSQei3Sx5b1jyU3tYIANZuBQXL7JYSIr6CHMhHVRCq3BSoI aMOfxqTzECIP/X68QLWsMHQ7ah/Zyo2JM9rvmUBM8fZw73wqGGcTtW4j1cP54N1zGbhO jH4D75S2+L4suVGzfKo5w6RWCcEtTTl+7lpEiLXFeVsrINgNw2+Es/PHvcqKemB+0kN9 Ulwx5bi75EAcIJAdDtXpc06iQuyTmWFypWKpIxyGaBuCF2IzODVqnbaGyC4l+z+Wcrh/ Vff/Ip2WFOSfRMtWjR2LiO1Tw09Zea0/EY/dt8gpA4jJ4eZ5nmE0EOYJRhIC9XZRUreG +PTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kde6edmnulJz8r8tSmaMrj2J/rMMQeyv2Ln8F/41JDY=; b=nytT3F0Nvv9ua454/BxyNUN28VPJcF+nHXSg0HnCuEbqqUj/nc15jCBxhewyE7nj8U l/NJmsMrAlQxzc0lYdG/jCjcIlzv4L4d+fdthTVm59s7DLjAvvQOJ3e4fuXq/k6THAmd ORLth3R9C2tp8R9o7HAndmEiFGunO5jXyxKyLCozvt3kVSrCOmqD3PbQzhRwKSpn4LYS 9QihX03xPnz2h0ukkVArYW74fspqZGx8C51AmVJ/lWu39GWHqXkkrXaU4d2GfpD8RGdD x2Bl7PbD++wCePmKhoVzdhg/L4BniHRBRLihlK7JA1GdxsWbXFckfFpiaGbAeEwj1q3E 3AVw== X-Gm-Message-State: APt69E2QZEf+8cOoDE044QY+AjM91ssV1dhwaHMSQrYpdG3z374KeeNO 9FOzvCQ1MyJoMuaF7R96NjRm61Az X-Google-Smtp-Source: AAOMgpe60aAYST83rGNznmcuHxu3ztiHDMMbhL9ncIRC7+SDfqqUVi1j0HAhwV/ksT+7N6PzMcjopw== X-Received: by 2002:a1c:f009:: with SMTP id a9-v6mr3621602wmb.104.1530339052211; Fri, 29 Jun 2018 23:10:52 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:02 +0200 Message-Id: <20180630061040.6018-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 09/47] hw/ivshmem: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Message-Id: <20180625124238.25339-8-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/misc/ivshmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index ee01c5e..6febbab 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -17,6 +17,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/hw.h" @@ -1301,7 +1302,7 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp) } if (s->sizearg == NULL) { - s->legacy_size = 4 << 20; /* 4 MB default */ + s->legacy_size = 4 * MiB; /* 4 MB default */ } else { int ret; uint64_t size; From patchwork Sat Jun 30 06:10:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Zxa3S9M0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk3T32n9z9s1B for ; Sat, 30 Jun 2018 16:23:17 +1000 (AEST) Received: from localhost ([::1]:45728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Hv-00069G-0V for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:23:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ95z-00042n-Il for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95y-0001pD-Ga for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:55 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:55231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95y-0001nj-8J for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:54 -0400 Received: by mail-wm0-x22f.google.com with SMTP id i139-v6so4085359wmf.4 for ; Fri, 29 Jun 2018 23:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dtay3fhDXtHI87/toLahyMqaAc3N2SKYPqLh7D77MmE=; b=Zxa3S9M0oIhRoTbFauyKn1qDLmT9ZsDuhiTY0DXKN3b16bCKMNbDB0Ni6IR9XfGVPH pyNahq5ZyyIOtaJf/C2dIvO3owsPr88pzhJu1sR41Tj3Sz4ENn8bDzcYYkSsxPlaBdcO VW3P6+KP/A8+OK2EXs3RUK6B5vM46Dy9gk8T8tchDMXxfnmqx+6byxhJz68nL+FH80r5 +pvQt3LVD8Nbr4IAbfGQFI0gyQT4/PsawM+AwrzGXvVlEZbeLBqfD51aNsxsFL3QEFGt 1DEfjm0fe1TRbafI+5cGldvqJu5U501FM1btolCn0RRceoxsvbMSMh2cRW8FhlzM3KwF T5tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Dtay3fhDXtHI87/toLahyMqaAc3N2SKYPqLh7D77MmE=; b=rlS5DzGGwYBxdRZjI1cLa01YRd+rWQhHqwm21f+KpSAJGuT5l65OAgfeQ8i8XzRn1X ODkFfkjmErTznGmWnwkSkJObeGWOjWRyB+NeoYLZBQa8EX7dWPSkQa3+aGtZe+GlGp5p DZRcmPe1k5frPMZzH0kKqHe2PABwyCDjE3WgbnDOkI2cpllMJxhjA8xfAgTfP9tuzobO iPxnSUSx+/aG13skafO//phZgVZxXyd0ToFgRc6NO/2+FNMP2E2OpPVBNc4p8bH6FBHE z2aUn+7WjQvSnzpgcw7TQeGNOy8HHvx3Di+9+FY7RJAFoMA3DsMf24LXwD4LBeAksOj1 uxKw== X-Gm-Message-State: APt69E2s8A7yMbG45da5wjRa9V8zFaUbkpdKBJBP1hmOB3+pQ0Bk2QsO 0DSkuosEn2kibz9ovk1jVDpJzsyY X-Google-Smtp-Source: AAOMgpeu1Isu42ZQ/h1feLQWrHOZxGNpSFk6gGXebNCZRo+YNP2Fpn6MIDTv0XEXq43BUtXGgbkzlw== X-Received: by 2002:a1c:c241:: with SMTP id s62-v6mr3669815wmf.146.1530339053073; Fri, 29 Jun 2018 23:10:53 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:03 +0200 Message-Id: <20180630061040.6018-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22f Subject: [Qemu-devel] [PULL 10/47] hw/ipack: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alberto Garcia Message-Id: <20180625124238.25339-9-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/ipack/tpci200.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index da05c85..cd3e791 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/ipack/ipack.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" @@ -597,9 +598,9 @@ static void tpci200_realize(PCIDevice *pci_dev, Error **errp) memory_region_init_io(&s->las1, OBJECT(s), &tpci200_las1_ops, s, "tpci200_las1", 1024); memory_region_init_io(&s->las2, OBJECT(s), &tpci200_las2_ops, - s, "tpci200_las2", 1024*1024*32); + s, "tpci200_las2", 32 * MiB); memory_region_init_io(&s->las3, OBJECT(s), &tpci200_las3_ops, - s, "tpci200_las3", 1024*1024*16); + s, "tpci200_las3", 16 * MiB); pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io); pci_register_bar(&s->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las0); From patchwork Sat Jun 30 06:10:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KOFEJ82m"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk6p0gjcz9s1B for ; Sat, 30 Jun 2018 16:26:10 +1000 (AEST) Received: from localhost ([::1]:45746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Kh-0000dz-Ml for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:26:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045l-Ad for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ95z-0001r0-BN for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:56114) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ95z-0001pL-4E for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:55 -0400 Received: by mail-wm0-x22f.google.com with SMTP id v16-v6so4105790wmv.5 for ; Fri, 29 Jun 2018 23:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Px3jbyJP5nEo7k0f7N9KUebZxNgaxZg4ubtp/RncdPc=; b=KOFEJ82m5madcPRpXB7Nnfe6GI+feInHfB9rlrS7B2Lj/F8IrpcmMi/BNuRqoP/knO h5kTZf6CEqZJLLBeFeI0jT7Ix5v6384H3OR6NHsfn4ObCTflm0CJk/PxaYZd9qx+QAQI GtWdC/oT7EDd9yN7CudiGq58P6OZYRMTf841pHaNIuvJ3uN9/561fQBVocJPBJfFxpK1 x3PyRRp71W9WQn3uCkz8nwM93v0qpykdflPBCi+ZQKhEkXn/NZvUNsD0cZzMdnZahMhT WkHdPB7J6eNrksC6X3nYufKHDYVu/Uvsm0Kj98UU23gV93Z2XTfqn7pgwS/+E4lVbVUX DCIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Px3jbyJP5nEo7k0f7N9KUebZxNgaxZg4ubtp/RncdPc=; b=WNu51K1WFd/wu68Ehz0FiWX4uDBnoYlWX8kIlcJf9jsC0fHxt4mh0Q5P0asCGWLYDS XlnGLIrFX24Kxu+S5FiOdbJCpfBwXZz36tX84Bkt4CRXXywM0HhNhzpVYC4pnlhPPZ5R cIH+oy3Kko5Jb5YMs54OivSZENBMPSYJ5T3j2PAYi8ovtOFi/oZNtJff1L+nLCfid5R7 e7XI0GH1oSS6vy9c2jUmXYpc+QHdPVorgQdz1b9fXnvR/3CSs5Cvo19ncpxL+IBJVK1Q uXwFAAiCfjaupxBim0lBkK8VUH2ISHCMNuFSJsPUEagJCr8SN3uQEwk2VYGmRbAH8pxM tZHw== X-Gm-Message-State: APt69E2aI6Jewh/WerWyYCnzLMPBeAgQbqb3QeqoK5v1D4CzhM6SkITC Yh5Xf2dD+CnkijVUi3zBNMt8W0uZ X-Google-Smtp-Source: AAOMgpf4V9HPehLetpAyz47hFo20B5jikuwFt1kQ7TE+1mJwQF/+dOvJnlU/44O4EX1pob1G1YiGIQ== X-Received: by 2002:a1c:46c2:: with SMTP id t185-v6mr3405931wma.56.1530339053929; Fri, 29 Jun 2018 23:10:53 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:04 +0200 Message-Id: <20180630061040.6018-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22f Subject: [Qemu-devel] [PULL 11/47] hw/scsi: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-10-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-disk.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 55a34b3..32f3f96 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -29,6 +29,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #endif #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/scsi/scsi.h" @@ -44,13 +45,13 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #include #endif -#define SCSI_WRITE_SAME_MAX 524288 -#define SCSI_DMA_BUF_SIZE 131072 +#define SCSI_WRITE_SAME_MAX (512 * KiB) +#define SCSI_DMA_BUF_SIZE (128 * KiB) #define SCSI_MAX_INQUIRY_LEN 256 #define SCSI_MAX_MODE_LEN 256 -#define DEFAULT_DISCARD_GRANULARITY 4096 -#define DEFAULT_MAX_UNMAP_SIZE (1 << 30) /* 1 GB */ +#define DEFAULT_DISCARD_GRANULARITY (4 * KiB) +#define DEFAULT_MAX_UNMAP_SIZE (1 * GiB) #define DEFAULT_MAX_IO_SIZE INT_MAX /* 2 GB - 1 block */ #define TYPE_SCSI_DISK_BASE "scsi-disk-base" From patchwork Sat Jun 30 06:10:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OwT+c3q6"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hjwk1rsyz9s1B for ; Sat, 30 Jun 2018 16:17:26 +1000 (AEST) Received: from localhost ([::1]:45700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9CF-00014S-Qy for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:17:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045k-9O for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ960-0001su-AU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:41188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ960-0001r9-29 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:56 -0400 Received: by mail-wr0-x241.google.com with SMTP id h10-v6so10635236wrq.8 for ; Fri, 29 Jun 2018 23:10:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ooxk8Lq0S5uWusor019OFFu0Yf3KP91shLnSI32amJA=; b=OwT+c3q622lV0WSrmRnhOMj5XsRZj8bWyNqsjLyDXyZ7vte5n5NzxMsTmMzChzKsDs bsaZ48+iY+udOh9g763OLtalLphe0eHheXFs6NBeGncNndOz7uhsnRFaA6vdQaC+F2O5 APMzVApSQEYq1fyda8P+IQmFmyYwf/VqejTvqZYJFe2dyfQgFHZHxbU15GMNpCSP15Sh 1ALbapLOy7Ah1Ml0eO8XhIAtHGHcmHrg1j3bQoBuZGdvaIjk9f/bYEML6ilV8FNw9dYk 3CM8uZrt1TkcvxPkNNfMITvayDSUc/VzhOGAlwax7anIqEmRH7eWy54x2uvaQ56COTzG WYxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ooxk8Lq0S5uWusor019OFFu0Yf3KP91shLnSI32amJA=; b=UgDw9oA4WBMoxTmw3iK6aXto3+TAs82eerDQaLP+50qeh6ZngJS7vhF3ooH/YrlBTm vI1buBKdg1+vGeRd/SRUb5zEu308OYWY15JfTjDVUXHQuq8LkdmbqoPEgWqxAjHnGeOD VvX7IhDXsxCSNnq5RlfckBNFKSxF1wnxzKhlnFjEwfR+copDjTddWtxAP6CH9LJU35yT hm/tEoM48vjcNFxHT/moZzfvYeI6Ip2fdFljyvnDyhrAcxi5K2xB6DWxAbBB1pbIh9D3 iVBc789ZtT3UmA60ep9F/b0cDIp3dfrsa7YEPUikPoUzET3xwtgWPcABRnOMPHvgmXc5 6aXA== X-Gm-Message-State: APt69E3LOLHOnjjZhT10SAQlr7Q73UMu2hvjQvjGopWRzYHeirGETuWg SawFPCrxpA37Ym9OjhS7ldcAGjWD X-Google-Smtp-Source: AAOMgpe/WMvOFB7AjyzCst6el5eNCltJgfkx25DMfbbnfC8iavL7hrzIpaP3gwSTQmCfB4yH4Vh+1Q== X-Received: by 2002:adf:e841:: with SMTP id d1-v6mr549182wrn.269.1530339054938; Fri, 29 Jun 2018 23:10:54 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:05 +0200 Message-Id: <20180630061040.6018-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 12/47] hw/smbios: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-11-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/smbios/smbios.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 27a07e9..a27e54b 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" @@ -625,10 +626,6 @@ static void smbios_build_type_11_table(void) SMBIOS_BUILD_TABLE_POST; } -#define ONE_KB ((ram_addr_t)1 << 10) -#define ONE_MB ((ram_addr_t)1 << 20) -#define ONE_GB ((ram_addr_t)1 << 30) - #define MAX_T16_STD_SZ 0x80000000 /* 2T in Kilobytes */ static void smbios_build_type_16_table(unsigned dimm_cnt) @@ -640,7 +637,7 @@ static void smbios_build_type_16_table(unsigned dimm_cnt) t->location = 0x01; /* Other */ t->use = 0x03; /* System memory */ t->error_correction = 0x06; /* Multi-bit ECC (for Microsoft, per SeaBIOS) */ - size_kb = QEMU_ALIGN_UP(ram_size, ONE_KB) / ONE_KB; + size_kb = QEMU_ALIGN_UP(ram_size, KiB) / KiB; if (size_kb < MAX_T16_STD_SZ) { t->maximum_capacity = cpu_to_le32(size_kb); t->extended_maximum_capacity = cpu_to_le64(0); @@ -668,7 +665,7 @@ static void smbios_build_type_17_table(unsigned instance, uint64_t size) t->memory_error_information_handle = cpu_to_le16(0xFFFE); /* Not provided */ t->total_width = cpu_to_le16(0xFFFF); /* Unknown */ t->data_width = cpu_to_le16(0xFFFF); /* Unknown */ - size_mb = QEMU_ALIGN_UP(size, ONE_MB) / ONE_MB; + size_mb = QEMU_ALIGN_UP(size, MiB) / MiB; if (size_mb < MAX_T17_STD_SZ) { t->size = cpu_to_le16(size_mb); t->extended_size = cpu_to_le32(0); @@ -707,8 +704,8 @@ static void smbios_build_type_19_table(unsigned instance, end = start + size - 1; assert(end > start); - start_kb = start / ONE_KB; - end_kb = end / ONE_KB; + start_kb = start / KiB; + end_kb = end / KiB; if (start_kb < UINT32_MAX && end_kb < UINT32_MAX) { t->starting_address = cpu_to_le32(start_kb); t->ending_address = cpu_to_le32(end_kb); @@ -869,7 +866,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, smbios_build_type_11_table(); -#define MAX_DIMM_SZ (16ll * ONE_GB) +#define MAX_DIMM_SZ (16 * GiB) #define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ \ : ((ram_size - 1) % MAX_DIMM_SZ) + 1) From patchwork Sat Jun 30 06:10:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NmYZmW7I"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HjsF58tyz9s1B for ; Sat, 30 Jun 2018 16:14:25 +1000 (AEST) Received: from localhost ([::1]:45682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ99L-0006Ww-Am for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:14:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045n-BM for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ961-0001vL-N3 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:37535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ961-0001tl-Cj for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:57 -0400 Received: by mail-wm0-x244.google.com with SMTP id n17-v6so3954459wmh.2 for ; Fri, 29 Jun 2018 23:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iQy2wFKNWy6mmESx7BKztmKco1h++t/+jerjS61pBR8=; b=NmYZmW7IfsB7gPQ857iUVNzfPdrWCyUm0thCC+LIqp96COPPGLI3lNUqlGIj0QahFY BM+JL5dlZK6MzYzJv5w7UkCYCtEitPuupGRLnYElw5//q94siygOhitwsUIlV0DKxhcD wekdbSwRFolHEKMtUN5GytuvWGxfaZAgLkYaUEKIr9g+5HWwGxu5wtwShwISbRxhyecT OSr1wZQdlBIqD3ftIkD/XGy0x9o6SMRCgmIW0EdH4imrYOMIx5Isi1x3M81Yp3p/ZhzB 4J7Nm00v+TX/M5pVpE279g+6quI9OYWBZXy7hWTJSEi3CcEhEQkPSI5HkHu7+KnF+9S7 dF0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iQy2wFKNWy6mmESx7BKztmKco1h++t/+jerjS61pBR8=; b=OAY5LRsLC6KkIeZbC8ANrH2G3krv90cFatbXTeF4rjL3D2EsXt9BHTpLKtCoglmX4Q Y9rCkDfgpO01642lj1Gfj5rX00WcCffAUVe6nF0fZN+PTw5aN1d5LHn5uuZSksir9YGe 4KV5UxmkIqwloNBDkqqrNzlTTTOFGrG2fP+xZXvF+n50597QFH/OieO9YAfG0tJzofW8 aLvALlPRB42Cvvd0UN+iWhlS4gwEUh1+xR8wAUwwdfTU3VtqA5WUmQFzk9GYhPJb/SXN urskPycc5oBCT9MvkmxBVFF6zQeYzbid7E8aGmPFXim36JeLszMXLvSHXzdBEvg3kg/9 PtWw== X-Gm-Message-State: APt69E3Z1Uj5XJzaycFNOmoQwGdiSLUDiuAybKFmfHT3z9FnfhqYPlvg Wt2OZZrCRQ+gb9/8Yr8vEfBYwvKO X-Google-Smtp-Source: AAOMgpcHGnSopYzvNTr1w+iYsg6IFODINxoeNAv9PRC2q4ZHzBIB6ZbzVWRjdC/fRNRvjIamFYSVvw== X-Received: by 2002:a1c:338c:: with SMTP id z134-v6mr3663506wmz.93.1530339056276; Fri, 29 Jun 2018 23:10:56 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:06 +0200 Message-Id: <20180630061040.6018-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 13/47] hw/xen: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alan Robinson Message-Id: <20180625124238.25339-12-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/block/xen_disk.c | 3 ++- hw/i386/xen/xen-mapcache.c | 3 ++- hw/xenpv/xen_domainbuild.c | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 9fbc0cd..36eff94 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -20,6 +20,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include #include @@ -814,7 +815,7 @@ static int blk_connect(struct XenDevice *xendev) xen_pv_printf(xendev, 1, "type \"%s\", fileproto \"%s\", filename \"%s\"," " size %" PRId64 " (%" PRId64 " MB)\n", blkdev->type, blkdev->fileproto, blkdev->filename, - blkdev->file_size, blkdev->file_size >> 20); + blkdev->file_size, blkdev->file_size / MiB); /* Fill in number of sector size and number of sectors */ xenstore_write_be_int(xendev, "sector-size", blkdev->file_blk); diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index 628b813..4e4f069 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include @@ -46,7 +47,7 @@ * From empirical tests I observed that qemu use 75MB more than the * max_mcache_size. */ -#define NON_MCACHE_MEMORY_SIZE (80 * 1024 * 1024) +#define NON_MCACHE_MEMORY_SIZE (80 * MiB) typedef struct MapCacheEntry { hwaddr paddr_index; diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index 027f76f..188acac 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/xen/xen_backend.h" #include "xen_domainbuild.h" #include "qemu/timer.h" @@ -75,9 +76,9 @@ int xenstore_domain_init1(const char *kernel, const char *ramdisk, xenstore_write_str(dom, "vm", vm); /* memory */ - xenstore_write_int(dom, "memory/target", ram_size >> 10); // kB - xenstore_write_int(vm, "memory", ram_size >> 20); // MB - xenstore_write_int(vm, "maxmem", ram_size >> 20); // MB + xenstore_write_int(dom, "memory/target", ram_size / KiB); + xenstore_write_int(vm, "memory", ram_size / MiB); + xenstore_write_int(vm, "maxmem", ram_size / MiB); /* cpus */ for (i = 0; i < smp_cpus; i++) { @@ -113,7 +114,7 @@ int xenstore_domain_init2(int xenstore_port, int xenstore_mfn, /* console */ xenstore_write_str(dom, "console/type", "ioemu"); - xenstore_write_int(dom, "console/limit", 128 * 1024); + xenstore_write_int(dom, "console/limit", 128 * KiB); xenstore_write_int(dom, "console/ring-ref", console_mfn); xenstore_write_int(dom, "console/port", console_port); xen_config_dev_console(0); @@ -260,7 +261,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, } #endif - rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10); + rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size / KiB); if (rc < 0) { fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n"); goto err; @@ -269,7 +270,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, xenstore_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); console_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); - rc = xc_linux_build(xen_xc, xen_domid, ram_size >> 20, + rc = xc_linux_build(xen_xc, xen_domid, ram_size / MiB, kernel, ramdisk, cmdline, 0, flags, xenstore_port, &xenstore_mfn, From patchwork Sat Jun 30 06:10:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YdXzDG/f"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HjwY3SVzz9s29 for ; Sat, 30 Jun 2018 16:17:16 +1000 (AEST) Received: from localhost ([::1]:45697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9C6-0000xM-0M for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:17:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045m-BB for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ963-0001xZ-1v for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:36496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ962-0001vk-Hm for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:58 -0400 Received: by mail-wm0-x232.google.com with SMTP id u18-v6so3959234wmc.1 for ; Fri, 29 Jun 2018 23:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=frwTU4ABbBEygKoi7+C/pNGudVTYVJ/pm/oTEzDaRfA=; b=YdXzDG/fhsH1ORLak17Odnt90SN1jptOjniMBJhln5fzSVepgD25o+QiyaV3ldkWQN hzIitOECbmFO3Pek/QJ5WTzBabVy4tF5bhw+pvv7qXZiqdKLd4UajN7Mxjibm0PJKwOp YaJnJFqZxHpFaeB9rHt6k4F/CX3EfhLNbia6kQ29rTQKIIyhhC4Rka8eS1EFnTrKUYM6 pw+ml6j83Bcz8Zr5Kc5OY3i1SHXcitk5nTt2GpABh8fpY+jI0BSP9hsHd2Cu6j10ful4 9DizQu2G8GsQQRNkZCmr5DigeVn9kZmStYn3/JMx999dav9QVEgosVEdshqWDZKvlVqR Tr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=frwTU4ABbBEygKoi7+C/pNGudVTYVJ/pm/oTEzDaRfA=; b=aXv/pNKe+QtlvQz2sPotxqMkuWp0xpdXJ4VtTOWc6pkcX9bbYn3dHEfwUMrVuAG2UJ Gm2+z1HPdsVUkippS86nTzCP+MGoEiKlQ9zmcRCicX0B6Y1PQ5VDlG3fmaakyLHPN72E KEeurf034OH/uiTT/4rHBMKY7u1r42PLaXmorV/qaK39bVHseO9B/erI5tyM4bDxd5t0 z5IEU/nZxX/HfCMweYeCUk6vm/MEKYLnLOucf5d356UvkcVclTrRWYKISDr1EfQqNf7y d+cNgaWDWhI4KkdjSovRi2hUe6c73CrQjKj2jZFj+/61vNM+DM+nbcjVz2DLH39OY2L2 Cl2w== X-Gm-Message-State: APt69E1idMbd14IR2x2ktKJk5hwcyViYjXm1bJ9Fmw+y/oEQpWIlk86q 6T9DYRSoBJwVnK5zbh4GeWcGVU9w X-Google-Smtp-Source: AAOMgpcO6kpjV3iQpb11IgZZ8TSEL+wyskxQVybawtY4HWi4BZKkcLlzieSLHB5WkgUPTzKHx5n9gQ== X-Received: by 2002:a1c:c289:: with SMTP id s131-v6mr3893494wmf.65.1530339057345; Fri, 29 Jun 2018 23:10:57 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:07 +0200 Message-Id: <20180630061040.6018-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::232 Subject: [Qemu-devel] [PULL 14/47] hw/tpm: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Message-Id: <20180625124238.25339-13-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- include/hw/acpi/tpm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h index 46ac4dc..3580ffd 100644 --- a/include/hw/acpi/tpm.h +++ b/include/hw/acpi/tpm.h @@ -16,6 +16,7 @@ #ifndef HW_ACPI_TPM_H #define HW_ACPI_TPM_H +#include "qemu/units.h" #include "hw/registerfields.h" #define TPM_TIS_ADDR_BASE 0xFED40000 @@ -176,7 +177,7 @@ REG32(CRB_DATA_BUFFER, 0x80) #define TPM_CRB_ADDR_CTRL (TPM_CRB_ADDR_BASE + A_CRB_CTRL_REQ) #define TPM_CRB_R_MAX R_CRB_DATA_BUFFER -#define TPM_LOG_AREA_MINIMUM_SIZE (64 * 1024) +#define TPM_LOG_AREA_MINIMUM_SIZE (64 * KiB) #define TPM_TCPA_ACPI_CLASS_CLIENT 0 #define TPM_TCPA_ACPI_CLASS_SERVER 1 From patchwork Sat Jun 30 06:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ai1loY1C"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkB54XLyz9s29 for ; Sat, 30 Jun 2018 16:29:01 +1000 (AEST) Received: from localhost ([::1]:45758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9NT-0002ww-8x for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:28:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045q-RO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ963-0001z4-Rq for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:54800) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ963-0001xa-Ju for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:59 -0400 Received: by mail-wm0-x243.google.com with SMTP id i139-v6so4085516wmf.4 for ; Fri, 29 Jun 2018 23:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MMd5fYi9h0LYdqJ/n81uzSxU18pw2JNYfoHdsmDiQe0=; b=ai1loY1CpZDC9hISmUTe+Ktz9EFzW1MkWJC3ZWCDSNH2avNfTBrlkdmjh1nWr0kisK byJ9Id7lCk15pFNAxpIamE8RBS234jCDb0NYUNFObdJ3TisTQ4D8wHALxQfka9F49nS1 GTYEuKjaugiko8Hcn7qKBNzcy+qg9ah1McuMMCOPQnElI6jbl417t0HWr43F+kbynjSw fRa6GZzIbOP34c1jYGDQwz7lzjF40qHheC8s4HzxNncW22rCVTgmc1/vssfjGuwhGM3c iqMHyQCICwcDnff0ODl5czN2J5ZdBm1/zOCSze2JkrpAZpXuKsk1PQls+F2fEJrnnldZ 7NYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MMd5fYi9h0LYdqJ/n81uzSxU18pw2JNYfoHdsmDiQe0=; b=MZqrGFL9SvUcYc4GieYljKLBHqr6IhzKa41lMD9sxCqMT1PPjPCLj/KYsmqwsMpsJB jWwAY/SLRTKohV2b19IBPGH19eOQGdfSs/GBXMaYlV/hG7islpRtzMfUu0X/JTq85TnH XVPye4Zsy0t25sUa/Uqwt+wFJc6F0hZqTuRl3hnKea64Vx9EBmIsFBi1cmRZgqGEzQzx b8khUXAhOaEJWOJRGAleZe2SfQaUlvr0yTKtsbH9Y71qvyYnZTJeY6pbnW0xWK54Hnjd NgbD0mFTlINuuZYgC03zU5KBhwknx2ku91KXg6+UGsM6W5kPiuGwYwMIeKjG+2khNU+9 CUhg== X-Gm-Message-State: APt69E3EMGdBygRe9wwcGLlAx6i86wBdkDvRbYOCmahzTmYVFmUtAe2W myzCyvejv14pIIWg+95BGlauWThC X-Google-Smtp-Source: AAOMgpcpO/8k2gln9upUNzOSRJu/J1lxQd6BchXftVv6ceaUajP7ZU+me6r7bQPSwuz3qsomef/47A== X-Received: by 2002:a1c:5dc9:: with SMTP id r192-v6mr3474061wmb.85.1530339058458; Fri, 29 Jun 2018 23:10:58 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:08 +0200 Message-Id: <20180630061040.6018-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 15/47] hw/block: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-14-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/block/m25p80.c | 5 +++-- hw/block/nvme.c | 3 ++- hw/block/tc58128.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index b0ed8fa..e8dfa14 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -22,6 +22,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "sysemu/block-backend.h" #include "hw/ssi/ssi.h" @@ -541,12 +542,12 @@ static void flash_erase(Flash *s, int offset, FlashCMD cmd) switch (cmd) { case ERASE_4K: case ERASE4_4K: - len = 4 << 10; + len = 4 * KiB; capa_to_assert = ER_4K; break; case ERASE_32K: case ERASE4_32K: - len = 32 << 10; + len = 32 * KiB; capa_to_assert = ER_32K; break; case ERASE_SECTOR: diff --git a/hw/block/nvme.c b/hw/block/nvme.c index d5bf95b..65c84e7 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -25,6 +25,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/block/block.h" #include "hw/hw.h" #include "hw/pci/msix.h" @@ -648,7 +649,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c) { - static const int data_len = 4096; + static const int data_len = 4 * KiB; uint32_t min_nsid = le32_to_cpu(c->nsid); uint64_t prp1 = le64_to_cpu(c->prp1); uint64_t prp2 = le64_to_cpu(c->prp2); diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index 1d9f7ee..808ad76 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/sh4/sh.h" #include "hw/loader.h" @@ -26,7 +27,7 @@ typedef struct { static tc58128_dev tc58128_devs[2]; -#define FLASH_SIZE (16*1024*1024) +#define FLASH_SIZE (16 * MiB) static void init_dev(tc58128_dev * dev, const char *filename) { From patchwork Sat Jun 30 06:10:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937316 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QXgodEMw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkFl1Vhpz9s29 for ; Sat, 30 Jun 2018 16:32:11 +1000 (AEST) Received: from localhost ([::1]:45776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9QW-000602-Qp for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:32:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ969-0004Ca-4t for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ965-000223-Cu for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:05 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:40662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ965-000202-16 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:01 -0400 Received: by mail-wr0-x231.google.com with SMTP id l2-v6so10069958wro.7 for ; Fri, 29 Jun 2018 23:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/bRLdf17CTL/2BKp5w1xVm6uhzgd8AXKJxmvB49fd1M=; b=QXgodEMwGGS9Gc5WAEEUamLWVsOhkNlSfkzCas7tsLOk2G9jyqBC/9S6Zxjq+pXPyr 93+6bSIHGb/OMwltUKpLzKfzHLj+k89h+vw1dvdYFY0dVOiO0t3ehFg5m9QJf4aeynui s1YeM0AqHlatszNdlwisxjvYLq1zJJeiChIR4GYXM8337s2fjtfT6HXc9c48vA2el59r 4TGgy7MZKpn/59MWG1a8dgTMohH0RDR1KMw1Uzy1pMu77k2eTcdW2TDZgoUGzwRfwVuH 6Xv6aXJlQkUs2kGr+fgujSD/Rm47YULuJPsOJSA2pD4f7qDJSb2wtLGVVF7IR1bOezIy 3SdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/bRLdf17CTL/2BKp5w1xVm6uhzgd8AXKJxmvB49fd1M=; b=jt58a6iCRKG2Suf9MPpG5xW7d+lBd0hHKOLDyZnRs/cDCjx0H57NqUaK6HSk45+R7v Ph6BjmCFcYlyLshGDnX6Kg6Et9E+JLhKZloEhJdxIoNYvgUSg7Evj8KofV+cD6B/TSPY 6YME2TC1pGUd4J2WTWJ0Cps9QUcNOdq4bYKpXqrdCa5orKquy2Rn1jucRSTlHDRvLdyn wcvXuTevo1ZzT0Vy+CxINhyx30RPS/2GIjtA3gxfawZhsLdJhC+wGrtohDmuN9bfHrXk w2AlsRQhT5zXZrFMvvdaNo/nhIgQySCO79iycVfb0h+fAoMTch7bRF0zVMNNj0gbUmf/ ZeWg== X-Gm-Message-State: APt69E0ZBVq+3fZmkHSNPmngeQn+RUehmUPVUbqIgvs86vaRGHDq57Vx poGhUJ3jkbjtOY8vnBCz/6cp1bt4 X-Google-Smtp-Source: AAOMgpdNiLLlnINUP53lnfy4hOETF6VhFDji5DuJVVxl5WWrmxAT+QYIsQRgAodVzIVkPSOGbniFEw== X-Received: by 2002:adf:ec02:: with SMTP id x2-v6mr13269152wrn.245.1530339059726; Fri, 29 Jun 2018 23:10:59 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:09 +0200 Message-Id: <20180630061040.6018-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::231 Subject: [Qemu-devel] [PULL 16/47] hw/display: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Gerd Hoffmann Reviewed-by: Alistair Francis Message-Id: <20180625124238.25339-15-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/display/bochs-display.c | 9 +++++---- hw/display/cirrus_vga.c | 10 +++++----- hw/display/g364fb.c | 4 ++-- hw/display/qxl.c | 30 ++++++++++++++---------------- hw/display/vga-isa-mm.c | 5 +++-- hw/display/vga.c | 5 +++-- hw/display/virtio-gpu.c | 4 ++-- hw/display/vmware_vga.c | 3 ++- hw/display/xenfb.c | 3 ++- include/hw/display/xlnx_dp.h | 5 +++-- 10 files changed, 41 insertions(+), 37 deletions(-) diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 1187d77..5e0c1f1 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -5,6 +5,7 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/display/bochs-vbe.h" @@ -70,7 +71,7 @@ static uint64_t bochs_display_vbe_read(void *ptr, hwaddr addr, case VBE_DISPI_INDEX_ID: return VBE_DISPI_ID5; case VBE_DISPI_INDEX_VIDEO_MEMORY_64K: - return s->vgamem / (64 * 1024); + return s->vgamem / (64 * KiB); } if (index >= ARRAY_SIZE(s->vbe_regs)) { @@ -258,10 +259,10 @@ static void bochs_display_realize(PCIDevice *dev, Error **errp) s->con = graphic_console_init(DEVICE(dev), 0, &bochs_display_gfx_ops, s); - if (s->vgamem < (4 * 1024 * 1024)) { + if (s->vgamem < 4 * MiB) { error_setg(errp, "bochs-display: video memory too small"); } - if (s->vgamem > (256 * 1024 * 1024)) { + if (s->vgamem > 256 * MiB) { error_setg(errp, "bochs-display: video memory too big"); } s->vgamem = pow2ceil(s->vgamem); @@ -323,7 +324,7 @@ static void bochs_display_exit(PCIDevice *dev) } static Property bochs_display_properties[] = { - DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * 1024 * 1024), + DEFINE_PROP_SIZE("vgamem", BochsDisplayState, vgamem, 16 * MiB), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 138ae96..5e44f00 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -27,6 +27,7 @@ * available at http://home.worldonline.dk/~finth/ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "trace.h" #include "hw/hw.h" @@ -2218,7 +2219,7 @@ static inline void cirrus_cursor_compute_yrange(CirrusVGAState *s) uint32_t content; int y, y_min, y_max; - src = s->vga.vram_ptr + s->real_vram_size - 16 * 1024; + src = s->vga.vram_ptr + s->real_vram_size - 16 * KiB; if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { src += (s->vga.sr[0x13] & 0x3c) * 256; y_min = 64; @@ -2347,7 +2348,7 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) return; } - src = s->vga.vram_ptr + s->real_vram_size - 16 * 1024; + src = s->vga.vram_ptr + s->real_vram_size - 16 * KiB; if (s->vga.sr[0x12] & CIRRUS_CURSOR_LARGE) { src += (s->vga.sr[0x13] & 0x3c) * 256; src += (scr_y - s->vga.hw_cursor_y) * 16; @@ -2995,8 +2996,7 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, /* I/O handler for LFB */ memory_region_init_io(&s->cirrus_linear_io, owner, &cirrus_linear_io_ops, s, - "cirrus-linear-io", s->vga.vram_size_mb - * 1024 * 1024); + "cirrus-linear-io", s->vga.vram_size_mb * MiB); memory_region_set_flush_coalesced(&s->cirrus_linear_io); /* I/O handler for LFB */ @@ -3013,7 +3013,7 @@ static void cirrus_init_common(CirrusVGAState *s, Object *owner, memory_region_set_flush_coalesced(&s->cirrus_mmio_io); s->real_vram_size = - (s->device_id == CIRRUS_ID_CLGD5446) ? 4096 * 1024 : 2048 * 1024; + (s->device_id == CIRRUS_ID_CLGD5446) ? 4 * MiB : 2 * MiB; /* XXX: s->vga.vram_size must be a power of two */ s->cirrus_addr_mask = s->real_vram_size - 1; diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 3d75394..fbc2b24 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "qemu/error-report.h" #include "ui/console.h" @@ -510,8 +511,7 @@ static void g364fb_sysbus_reset(DeviceState *d) } static Property g364fb_sysbus_properties[] = { - DEFINE_PROP_UINT32("vram_size", G364SysBusState, g364.vram_size, - 8 * 1024 * 1024), + DEFINE_PROP_UINT32("vram_size", G364SysBusState, g364.vram_size, 8 * MiB), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/display/qxl.c b/hw/display/qxl.c index a71714c..b09a039 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include #include "qapi/error.h" @@ -2012,11 +2013,11 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) if (qxl->vgamem_size_mb > 256) { qxl->vgamem_size_mb = 256; } - qxl->vgamem_size = qxl->vgamem_size_mb * 1024 * 1024; + qxl->vgamem_size = qxl->vgamem_size_mb * MiB; /* vga ram (bar 0, total) */ if (qxl->ram_size_mb != -1) { - qxl->vga.vram_size = qxl->ram_size_mb * 1024 * 1024; + qxl->vga.vram_size = qxl->ram_size_mb * MiB; } if (qxl->vga.vram_size < qxl->vgamem_size * 2) { qxl->vga.vram_size = qxl->vgamem_size * 2; @@ -2024,7 +2025,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) /* vram32 (surfaces, 32bit, bar 1) */ if (qxl->vram32_size_mb != -1) { - qxl->vram32_size = qxl->vram32_size_mb * 1024 * 1024; + qxl->vram32_size = qxl->vram32_size_mb * MiB; } if (qxl->vram32_size < 4096) { qxl->vram32_size = 4096; @@ -2032,7 +2033,7 @@ static void qxl_init_ramsize(PCIQXLDevice *qxl) /* vram (surfaces, 64bit, bar 4+5) */ if (qxl->vram_size_mb != -1) { - qxl->vram_size = (uint64_t)qxl->vram_size_mb * 1024 * 1024; + qxl->vram_size = (uint64_t)qxl->vram_size_mb * MiB; } if (qxl->vram_size < qxl->vram32_size) { qxl->vram_size = qxl->vram32_size; @@ -2134,13 +2135,12 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) } /* print pci bar details */ - dprint(qxl, 1, "ram/%s: %d MB [region 0]\n", - qxl->id == 0 ? "pri" : "sec", - qxl->vga.vram_size / (1024*1024)); - dprint(qxl, 1, "vram/32: %" PRIx64 "d MB [region 1]\n", - qxl->vram32_size / (1024*1024)); - dprint(qxl, 1, "vram/64: %" PRIx64 "d MB %s\n", - qxl->vram_size / (1024*1024), + dprint(qxl, 1, "ram/%s: %" PRId64 " MB [region 0]\n", + qxl->id == 0 ? "pri" : "sec", qxl->vga.vram_size / MiB); + dprint(qxl, 1, "vram/32: %" PRIx64 " MB [region 1]\n", + qxl->vram32_size / MiB); + dprint(qxl, 1, "vram/64: %" PRIx64 " MB %s\n", + qxl->vram_size / MiB, qxl->vram32_size < qxl->vram_size ? "[region 4]" : "[unmapped]"); qxl->ssd.qxl.base.sif = &qxl_interface.base; @@ -2167,7 +2167,7 @@ static void qxl_realize_primary(PCIDevice *dev, Error **errp) qxl->id = 0; qxl_init_ramsize(qxl); vga->vbe_size = qxl->vgamem_size; - vga->vram_size_mb = qxl->vga.vram_size >> 20; + vga->vram_size_mb = qxl->vga.vram_size / MiB; vga_common_init(vga, OBJECT(dev), true); vga_init(vga, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev), false); @@ -2391,10 +2391,8 @@ static VMStateDescription qxl_vmstate = { }; static Property qxl_properties[] = { - DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, - 64 * 1024 * 1024), - DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, - 64 * 1024 * 1024), + DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size, 64 * MiB), + DEFINE_PROP_UINT64("vram_size", PCIQXLDevice, vram32_size, 64 * MiB), DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision, QXL_DEFAULT_REVISION), DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0), diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index e887b45..bd58141 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -22,12 +22,13 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/display/vga.h" #include "vga_int.h" #include "ui/pixel_ops.h" -#define VGA_RAM_SIZE (8192 * 1024) +#define VGA_RAM_SIZE (8 * MiB) typedef struct ISAVGAMMState { VGACommonState vga; @@ -130,7 +131,7 @@ int isa_vga_mm_init(hwaddr vram_base, s = g_malloc0(sizeof(*s)); - s->vga.vram_size_mb = VGA_RAM_SIZE >> 20; + s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; vga_common_init(&s->vga, NULL, true); vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); diff --git a/hw/display/vga.c b/hw/display/vga.c index ed476e4..d759918 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/display/vga.h" @@ -721,7 +722,7 @@ uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr) val = s->vbe_regs[s->vbe_index]; } } else if (s->vbe_index == VBE_DISPI_INDEX_VIDEO_MEMORY_64K) { - val = s->vbe_size / (64 * 1024); + val = s->vbe_size / (64 * KiB); } else { val = 0; } @@ -2192,7 +2193,7 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) s->vram_size_mb = uint_clamp(s->vram_size_mb, 1, 512); s->vram_size_mb = pow2ceil(s->vram_size_mb); - s->vram_size = s->vram_size_mb << 20; + s->vram_size = s->vram_size_mb * MiB; if (!s->vbe_size) { s->vbe_size = s->vram_size; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 2dd3c34..71a0071 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "qemu/iov.h" #include "ui/console.h" @@ -1314,8 +1315,7 @@ static const VMStateDescription vmstate_virtio_gpu = { static Property virtio_gpu_properties[] = { DEFINE_PROP_UINT32("max_outputs", VirtIOGPU, conf.max_outputs, 1), - DEFINE_PROP_SIZE("max_hostmem", VirtIOGPU, conf.max_hostmem, - 256 * 1024 * 1024), + DEFINE_PROP_SIZE("max_hostmem", VirtIOGPU, conf.max_hostmem, 256 * MiB), #ifdef CONFIG_VIRGL DEFINE_PROP_BIT("virgl", VirtIOGPU, conf.flags, VIRTIO_GPU_FLAG_VIRGL_ENABLED, true), diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index bd3e8b3..08deb08 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/loader.h" @@ -565,7 +566,7 @@ static inline int vmsvga_fifo_length(struct vmsvga_state_s *s) s->fifo_next >= SVGA_FIFO_SIZE) { return 0; } - if (s->fifo_max < s->fifo_min + 10 * 1024) { + if (s->fifo_max < s->fifo_min + 10 * KiB) { return 0; } diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 911291c..0330dc6 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -25,6 +25,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "ui/input.h" @@ -889,7 +890,7 @@ static int fb_initialise(struct XenDevice *xendev) return rc; fb_page = fb->c.page; - rc = xenfb_configure_fb(fb, videoram * 1024 * 1024U, + rc = xenfb_configure_fb(fb, videoram * MiB, fb_page->width, fb_page->height, fb_page->depth, fb_page->mem_length, 0, fb_page->line_length); if (rc != 0) diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index ee046a5..26b759c 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -29,14 +29,15 @@ #include "hw/display/dpcd.h" #include "hw/i2c/i2c-ddc.h" #include "qemu/fifo8.h" +#include "qemu/units.h" #include "hw/dma/xlnx_dpdma.h" #include "audio/audio.h" #ifndef XLNX_DP_H #define XLNX_DP_H -#define AUD_CHBUF_MAX_DEPTH 32768 -#define MAX_QEMU_BUFFER_SIZE 4096 +#define AUD_CHBUF_MAX_DEPTH (32 * KiB) +#define MAX_QEMU_BUFFER_SIZE (4 * KiB) #define DP_CORE_REG_ARRAY_SIZE (0x3AF >> 2) #define DP_AVBUF_REG_ARRAY_SIZE (0x238 >> 2) From patchwork Sat Jun 30 06:10:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DnhjK3my"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk011hWPz9s1B for ; Sat, 30 Jun 2018 16:20:17 +1000 (AEST) Received: from localhost ([::1]:45708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9F0-0003Mf-Ou for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:20:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ967-00048F-3X for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ966-00023H-3s for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:03 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:34816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ965-00021z-T0 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:02 -0400 Received: by mail-wm0-x233.google.com with SMTP id z137-v6so3958443wmc.0 for ; Fri, 29 Jun 2018 23:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s9MOWlsLaWNXwC2m8KQ43kZsKN9FKnpgqDh4lwgF94s=; b=DnhjK3myJKhqhlVMR/FqzGM/VO1iLb0oljwLRJwNVLgZlZNaRXauZXKFE2XtnSqb88 kgI/I0jWCZ8lSYfNLlAWGyDLPULzKYSxc9JpgeDOzuewFSZopNT8A3QXJvK/uFw9KCma 4CrgMPtpAYY90k1PN1xgkpa7dt04aVOX94MBTHnW67RQCVJxFggR2W4EYFonEkicxz4V m65bFydN1kPwP9I48UpyMaM5eLgZbxqI9M3zZbmzb5C5RylTIY7CFK0NJeXmBn89Rz68 4/dpNqzLLNTkF4ZSnVFpoDsXeT3QDlroE6/eGgNvPnsdCTEKTlQV5BRpoNs3GrPdp10f YEIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=s9MOWlsLaWNXwC2m8KQ43kZsKN9FKnpgqDh4lwgF94s=; b=GFeUhe0VwrPWMZQW4WFwF5UF83XpAItEMETUUutxRgQ6pv0N6Ch0c62ewX3PGDNr/s UanGXmP25moYLQPhzApITak81a8b1e3LLhqIDkG9U6WMIydc/G+kYy0QloUJMf+4CEV2 an8jLgZzF0k8W9J8oD4vtYiwSMqdnw0/8iDOrQl4/unsrxFHtkXEJyQqjG86h6LxQf0C xk1NAFHctbhRHt/nny1E07k4LUVNsZC2I54HuFa6NOS/XZ7JTU6mRBQ3aeHhLud7iLUW Xc3a31SGPkL8wzGdpJ1U8ONSuLRpLePdsqdwkUl44rZXMzZ/xz5xw0thOhl7sfpsbENn JQ3g== X-Gm-Message-State: APt69E3JYWQYeSORVfKhB71EylBniqB8jj5blefj0d/6rOYwwnJMDyb6 Ls7XMQFJqHcfVq1A2blpLa0iDtNj X-Google-Smtp-Source: AAOMgpfNqs6a4kwAmG67JHpn3PkMKcQa/D4tyET2B5D06SLZWhdVrmzrsC2l6IkxL+H1EbV/Lv+iOA== X-Received: by 2002:a1c:c91a:: with SMTP id f26-v6mr3681733wmb.140.1530339060766; Fri, 29 Jun 2018 23:11:00 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:10 +0200 Message-Id: <20180630061040.6018-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL 17/47] hw/misc: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-16-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/misc/auxbus.c | 3 ++- hw/misc/edu.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index b4cacd6..b8a8721 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -27,6 +27,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/log.h" #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" @@ -68,7 +69,7 @@ AUXBus *aux_init_bus(DeviceState *parent, const char *name) /* Memory related. */ bus->aux_io = g_malloc(sizeof(*bus->aux_io)); - memory_region_init(bus->aux_io, OBJECT(bus), "aux-io", (1 << 20)); + memory_region_init(bus->aux_io, OBJECT(bus), "aux-io", 1 * MiB); address_space_init(&bus->aux_addr_space, bus->aux_io, "aux-io"); return bus; } diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 34eb05d..df26a4d 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "qemu/timer.h" @@ -357,7 +358,7 @@ static void pci_edu_realize(PCIDevice *pdev, Error **errp) edu, QEMU_THREAD_JOINABLE); memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu, - "edu-mmio", 1 << 20); + "edu-mmio", 1 * MiB); pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio); } From patchwork Sat Jun 30 06:10:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mUlo7Ux+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk3S2TGgz9s1B for ; Sat, 30 Jun 2018 16:23:16 +1000 (AEST) Received: from localhost ([::1]:45727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Ht-000685-SB for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:23:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ968-0004AS-3i for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ967-00024k-6j for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:04 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:34554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ967-00023R-02 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:03 -0400 Received: by mail-wm0-x22b.google.com with SMTP id l15-v6so3502415wmc.1 for ; Fri, 29 Jun 2018 23:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ShQopHbVLu2ZiuVM8IzDN7KgfPr2sew8y07HjHvWZaY=; b=mUlo7Ux+GR/btcTzr38cVuI0s+UsKkgRt9SZwe/cMyFDDvvL546mN1NiSdFwZdXnGn LDpIbmlKg7RBlaRhoXd3G7Ch6fMEaSMxk1W/opNJ6gNqw+XJE+oh7sjsKhhox2+dPNvr pYEo0//0S3DNZCyTAXTNB9zsFhkBv6Du6xfja0wscaKyCFnNE7rxhM1sq0BzlGbMPpL+ ycX5ORFrvJnLO8H1Q1ffi1zBFgcd+F36z4fgAXj5pXvYQvFthjecBmWJYaQ8kDLyJWvZ SKgfsd6MZTt0+luE8AWlpoUAOWBBRRIiGDdM9IMwknFdVCo4RPe8g2zFcgyXlrFc0nKX HvSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ShQopHbVLu2ZiuVM8IzDN7KgfPr2sew8y07HjHvWZaY=; b=Hz8d0ASEJcWHD9Ma2Ujt9IRmc5bvZ7Ydvf7zACn0E0jay8dnWNFPalFKJQ5yJ4pRH9 O+n/bLnzd23B0VGkUq93YW0NmGSubuqk8zgPElVweHPenM60cFiajpzBp9H61S9YyHQ3 2Y82HxPNsrqBQQHjxcE9jwXnWr0nEN+R+LS/l5p3SvqEbs6lgRxJInnEFORxDaJh/E1E 8QZ12b9j+8PFydjVmLvLAFP46efFRaaiFTB+uR6PRdPbwcN9+TeFjcpM3ZkUbwg+lMow +M87MtuDNy+Npn7qXArOAQBkumCrtRAa5uPWawTc7Wq49wDRwGme6zUfvvmH2tgtaQvq BtBg== X-Gm-Message-State: APt69E0w9NLtqWfAIT5LBA2MaTPlZPNhh8pO1xnwttXAW1H/pK8cxvs4 kWpuZ4CNPBnXD3VLp9Kv3K89lFlL X-Google-Smtp-Source: AAOMgpfcOhbFsRrmCQqyJ2De4BJzewCTg35Kaa4P0pEdpM/6FBW9CT/q1enFWyyts6EulopLml3HIA== X-Received: by 2002:a1c:e041:: with SMTP id x62-v6mr3304454wmg.155.1530339061783; Fri, 29 Jun 2018 23:11:01 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:11 +0200 Message-Id: <20180630061040.6018-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PULL 18/47] hw/riscv: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Clark Message-Id: <20180625124238.25339-17-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/riscv/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index ad03113..34d4899 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -84,7 +85,7 @@ static hwaddr load_initrd(const char *filename, uint64_t mem_size, * halfway into RAM, and for boards with 256MB of RAM or more we put * the initrd at 128MB. */ - *start = kernel_entry + MIN(mem_size / 2, 128 * 1024 * 1024); + *start = kernel_entry + MIN(mem_size / 2, 128 * MiB); size = load_ramdisk(filename, *start, mem_size - *start); if (size == -1) { From patchwork Sat Jun 30 06:10:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sB5mH5u7"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk0D4Dhhz9s1B for ; Sat, 30 Jun 2018 16:20:28 +1000 (AEST) Received: from localhost ([::1]:45713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9FC-0003lQ-63 for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:20:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ968-0004CR-VY for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ968-000264-15 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:04 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:34556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ967-00024f-QH for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:03 -0400 Received: by mail-wm0-x22d.google.com with SMTP id l15-v6so3502429wmc.1 for ; Fri, 29 Jun 2018 23:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/hLXVQXwcSAJ3TZFDnrRpV/W+A9+XUkY2m//Q+rcMrM=; b=sB5mH5u7UfWtaEfn9/QCNwXbhO8D/u9w4wQVXGJ0OK6H+gHf9HEKBWWdx7zvlT2AVV 9Qv3BJDyD9TosNYcwRcLO6pulRMtbF9UC1nUCo19in22ptJ6+Fww1Y3ZcCPBR6p4tTHx QNE7f1u+4KIjqQJNtH2cP3us3GS/sCbhRQV7WOkFXoHxIgcxEaive/2B+NeSsgHNBDJm YidsMZP6MIP0VRGmK2epKemIVgzAtj3jUBSHWRPrF9yUluKKq2ybJepRiJbIJJOnjYzs y8Y0Cz27WPivbvAP8Y04bAJr7s7pZs6c8HLnRSkvj2yNizjQ7x/o8jXCQaXspTyJnmeL O7Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/hLXVQXwcSAJ3TZFDnrRpV/W+A9+XUkY2m//Q+rcMrM=; b=EtE/wtqDG4GrZaAY35/rHBosW1cB/BVGvZ5nsXEF5dHr2yI1lTDM8afH2s6xcENxee 9mh3oFU5oPR0Q3bN/WV2hm5S7Dy5MLx5ER3QGagJjYLTZ5Kbjw31tDq3nKPkZQP+gt6v Sg/JwkNwstHxqdq5WPhagYoqIsC3egFhkD9ClybY31Lmo7LSQKdjTqHQW4PZC8HX8Lay gOeJRtyDIm476Y5ZOpx6QvH1ye5ERkDzAmY+CeaJRjdeHKTv5bZV5E6kLBvcTp1Rcob6 1VPqOiIcNhoQwZyhZrXXuKB2EyGOhYUbFPVhURiYapMmJO16hWAiDagnGwrzb1IjMj3i Ixzg== X-Gm-Message-State: APt69E310WNNykqY7FRjLMmPqXmybqEoWtsdIVMuGL/VETKWshr1A0Li bSt4ZHD9MZtM0kd/IyXh+NymaQns X-Google-Smtp-Source: AAOMgpcUqnWaHH4RONyUemYWX7mJ6g4DROZFn67MYasDVCPWybiH11ePVuzMHrlH3/WYiQjw8r8R4Q== X-Received: by 2002:a1c:91c4:: with SMTP id t187-v6mr3743834wmd.51.1530339062635; Fri, 29 Jun 2018 23:11:02 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:12 +0200 Message-Id: <20180630061040.6018-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 19/47] hw/m68k: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20180625124238.25339-18-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/m68k/mcf5208.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index ae3dcc9..0f2245d 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -6,6 +6,7 @@ * This code is licensed under the GPL */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" @@ -241,7 +242,7 @@ static void mcf5208evb_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Internal SRAM. */ - memory_region_init_ram(sram, NULL, "mcf5208.sram", 16384, &error_fatal); + memory_region_init_ram(sram, NULL, "mcf5208.sram", 16 * KiB, &error_fatal); memory_region_add_subregion(address_space_mem, 0x80000000, sram); /* Internal peripherals. */ From patchwork Sat Jun 30 06:10:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NiXI0+Ex"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk1R1m1Dz9s1B for ; Sat, 30 Jun 2018 16:21:31 +1000 (AEST) Received: from localhost ([::1]:45719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9GC-0004kz-Ru for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:21:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96A-0004Dg-3C for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ969-00027i-1l for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:06 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:50480) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ968-00026Q-OZ for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:04 -0400 Received: by mail-wm0-x235.google.com with SMTP id v25-v6so3127228wmc.0 for ; Fri, 29 Jun 2018 23:11:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uYuYG5Q7e8ZCofGVeD4Z4X1I3oUBODLktzO3kHSlRmw=; b=NiXI0+Exb+IlAfksHo0sN7W7b0vkUscS9XjnaAfWhS/MIvkc4LFjVY1OE+ngLwiKV8 7+BQJ5SgMK3Vw8V9gg8OHGM15dluJ/33GmjxB4KEeHt55rHQpz853csEK5QeBD8L7mwz r/NJG1bGxO/IpcMBv8q6990DUZFdjqThSioRVXHUsNGaLr4m1x3k97LYrKELrHaaZdJc arlpqE27RKZxhIP3JT+GY39ucDcDY7KAqs362/9XFV3GBsepF3IEUG70IOYHduJBCUF2 o/ymUgu5dATDlmm5KvJbsOD7PjrV+A2JJMNMtdPE9XP/nPiqKwoLcDjg/LqMpsONWH3u qJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uYuYG5Q7e8ZCofGVeD4Z4X1I3oUBODLktzO3kHSlRmw=; b=j67c5nEI6JrNYneQ/W2xsJAsz8KPz4yjJXzOLqLrIS7PA7LmFaYPD1plRgSK/mOr+4 d4nlwI980yQgpgRrWTXlyjmqgvl69HWexTmqRmk+BfwGCC49+E/Qf8hRRtipixxVaL4B yMwD7AUpf83oY/kSN1eHLSX9I9bt7qqo07qgrf6dUVnCyigntThLCKgpdAGsmJ4aUOrw dr4/EyW8jjkOcUNo2ZtZaGGv45mm3zH4O4XWVcTCSBYS7FoT3yVLcvkNdrlvlZJZWK1l Le0kJg0QfbEt74fD9ULQzBtSRdkO/odEeECmtnh5Pso9ZtREGGCjFr5b32jHyDNSrPsR yJ2Q== X-Gm-Message-State: APt69E23rCfFf3WN460477g82+xDmSvHfxL5KgTGWNxaP5IL50WIZ/D6 jc7OVrs0FvZBsEVVpmdrQoFgjsdw X-Google-Smtp-Source: AAOMgpdBZnuITltHwDbkRPHJl24v8MJWOvreoYEls1DZ1YWDiaZQiizWBlL4AFQHTm3W0Mvup/pfkg== X-Received: by 2002:a1c:6341:: with SMTP id x62-v6mr3627088wmb.35.1530339063571; Fri, 29 Jun 2018 23:11:03 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:13 +0200 Message-Id: <20180630061040.6018-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PULL 20/47] hw/sparc: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-19-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/sparc/leon3.c | 10 ++++++---- hw/sparc/sun4m.c | 10 +++++----- hw/sparc64/niagara.c | 3 ++- hw/sparc64/sun4u.c | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 98fa6ad..fa98ab8 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" @@ -139,9 +140,10 @@ static void leon3_generic_hw_init(MachineState *machine) env->qemu_irq_ack = leon3_irq_manager; /* Allocate RAM */ - if ((uint64_t)ram_size > (1UL << 30)) { - error_report("Too much memory for this machine: %d, maximum 1G", - (unsigned int)(ram_size / (1024 * 1024))); + if (ram_size > 1 * GiB) { + error_report("Too much memory for this machine: %" PRId64 "MB," + " maximum 1G", + ram_size / MiB); exit(1); } @@ -149,7 +151,7 @@ static void leon3_generic_hw_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Allocate BIOS */ - prom_size = 8 * 1024 * 1024; /* 8Mb */ + prom_size = 8 * MiB; memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size, &error_fatal); memory_region_set_readonly(prom, true); memory_region_add_subregion(address_space_mem, 0x00000000, prom); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index b984d2d..a9d4775 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -45,7 +46,6 @@ #include "hw/loader.h" #include "elf.h" #include "trace.h" -#include "qemu/cutils.h" /* * Sun4m architecture was used in the following machines: @@ -66,7 +66,7 @@ #define KERNEL_LOAD_ADDR 0x00004000 #define CMDLINE_ADDR 0x007ff000 #define INITRD_LOAD_ADDR 0x00800000 -#define PROM_SIZE_MAX (1024 * 1024) +#define PROM_SIZE_MAX (1 * MiB) #define PROM_VADDR 0xffd00000 #define PROM_FILENAME "openbios-sparc32" #define CFG_ADDR 0xd00000510ULL @@ -774,9 +774,9 @@ static void ram_init(hwaddr addr, ram_addr_t RAM_size, /* allocate RAM */ if ((uint64_t)RAM_size > max_mem) { - error_report("Too much memory for this machine: %d, maximum %d", - (unsigned int)(RAM_size / (1024 * 1024)), - (unsigned int)(max_mem / (1024 * 1024))); + error_report("Too much memory for this machine: %" PRId64 "," + " maximum %" PRId64, + RAM_size / MiB, max_mem / MiB); exit(1); } dev = qdev_create(NULL, "memory"); diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 22c4655..4fa8cb2 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -84,7 +85,7 @@ typedef struct NiagaraBoardState { #define NIAGARA_PROM_BASE 0xfff0000000ULL #define NIAGARA_Q_OFFSET 0x10000ULL #define NIAGARA_OBP_OFFSET 0x80000ULL -#define PROM_SIZE_MAX (4 * 1024 * 1024) +#define PROM_SIZE_MAX (4 * MiB) static void add_rom_or_fail(const char *file, const hwaddr addr) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 3975a7b..97d1269 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" @@ -52,11 +53,10 @@ #include "hw/loader.h" #include "elf.h" #include "trace.h" -#include "qemu/cutils.h" #define KERNEL_LOAD_ADDR 0x00404000 #define CMDLINE_ADDR 0x003ff000 -#define PROM_SIZE_MAX (4 * 1024 * 1024) +#define PROM_SIZE_MAX (4 * MiB) #define PROM_VADDR 0x000ffd00000ULL #define PBM_SPECIAL_BASE 0x1fe00000000ULL #define PBM_MEM_BASE 0x1ff00000000ULL From patchwork Sat Jun 30 06:10:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qiPU534l"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk6m5Gsmz9s1B for ; Sat, 30 Jun 2018 16:26:08 +1000 (AEST) Received: from localhost ([::1]:45745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Kg-0000cT-CM for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:26:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96F-0004JF-1A for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ969-00028b-Ub for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:50481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ969-00027p-OJ for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:05 -0400 Received: by mail-wm0-x236.google.com with SMTP id v25-v6so3127247wmc.0 for ; Fri, 29 Jun 2018 23:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=erZCK06C49girT+8OYEXbEAMv0WFhcjjVDp5qPC83T4=; b=qiPU534lglzhlIISYTSpwJPdqfRP7Nc+p+eYp8Kyxzdq2Yxg5vUpGdKpMwxyJdHoTy wGZsJgUsmGvLAILhNN9e94F9HE0f9SxhdSdbuK/ZTtH/cdMgQGVTOKWOIuk15uz3ReGv 4zlCJnhZPsfwMjuA13FCVwrxnbr37juwtBrlJPyS16W3hnY9vf4/GELzuZ0m9Oe61Bhe Ydy40Z2A06gOTEJjVzoqEojHglbc6UvY7tI4hH6QOmT2meOlBctKK8aMwPy3v+M760tg qpr0g6Yvq+laqZ+N7cQxU3ksnnvgxWNkUw8j8U4Dn7W7dcPbTs5M7FK0QuJrXSMcUg4Y J6wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=erZCK06C49girT+8OYEXbEAMv0WFhcjjVDp5qPC83T4=; b=sCoPO56efYNit+jLhT4tm/GjARmZPIigikXZOaY0AGWUvvxcVEakKS7WAd4ruPc0Ig vUbzUvepJFLY4gziWLI66uK0x60c4z9LzO3uBISZZVXwVTgpgZvOtUAlporOb6ldy4sK IdGCS7wMCv0Iy/+QxG4ShIw6rQaAOXFO6yONxyf+Xf3224ClYeDDWqTs6FXTYkbpBXt8 jUw1gGr76iKjxkhV/arMvE4KugJitPKZOT8cRC062XEFqgADj4QI4VTpce0wxv9mUz/f vY/x5pJvn+Z8vz4M9w+xySPMjnx0dxVYkszxOCTb+Ny3grFZGVDKBKQF7HLzMAijzIH8 ccHw== X-Gm-Message-State: APt69E2zwJTRlZUL3JCmZYnvyaBCGx/d5fnJ6vWkZR00wnNQfh/xgvlZ ddugsu6MyCA41elE/TJq3l9M7y8m X-Google-Smtp-Source: AAOMgpdc3qVDTFq76EzgfawCDAu6iE5yedX5QCkR72jlFWYIOx6NBHNKUIizMEKUUeMv3HCiBg2Mxg== X-Received: by 2002:a1c:5fc1:: with SMTP id t184-v6mr3442614wmb.8.1530339064565; Fri, 29 Jun 2018 23:11:04 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:14 +0200 Message-Id: <20180630061040.6018-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PULL 21/47] hw/s390x: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Cornelia Huck Message-Id: <20180625124238.25339-20-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/s390x/s390-skeys.c | 3 ++- hw/s390x/s390-stattrib.c | 3 ++- hw/s390x/sclp.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 76241c2..15f7ab0 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/boards.h" #include "hw/s390x/storage-keys.h" #include "qapi/error.h" @@ -19,7 +20,7 @@ #include "sysemu/kvm.h" #include "migration/register.h" -#define S390_SKEYS_BUFFER_SIZE 131072 /* Room for 128k storage keys */ +#define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys */ #define S390_SKEYS_SAVE_FLAG_EOS 0x01 #define S390_SKEYS_SAVE_FLAG_SKEYS 0x02 #define S390_SKEYS_SAVE_FLAG_ERROR 0x04 diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 70b9555..5161a16 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/boards.h" #include "cpu.h" #include "migration/qemu-file.h" @@ -20,7 +21,7 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" -#define CMMA_BLOCK_SIZE (1 << 10) +#define CMMA_BLOCK_SIZE (1 * KiB) #define STATTR_FLAG_EOS 0x01ULL #define STATTR_FLAG_MORE 0x02ULL diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 047d577..bd2a024 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -13,6 +13,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "sysemu/sysemu.h" @@ -289,7 +290,7 @@ static void sclp_realize(DeviceState *dev, Error **errp) ret = s390_set_memory_limit(machine->maxram_size, &hw_limit); if (ret == -E2BIG) { error_setg(&err, "host supports a maximum of %" PRIu64 " GB", - hw_limit >> 30); + hw_limit / GiB); } else if (ret) { error_setg(&err, "setting the guest size failed"); } From patchwork Sat Jun 30 06:10:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vTqEaLFL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk3g2Qllz9s1B for ; Sat, 30 Jun 2018 16:23:27 +1000 (AEST) Received: from localhost ([::1]:45730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9I4-0006G4-Tw for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:23:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96E-0004JA-Vg for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96A-00029T-R4 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:54090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96A-00028g-KO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:06 -0400 Received: by mail-wm0-x229.google.com with SMTP id b188-v6so4122420wme.3 for ; Fri, 29 Jun 2018 23:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4315qx1yBDroBJU7hyaj853Jqtf3eAAha5O391dtDf4=; b=vTqEaLFLqmgiOdtOWwJxHo9To6fS4lkciOm3//FjbBaqWhjfus08S5x2vSyWg2QqaN g/85Co5nMa7/KzLFkxPD3h8trjkmtBW2oiRDZPZYNNN1e3zGp8RDK9NguP6LVQSFdg+j /6WahihTj4O/+QMs62P9Set0fLvccCptwd96GFgNsfx6aYqVO+k1sDYX7m2YkCaySt+3 DAnDkA7xAjZvMFjPvcyzKTvlbS2+saoemhxMxfZIxH479UxyS50jqaeuqV9bmr5qPAso 7fA8U2FlDatoVR04/X2O/APPMFOnDNT6OH91DGQU5+4pMZox3rX/jDZ1wZzBF23M7bsR Sd1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4315qx1yBDroBJU7hyaj853Jqtf3eAAha5O391dtDf4=; b=iYQXswc2uNTIW2Xa1MdBN6nNrobhJvOl6PjdbDhoQI+gffKtobb/x/nMqAZXGa5vPj OHPvJRdWkzKARWKjmzBleqVDs2SCc5RIXb5nhVzJfctPcRpRgrr2TwtjnHNZTW0+1BZC 4paxQS9PqU7tqXZMLb8yKqdB/G9DbovRkqrMli2uzVdb8MB6RPUk7rC8qJ7JjL4x/9NS AbxDcm9Z8f6kgetfLcsDt+mp7AxG9H/DGdG/qjBByfwXnhmnmlqGAWL3yhTsBJt6xN+E F8/JaQtopUPslWN8CLuAYvECZgISH7WrpzyDgGlx5gKrghvOKnhEX27Lautmuu60+MYz F6UQ== X-Gm-Message-State: APt69E3SV025BbXycwE5vE6fdULm5E7jOInyExp1HqRInUkvrgLhF/jF Jbh5pkwkCdujqAzc6Wor1G/ScMrJ X-Google-Smtp-Source: AAOMgpe174hkf4vrnxBfripBn/00uodonE+Ixv1S2abBXH61zXCBMtfand3/rDoDqHmCtx/iCV0ppg== X-Received: by 2002:a1c:2d54:: with SMTP id t81-v6mr3761637wmt.31.1530339065409; Fri, 29 Jun 2018 23:11:05 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:15 +0200 Message-Id: <20180630061040.6018-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PULL 22/47] hw/hppa: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Cornelia Huck Message-Id: <20180625124238.25339-20-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/hppa/dino.c | 3 ++- hw/hppa/machine.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 26f2704..564b938 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" @@ -76,7 +77,7 @@ /* #define xxx 0x200 - bit 9 not used */ #define RS232INT 0x400 -#define DINO_MEM_CHUNK_SIZE (8 * 1024 * 1024) /* 8MB */ +#define DINO_MEM_CHUNK_SIZE (8 * MiB) #define DINO_PCI_HOST_BRIDGE(obj) \ OBJECT_CHECK(DinoState, (obj), TYPE_DINO_PCI_HOST_BRIDGE) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 2ba2696..cf7c61c 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -17,7 +17,7 @@ #include "hw/timer/i8254.h" #include "hw/char/serial.h" #include "hppa_sys.h" -#include "qemu/cutils.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" @@ -178,8 +178,8 @@ static void machine_hppa_init(MachineState *machine) } qemu_log_mask(CPU_LOG_PAGE, "Kernel loaded at 0x%08" PRIx64 "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 - ", size %ld kB.\n", - kernel_low, kernel_high, kernel_entry, size / 1024); + ", size %" PRIu64 " kB\n", + kernel_low, kernel_high, kernel_entry, size / KiB); if (kernel_cmdline) { cpu[0]->env.gr[24] = 0x4000; @@ -203,8 +203,8 @@ static void machine_hppa_init(MachineState *machine) (1) Due to sign-extension problems and PDC, put the initrd no higher than 1G. (2) Reserve 64k for stack. */ - initrd_base = MIN(ram_size, 1024 * 1024 * 1024); - initrd_base = initrd_base - 64 * 1024; + initrd_base = MIN(ram_size, 1 * GiB); + initrd_base = initrd_base - 64 * KiB; initrd_base = (initrd_base - initrd_size) & TARGET_PAGE_MASK; if (initrd_base < kernel_high) { From patchwork Sat Jun 30 06:10:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oN7zUuyK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk6y431Zz9s1B for ; Sat, 30 Jun 2018 16:26:18 +1000 (AEST) Received: from localhost ([::1]:45748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Kq-0000lR-5e for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:26:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96F-0004JD-0R for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96B-0002AZ-QK for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:40592) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96B-00029a-I8 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:07 -0400 Received: by mail-wm0-x234.google.com with SMTP id z13-v6so3944778wma.5 for ; Fri, 29 Jun 2018 23:11:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=le/BZsxdCygUXfPv7EM914rRKKDMIEi8+re5JmVzOC0=; b=oN7zUuyK7tVpi9M+38Ujtqti2k7Rz4CbSwKnRyySWz6XnXB+SJ3KgsoxYhJVmdSZws wIQi5wwvSia2EssIwGqASD92stGw48vZToDYi+IzY8x+MsTgaSRKl+sdfAmOhMNHBFuI rtqXh1CQxO5plsOyyv+YJSq268jk3lsb+wFXojq9H4R/nOJS1GTxmUpIPcQe9IfCJ2Tn ruFYAILa4ROKkssiC374kc05TxbnI1PB6+vltWsyJZAxNY9bvege0a+0UNb/CEk5vnlq dHYhUa6i3wFpjEkpVX/axnQn7u1MDmL4uKI4B+p+v+WGv7/8ooOBbiIlGO9YWukismEE BDQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=le/BZsxdCygUXfPv7EM914rRKKDMIEi8+re5JmVzOC0=; b=LcAryTGAcQARMt3W3cOl87zNowerP5fG1tWwCv1zUA/1IvMfmz/UIHkSzcCBGF9C3/ O4s7tN8WTBu8vrVEnjIIs1ZUC0DAR5DDqh8D8VsXN3s0/asVLBEqwU9e77rBL8tOceW5 jRJyFV84ig9pIXZE3+n/QEDmbU478sndAhsQqxWpF4iIpGB2+ajjPKEREOUd8aNsSykj QfZCZThPmEzhnL5vkqbBrHzTbVFQV5xb5FUw/MFkYMadjqUGY4+HUT1oyr38KWtj5rn5 JcfCrwPYeCFuWAp0mCMt/VhszgjQf0PfJmIPxx0du7QdaB/NgOVbAF3sjFopY69PkdRT ABpQ== X-Gm-Message-State: APt69E0RG/KIP+oEfUU/+S87NJfpeDn55srPGXC6FSsLuU5rG3Yjanmh tP+Q1GFurKOCI5VS5cSEtV4eOLxW X-Google-Smtp-Source: AAOMgpfGsIK+lPkPQ5Omxm40svccRJeXnRErFa/Wiue/W0sIRdy/x9Nq25WdJ1Go/yi5nkSml0+KPQ== X-Received: by 2002:a1c:f03:: with SMTP id 3-v6mr3525957wmp.129.1530339066352; Fri, 29 Jun 2018 23:11:06 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:16 +0200 Message-Id: <20180630061040.6018-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [PULL 23/47] hw/xtensa: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Max Filippov Message-Id: <20180625124238.25339-22-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/xtensa/xtfpga.c | 9 +++++---- target/xtensa/helper.c | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 5dc1303..b3161de 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "sysemu/sysemu.h" @@ -152,7 +153,7 @@ static void xtfpga_net_init(MemoryRegion *address_space, sysbus_mmio_get_region(s, 1)); ram = g_malloc(sizeof(*ram)); - memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16384, + memory_region_init_ram_nomigrate(ram, OBJECT(s), "open_eth.ram", 16 * KiB, &error_fatal); vmstate_register_ram_global(ram); memory_region_add_subregion(address_space, buffers, ram); @@ -229,7 +230,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); const char *dtb_filename = qemu_opt_get(machine_opts, "dtb"); const char *initrd_filename = qemu_opt_get(machine_opts, "initrd"); - const unsigned system_io_size = 224 * 1024 * 1024; + const unsigned system_io_size = 224 * MiB; int n; for (n = 0; n < smp_cpus; n++) { @@ -342,7 +343,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) cpu_physical_memory_write(cur_lowmem, fdt, fdt_size); cur_tagptr = put_tag(cur_tagptr, BP_TAG_FDT, sizeof(dtb_addr), &dtb_addr); - cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4096); + cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + fdt_size, 4 * KiB); } #else if (dtb_filename) { @@ -370,7 +371,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) initrd_location.end = tswap32(cur_lowmem + initrd_size); cur_tagptr = put_tag(cur_tagptr, BP_TAG_INITRD, sizeof(initrd_location), &initrd_location); - cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + initrd_size, 4096); + cur_lowmem = QEMU_ALIGN_UP(cur_lowmem + initrd_size, 4 * KiB); } cur_tagptr = put_tag(cur_tagptr, BP_TAG_LAST, 0, NULL); env->regs[2] = tagptr; diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 34844ee..c9a6132 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" @@ -726,10 +727,10 @@ static void dump_tlb(FILE *f, fprintf_function cpu_fprintf, bool print_header = true; if (sz >= 0x100000) { - sz >>= 20; + sz /= MiB; sz_text = "MB"; } else { - sz >>= 10; + sz /= KiB; sz_text = "KB"; } From patchwork Sat Jun 30 06:10:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YdjRwD4G"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkKc5S66z9s29 for ; Sat, 30 Jun 2018 16:35:32 +1000 (AEST) Received: from localhost ([::1]:45791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Tm-0008Us-Dp for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:35:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96F-0004JC-04 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96C-0002Bf-M9 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:39341) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96C-0002An-F7 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:08 -0400 Received: by mail-wm0-x243.google.com with SMTP id p11-v6so3923730wmc.4 for ; Fri, 29 Jun 2018 23:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I/3Bz3241hCep7I0085Oyl2MY7tF+sPwu3PDHcofOvE=; b=YdjRwD4GvH2+1ts3B6ZfRBlqpRcFzEFbzI+/18JDOcB66GruQRkkzzEpZ3fMOSw7sd bQtEztEuzVEv2MrJ5dvcCdfgGIgLGKJe2dIrn57pkUXPRdNrtOD8/NZVwNOIRE9FKxR1 i2FAshbCkbHcoA2DhgecxfeLKRDsxruPvU8I5kyxdio6MdRRZD4+dLeJ9R7gt0y6VO1G uJ07FMtYJFC/nyy7PeYoDvnq//hB8fXru+44wbj8SQkuoCNOnAg1MUeNKHQNbi1z/7Vc NctqdZjbl4X8lzd1DRGjQj6ez+HILhMkFr2PkjhBIaHVjWK+ITpuey9st9G28qkpMOWW MODw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I/3Bz3241hCep7I0085Oyl2MY7tF+sPwu3PDHcofOvE=; b=nMz0Y+E08+73bEw4mD1HE+5ICGdsvfxUinm/5ApFbco6X3zczNvqisJSBYD/wWmDsu vkTUSOsqYwlL/EkHEwxPkP7O2/vRPdunCg9FPJkiTaOfBi7AmjDR7f9BBLNtWdKR8IY/ MTZn0LdEwlE5zXc74ByaJJOyYy4clmHHBhaRixhEhTXPZ7p3VN8Khe573L6vDR6mmvRH snTDHeex+nKE7r76OOMfYidF3BS5hZwxEORh9ce97PWm2VphY8+6vSA/ThMhOGR05nRt /7ofgfS5qSK9wNMA9FCLOAaiDtEXJWp/LAjhmeoTqRJO5vG+I0jaDLCfFAYMqb8d+gCI NvRg== X-Gm-Message-State: APt69E12/rqMYZkS3gr2FqsxNgsaiAEot7QOAlR+QbT/xlGwYqYapVBV g2oPbqTe4MvRnLqhbrQiF+rZVXGd X-Google-Smtp-Source: AAOMgpfxY70KtAnEsMsqevrzht3bUlzu66IDPecjHeLpKljApBDuFdyYLbmX589VXF8n1nfR6UjvDA== X-Received: by 2002:a1c:46c2:: with SMTP id t185-v6mr3406362wma.56.1530339067289; Fri, 29 Jun 2018 23:11:07 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:17 +0200 Message-Id: <20180630061040.6018-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PULL 24/47] hw/alpha: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-23-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/alpha/typhoon.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index d3ed7cd..d74b5b5 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -7,6 +7,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" @@ -813,8 +814,6 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, qemu_irq *p_rtc_irq, AlphaCPU *cpus[4], pci_map_irq_fn sys_map_irq) { - const uint64_t MB = 1024 * 1024; - const uint64_t GB = 1024 * MB; MemoryRegion *addr_space = get_system_memory(); DeviceState *dev; TyphoonState *s; @@ -855,30 +854,30 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, /* Pchip0 CSRs, 0x801.8000.0000, 256MB. */ memory_region_init_io(&s->pchip.region, OBJECT(s), &pchip_ops, s, "pchip0", - 256*MB); + 256 * MiB); memory_region_add_subregion(addr_space, 0x80180000000ULL, &s->pchip.region); /* Cchip CSRs, 0x801.A000.0000, 256MB. */ memory_region_init_io(&s->cchip.region, OBJECT(s), &cchip_ops, s, "cchip0", - 256*MB); + 256 * MiB); memory_region_add_subregion(addr_space, 0x801a0000000ULL, &s->cchip.region); /* Dchip CSRs, 0x801.B000.0000, 256MB. */ memory_region_init_io(&s->dchip_region, OBJECT(s), &dchip_ops, s, "dchip0", - 256*MB); + 256 * MiB); memory_region_add_subregion(addr_space, 0x801b0000000ULL, &s->dchip_region); /* Pchip0 PCI memory, 0x800.0000.0000, 4GB. */ - memory_region_init(&s->pchip.reg_mem, OBJECT(s), "pci0-mem", 4*GB); + memory_region_init(&s->pchip.reg_mem, OBJECT(s), "pci0-mem", 4 * GiB); memory_region_add_subregion(addr_space, 0x80000000000ULL, &s->pchip.reg_mem); /* Pchip0 PCI I/O, 0x801.FC00.0000, 32MB. */ memory_region_init_io(&s->pchip.reg_io, OBJECT(s), &alpha_pci_ignore_ops, - NULL, "pci0-io", 32*MB); + NULL, "pci0-io", 32 * MiB); memory_region_add_subregion(addr_space, 0x801fc000000ULL, &s->pchip.reg_io); @@ -899,13 +898,13 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, /* Pchip0 PCI special/interrupt acknowledge, 0x801.F800.0000, 64MB. */ memory_region_init_io(&s->pchip.reg_iack, OBJECT(s), &alpha_pci_iack_ops, - b, "pci0-iack", 64*MB); + b, "pci0-iack", 64 * MiB); memory_region_add_subregion(addr_space, 0x801f8000000ULL, &s->pchip.reg_iack); /* Pchip0 PCI configuration, 0x801.FE00.0000, 16MB. */ memory_region_init_io(&s->pchip.reg_conf, OBJECT(s), &alpha_pci_conf1_ops, - b, "pci0-conf", 16*MB); + b, "pci0-conf", 16 * MiB); memory_region_add_subregion(addr_space, 0x801fe000000ULL, &s->pchip.reg_conf); From patchwork Sat Jun 30 06:10:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rPK57ef0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkBG2MdQz9s1B for ; Sat, 30 Jun 2018 16:29:10 +1000 (AEST) Received: from localhost ([::1]:45760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Nb-00033K-Qq for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:29:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96E-0004JB-Vx for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96D-0002E4-M0 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:54093) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96D-0002Bm-Du for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:09 -0400 Received: by mail-wm0-x22c.google.com with SMTP id b188-v6so4122502wme.3 for ; Fri, 29 Jun 2018 23:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xeDgZqYaPf77uGnNivk4MfAuwpcK4p81HkrHzCpOAc0=; b=rPK57ef0/Ud43vVmnoWKKRZzlv1PHRQ0ZouBc4cW2NXHvPGJ6TnkjcvGrGadV8xSz8 c4bbOg0msMKcENv345eQPnMwz5hmFXa45ZfJbHdOW2p0QP8mer4uGyC24P6CqTpTOEfm xUTfzZNHrjSsSuu2vIIFrbIhYfN9zzp892v82oKhYzxmLxfrVdGTmQkScbN6AEHBgVWL jVq1Z/8b9nbYix6J16XMWZKJk9qArkq0kPD+41iGm984YCoddxwf3jS2ZSO9da8mzNKI KJJLWm8KfIjQRzdS7hz8ejI0srsF2z3KhKwpgCZlid9Mou28c+dNatUDqIjQYO5EwFZj s+lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xeDgZqYaPf77uGnNivk4MfAuwpcK4p81HkrHzCpOAc0=; b=uV9hsdIltluajuzgKzElV4ypnZYzI9p6ifaJzqiZU5DAVoJl/gVoQyZOwVZ9+wgNor H4VEUvTVbgwqBR7G5J72bGXZhL3+OCYBJKv7/Kgelj98JAPd3TeWcJbx8YzYYjZh5FfA D1sxy+XmBD1TQm1/4MAcJsKG+Zo+3sGsVlKMqRaLItguLaFR56K9ZCtfEZEqiJ5Tb9jq QcsMNxmW1OGFAOOgMfYIi2j5uGQsNDi6heJO+JjVn1V24RfmHlDPxX35fPZiBXkB5+j6 fg7H0nJJNEK+/FtUSMaY2/7rDKjy+UBDfsRO6afwl8d0/Hm9SnXjthjIcNRmyf+UdZMe wYEw== X-Gm-Message-State: APt69E2w4HaHfzy/SOeGj6QSV87kK1MRHrY5ktGzhhfevf0ENyw0AY20 V9Jhb5guprve9iMb4iNnyq7ARYms X-Google-Smtp-Source: AAOMgpdsI4eQ5IXI5OzmxSx6pjzV0uOcRMamnN3badx54Ba72lzkePcjI8y7u3cx2PjMxqmMy2nG9A== X-Received: by 2002:a1c:d92:: with SMTP id 140-v6mr3361552wmn.32.1530339068207; Fri, 29 Jun 2018 23:11:08 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:18 +0200 Message-Id: <20180630061040.6018-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 25/47] hw/tricore: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Bastian Koppelmann Message-Id: <20180625124238.25339-24-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/tricore/tricore_testboard.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 8e61dfc..a58096f 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -72,17 +73,17 @@ static void tricore_testboard_init(MachineState *machine, int board_id) cpu = TRICORE_CPU(cpu_create(machine->cpu_type)); env = &cpu->env; memory_region_init_ram(ext_cram, NULL, "powerlink_ext_c.ram", - 2 * 1024 * 1024, &error_fatal); + 2 * MiB, &error_fatal); memory_region_init_ram(ext_dram, NULL, "powerlink_ext_d.ram", - 4 * 1024 * 1024, &error_fatal); - memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48 * 1024, + 4 * MiB, &error_fatal); + memory_region_init_ram(int_cram, NULL, "powerlink_int_c.ram", 48 * KiB, &error_fatal); - memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48 * 1024, + memory_region_init_ram(int_dram, NULL, "powerlink_int_d.ram", 48 * KiB, &error_fatal); memory_region_init_ram(pcp_data, NULL, "powerlink_pcp_data.ram", - 16 * 1024, &error_fatal); + 16 * KiB, &error_fatal); memory_region_init_ram(pcp_text, NULL, "powerlink_pcp_text.ram", - 32 * 1024, &error_fatal); + 32 * KiB, &error_fatal); memory_region_add_subregion(sysmem, 0x80000000, ext_cram); memory_region_add_subregion(sysmem, 0xa1000000, ext_dram); From patchwork Sat Jun 30 06:10:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AmM2PB8g"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkFm5Cpjz9s29 for ; Sat, 30 Jun 2018 16:32:12 +1000 (AEST) Received: from localhost ([::1]:45778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9QY-00063B-9L for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:32:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96F-0004K2-Lh for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96E-0002GA-HG for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:11 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:36492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96E-0002EG-9L for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:10 -0400 Received: by mail-wm0-x22d.google.com with SMTP id u18-v6so3959490wmc.1 for ; Fri, 29 Jun 2018 23:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IoGQAKu8p9jneTKieD7S589NvaS6f8CPtBeAo2ZoIwk=; b=AmM2PB8g+4fFYaF3gB1QMnXyIs48wZWu5iVIQEPCQjp0mV1sU/Uk01Dnw9BXwpWGHJ K7ICHeovsfRruWaEEsMUoHxtT4hhMCgv5Ql24nwGMTqA75wY/OxmQ0baWlY4FP9AOxAC qYw6Cw2y44AjqyovCqUWkcWWCHTn5TCX5dnKAy7UEttGTB+gnxvMXCrHr5LF5BqlWiRl 5d6pUGkV9UU8m9DuIiJi8a1o/RsvZ1Re2jmPFITA6ZCQKV7jw6uzGmLFPbl/0m0eJvq9 MzjFlJfXouqNqCXiDaisTVs50OD9NK40o1qvEs0eo/fQbAFgpandFfIM7aUZa17NF3l0 qLrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IoGQAKu8p9jneTKieD7S589NvaS6f8CPtBeAo2ZoIwk=; b=ZJA4agxZGLoXTDSf18VTyot5w984AqLIBGfOXqrm9EVEUPdnmaSquarw1KuqFkB/D8 +vQQOXpCLLlE98NuKxlHdDrKk1kTVPlYJN//NdWBqI7hXjDRotWD5Zz+R8JQcETkPpM7 QTRVyR29ZD9AhLZGotRNrnkU3Ba9efWbxG5n7d1oxdKufjLlah5pEmK307HK8cYq9Rer jTOwmh4vB4PLIAkGG9OMx37X2lMw+iOrVAWlZCFa1pyikNL7JB5TURNWov353+7hwVOZ v/IGuQhIP2kL2Pi1Gv25Sc0vMih/MP+IH7ghcnx42fOw24tJxTdNhbw5aYJGnKzlJaek t+EA== X-Gm-Message-State: APt69E1Xg1F3tiuvJvDFgCQIjNorXkoge3PeRKwTuuybo/w0MfoNEpFu hxQL5DzACoIeMfCFq/UkeCRn1u2X X-Google-Smtp-Source: AAOMgpfgpv/gDcgM3AtegYOOgZcx6fliFRFUXiEsKFxk0u4AiafLKGkZ1Id6cdbA1x1DXpXJKTMZcQ== X-Received: by 2002:a1c:a484:: with SMTP id n126-v6mr3727412wme.140.1530339069157; Fri, 29 Jun 2018 23:11:09 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:19 +0200 Message-Id: <20180630061040.6018-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 26/47] hw/microblaze: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-25-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/microblaze/petalogix_ml605_mmu.c | 7 ++++--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 6c4a544..c730878 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -44,8 +45,8 @@ #include "hw/stream.h" -#define LMB_BRAM_SIZE (128 * 1024) -#define FLASH_SIZE (32 * 1024 * 1024) +#define LMB_BRAM_SIZE (128 * KiB) +#define FLASH_SIZE (32 * MiB) #define BINARY_DEVICE_TREE_FILE "petalogix-ml605.dtb" @@ -109,7 +110,7 @@ petalogix_ml605_init(MachineState *machine) pflash_cfi01_register(FLASH_BASEADDR, NULL, "petalogix_ml605.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * KiB, FLASH_SIZE >> 16, 2, 0x89, 0x18, 0x0000, 0x0, 0); diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 0da3e62..5cf7b84 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -39,8 +40,8 @@ #include "boot.h" -#define LMB_BRAM_SIZE (128 * 1024) -#define FLASH_SIZE (16 * 1024 * 1024) +#define LMB_BRAM_SIZE (128 * KiB) +#define FLASH_SIZE (16 * MiB) #define BINARY_DEVICE_TREE_FILE "petalogix-s3adsp1800.dtb" @@ -87,7 +88,7 @@ petalogix_s3adsp1800_init(MachineState *machine) pflash_cfi01_register(FLASH_BASEADDR, NULL, "petalogix_s3adsp1800.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * KiB, FLASH_SIZE >> 16, 1, 0x89, 0x18, 0x0000, 0x0, 1); dev = qdev_create(NULL, "xlnx.xps-intc"); From patchwork Sat Jun 30 06:10:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="muyJBgur"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkB517TRz9s1B for ; Sat, 30 Jun 2018 16:29:01 +1000 (AEST) Received: from localhost ([::1]:45757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9NS-0002w2-M5 for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:28:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96G-0004LK-PT for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96F-0002JW-Nw for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:43456) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96F-0002Gw-FR for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:11 -0400 Received: by mail-wr0-x22c.google.com with SMTP id c5-v6so10637845wrs.10 for ; Fri, 29 Jun 2018 23:11:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bnnOftntBQ7pzVZgedKlC87hjNi23GfbJ+81jXcnqsY=; b=muyJBgurJlPYYFOQ2NZg+kiUPNVtABEWnBz+uTECfMAi8dQ5n4xotOQkZyyK4TTmca XxiKnkbcmEHsrmSMhHPKpIKZUbNbAONYuoikhpM11AFNU9okhevcmg8p5JqaZI7lvJL0 bEyaB5eh8AyX062jIjDlocI2V4t1q/8ZZfqFuCZkmh3pCwt8MWN1QxbTm3Xwm02FKL34 nIwQxdM+EaP48bVCCRwFlgEY4pBI+H4S/g+c7ew+WqT1sNeL85yi5kb/ceg1hlJQOQsh jE2sA+RkdNLc4SMN3Mvimv6aCacUrANjQCf3svPIlFVwF9QTFlb5rNqJdDvBWZv74r6n gPGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bnnOftntBQ7pzVZgedKlC87hjNi23GfbJ+81jXcnqsY=; b=AP0TSJXMxHaNoJgRki9wetlKEVunAImex0XkxSgjm4uEIP81STJCqN+akhuqQXLfgy UX0HH0jgkluYLv8Tv3CwLpsiB1YmCv6IpUeBhBco5Q+VPzmbZjPHaORjI+9tN/CnL6kL 4P0TQ0POTes+g/BsLGsZECXks3xAB6wZKE2VjBrGYd528eqayCddKUL9fj+AFzbFoF8k H+EkN3dIocGyV8k+09X4Qjdk3lfzX8o4n8QTAbmLMZ7iqCWx5NhcA6TkKZA7bkQLwgwf FuzPKRU2m7rK6e/eM9aYRV0uufhwOayWgKkbQ8S8QEeYNLS2+B8DrUqpCi4HP2817sto GVuQ== X-Gm-Message-State: APt69E0xMlyEt8XN0ecPupwvOySuHJ2YcafXjR0ppzPXPITmhp90HHcy RSlJApSlXoQC81pm2P7/uwcXoJCV X-Google-Smtp-Source: AAOMgpes8q00mJ/3jQtV1wBj5dbwp2b1pPPp9gi1pjW7F1I5/8bxrpcw057BxVcuGIqhODwqEv7WzA== X-Received: by 2002:adf:b839:: with SMTP id h54-v6mr14315525wrf.36.1530339070260; Fri, 29 Jun 2018 23:11:10 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:20 +0200 Message-Id: <20180630061040.6018-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22c Subject: [Qemu-devel] [PULL 27/47] hw/nios2: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-26-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/nios2/boot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 94f436e..4bb5b60 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -29,6 +29,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "cpu.h" #include "qemu/option.h" @@ -38,7 +39,6 @@ #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h" -#include "qemu/cutils.h" #include "boot.h" @@ -177,7 +177,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, high = ddr_base + kernel_size; } - high = ROUND_UP(high, 1024 * 1024); + high = ROUND_UP(high, 1 * MiB); /* If initrd is available, it goes after the kernel, aligned to 1M. */ if (initrd_filename) { @@ -213,7 +213,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, high += fdt_size; /* Kernel command is at the end, 4k aligned. */ - boot_info.cmdline = ROUND_UP(high, 4096); + boot_info.cmdline = ROUND_UP(high, 4 * KiB); if (kernel_cmdline && strlen(kernel_cmdline)) { pstrcpy_targphys("cmdline", boot_info.cmdline, 256, kernel_cmdline); } From patchwork Sat Jun 30 06:10:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SFhPCTqB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkKc2sh9z9s1B for ; Sat, 30 Jun 2018 16:35:32 +1000 (AEST) Received: from localhost ([::1]:45790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Tj-0008UF-6E for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:35:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96H-0004MK-Im for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96G-0002Li-J6 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:13 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:37814) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96G-0002Jk-C9 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:12 -0400 Received: by mail-wm0-x22b.google.com with SMTP id n17-v6so3954756wmh.2 for ; Fri, 29 Jun 2018 23:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M5ILyK3zRFfpJMZ6OGZ3ItB+w4u47/ewrRDs68yzPp0=; b=SFhPCTqBAgV+fsSGvBcn1fP4vLo8GYNGsxBwzomZymYp9fDvl9O1OD1wB1v3PxJYbe BasFLl3ghCX99UrgRuHnm/Xgx49YuzoS3TtzkHLqPvryOsTsLs5WhD38uCORfZCXEYKo LHomj0E52Ydrviun22h5DEQtDNrKHhrGlma7bvgNE6saIr2m1Q1YMloIxeANuzRXRuGH NyCLWyS1HObgTosudL/17+XM5DoO6PvqSzQRQ++jUR9rpJRqoAZyhnM9Q3tnIHk0rihD ZwCeAzo4h4Q0IlILGmHp0CXrjx48PhHiXcAlEbI2dYyuJdS0V3Yw+DstCVYU8Sa+1EX+ kpLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M5ILyK3zRFfpJMZ6OGZ3ItB+w4u47/ewrRDs68yzPp0=; b=E+apLwyAnoYE/dUpNKvDml/0d2b02polUY5XaY8ZTVGtEm9bsqH4hcFll0nbdeiwUo TXem+SmXrFrw2mprZ+bMTa0BbHYDpo9jEFkZvswzVVvt/QaFLSmPBHhHiigg37QyAt+s rXbQjuPjo1PVd5MgvdDFfNcNzEs7MUEqDFvSByixwHWk2w0Vf2LBnEEuEZX2qSJmKXDb rZstDHF+XpXtzKv7kGGpuH3kVUnXOQ0jHUGkTS9rOvltqUkFYyvnviEfKwMduRmDi4vD uEFky+MN5QuJbIYk34tGXPxTho2xuTyG5Dp0MgES+5mRP3bleh/6M0slAG349maa8I8m 9FCg== X-Gm-Message-State: APt69E0kifHD7wQ3VZN36jBuKQnshbyc8+7qstTst6ds8jhqYUaDq/6W GsEbm6NLVrW6oLMyD59wvBYIvpYs X-Google-Smtp-Source: AAOMgpfS+wpC941vsbNZ3BWKeFUbTbBGZKYMj04Ak5c7pWuxDmQBE2mp62ZN0Dp8lnsah3mz+JXIWw== X-Received: by 2002:a1c:6341:: with SMTP id x62-v6mr3627350wmb.35.1530339071280; Fri, 29 Jun 2018 23:11:11 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:21 +0200 Message-Id: <20180630061040.6018-29-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PULL 28/47] hw/cris: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-27-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/cris/axis_dev88.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index 56ee398..191292e 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -242,7 +243,7 @@ static const MemoryRegionOps gpio_ops = { }, }; -#define INTMEM_SIZE (128 * 1024) +#define INTMEM_SIZE (128 * KiB) static struct cris_load_info li; From patchwork Sat Jun 30 06:10:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u/7czeM9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk4q6Hgdz9s29 for ; Sat, 30 Jun 2018 16:24:27 +1000 (AEST) Received: from localhost ([::1]:45733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9J3-00074y-HH for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:24:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96I-0004Nc-Pm for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96H-0002OX-Id for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:14 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:56118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96H-0002Ly-AO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:13 -0400 Received: by mail-wm0-x233.google.com with SMTP id v16-v6so4106213wmv.5 for ; Fri, 29 Jun 2018 23:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mPDIUvn4Z7n8mjHSBtJXA9SmtwhdUvf5qbGFYyTOvNM=; b=u/7czeM9KjSPfTOcKQCUH8c1iyTzauKilEBuOFboHOqqEPeay1Jj2DcPG+xB1GGcjk IoyfXCkKjIyJvEVla9i5zob2A9V7PVJ282r0C7vsieAAMChCyL1qLcQb+aeKY12A9+ZS oC9KtM5Y1kaOa8cte459/LA1qf8XrmtUDAThrLUxF8jHsoudSFwSCBc1/2rtFPPlldsa PtBtNEDr3dWO5Rpw0NjgSS+8LKVXgXhpe7VWF9aItcFMlDda6dqaKmOKOJGqlLZcEbG2 imAsaKZnyJkRMXxH4q5keXnWch/s6sYZtG7NeMeInKskT+NW+eUfa5FdMk4Y57VUxXZ4 v2Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mPDIUvn4Z7n8mjHSBtJXA9SmtwhdUvf5qbGFYyTOvNM=; b=UG5U1HSa5dZuCGEtrB67mHVMl6NcTavIfQHhAkxB6RFOTsyZPThB+5iCdSKZFEqqZB TkoJf/48nP+16P6MjNpsPUVXCYc7gl9QaN9tjmDischzxVNaynmM4fdditMy8DOM2d88 Dhe77iAtTpwGnuP8KbOQS8ASV7Y+40e0ctVyt0t37EYDD7jup12ukm4YAnAoru0hLq7D pU5ImYUN+GpC8cblqbqXrLQT3685FlO1pmLs5a3G2AojLPR8o/0WYs6NA8/OccgzEkVh UPGM4law/jG3+CFVGwzi7IgnzReU2lZHxakJH2ekgwz4IXkpQMdPoDpvXHjlKCyXMHQ5 kM2Q== X-Gm-Message-State: APt69E1r/AYXtUSx5vOZJYg2xkSfHlxd16oa3Jl3TaH7V6O8t3dxT+xK fz9oJ1MjZ8M0c6G4d9RwEy1seDQ+ X-Google-Smtp-Source: AAOMgpdWVhEfiNGfVRH7gFdo6yrD+yLmNmWJio4yxAu2Ah2oEpdaejLPOi79gogGyiRxTwiKEIlCuw== X-Received: by 2002:a1c:7d47:: with SMTP id y68-v6mr3369481wmc.62.1530339072192; Fri, 29 Jun 2018 23:11:12 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:22 +0200 Message-Id: <20180630061040.6018-30-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL 29/47] hw/lm32: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Michael Walle Message-Id: <20180625124238.25339-28-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/lm32/lm32_boards.c | 13 +++++++------ hw/lm32/milkymist.c | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 1670583..fd8eccc 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" @@ -87,10 +88,10 @@ static void lm32_evr_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * KiB; + size_t flash_size = 32 * MiB; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * MiB; hwaddr timer0_base = 0x80002000; hwaddr uart0_base = 0x80006000; hwaddr timer1_base = 0x8000a000; @@ -173,10 +174,10 @@ static void lm32_uclinux_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * KiB; + size_t flash_size = 32 * MiB; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * MiB; hwaddr uart0_base = 0x80000000; hwaddr timer0_base = 0x80002000; hwaddr timer1_base = 0x80010000; diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index c36bbc4..321f184 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" @@ -33,11 +34,10 @@ #include "milkymist-hw.h" #include "lm32.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #define BIOS_FILENAME "mmone-bios.bin" #define BIOS_OFFSET 0x00860000 -#define BIOS_SIZE (512*1024) +#define BIOS_SIZE (512 * KiB) #define KERNEL_LOAD_ADDR 0x40000000 typedef struct { @@ -96,10 +96,10 @@ milkymist_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x00000000; - size_t flash_sector_size = 128 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 128 * KiB; + size_t flash_size = 32 * MiB; hwaddr sdram_base = 0x40000000; - size_t sdram_size = 128 * 1024 * 1024; + size_t sdram_size = 128 * MiB; hwaddr initrd_base = sdram_base + 0x1002000; hwaddr cmdline_base = sdram_base + 0x1000000; From patchwork Sat Jun 30 06:10:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="s9rgRmGx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkFd5qYZz9s29 for ; Sat, 30 Jun 2018 16:32:05 +1000 (AEST) Received: from localhost ([::1]:45775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9QR-0005xc-At for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:32:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96J-0004OD-GN for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96I-0002Qu-Im for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:15 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:36380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96I-0002P3-C4 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:14 -0400 Received: by mail-wr0-x22c.google.com with SMTP id f16-v6so10646200wrm.3 for ; Fri, 29 Jun 2018 23:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TgitwpgluCg1J3PBztf5EcU+4x+KjVGzpVPw3cG5pkQ=; b=s9rgRmGxtaFezfs8v3Vimf/85rCX7gvS++xOEHZZbtwlgQxRtMQ4WXR+5WlvMMyLJW 75D+/xG57Ua084SwWTXZbVj3phjdry4nTMKri0UeQMbgCaScsc6OCRiuP9CRmwaZCsNK WEzd5Pg66EaEVhB9/t+elKLSILzSkH9lzzUQQdkzABEZlBJSywrV7Ck05ym3I/1pSos7 X3MAsaOZ3H5vj65257Wjcw2zUvXBKcVvXNrOqHD9U/y74gc56D6FU2l6EXBsW0QijT62 9UpNTu+dv8auJDK9ym0frykSSv7q5HZbx2s9uy/0xTN3ATDI3fbeknI8BOp+qX2EKkpd pXFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TgitwpgluCg1J3PBztf5EcU+4x+KjVGzpVPw3cG5pkQ=; b=oV0aNnyLyTvIT2GVUymM/hWKySeMwWJ5ds1I62ihGbpMc9UiZDU/b727b+W2xT+Ozl 8Hl9zTML4QtDYnhESBOLLdt8sTAmE8Xa3e0Ql/MiAEMabmE3FPmxeA6ar4eczlekSmuI S0ClLykFOnu63ZVPmves3LE1TW5wJXDM7sg82odqru4GDqcirviDr/UFNZgktEZ/dyod EPJHDRezmbH5ds039N5bu3nNCrx0jVpIlwAMacSe9r4uu7/6WovS/tEcUcElxK66+DMA NO8CRp78KkXH2OMJ419E5AtMIXe1OUr6qwKjZrr8BZ+YQMBKtxyB2nPGDNHd778PxAyo gNoQ== X-Gm-Message-State: APt69E2XxjQIMvnL26HEniYZ3IAPKMCN/mDq9iRQ1jesWp9zPwIUKQvo 9PGMTP0BPweSRIhM5rmWd6qO7cO3 X-Google-Smtp-Source: AAOMgpds1WeU3I+wpmiT42nOIGpOxjjFCTHdjc3PpbXfHsmVU3pYSMvrIgnscqRdNIfMRObAWjHKLg== X-Received: by 2002:adf:88e3:: with SMTP id g32-v6mr13181534wrg.62.1530339073225; Fri, 29 Jun 2018 23:11:13 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:23 +0200 Message-Id: <20180630061040.6018-31-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22c Subject: [Qemu-devel] [PULL 30/47] hw/sh4: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-29-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/sh4/r2d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 8fe8766..6a5fc46 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -291,7 +292,7 @@ static void r2d_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (16 * 1024), FLASH_SIZE >> 16, + 16 * KiB, FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000, 0x555, 0x2aa, 0); From patchwork Sat Jun 30 06:10:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZhSPvhX0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkNj4YQpz9s29 for ; Sat, 30 Jun 2018 16:38:13 +1000 (AEST) Received: from localhost ([::1]:45806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9WN-0002KA-9k for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:38:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96K-0004P4-Dl for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96J-0002UB-EG for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:16 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:35519) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96J-0002R1-6Y for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:15 -0400 Received: by mail-wr0-x22a.google.com with SMTP id c13-v6so10641505wrq.2 for ; Fri, 29 Jun 2018 23:11:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aXeCUCvhTc/7JbI0OlQZH9N7BtEGKomNRtG286FmPrM=; b=ZhSPvhX0i7AK7nI64wnStToXOoTc08l9TBx9XRaxcDVrf377hmg4wOhcrIz+3Q6zkn g71Kc38njjQ4WvSun65UqTLDbU4AIxOdff+1F/gbqjUkELY5yQzkJOpl7Ns0ojdJFhc3 kAd4goj6zLHSDdt8e+stSXpqsAJ39CPehtuDwDsOtLASiBeEKbMU6kuJkGlQ+NyxWXIo YZP+YTaiDb6qEmRCH0v49rUzLF/FV4n+zwq22o8KqoUsbaxPT24UiAoRXCXST1RuX3za vbNqzWRfTDZT475f86nfXhdRRx42AH2B8ESrKWbULhF/2pb9hrxX1CWwB4YPEGKaMPaL ItcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aXeCUCvhTc/7JbI0OlQZH9N7BtEGKomNRtG286FmPrM=; b=KzVBvdpgKoqrfUoWc/yeNQxhQpYXNEBImU1U3whZ+99oYo2Dz1znyNMB8rcgGr15N7 +Kx5PteyX0Yz88gplZSZW6Ltqc1eDXfapCREFaSj09PQRCP0FCFDMot0ZXxLyBTstpM+ +uZVF/RHi5sCj3qdWXsYNfbBKUSS1HjpTMS9/rEbQ6IdmKTyL0quAjZui6sfxyZKyDjO Kc4TA4YA0G6zJHEi61bOw8Dg1orHm22P/L5HlcWPsCBpB7vNjKX91WypRcWBqu1emnS6 P2OElOjip50fDhLYBHTz9F512xMwZ2EEYzzmHctaDgEyrj3hNXhJEx7cXswp8yHrKLJy MQ8w== X-Gm-Message-State: APt69E0UWou2tzWmdR0F1tHhftdDNAWBJLlPm2V4uL1aG9VYu2GE5rEC OBgNUYr9R+KLobqqeByOvpYyZ9xZ X-Google-Smtp-Source: AAOMgpeA5rE+pzlIvkVul5aOeuZT8YgiV1gzOb9qMa3Izs6MFE/5HZOSEzJVNkZijMozDS7/WVGADQ== X-Received: by 2002:adf:d181:: with SMTP id h1-v6mr13974004wri.198.1530339074059; Fri, 29 Jun 2018 23:11:14 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:24 +0200 Message-Id: <20180630061040.6018-32-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22a Subject: [Qemu-devel] [PULL 31/47] hw/mips/r4k: Constify params_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-30-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/mips/mips_r4k.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index e5cf8ed..fc38b4b 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -79,8 +79,9 @@ typedef struct ResetData { static int64_t load_kernel(void) { + const size_t params_size = 264; int64_t entry, kernel_high; - long kernel_size, initrd_size, params_size; + long kernel_size, initrd_size; ram_addr_t initrd_offset; uint32_t *params_buf; int big_endian; @@ -128,7 +129,6 @@ static int64_t load_kernel(void) } /* Store command line. */ - params_size = 264; params_buf = g_malloc(params_size); params_buf[0] = tswap32(ram_size); @@ -143,7 +143,7 @@ static int64_t load_kernel(void) } rom_add_blob_fixed("params", params_buf, params_size, - (16 << 20) - 264); + (16 << 20) - params_size); g_free(params_buf); return entry; From patchwork Sat Jun 30 06:10:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937330 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qOVY/Urb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkRK5MCLz9ry1 for ; Sat, 30 Jun 2018 16:40:29 +1000 (AEST) Received: from localhost ([::1]:45812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9YZ-0004VZ-Dg for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:40:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96P-0004Un-EU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96K-0002YQ-Ov for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:21 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:41012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96K-0002Vg-Di for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:16 -0400 Received: by mail-wr0-x235.google.com with SMTP id h10-v6so10635651wrq.8 for ; Fri, 29 Jun 2018 23:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mjM2/WybxeNyeEMfwi3ilHmO2657l+irAMdN1Iy8Di8=; b=qOVY/UrbbLr/uzCXXhj0CXF+oDPW5WaqMB8b7El4QtH8THpjkCA2W9AEVwZEIkrZSN /W+ZhlnyM7t3zEqCNbcCjfYNaswS4WCRPZacvfyOwz74ZKEDql6L116NYE2AMrJAOwJB TMHmVocWoVKEC37pmLmlPsWgfU5F/ETcdcOtqyP6YZPZ0LEoYsoTRJRguelOncfqYert 14TE8HH/i9qcMIKsYvkH3SxqZeqPnNmTeq86tow/tUyMMVlatYvUuDk+cARsa7+KcbFD EYpk68ieCoebwp1QlNe2azQp16sFJVBYaUQw9ad3PDhjSqRmzaZMY45emNAwLvxbv6oW 16/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mjM2/WybxeNyeEMfwi3ilHmO2657l+irAMdN1Iy8Di8=; b=MbizzDM00f3yin/oY63JaQebfrsf+1z740BINSqw2ALDcRNFkt5UOlu6UaqS6HwfUf a6RiaSooFU4nNjYfn3hJ/RAgoF4oJkjoOoyhVYgCQUpnRDOgSGlmR+x4q4hencH9CB38 uiJSstYSoSrvmwHUKc2HFYYi85pgJVTS8HiGif0qgPeEd+qsikMdnCMUCfvI+OLc2juE gqadxiocYO6b4Okh/9J+Xfe9F/zHbzo8v6Wt8Rh6hDZ7l9CbVdd1GnDafde8fQ9Y3sc1 UL45GUvpycVbeQ2WXyLEVISZS/odnR4TUSpoCzmSy/jVJXecwlk60+Q/1lLURuIWvOms P0Nw== X-Gm-Message-State: APt69E1Y0OK1jJ6HHNjCNnFsRoOmpcaNHinx6Uxv++Xf6XfTXFINS+tl s4NdwMWKC1uXWbStpSM9JL/bPFDD X-Google-Smtp-Source: AAOMgpdhNd++92lxrcLMa7PRCV1OM4pLAnF3yGPkqFdFCbMbCLEe0JZ6c5V3Q0mMmM9J+rGwdKUaZg== X-Received: by 2002:adf:8345:: with SMTP id 63-v6mr14440904wrd.37.1530339075167; Fri, 29 Jun 2018 23:11:15 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:25 +0200 Message-Id: <20180630061040.6018-33-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::235 Subject: [Qemu-devel] [PULL 32/47] hw/mips: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-Id: <20180625124238.25339-31-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/mips/mips_fulong2e.c | 7 ++++--- hw/mips/mips_malta.c | 25 ++++++++++++++----------- hw/mips/mips_r4k.c | 11 ++++++----- hw/misc/mips_itu.c | 3 ++- hw/pci-host/xilinx-pcie.c | 5 +++-- include/hw/intc/mips_gic.h | 3 ++- include/hw/mips/bios.h | 3 ++- 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 02fb2fd..c1694c8 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/i386/pc.h" @@ -159,7 +160,7 @@ static int64_t load_kernel (CPUMIPSState *env) /* Setup minimum environment variables */ prom_set(prom_buf, index++, "busclock=33000000"); prom_set(prom_buf, index++, "cpuclock=100000000"); - prom_set(prom_buf, index++, "memsize=%i", loaderparams.ram_size/1024/1024); + prom_set(prom_buf, index++, "memsize=%"PRIi64, loaderparams.ram_size / MiB); prom_set(prom_buf, index++, "modetty0=38400n8r"); prom_set(prom_buf, index++, NULL); @@ -303,10 +304,10 @@ static void mips_fulong2e_init(MachineState *machine) qemu_register_reset(main_cpu_reset, cpu); /* fulong 2e has 256M ram. */ - ram_size = 256 * 1024 * 1024; + ram_size = 256 * MiB; /* fulong 2e has a 1M flash.Winbond W39L040AP70Z */ - bios_size = 1024 * 1024; + bios_size = 1 * MiB; /* allocate RAM */ memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index b9d92bf..1603f9a 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -191,7 +192,7 @@ static void generate_eeprom_spd(uint8_t *eeprom, ram_addr_t ram_size) int i; /* work in terms of MB */ - ram_size >>= 20; + ram_size /= MiB; while ((ram_size >= 4) && (nbanks <= 2)) { int sz_log2 = MIN(31 - clz32(ram_size), 14); @@ -843,7 +844,8 @@ static int64_t load_kernel (void) /* The kernel allocates the bootmap memory in the low memory after the initrd. It takes at most 128kiB for 2GB RAM and 4kiB pages. */ - initrd_offset = (loaderparams.ram_low_size - initrd_size - 131072 + initrd_offset = (loaderparams.ram_low_size - initrd_size + - (128 * KiB) - ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (kernel_high >= initrd_offset) { error_report("memory too small for initial ram disk '%s'", @@ -1021,9 +1023,9 @@ void mips_malta_init(MachineState *machine) mips_create_cpu(s, machine->cpu_type, &cbus_irq, &i8259_irq); /* allocate RAM */ - if (ram_size > (2048u << 20)) { - error_report("Too much memory for this machine: %dMB, maximum 2048MB", - ((unsigned int)ram_size / (1 << 20))); + if (ram_size > 2 * GiB) { + error_report("Too much memory for this machine: %" PRId64 "MB," + " maximum 2048MB", ram_size / MiB); exit(1); } @@ -1034,17 +1036,18 @@ void mips_malta_init(MachineState *machine) /* alias for pre IO hole access */ memory_region_init_alias(ram_low_preio, NULL, "mips_malta_low_preio.ram", - ram_high, 0, MIN(ram_size, (256 << 20))); + ram_high, 0, MIN(ram_size, 256 * MiB)); memory_region_add_subregion(system_memory, 0, ram_low_preio); /* alias for post IO hole access, if there is enough RAM */ - if (ram_size > (512 << 20)) { + if (ram_size > 512 * MiB) { ram_low_postio = g_new(MemoryRegion, 1); memory_region_init_alias(ram_low_postio, NULL, "mips_malta_low_postio.ram", - ram_high, 512 << 20, - ram_size - (512 << 20)); - memory_region_add_subregion(system_memory, 512 << 20, ram_low_postio); + ram_high, 512 * MiB, + ram_size - 512 * MiB); + memory_region_add_subregion(system_memory, 512 * MiB, + ram_low_postio); } #ifdef TARGET_WORDS_BIGENDIAN @@ -1076,7 +1079,7 @@ void mips_malta_init(MachineState *machine) bios = pflash_cfi01_get_memory(fl); fl_idx++; if (kernel_filename) { - ram_low_size = MIN(ram_size, 256 << 20); + ram_low_size = MIN(ram_size, 256 * MiB); /* For KVM we reserve 1MB of RAM for running bootloader */ if (kvm_enabled()) { ram_low_size -= 0x100000; diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index fc38b4b..d5725d0 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -8,6 +8,7 @@ * the standard PC ISA addresses. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -143,7 +144,7 @@ static int64_t load_kernel(void) } rom_add_blob_fixed("params", params_buf, params_size, - (16 << 20) - params_size); + 16 * MiB - params_size); g_free(params_buf); return entry; @@ -158,7 +159,7 @@ static void main_cpu_reset(void *opaque) env->active_tc.PC = s->vector; } -static const int sector_len = 32 * 1024; +static const int sector_len = 32 * KiB; static void mips_r4k_init(MachineState *machine) { @@ -194,9 +195,9 @@ void mips_r4k_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); /* allocate RAM */ - if (ram_size > (256 << 20)) { - error_report("Too much memory for this machine: %dMB, maximum 256MB", - ((unsigned int)ram_size / (1 << 20))); + if (ram_size > 256 * MiB) { + error_report("Too much memory for this machine: %" PRId64 "MB," + " maximum 256MB", ram_size / MiB); exit(1); } memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size); diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index ccc4c7d..43bbec4 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/log.h" #include "qapi/error.h" #include "cpu.h" @@ -80,7 +81,7 @@ static void itc_reconfigure(MIPSITUState *tag) uint64_t *am = &tag->ITCAddressMap[0]; MemoryRegion *mr = &tag->storage_io; hwaddr address = am[0] & ITC_AM0_BASE_ADDRESS_MASK; - uint64_t size = (1 << 10) + (am[1] & ITC_AM1_ADDR_MASK_MASK); + uint64_t size = (1 * KiB) + (am[1] & ITC_AM1_ADDR_MASK_MASK); bool is_enabled = (am[0] & ITC_AM0_EN_MASK) != 0; memory_region_transaction_begin(); diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index b0a31b9..60309af 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" #include "hw/pci-host/xilinx-pcie.h" @@ -157,9 +158,9 @@ static void xilinx_pcie_host_init(Object *obj) static Property xilinx_pcie_host_props[] = { DEFINE_PROP_UINT32("bus_nr", XilinxPCIEHost, bus_nr, 0), DEFINE_PROP_SIZE("cfg_base", XilinxPCIEHost, cfg_base, 0), - DEFINE_PROP_SIZE("cfg_size", XilinxPCIEHost, cfg_size, 32 << 20), + DEFINE_PROP_SIZE("cfg_size", XilinxPCIEHost, cfg_size, 32 * MiB), DEFINE_PROP_SIZE("mmio_base", XilinxPCIEHost, mmio_base, 0), - DEFINE_PROP_SIZE("mmio_size", XilinxPCIEHost, mmio_size, 1 << 20), + DEFINE_PROP_SIZE("mmio_size", XilinxPCIEHost, mmio_size, 1 * MiB), DEFINE_PROP_BOOL("link_up", XilinxPCIEHost, link_up, true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h index b98d500..902a12b 100644 --- a/include/hw/intc/mips_gic.h +++ b/include/hw/intc/mips_gic.h @@ -11,6 +11,7 @@ #ifndef MIPS_GIC_H #define MIPS_GIC_H +#include "qemu/units.h" #include "hw/timer/mips_gictimer.h" #include "cpu.h" /* @@ -19,7 +20,7 @@ /* The MIPS default location */ #define GIC_BASE_ADDR 0x1bdc0000ULL -#define GIC_ADDRSPACE_SZ (128 * 1024) +#define GIC_ADDRSPACE_SZ (128 * KiB) /* Constants */ #define GIC_POL_POS 1 diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h index b4b88ac..d67ef33 100644 --- a/include/hw/mips/bios.h +++ b/include/hw/mips/bios.h @@ -1,6 +1,7 @@ +#include "qemu/units.h" #include "cpu.h" -#define BIOS_SIZE (4 * 1024 * 1024) +#define BIOS_SIZE (4 * MiB) #ifdef TARGET_WORDS_BIGENDIAN #define BIOS_FILENAME "mips_bios.bin" #else From patchwork Sat Jun 30 06:10:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EWhXdoXs"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkNl5wmMz9s29 for ; Sat, 30 Jun 2018 16:38:15 +1000 (AEST) Received: from localhost ([::1]:45807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9WP-0002L3-IM for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:38:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96Q-0004VZ-3S for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96M-0002eH-Rf for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:22 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:37534) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96M-0002bF-Cy for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:18 -0400 Received: by mail-wm0-x241.google.com with SMTP id n17-v6so3954860wmh.2 for ; Fri, 29 Jun 2018 23:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wkaHGXMEshux52Dk4dtKlHk1Lfw2doggOpljvS11d+A=; b=EWhXdoXsHzdQMoDzsHWefE/Sv0dTa7hAG3iBtL7IY80RU6gQi+gYnB/y+0mSQbzc2E cLJ94vPC0cMBDXz6S83myM7bSrKLeGn9hjI3CvRQRrSVyeQNdcGE4fPs+zRPH5bh6qSR tRtYUquMCxsoEpiTkbYqzdPlKBuBcZWJVo8V/zie+bh6xyZ+5frh5nZ/EQGex1GuHckB X8teq2rrYEeV1LmBZ3uWVyDditxphydTuIDpBhr0LHciddpa7qzrSgdLkovEnCSLFCsR OmfCllNWgXh+y8sFiBMLxCUUZlnkh45tEcI37sKmrL2R8PJqaP79DkoHe49SaF/smF59 TXvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wkaHGXMEshux52Dk4dtKlHk1Lfw2doggOpljvS11d+A=; b=Edbq3XoQabFPAi8UDz8/8pq2nH6HvHC+qUjGnwPSxtDPngPiS+u8d7wcssdTrA2d30 G+3zzdgBAmOhb+GzFPceuuG2V+P1Ogmb/EhLWRiRshCRvVnFabIO0GoJ7s6/XSnzKvVk 428cZGdgFjU1YZiDvlJuJfuqgEiw+A3XFyeL+aevl+GQtfeC/bOC8FUR8OxoPBmQCbgd uJQitO1ZVtQpUwVpSJOD+HBiA4pZqjxAli2C18nCubjWaxffvF8f3NROIDG1xmS5+OcW NaNsYTfNvXQWURywL5RU4eg6XfW1eJOAdbNo4FjSTlqZMfQHuY0HPljtyDVwruNzS3t2 uF1g== X-Gm-Message-State: APt69E3BAsskH6U+WSO9NhADZNGPYdyXMci80eKn44TeP9KqAqUUpnJG yKYrfpFDKbY32009UV0C1MOvZgNU X-Google-Smtp-Source: AAOMgperrQkAh+bxFlRt+WkDHELHvg0TVDo+WEzD8qPGj6GRIffEbeZj97YDvHjB4eY3OItQTUKzPg== X-Received: by 2002:a1c:1815:: with SMTP id 21-v6mr3636271wmy.72.1530339076876; Fri, 29 Jun 2018 23:11:16 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:26 +0200 Message-Id: <20180630061040.6018-34-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 33/47] hw/ppc: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson Message-Id: <20180625124238.25339-33-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/nvram/spapr_nvram.c | 11 +++++++---- hw/pci-host/prep.c | 3 ++- hw/ppc/e500.c | 13 +++++++------ hw/ppc/e500plat.c | 3 ++- hw/ppc/mac.h | 3 ++- hw/ppc/mac_newworld.c | 1 - hw/ppc/mac_oldworld.c | 9 ++++----- hw/ppc/ppc405_boards.c | 9 +++++---- hw/ppc/ppc405_uc.c | 7 ++++--- hw/ppc/ppc440_bamboo.c | 5 +++-- hw/ppc/ppc4xx_devs.c | 22 ++++++++++++---------- hw/ppc/ppce500_spin.c | 3 ++- hw/ppc/prep.c | 4 ++-- hw/ppc/rs6000_mc.c | 13 +++++++------ hw/ppc/sam460ex.c | 16 ++++++++-------- hw/ppc/spapr.c | 10 +++++----- hw/ppc/spapr_rtas.c | 2 +- hw/ppc/virtex_ml507.c | 7 ++++--- include/hw/ppc/spapr.h | 5 +++-- target/ppc/mmu_helper.c | 8 ++++---- 20 files changed, 84 insertions(+), 70 deletions(-) diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index 4a0aec8..bed1557 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -47,9 +48,9 @@ typedef struct sPAPRNVRAM { #define VIO_SPAPR_NVRAM(obj) \ OBJECT_CHECK(sPAPRNVRAM, (obj), TYPE_VIO_SPAPR_NVRAM) -#define MIN_NVRAM_SIZE 8192 -#define DEFAULT_NVRAM_SIZE 65536 -#define MAX_NVRAM_SIZE 1048576 +#define MIN_NVRAM_SIZE (8 * KiB) +#define DEFAULT_NVRAM_SIZE (64 * KiB) +#define MAX_NVRAM_SIZE (1 * MiB) static void rtas_nvram_fetch(PowerPCCPU *cpu, sPAPRMachineState *spapr, uint32_t token, uint32_t nargs, @@ -167,7 +168,9 @@ static void spapr_nvram_realize(VIOsPAPRDevice *dev, Error **errp) nvram->buf = g_malloc0(nvram->size); if ((nvram->size < MIN_NVRAM_SIZE) || (nvram->size > MAX_NVRAM_SIZE)) { - error_setg(errp, "spapr-nvram must be between %d and %d bytes in size", + error_setg(errp, + "spapr-nvram must be between %" PRId64 + " and %" PRId64 " bytes in size", MIN_NVRAM_SIZE, MAX_NVRAM_SIZE); return; } diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 01f67f9..88f035c 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/pci/pci.h" @@ -70,7 +71,7 @@ typedef struct PRePPCIState { int contiguous_map; } PREPPCIState; -#define BIOS_SIZE (1024 * 1024) +#define BIOS_SIZE (1 * MiB) static inline uint32_t raven_pci_io_config(hwaddr addr) { diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 826053e..7d19b14 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -15,6 +15,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "e500.h" #include "e500-ccsr.h" @@ -46,11 +47,11 @@ #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" #define DTC_LOAD_PAD 0x1800000 #define DTC_PAD_MASK 0xFFFFF -#define DTB_MAX_SIZE (8 * 1024 * 1024) +#define DTB_MAX_SIZE (8 * MiB) #define INITRD_LOAD_PAD 0x2000000 #define INITRD_PAD_MASK 0xFFFFFF -#define RAM_SIZES_ALIGN (64UL << 20) +#define RAM_SIZES_ALIGN (64 * MiB) /* TODO: parameterize */ #define MPC8544_CCSRBAR_SIZE 0x00100000ULL @@ -603,7 +604,7 @@ static int ppce500_prep_device_tree(PPCE500MachineState *machine, /* Create -kernel TLB entries for BookE. */ hwaddr booke206_page_size_to_tlb(uint64_t size) { - return 63 - clz64(size >> 10); + return 63 - clz64(size / KiB); } static int booke206_initial_map_tsize(CPUPPCState *env) @@ -671,7 +672,7 @@ static void ppce500_cpu_reset(void *opaque) /* Set initial guest state. */ cs->halted = 0; - env->gpr[1] = (16<<20) - 8; + env->gpr[1] = (16 * MiB) - 8; env->gpr[3] = bi->dt_base; env->gpr[4] = 0; env->gpr[5] = 0; @@ -1012,9 +1013,9 @@ void ppce500_init(MachineState *machine) } cur_base = loadaddr + payload_size; - if (cur_base < (32 * 1024 * 1024)) { + if (cur_base < 32 * MiB) { /* u-boot occupies memory up to 32MB, so load blobs above */ - cur_base = (32 * 1024 * 1024); + cur_base = 32 * MiB; } /* Load bare kernel only if no bios/u-boot has been provided */ diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index d8e3f20..963d429 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "e500.h" #include "hw/net/fsl_etsec/etsec.h" @@ -85,7 +86,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data) pmc->has_mpc8xxx_gpio = true; pmc->has_platform_bus = true; pmc->platform_bus_base = 0xf00000000ULL; - pmc->platform_bus_size = (128ULL * 1024 * 1024); + pmc->platform_bus_size = 128 * MiB; pmc->platform_bus_first_irq = 5; pmc->platform_bus_num_irqs = 10; pmc->ccsrbar_base = 0xFE0000000ULL; diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index c0217e6..41fd289 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -26,6 +26,7 @@ #ifndef PPC_MAC_H #define PPC_MAC_H +#include "qemu/units.h" #include "exec/memory.h" #include "hw/boards.h" #include "hw/sysbus.h" @@ -38,7 +39,7 @@ /* SMP is not enabled, for now */ #define MAX_CPUS 1 -#define BIOS_SIZE (1024 * 1024) +#define BIOS_SIZE (1 * MiB) #define NVRAM_SIZE 0x2000 #define PROM_FILENAME "openbios-ppc" #define PROM_ADDR 0xfff00000 diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ff715ff..84355b2 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -71,7 +71,6 @@ #include "hw/usb.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" -#include "qemu/cutils.h" #include "trace.h" #define MAX_IDE_BUS 2 diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 4608bab..06ed6f6 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" @@ -46,7 +47,6 @@ #include "sysemu/kvm.h" #include "kvm_ppc.h" #include "exec/address-spaces.h" -#include "qemu/cutils.h" #define MAX_IDE_BUS 2 #define CFG_ADDR 0xf0000510 @@ -118,10 +118,9 @@ static void ppc_heathrow_init(MachineState *machine) } /* allocate RAM */ - if (ram_size > (2047 << 20)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 2047 MB\n", - ((unsigned int)ram_size / (1 << 20))); + if (ram_size > 2047 * MiB) { + error_report("Too much memory for this machine: %" PRId64 " MB, " + "maximum 2047 MB", ram_size / MiB); exit(1); } diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index d301067..7011107 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -40,7 +41,7 @@ #include "exec/address-spaces.h" #define BIOS_FILENAME "ppc405_rom.bin" -#define BIOS_SIZE (2048 * 1024) +#define BIOS_SIZE (2 * MiB) #define KERNEL_LOAD_ADDR 0x00000000 #define INITRD_LOAD_ADDR 0x01800000 @@ -216,14 +217,14 @@ static void ref405ep_init(MachineState *machine) memory_region_init(&ram_memories[1], NULL, "ef405ep.ram1", 0); ram_bases[1] = 0x00000000; ram_sizes[1] = 0x00000000; - ram_size = 128 * 1024 * 1024; + ram_size = 128 * MiB; #ifdef DEBUG_BOARD_INIT printf("%s: register cpu\n", __func__); #endif env = ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, 33333333, &pic, kernel_filename == NULL ? 0 : 1); /* allocate SRAM */ - sram_size = 512 * 1024; + sram_size = 512 * KiB; memory_region_init_ram(sram, NULL, "ef405ep.sram", sram_size, &error_fatal); memory_region_add_subregion(sysmem, 0xFFF00000, sram); @@ -589,7 +590,7 @@ static void taihu_405ep_init(MachineState *machine) bios_size = blk_getlength(blk); /* XXX: should check that size is 32MB */ - bios_size = 32 * 1024 * 1024; + bios_size = 32 * MiB; fl_sectors = (bios_size + 65535) >> 16; #ifdef DEBUG_BOARD_INIT printf("Register parallel flash %d size %lx" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 34f8d57..4bd9fbc 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -983,10 +984,10 @@ static void ppc405_ocm_init(CPUPPCState *env) ocm = g_malloc0(sizeof(ppc405_ocm_t)); /* XXX: Size is 4096 or 0x04000000 */ - memory_region_init_ram(&ocm->isarc_ram, NULL, "ppc405.ocm", 4096, + memory_region_init_ram(&ocm->isarc_ram, NULL, "ppc405.ocm", 4 * KiB, &error_fatal); - memory_region_init_alias(&ocm->dsarc_ram, NULL, "ppc405.dsarc", &ocm->isarc_ram, - 0, 4096); + memory_region_init_alias(&ocm->dsarc_ram, NULL, "ppc405.dsarc", + &ocm->isarc_ram, 0, 4 * KiB); qemu_register_reset(&ocm_reset, ocm); ppc_dcr_register(env, OCM0_ISARC, ocm, &dcr_read_ocm, &dcr_write_ocm); diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 44e6a0c..3d4c43b 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qemu-common.h" #include "qemu/error-report.h" @@ -49,7 +50,7 @@ #define PPC440EP_SDRAM_NR_BANKS 4 static const unsigned int ppc440ep_sdram_bank_sizes[] = { - 256<<20, 128<<20, 64<<20, 32<<20, 16<<20, 8<<20, 0 + 256 * MiB, 128 * MiB, 64 * MiB, 32 * MiB, 16 * MiB, 8 * MiB, 0 }; static hwaddr entry; @@ -151,7 +152,7 @@ static void main_cpu_reset(void *opaque) CPUPPCState *env = &cpu->env; cpu_reset(CPU(cpu)); - env->gpr[1] = (16<<20) - 8; + env->gpr[1] = (16 * MiB) - 8; env->gpr[3] = FDT_ADDR; env->nip = entry; diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index 2e96389..8c6f3c9 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" @@ -29,6 +30,7 @@ #include "hw/boards.h" #include "qemu/log.h" #include "exec/address-spaces.h" +#include "qemu/error-report.h" #define DEBUG_UIC @@ -353,25 +355,25 @@ static uint32_t sdram_bcr (hwaddr ram_base, uint32_t bcr; switch (ram_size) { - case (4 * 1024 * 1024): + case 4 * MiB: bcr = 0x00000000; break; - case (8 * 1024 * 1024): + case 8 * MiB: bcr = 0x00020000; break; - case (16 * 1024 * 1024): + case 16 * MiB: bcr = 0x00040000; break; - case (32 * 1024 * 1024): + case 32 * MiB: bcr = 0x00060000; break; - case (64 * 1024 * 1024): + case 64 * MiB: bcr = 0x00080000; break; - case (128 * 1024 * 1024): + case 128 * MiB: bcr = 0x000A0000; break; - case (256 * 1024 * 1024): + case 256 * MiB: bcr = 0x000C0000; break; default: @@ -399,7 +401,7 @@ static target_ulong sdram_size (uint32_t bcr) if (sh == 7) size = -1; else - size = (4 * 1024 * 1024) << sh; + size = (4 * MiB) << sh; return size; } @@ -702,8 +704,8 @@ ram_addr_t ppc4xx_sdram_adjust(ram_addr_t ram_size, int nr_banks, ram_size -= size_left; if (size_left) { - printf("Truncating memory to %d MiB to fit SDRAM controller limits.\n", - (int)(ram_size >> 20)); + error_report("Truncating memory to %" PRId64 " MiB to fit SDRAM" + " controller limits", ram_size / MiB); } memory_region_allocate_system_memory(ram, NULL, "ppc4xx.sdram", ram_size); diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index 69ca2d0..c45fc85 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -28,6 +28,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/hw_accel.h" @@ -89,7 +90,7 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; SpinInfo *curspin = data.host_ptr; - hwaddr map_size = 64 * 1024 * 1024; + hwaddr map_size = 64 * MiB; hwaddr map_start; cpu_synchronize_state(cs); diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 25ae533..6689407 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -50,7 +50,7 @@ #include "exec/address-spaces.h" #include "trace.h" #include "elf.h" -#include "qemu/cutils.h" +#include "qemu/units.h" #include "kvm_ppc.h" /* SMP is not enabled, for now */ @@ -60,7 +60,7 @@ #define CFG_ADDR 0xf0000510 -#define BIOS_SIZE (1024 * 1024) +#define BIOS_SIZE (1 * MiB) #define BIOS_FILENAME "ppc_rom.bin" #define KERNEL_LOAD_ADDR 0x01000000 #define INITRD_LOAD_ADDR 0x01800000 diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index b613565..45cb95e 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/isa/isa.h" #include "exec/address-spaces.h" #include "hw/boards.h" @@ -109,7 +110,7 @@ static void rs6000mc_port0820_write(void *opaque, uint32_t addr, uint32_t val) size = end_address - start_address; memory_region_set_enabled(&s->simm[socket - 1], size != 0); memory_region_set_address(&s->simm[socket - 1], - start_address * 8 * 1024 * 1024); + start_address * 8 * MiB); } } } @@ -140,7 +141,7 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp) { RS6000MCState *s = RS6000MC_DEVICE(dev); int socket = 0; - unsigned int ram_size = s->ram_size / (1024 * 1024); + unsigned int ram_size = s->ram_size / MiB; while (socket < 6) { if (ram_size >= 64) { @@ -163,8 +164,8 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp) char name[] = "simm.?"; name[5] = socket + '0'; memory_region_allocate_system_memory(&s->simm[socket], OBJECT(dev), - name, s->simm_size[socket] - * 1024 * 1024); + name, + s->simm_size[socket] * MiB); memory_region_add_subregion_overlap(get_system_memory(), 0, &s->simm[socket], socket); } @@ -172,8 +173,8 @@ static void rs6000mc_realize(DeviceState *dev, Error **errp) if (ram_size) { /* unable to push all requested RAM in SIMMs */ error_setg(errp, "RAM size incompatible with this board. " - "Try again with something else, like %d MB", - s->ram_size / 1024 / 1024 - ram_size); + "Try again with something else, like %" PRId64 " MB", + s->ram_size / MiB - ram_size); return; } diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 2a98c10..c7c799b 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -12,8 +12,8 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" -#include "qemu/cutils.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" @@ -46,7 +46,7 @@ /* from Sam460 U-Boot include/configs/Sam460ex.h */ #define FLASH_BASE 0xfff00000 #define FLASH_BASE_H 0x4 -#define FLASH_SIZE (1 << 20) +#define FLASH_SIZE (1 * MiB) #define UBOOT_LOAD_BASE 0xfff80000 #define UBOOT_SIZE 0x00080000 #define UBOOT_ENTRY 0xfffffffc @@ -71,7 +71,7 @@ /* FIXME: See u-boot.git 8ac41e, also fix in ppc440_uc.c */ static const unsigned int ppc460ex_sdram_bank_sizes[] = { - 1024 << 20, 512 << 20, 256 << 20, 128 << 20, 64 << 20, 32 << 20, 0 + 1 * GiB, 512 * MiB, 256 * MiB, 128 * MiB, 64 * MiB, 32 * MiB, 0 }; struct boot_info { @@ -126,7 +126,7 @@ static void generate_eeprom_spd(uint8_t *eeprom, ram_addr_t ram_size) int i; /* work in terms of MB */ - ram_size >>= 20; + ram_size /= MiB; while ((ram_size >= 4) && (nbanks <= 2)) { int sz_log2 = MIN(31 - clz32(ram_size), 14); @@ -225,7 +225,7 @@ static int sam460ex_load_uboot(void) fl_sectors = (bios_size + 65535) >> 16; if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size, - blk, (64 * 1024), fl_sectors, + blk, 64 * KiB, fl_sectors, 1, 0x89, 0x18, 0x0000, 0x0, 1)) { error_report("qemu: Error registering flash memory."); /* XXX: return an error instead? */ @@ -359,14 +359,14 @@ static void main_cpu_reset(void *opaque) /* either we have a kernel to boot or we jump to U-Boot */ if (bi->entry != UBOOT_ENTRY) { - env->gpr[1] = (16 << 20) - 8; + env->gpr[1] = (16 * MiB) - 8; env->gpr[3] = FDT_ADDR; env->nip = bi->entry; /* Create a mapping for the kernel. */ mmubooke_create_initial_mapping(env, 0, 0); env->gpr[6] = tswap32(EPAPR_MAGIC); - env->gpr[7] = (16 << 20) - 8; /*bi->ima_size;*/ + env->gpr[7] = (16 * MiB) - 8; /* bi->ima_size; */ } else { env->nip = UBOOT_ENTRY; @@ -479,7 +479,7 @@ static void sam460ex_init(MachineState *machine) /* 256K of L2 cache as memory */ ppc4xx_l2sram_init(env); /* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */ - memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 << 10, + memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 * KiB, &error_abort); memory_region_add_subregion(address_space_mem, 0x400000000LL, l2cache_ram); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7dbdb4e..1602472 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2322,7 +2322,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) if (machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Memory size 0x" RAM_ADDR_FMT - " is not aligned to %llu MiB", + " is not aligned to %" PRIu64 " MiB", machine->ram_size, SPAPR_MEMORY_BLOCK_SIZE / MiB); return; @@ -2330,7 +2330,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) if (machine->maxram_size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Maximum memory size 0x" RAM_ADDR_FMT - " is not aligned to %llu MiB", + " is not aligned to %" PRIu64 " MiB", machine->ram_size, SPAPR_MEMORY_BLOCK_SIZE / MiB); return; @@ -2340,7 +2340,7 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) if (numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Node %d memory size 0x%" PRIx64 - " is not aligned to %llu MiB", + " is not aligned to %" PRIu64 " MiB", i, numa_info[i].node_mem, SPAPR_MEMORY_BLOCK_SIZE / MiB); return; @@ -2763,7 +2763,7 @@ static void spapr_machine_init(MachineState *machine) } } - if (spapr->rma_size < (MIN_RMA_SLOF << 20)) { + if (spapr->rma_size < (MIN_RMA_SLOF * MiB)) { error_report( "pSeries SLOF firmware requires >= %ldM guest RMA (Real Mode Area memory)", MIN_RMA_SLOF); @@ -3209,7 +3209,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, if (size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Hotplugged memory size must be a multiple of " - "%lld MB", SPAPR_MEMORY_BLOCK_SIZE / MiB); + "%" PRIu64 " MB", SPAPR_MEMORY_BLOCK_SIZE / MiB); return; } diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index f32740b..4ac96bc 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -237,7 +237,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, switch (parameter) { case RTAS_SYSPARM_SPLPAR_CHARACTERISTICS: { char *param_val = g_strdup_printf("MaxEntCap=%d," - "DesMem=%llu," + "DesMem=%" PRIu64 "," "DesProcs=%d," "MaxPlatProcs=%d", max_cpus, diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index b4bb90d..7891464 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" @@ -45,7 +46,7 @@ #include "ppc405.h" #define EPAPR_MAGIC (0x45504150) -#define FLASH_SIZE (16 * 1024 * 1024) +#define FLASH_SIZE (16 * MiB) #define INTC_BASEADDR 0x81800000 #define UART16550_BASEADDR 0x83e01003 @@ -127,7 +128,7 @@ static void main_cpu_reset(void *opaque) * r8: 0 * r9: 0 */ - env->gpr[1] = (16<<20) - 8; + env->gpr[1] = (16 * MiB) - 8; /* Provide a device-tree. */ env->gpr[3] = bi->fdt; env->nip = bi->bootstrap_pc; @@ -235,7 +236,7 @@ static void virtex_init(MachineState *machine) dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi01_register(PFLASH_BASEADDR, NULL, "virtex.flash", FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, - (64 * 1024), FLASH_SIZE >> 16, + 64 * KiB, FLASH_SIZE >> 16, 1, 0x89, 0x18, 0x0000, 0x0, 1); cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT]; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 7e02816..7e5de1a 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -1,6 +1,7 @@ #ifndef HW_SPAPR_H #define HW_SPAPR_H +#include "qemu/units.h" #include "sysemu/dma.h" #include "hw/boards.h" #include "hw/ppc/xics.h" @@ -749,8 +750,8 @@ int spapr_rng_populate_dt(void *fdt); */ #define SPAPR_MAX_RAM_SLOTS 32 -/* 1GB alignment for device memory region */ -#define SPAPR_DEVICE_MEM_ALIGN (1ULL << 30) +/* 1GB alignment for hotplug memory region */ +#define SPAPR_DEVICE_MEM_ALIGN (1 * GiB) /* * Number of 32 bit words in each LMB list entry in ibm,dynamic-memory diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 98ce179..e6739e6 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -17,6 +17,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "exec/helper-proto.h" #include "sysemu/kvm.h" @@ -1090,11 +1091,10 @@ static void mmubooke_dump_mmu(FILE *f, fprintf_function cpu_fprintf, pa = entry->RPN & mask; /* Extend the physical address to 36 bits */ pa |= (hwaddr)(entry->RPN & 0xF) << 32; - size /= 1024; - if (size >= 1024) { - snprintf(size_buf, sizeof(size_buf), "%3" PRId64 "M", size / 1024); + if (size >= 1 * MiB) { + snprintf(size_buf, sizeof(size_buf), "%3" PRId64 "M", size / MiB); } else { - snprintf(size_buf, sizeof(size_buf), "%3" PRId64 "k", size); + snprintf(size_buf, sizeof(size_buf), "%3" PRId64 "k", size / KiB); } cpu_fprintf(f, "0x%016" PRIx64 " 0x%016" PRIx64 " %s %-5u %08x %08x\n", (uint64_t)ea, (uint64_t)pa, size_buf, (uint32_t)entry->PID, From patchwork Sat Jun 30 06:10:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937323 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YTurR00p"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkKS3Gp6z9s1B for ; Sat, 30 Jun 2018 16:35:24 +1000 (AEST) Received: from localhost ([::1]:45787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Te-0008MY-3O for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:35:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96P-0004Uo-Eg for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96N-0002gT-Lv for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:21 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:44651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96N-0002eC-Bl for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:19 -0400 Received: by mail-wr0-x241.google.com with SMTP id p12-v6so10631196wrn.11 for ; Fri, 29 Jun 2018 23:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=FQLzFmRzgw1CF/82tockVhlq+aNtMC8/bs5xB8/8izg=; b=YTurR00pjjpD346KRdk3s4blt2iuhx8Em5GWvbxZqHkCtMwClLiKAVYTOKwGOx/Is2 sWXFhe+Y0oZaYBr0rz5FIuAA8ezyxvYV3BUzVEQEuWCca5PcLyC4QNYMzeset00DsVvE xZA8BclFZdKR/3GyZbUnxuSTmI/uMZnmtsbiveo2MUmm7BbWU6ePb37mWZX7m/Ew7ejQ AgoPpN9OP5ZIyPnaHe1AGblsxZ7BFCQkyRdILWf8afrFQrP9qBn8yoN1AsckrAViLFrv 6C7oVHU4KJkHx2qD6amYie7aflqUBRhTx+JZfmw5kxQeSB8prOvIH5ic/qBn5qr0g1uo aXAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=FQLzFmRzgw1CF/82tockVhlq+aNtMC8/bs5xB8/8izg=; b=iR7JovAyhXFLXVi4q+iBpLwF3R//4zywgCqGpkoliv4zI5TN4SRO4rwBeWd8jY/lki D9J63pxoJf4XyJf1mV0YJ1eN72u6gn1KuxDS+RAKYYkGPdQhOxwX4UNq8/hMEMdV2JFn 0oxBwjX0rMWt8AAY0geT94QSmGhR31lZxLK+ZzRreTC+kiltP7S001CJY7B75ys+MTQ8 1WAhWfo1qsBn8jHpdb5MUZFBmkgjQ9xdpgNo/Bu1hyPJw6JM9Xec63hzNzj47YiLRwj4 lndlaF+imSDRf0zaDyhfIPgDRjBC+MK/+KA5IZ6OAaf5VqBHBSLjy681hmqNXg5aW55x HVhg== X-Gm-Message-State: APt69E3t83cUyNQgUzFLU3fyipp46l5MEz7qPbVY7ggEBHw17cpDu5XA mdhSt2VHalPkodis1XuvA56r67Fz X-Google-Smtp-Source: AAOMgpd0w9VPF3HooSpglckBJCbHHTrAcSli88BGoMcgaSjcpYWy/7gnCCnm12PB/gBw2XKg++Su+g== X-Received: by 2002:adf:e841:: with SMTP id d1-v6mr550039wrn.269.1530339078126; Fri, 29 Jun 2018 23:11:18 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:27 +0200 Message-Id: <20180630061040.6018-35-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 34/47] hw/i386: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" It eases code review, unit is explicit. Patch generated using: $ git grep -E '[<>][<>]=? ?[1-5]0' hw/ include/hw/ and modified manually. Signed-off-by: Paolo Bonzini --- hw/i386/acpi-build.c | 4 ++-- hw/i386/pc.c | 23 ++++++++++++----------- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 3 ++- hw/i386/pc_sysfw.c | 10 ++++------ 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 9bc6d97..796de91 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2248,8 +2248,8 @@ build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL); } -#define HOLE_640K_START (640 * 1024) -#define HOLE_640K_END (1024 * 1024) +#define HOLE_640K_START (640 * KiB) +#define HOLE_640K_END (1 * MiB) static void build_srat_hotpluggable_memory(GArray *table_data, uint64_t base, uint64_t len, int default_node) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f310040..50d5553 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/char/serial.h" @@ -448,12 +449,12 @@ void pc_cmos_init(PCMachineState *pcms, /* memory size */ /* base memory (first MiB) */ - val = MIN(pcms->below_4g_mem_size / 1024, 640); + val = MIN(pcms->below_4g_mem_size / KiB, 640); rtc_set_memory(s, 0x15, val); rtc_set_memory(s, 0x16, val >> 8); /* extended memory (next 64MiB) */ - if (pcms->below_4g_mem_size > 1024 * 1024) { - val = (pcms->below_4g_mem_size - 1024 * 1024) / 1024; + if (pcms->below_4g_mem_size > 1 * MiB) { + val = (pcms->below_4g_mem_size - 1 * MiB) / KiB; } else { val = 0; } @@ -464,8 +465,8 @@ void pc_cmos_init(PCMachineState *pcms, rtc_set_memory(s, 0x30, val); rtc_set_memory(s, 0x31, val >> 8); /* memory between 16MiB and 4GiB */ - if (pcms->below_4g_mem_size > 16 * 1024 * 1024) { - val = (pcms->below_4g_mem_size - 16 * 1024 * 1024) / 65536; + if (pcms->below_4g_mem_size > 16 * MiB) { + val = (pcms->below_4g_mem_size - 16 * MiB) / (64 * KiB); } else { val = 0; } @@ -1392,11 +1393,11 @@ void pc_memory_init(PCMachineState *pcms, } machine->device_memory->base = - ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1ULL << 30); + ROUND_UP(0x100000000ULL + pcms->above_4g_mem_size, 1 * GiB); if (pcmc->enforce_aligned_dimm) { /* size device region assuming 1G page max alignment per slot */ - device_mem_size += (1ULL << 30) * machine->ram_slots; + device_mem_size += (1 * GiB) * machine->ram_slots; } if ((machine->device_memory->base + device_mem_size) < @@ -1438,7 +1439,7 @@ void pc_memory_init(PCMachineState *pcms, if (!pcmc->broken_reserved_end) { res_mem_end += memory_region_size(&machine->device_memory->mr); } - *val = cpu_to_le64(ROUND_UP(res_mem_end, 0x1ULL << 30)); + *val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB)); fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); } @@ -1475,7 +1476,7 @@ uint64_t pc_pci_hole64_start(void) hole64_start = 0x100000000ULL + pcms->above_4g_mem_size; } - return ROUND_UP(hole64_start, 1ULL << 30); + return ROUND_UP(hole64_start, 1 * GiB); } qemu_irq pc_allocate_cpu_irq(void) @@ -2095,7 +2096,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, error_propagate(errp, error); return; } - if (value > (1ULL << 32)) { + if (value > 4 * GiB) { error_setg(&error, "Machine option 'max-ram-below-4g=%"PRIu64 "' expects size less than or equal to 4G", value); @@ -2103,7 +2104,7 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, return; } - if (value < (1ULL << 20)) { + if (value < 1 * MiB) { warn_report("Only %" PRIu64 " bytes of RAM below the 4GiB boundary," "BIOS may not work with less than 1MiB", value); } diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d357907..dc09466 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/loader.h" #include "hw/i386/pc.h" @@ -131,7 +132,7 @@ static void pc_init1(MachineState *machine, if (lowmem > 0xc0000000) { lowmem = 0xc0000000; } - if (lowmem & ((1ULL << 30) - 1)) { + if (lowmem & (1 * GiB - 1)) { warn_report("Large machine and max_ram_below_4g " "(%" PRIu64 ") not a multiple of 1G; " "possible bad performance.", diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 1a73e18..532241e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -29,6 +29,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/loader.h" #include "sysemu/arch_init.h" @@ -105,7 +106,7 @@ static void pc_q35_init(MachineState *machine) if (lowmem > pcms->max_ram_below_4g) { lowmem = pcms->max_ram_below_4g; if (machine->ram_size - lowmem > lowmem && - lowmem & ((1ULL << 30) - 1)) { + lowmem & (1 * GiB - 1)) { warn_report("There is possibly poor performance as the ram size " " (0x%" PRIx64 ") is more then twice the size of" " max-ram-below-4g (%"PRIu64") and" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 73ac783..091e22d 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -28,6 +28,7 @@ #include "sysemu/block-backend.h" #include "qemu/error-report.h" #include "qemu/option.h" +#include "qemu/units.h" #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i386/pc.h" @@ -56,7 +57,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, flash_size = memory_region_size(flash_mem); /* map the last 128KB of the BIOS in ISA space */ - isa_bios_size = MIN(flash_size, 128 * 1024); + isa_bios_size = MIN(flash_size, 128 * KiB); isa_bios = g_malloc(sizeof(*isa_bios)); memory_region_init_ram(isa_bios, NULL, "isa-bios", isa_bios_size, &error_fatal); @@ -83,7 +84,7 @@ static void pc_isa_bios_init(MemoryRegion *rom_memory, * only 18MB-4KB below 4G. For now, restrict the cumulative mapping to 8MB in * size. */ -#define FLASH_MAP_BASE_MIN ((hwaddr)(0x100000000ULL - 8*1024*1024)) +#define FLASH_MAP_BASE_MIN ((hwaddr)(4 * GiB - 8 * MiB)) /* This function maps flash drives from 4G downward, in order of their unit * numbers. The mapping starts at unit#0, with unit number increments of 1, and @@ -221,10 +222,7 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) g_free(filename); /* map the last 128KB of the BIOS in ISA space */ - isa_bios_size = bios_size; - if (isa_bios_size > (128 * 1024)) { - isa_bios_size = 128 * 1024; - } + isa_bios_size = MIN(bios_size, 128 * KiB); isa_bios = g_malloc(sizeof(*isa_bios)); memory_region_init_alias(isa_bios, NULL, "isa-bios", bios, bios_size - isa_bios_size, isa_bios_size); From patchwork Sat Jun 30 06:10:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="J5q+Jdhu"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkNc33jKz9ry1 for ; Sat, 30 Jun 2018 16:38:07 +1000 (AEST) Received: from localhost ([::1]:45802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9WF-0002Eb-6R for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:38:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38110) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96Q-0004VV-0k for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96O-0002iD-JP for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:21 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96O-0002gX-CX for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:20 -0400 Received: by mail-wr0-x244.google.com with SMTP id f16-v6so10646309wrm.3 for ; Fri, 29 Jun 2018 23:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u2so84jb1PTcKCiAQwxD1ZWKIk8LtOiInhXEf7vTBlM=; b=J5q+Jdhu9cUK1h2EJSsjnxvse/MM1rMRq9NFJw/EYUthEtA3QHAXvnIucOtgy5Wfdm +bEzmtC3Tq3MbOjE+RqXdRyylxY+suJm/HxlHgH35nspXPkpNjYs61gOcvFtIeBD6gus x0DhlQa3Djt0k3BwlKGR60u0v3TIujB7Pw+FizvikevTyO/w8H6OqPgA2GXHHsKL6qVr /gWRswK0Q+OvcS9WVmAIZ4oQfqoOlXtd1oLXCmTwdxR9UXoqX9Aa+7lbQvwQSp85VbLR RfskXNCWZN6eLaRwgjzLrGyUFHyp/E97/PbozuYysnclfjfcTwKDlHSZrLpYRzjn9EGX KWbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u2so84jb1PTcKCiAQwxD1ZWKIk8LtOiInhXEf7vTBlM=; b=QnrM9rMy69AmCDYq5hx6Mx0dv0YbjBtbc/clUYTAytrmWJhwMcxpDFE+1RP3d3eB/C oeFa5UQTRWQentVFrW48H1NUu30qZEEZVhnz3HP00/WOaF5W309HdxNTb/ase2MQDbSs rFOmufy6GUntZAKtnZWQXl4UNa/ZRUlZVPKpGSMQ6uXVdmA3FeiDUaaiHxhmjosnbvto 7M7LeUde5ML4ZQOVt7ZtsN7rYDXNTtydI49LztXW9TIHEowL+IjTLQNOXtcTY6/IIHYY BgAWUDrQhWSnxYYj/udSWIUeuxwcujHD0F5yyauBzcMje6hD98bY681+i3GxE15nH8xE qeGQ== X-Gm-Message-State: APt69E3yvRVtL/IUZ5oExETcFBS41PvSd7wdkY7t/kDlF9oCt5N0Oe03 06y8qxlYLgkpNVAFjgryK+ATOHu1 X-Google-Smtp-Source: AAOMgpcMS/hzYIp47F8xpaUVrEfESQcHxfS5fwCon0VnwQmsV2ZbBKa9xFuFT3HaXHEpQn58fQhYcA== X-Received: by 2002:adf:c383:: with SMTP id p3-v6mr9585600wrf.68.1530339079164; Fri, 29 Jun 2018 23:11:19 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:28 +0200 Message-Id: <20180630061040.6018-36-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 35/47] hw/net: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Weil Message-Id: <20180625124238.25339-35-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/net/e1000e.c | 7 ++++--- hw/net/e1000x_common.c | 3 ++- hw/net/eepro100.c | 3 +-- hw/net/ne2000.h | 5 +++-- include/hw/net/allwinner_emac.h | 5 +++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index cda8d48..510ddb3 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -34,6 +34,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "net/net.h" #include "net/tap.h" #include "qemu/range.h" @@ -81,10 +82,10 @@ typedef struct E1000EState { #define E1000E_IO_IDX 2 #define E1000E_MSIX_IDX 3 -#define E1000E_MMIO_SIZE (128 * 1024) -#define E1000E_FLASH_SIZE (128 * 1024) +#define E1000E_MMIO_SIZE (128 * KiB) +#define E1000E_FLASH_SIZE (128 * KiB) #define E1000E_IO_SIZE (32) -#define E1000E_MSIX_SIZE (16 * 1024) +#define E1000E_MSIX_SIZE (16 * KiB) #define E1000E_MSIX_TABLE (0x0000) #define E1000E_MSIX_PBA (0x2000) diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c index eb0e097..0904780 100644 --- a/hw/net/e1000x_common.c +++ b/hw/net/e1000x_common.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "net/net.h" @@ -111,7 +112,7 @@ bool e1000x_is_oversized(uint32_t *mac, size_t size) static const int maximum_ethernet_vlan_size = 1522; /* this is the size past which hardware will drop packets when setting LPE=1 */ - static const int maximum_ethernet_lpe_size = 16384; + static const int maximum_ethernet_lpe_size = 16 * KiB; if ((size > maximum_ethernet_lpe_size || (size > maximum_ethernet_vlan_size diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index a07a632..e761daf 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -41,6 +41,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "net/net.h" @@ -60,8 +61,6 @@ * changed to pad short packets itself. */ #define CONFIG_PAD_RECEIVED_FRAMES -#define KiB 1024 - /* Debug EEPRO100 card. */ #if 0 # define DEBUG_EEPRO100 diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h index adb8021..2cd193e 100644 --- a/hw/net/ne2000.h +++ b/hw/net/ne2000.h @@ -1,11 +1,12 @@ #ifndef HW_NE2000_H #define HW_NE2000_H +#include "qemu/units.h" #include "hw/hw.h" #include "net/net.h" -#define NE2000_PMEM_SIZE (32*1024) -#define NE2000_PMEM_START (16*1024) +#define NE2000_PMEM_SIZE (32 * KiB) +#define NE2000_PMEM_START (16 * KiB) #define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START) #define NE2000_MEM_SIZE NE2000_PMEM_END diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h index 4cc8aab..905a43d 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -23,6 +23,7 @@ #ifndef ALLWINNER_EMAC_H #define ALLWINNER_EMAC_H +#include "qemu/units.h" #include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/mii.h" @@ -125,8 +126,8 @@ #define EMAC_INT_RX (1 << 8) /* Due to lack of specifications, size of fifos is chosen arbitrarily */ -#define TX_FIFO_SIZE (4 * 1024) -#define RX_FIFO_SIZE (32 * 1024) +#define TX_FIFO_SIZE (4 * KiB) +#define RX_FIFO_SIZE (32 * KiB) #define NUM_TX_FIFOS 2 #define RX_HDR_SIZE 8 From patchwork Sat Jun 30 06:10:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937331 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ucfwnyvu"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkRR2xndz9ry1 for ; Sat, 30 Jun 2018 16:40:35 +1000 (AEST) Received: from localhost ([::1]:45814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Yf-0004a2-21 for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:40:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96Q-0004WN-Q9 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96P-0002lR-Jo for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:22 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:35839) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96P-0002ie-Ca for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:21 -0400 Received: by mail-wm0-x231.google.com with SMTP id z137-v6so3958813wmc.0 for ; Fri, 29 Jun 2018 23:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pvncQlCKHGDnfb6hJ1QULcpk4jCHPUdmU9LPeVGWJpI=; b=ucfwnyvuQJ1gulypWer84UmkiOkM8l7IUDXtXL5HGm7bwYL+HIcpcwZHnhiPWBrEIQ nuWyNs/fAefxIoGjyx6yFQZ/hodUA28Uum46v0BEDz2lhXcQns3pklsqKvNCZMMH1FFX 2HdN6zhlobGhWizAAszjaLm6eEZz/ImzCMxXw/RRG8TCxW8y0aLkxi7G7vvsjthMHN3f j2MB+3HDsqQbp17bsDbE+s9CCdEyaTrbFz6se7yX82U4FvYQvWYblR4uRIvsxoW2KDGu V6p9212pBWSwdn3SM/9gnKlNdGI7ycBDP4VmFR5V1mLVXbae1PP65ACny0Ygrtakt723 FUHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pvncQlCKHGDnfb6hJ1QULcpk4jCHPUdmU9LPeVGWJpI=; b=BzfpT05lF40eWa0MdArQhqrj5P5dWYvt3P1Ymoti4htUdHBd7a3K+lE6oG1ejxcJFy 34pHf6AYh9CDJWAOz8GybyGhWSJUX0OYZJvuDHzD3GDhIPRNrG/cHTpxrrF4dd1SrdOm xZ+U2FPOAOSgOd/3IL0CY70AXDYMN1HgCY3jASQBvW14Dgn/Idj2zhFrlhn7VrysyJU1 gsDEmZOUi0Wv35/P23KucuRsygVW8oGHEXbDICF534Ye1WSI/k5MTpYNse9C6oIdZVJ/ fqxhacArnyMiAAMFRNoBtqbwJzzUvS9pv/v3QVrcpW16uvC/sIX12wUhHgZyG87qwOKl ehSg== X-Gm-Message-State: APt69E3gnPfy/u+LWm/vBEA2iGdd1LVgC0b4I/eq6fghVBeBixw2d7d8 e8WZvLlSLib9775Uey4qXRVbt/8d X-Google-Smtp-Source: AAOMgpehYTsIuLEHsTDwRmPtp7zKLPquYY64/bBSP9k8Y21V70CFPNHTUkpcxjaPuKOGUIFbBB/N+A== X-Received: by 2002:a1c:46c2:: with SMTP id t185-v6mr3406748wma.56.1530339080157; Fri, 29 Jun 2018 23:11:20 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:29 +0200 Message-Id: <20180630061040.6018-37-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PULL 36/47] hw/usb: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-36-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/usb/ccid-card-passthru.c | 9 +++++---- hw/usb/combined-packet.c | 3 ++- hw/usb/dev-smartcard-reader.c | 3 ++- hw/usb/redirect.c | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 25fb19b..0a6c657 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include #include "chardev/char-fe.h" #include "qemu/error-report.h" @@ -40,7 +41,7 @@ static const uint8_t DEFAULT_ATR[] = { 0x13, 0x08 }; -#define VSCARD_IN_SIZE 65536 +#define VSCARD_IN_SIZE (64 * KiB) /* maximum size of ATR - from 7816-3 */ #define MAX_ATR_SIZE 40 @@ -275,9 +276,9 @@ static void ccid_card_vscard_read(void *opaque, const uint8_t *buf, int size) VSCMsgHeader *hdr; if (card->vscard_in_pos + size > VSCARD_IN_SIZE) { - error_report( - "no room for data: pos %d + size %d > %d. dropping connection.", - card->vscard_in_pos, size, VSCARD_IN_SIZE); + error_report("no room for data: pos %u + size %d > %" PRId64 "." + " dropping connection.", + card->vscard_in_pos, size, VSCARD_IN_SIZE); ccid_card_vscard_drop_connection(card); return; } diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c index 48cac87..01a7ed0 100644 --- a/hw/usb/combined-packet.c +++ b/hw/usb/combined-packet.c @@ -20,6 +20,7 @@ * along with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #include "hw/usb.h" #include "qemu/iov.h" @@ -171,7 +172,7 @@ void usb_ep_combine_input_packets(USBEndpoint *ep) if ((p->iov.size % ep->max_packet_size) != 0 || !p->short_not_ok || next == NULL || /* Work around for Linux usbfs bulk splitting + migration */ - (totalsize == 16348 && p->int_req)) { + (totalsize == (16 * KiB - 36) && p->int_req)) { usb_device_handle_data(ep->dev, first); assert(first->status == USB_RET_ASYNC); if (first->combined) { diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 13d0bef..8f716fc 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -35,6 +35,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" @@ -63,7 +64,7 @@ do { \ * or handle the migration complexity - VMState doesn't handle this case. * sizes are expected never to be exceeded, unless guest misbehaves. */ -#define BULK_OUT_DATA_SIZE 65536 +#define BULK_OUT_DATA_SIZE (64 * KiB) #define PENDING_ANSWERS_NUM 128 #define BULK_IN_BUF_SIZE 384 diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 58e8f7f..99094a7 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/timer.h" @@ -1298,7 +1299,7 @@ static int usbredir_chardev_can_read(void *opaque) } /* usbredir_parser_do_read will consume *all* data we give it */ - return 1024 * 1024; + return 1 * MiB; } static void usbredir_chardev_read(void *opaque, const uint8_t *buf, int size) From patchwork Sat Jun 30 06:10:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OTMkLbuy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkV225hJz9ry1 for ; Sat, 30 Jun 2018 16:42:50 +1000 (AEST) Received: from localhost ([::1]:45827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9ap-0006K1-Uz for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:42:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96R-0004Wz-DM for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96Q-0002o0-AU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:23 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:33922) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96Q-0002l6-3u for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:22 -0400 Received: by mail-wr0-x233.google.com with SMTP id a12-v6so10656795wro.1 for ; Fri, 29 Jun 2018 23:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nOEvf4d3o/rGuBQjdN+c6AEQmI5GwFQQZRbR0fLREyU=; b=OTMkLbuyjrNcmsQpQFCwqxaN8mJKFnezfexSi6D57D+Uix3sN+iHkghDgP37V7Wq0g gvYr9tMV2agygSKv31fSBI5qkrl9jGp2s92DRqdWXHYvjGzmXXhUyXwDCFHSDpqwCZJN givZDDLxRYuNrNpNjlvDGl2XasP/StWRdVnzgAjm+SQo0rnbQjmBBZ7LeDchVbyc/lrv zy4hi2mZb39hHOMQn+9gUUs5zsroL0xjFG8x6tvZcney4HYzLD8iRtxhwFnEcEtByW0h bYoAkI+eogrQJb356EX7oC/Z5UdPFpukU4kmsbqIsvu57TjSWpyYbmZonZDe75GNkN9G jEGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nOEvf4d3o/rGuBQjdN+c6AEQmI5GwFQQZRbR0fLREyU=; b=lHsrTE+1J0MSYlFqDs2DJF3jIbhEY6sfy8xQluONFPEsjYbARkwohF7exsqyMpebDy nQSl/VMLppEWpHhrggU5AD19Jtc1YvPpFvl9Ay7x4lXrZ1JZZa2mfhWpbsjsFk3qaLe7 XQ+lSnQdKm79FBkq7YFz3mUCwr+T/2kv34mmhLtbAzUo9dVe9muy7V9KbKThitFPAtj+ TmZB7w7OZb0fsbiimrzzqK/lvoDFz3NbzTd1disp0plcud5lBpeh5hoXHyoepSk7vyl/ T6PdpRzHso7PxKAFyrrhBxb2Kg+DhyTRu7u7QRvQzZLT4CJ/8Gn2Og5k9XK9SGdbfT7Y 7aEw== X-Gm-Message-State: APt69E19rwcngCMKOLBmMWW4Gxz98/HDjVQLLlmyua2yShammk6to6NT Uciud30P1hCSAuhLPZfZzYlCZwlQ X-Google-Smtp-Source: AAOMgpdS9+DOKMIa6ycLZOjknjZWVmM9Y1PYA2X6OFv4Mx7f2leUQz7WcSeSUCUdXbIc8oDKWvDzxA== X-Received: by 2002:adf:8345:: with SMTP id 63-v6mr14441119wrd.37.1530339081035; Fri, 29 Jun 2018 23:11:21 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:30 +0200 Message-Id: <20180630061040.6018-38-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::233 Subject: [Qemu-devel] [PULL 37/47] hw/sd: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-37-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/sd/sd.c | 4 ++-- hw/sd/sdhci.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9a16b76..d4356e9 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -31,6 +31,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "hw/qdev.h" #include "hw/hw.h" #include "hw/registerfields.h" @@ -38,7 +39,6 @@ #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/bitmap.h" -#include "qemu/cutils.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/timer.h" @@ -403,7 +403,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) ((HWBLOCK_SHIFT << 6) & 0xc0); sd->csd[14] = 0x00; /* File format group */ } else { /* SDHC */ - size /= 512 * 1024; + size /= 512 * KiB; size -= 1; sd->csd[0] = 0x40; sd->csd[1] = 0x0e; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a11e802..643b39d 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" @@ -32,7 +33,6 @@ #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" -#include "qemu/cutils.h" #include "trace.h" #define TYPE_SDHCI_BUS "sdhci-bus" @@ -742,7 +742,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) if ((dscr->attr & SDHC_ADMA_ATTR_ACT_MASK) == SDHC_ADMA_ATTR_SET_LEN) { dscr->length = (uint16_t)extract32(adma1, 12, 16); } else { - dscr->length = 4096; + dscr->length = 4 * KiB; } break; case SDHC_CTRL_ADMA2_64: @@ -790,7 +790,7 @@ static void sdhci_do_adma(SDHCIState *s) return; } - length = dscr.length ? dscr.length : 65536; + length = dscr.length ? dscr.length : 64 * KiB; switch (dscr.attr & SDHC_ADMA_ATTR_ACT_MASK) { case SDHC_ADMA_ATTR_ACT_TRAN: /* data transfer */ From patchwork Sat Jun 30 06:10:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LmNdOV1w"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkXk1wzlz9ry1 for ; Sat, 30 Jun 2018 16:45:10 +1000 (AEST) Received: from localhost ([::1]:45838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9d5-0008AE-Ul for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:45:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96S-0004Y3-Di for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96R-0002rQ-7f for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:24 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:40584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96R-0002oW-1b for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:23 -0400 Received: by mail-wm0-x22b.google.com with SMTP id z13-v6so3945058wma.5 for ; Fri, 29 Jun 2018 23:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GpbcMH2fufJdaO/ozLnLITF9UkoZXjwVMc5nXMxw5Mg=; b=LmNdOV1wEY02r5NYZcFmSiDemREVE+YXwnSvk0shGUHXcop9g5J3hX+fS+73buPa6K oJlYQaHnOJWIHuf39vpn6O37enuRomU39n+kCeTjhsrrx4YnVEHB5GUsStH3Er96tnoK J3dJKXb/5s6AaYaj1aNmy9jYJF80078W5CBciBmeKStGb05+m73ZHWnnIId+9aBZ+lWn qZoC6q/WOTBvwJfKcWzJpQvz8EjQyn+WA5P0tJLvIc+ZSA8r64h8KW3wUY35xX9Sy4Tc oLBADYz3rSQ0B7WGGrJgHjLzxFCYDj4etXaS3vGW3dV6AGDVfnUeeHqbUwWVcJgs0qoD R7xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GpbcMH2fufJdaO/ozLnLITF9UkoZXjwVMc5nXMxw5Mg=; b=RQGk+sUozZ/6oo2Lt82HuP7bWI9DFocJSkE1eT8qvFTf1zDRCaiDH05R8kMVqcAx52 +Vy1YpGcNSu8XRN69qSTpCb/WX0KCL4KoDtUIiH9ayPNPT+C1JA4MLvMce7mObzl60BA xpb6L84zpUwzrFQQs/G0We4GBa97DTfqH6+1oyr2BM1utfoak2O+bmdERHFnO6tPjkkH 1kiEkt9cwW88+5sCmJ0F57+OHuGvIphp+jRZ8GUODRCzI8y8R5o79beerndhsMyEGz+Y 3toyIeZHSH2t1i+kQk28vpztVda5Z6cWtBI3+Lz/M8B+ApKxT6nTkqi9OnFnloRYzSJ8 KlJQ== X-Gm-Message-State: APt69E2icwbNZ9vQ9Vqp5nED/11jWZ+3eX/cWT+WVT5k3fU4KlWDJL8h h4b5D5Kabe/LoG67abQ8ZmGpTvds X-Google-Smtp-Source: AAOMgpdF2dKCiEQVnkfbzaR46H5tXWzoavKGNvFhUOuNS8hr0Yv3gDD1Pz8Xr2otZz4y+14LkF2qwQ== X-Received: by 2002:a1c:91c4:: with SMTP id t187-v6mr3744470wmd.51.1530339081942; Fri, 29 Jun 2018 23:11:21 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:31 +0200 Message-Id: <20180630061040.6018-39-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PULL 38/47] hw/vfio: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-38-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/vfio/pci-quirks.c | 9 +++++---- hw/vfio/pci.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 061259b..481fd08 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" @@ -1448,9 +1449,9 @@ static int vfio_igd_gtt_max(VFIOPCIDevice *vdev) ggms = 1 << ggms; } - ggms *= 1024 * 1024; + ggms *= MiB; - return (ggms / (4 * 1024)) * (gen < 8 ? 4 : 8); + return (ggms / (4 * KiB)) * (gen < 8 ? 4 : 8); } /* @@ -1705,7 +1706,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) igd->vdev = vdev; igd->index = ~0; igd->bdsm = vfio_pci_read_config(&vdev->pdev, IGD_BDSM, 4); - igd->bdsm &= ~((1 << 20) - 1); /* 1MB aligned */ + igd->bdsm &= ~((1 * MiB) - 1); /* 1MB aligned */ memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_igd_index_quirk, igd, "vfio-igd-index-quirk", 4); @@ -1752,7 +1753,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) * config offset 0x5C. */ bdsm_size = g_malloc(sizeof(*bdsm_size)); - *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * 1024 * 1024); + *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * MiB); fw_cfg_add_file(fw_cfg_find(), "etc/igd-bdsm-size", bdsm_size, sizeof(*bdsm_size)); diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 18c493b..a1577de 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -28,6 +28,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/range.h" +#include "qemu/units.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "pci.h" @@ -1417,7 +1418,7 @@ static void vfio_pci_relocate_msix(VFIOPCIDevice *vdev, Error **errp) } /* 2GB max size for 32-bit BARs, cannot double if already > 1G */ - if (vdev->bars[target_bar].size > (1 * 1024 * 1024 * 1024) && + if (vdev->bars[target_bar].size > 1 * GiB && !vdev->bars[target_bar].mem64) { error_setg(errp, "Invalid MSI-X relocation BAR %d, " "no space to extend 32-bit BAR", target_bar); From patchwork Sat Jun 30 06:10:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oypZCrFQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkV93LhGz9ry1 for ; Sat, 30 Jun 2018 16:42:57 +1000 (AEST) Received: from localhost ([::1]:45829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9ax-0006Q2-3E for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:42:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96T-0004Ym-3K for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96S-0002uA-5W for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:25 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:33931) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96R-0002rk-VS for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:24 -0400 Received: by mail-wr0-x243.google.com with SMTP id a12-v6so10656825wro.1 for ; Fri, 29 Jun 2018 23:11:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N5afWFNaJxVHHZ+F/X/MLqjBZ0Y1SrtlcCQt3SrIxm0=; b=oypZCrFQqGbN+wTcqJ5Fooa/9cDlnL+IT+Bmj3PlCOM//WArQ+Zk/qgDpHX2vzyw/r hFH9h+nKVn6sIneAQXEfHOuSqWFXN+TeAKgKPIwJcPo/PPQwwU+sK9n6cRR+U+xpsw/t ZvS6z4fN/sjX77QVLwyZwj759g/ANuLhJFnl5Qq8b3MvbNA6H81dznCoUrT3kwHLhWJv krUf/cCNNVDPdBDwFJIe8QNivtRldKQNwlN87TPyZkAX4/l5fNDwpI91hiik/8i+60kT 28M+qtXDJQ21ZErkxVGf9bp7B86rDKlsUXuGbCMoCCEouI2PSkJ5C2H0dgHknGu4Jf/D U4+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=N5afWFNaJxVHHZ+F/X/MLqjBZ0Y1SrtlcCQt3SrIxm0=; b=eibSHFEN4cak/1iRY8k337i23CDMmKV/TNtwQHqMHBedTOu3SA31qLmMOxqn3I8fYw zPsSboOF5Q6iMseSi6/lirDPUNUE3f2jqCwSUPuSXOtJYVUNzmodL8E9yfCXN8QBDKo3 C9SrjZW8jcv8bqpHkh6d63mkf+VwJgD/vg5RnF4/l67zqpcEyld2aLCEpBcDZ0w+R7mD 97EEPU0DcpOUyNOc7Kt2B3By/la96Cu9V/WujRvgvpuZ4t9FyqtwKcETglL0umbC6Dc/ s+cFVaEHyFTybC+gi03iOx5X8kyrgq1jIxQle4kQsZ/2DZgqTOkRscMhKtvofp8SW/Fm fofQ== X-Gm-Message-State: APt69E20F4+gu86ZqvI/bAf6GgP/uJZIXc1caoSZsJHBCplaKI2cQKl/ zMTRoXg9bq7gdcPkjXNgeeoFYFVJ X-Google-Smtp-Source: AAOMgpcJnzHJmn3Cycsqj5H8o2lENdyWO6YbG3Qu5s4Ememe8QHHEea0ydgpQhm17wCvKUNGiij4Mg== X-Received: by 2002:adf:84c5:: with SMTP id 63-v6mr14830301wrg.50.1530339082769; Fri, 29 Jun 2018 23:11:22 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:32 +0200 Message-Id: <20180630061040.6018-40-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 39/47] hw/virtio: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-39-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- include/hw/virtio/virtio-net.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 02484dc..4d7f3c8 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -14,6 +14,7 @@ #ifndef QEMU_VIRTIO_NET_H #define QEMU_VIRTIO_NET_H +#include "qemu/units.h" #include "standard-headers/linux/virtio_net.h" #include "hw/virtio/virtio.h" @@ -44,7 +45,7 @@ typedef struct virtio_net_conf } virtio_net_conf; /* Maximum packet size we can receive from tap device: header + 64k */ -#define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 << 10)) +#define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 * KiB)) typedef struct VirtIONetQueue { VirtQueue *rx_vq; From patchwork Sat Jun 30 06:10:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PYHycRgi"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkXs1r1nz9ry1 for ; Sat, 30 Jun 2018 16:45:17 +1000 (AEST) Received: from localhost ([::1]:45840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9dC-0008GZ-Vj for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:45:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96T-0004Zb-Qp for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96S-0002wr-SW for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:25 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:36499) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96S-0002tv-MU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:24 -0400 Received: by mail-wm0-x234.google.com with SMTP id u18-v6so3959729wmc.1 for ; Fri, 29 Jun 2018 23:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=koXattGyQx5abOfn6zea7ONiB52UkBBBZGLwXrLQN0Q=; b=PYHycRgig715ZQ85xFiWUj2mTNheehUkqQ90MPnOEIF2M9iF91FucccDLsf3jrNfez irpzURvC5R2w90xfMMIeEXlWC2PJlSaljkEK27sm7e/N56JRb7DUX9NZIuRr98Z6vw9T zLOFDIvNTXM+nejRRcD8JBPK7RiZ45anCN7d5uilVZit5JiPZ8O2I7DD5Ce981WbOnJu /nCEYkKnNNb73RhjUL79cplX/fpus/R3wyM9zS1zpkmWwLMlsZal8JQ1ncyc4c8cHg6r +xUF751oXNW6EulQS2XZ4ZfwabLwSVqmw5hYjW6n+jl6NXdZxaWH0vSEgk5taDT6fUCa l/dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=koXattGyQx5abOfn6zea7ONiB52UkBBBZGLwXrLQN0Q=; b=OsUf9/trvewmWn+RlwK2nQDOWpB0Ae71ybQVK4O1lO+ymnbbRhZ4geLLzfuRBH4Khf 10cxXBCQYyVptrLzpoWT2pRATiGDYiY/cC30Tptf0ZFJPJXnX3JsQbtBE1sUSCqy/sez Mf51t94GCHElJf6N1YycWikolfXJTsrgU8EKSzsBniH2+jlet7GNNai2DechgnHnFIAA 0Fkh4bvtMi/Uz0GFJg+eGxP2x2H2LVCwTXheYuHmr5Ohw/526WvMuL/+xPcsYuJYD9Ze Q42w/yMaivY8skvz5Fvzx06WQVzRcRxk8YY0CFyDpuGA8YuzNFZLbNYGhvrW7/EXAw4i EafA== X-Gm-Message-State: APt69E2PsmQemvq7pql+Sye0JpuzDY012n0qW3UC9HUXGfPnyW4zvMfp xwS5gZdinFrEu5KbjZHOHc9/EDhQ X-Google-Smtp-Source: AAOMgpcNtBsMS2u/fvs4i2rSRYvrXOj5Ni2oLiQkb/3DRSWDauM3HQYMww+D5ErEJ9tWsRF6L3aTXg== X-Received: by 2002:a1c:6341:: with SMTP id x62-v6mr3627735wmb.35.1530339083573; Fri, 29 Jun 2018 23:11:23 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:33 +0200 Message-Id: <20180630061040.6018-41-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [PULL 40/47] hw/rdma: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marcel Apfelbaum Reviewed-by: Yuval Shaia Message-Id: <20180625124238.25339-40-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/rdma/vmw/pvrdma.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index 0b46dc5..81e0e0e 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -16,6 +16,7 @@ #ifndef PVRDMA_PVRDMA_H #define PVRDMA_PVRDMA_H +#include "qemu/units.h" #include "hw/pci/pci.h" #include "hw/pci/msix.h" @@ -30,7 +31,7 @@ #define RDMA_MSIX_BAR_IDX 0 #define RDMA_REG_BAR_IDX 1 #define RDMA_UAR_BAR_IDX 2 -#define RDMA_BAR0_MSIX_SIZE (16 * 1024) +#define RDMA_BAR0_MSIX_SIZE (16 * KiB) #define RDMA_BAR1_REGS_SIZE 64 #define RDMA_BAR2_UAR_SIZE (0x1000 * MAX_UCS) /* each uc gets page */ From patchwork Sat Jun 30 06:10:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MAku/lq0"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkbV1zHzz9ry1 for ; Sat, 30 Jun 2018 16:47:34 +1000 (AEST) Received: from localhost ([::1]:45855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9fP-0002A5-US for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:47:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96U-0004aj-PD for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96T-0002z8-QV for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:26 -0400 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:36389) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96T-0002x4-J0 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:25 -0400 Received: by mail-wr0-x235.google.com with SMTP id f16-v6so10646417wrm.3 for ; Fri, 29 Jun 2018 23:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tjfI074WJBXqUMMVfbFHbN1VgKeep/RxPFLUmL671oQ=; b=MAku/lq0qVOaeD64ouzpDVyVZy4B4E9OBaQPSwNo2tVIyvo6sQHkCIL+c+oCU5a5Fh mj1Z+++719eCMtVvnxnOiRrGWhUdoisYdQridI5qR1oNs/z3C2/paW7c/uHZcASP8zMy dZFBNZLzqNWze64xbuX6Kmgem5orTI0lLtsllNLvqXoVeQ0MTU2CFs3Zis17k8c7ZIo+ VujYgGh77UdznukO/IL9kRHCsDIMS2PyFE5ymp2KKyRnY1vNP1SzJgqfmKG4/IwYfeKY 5gJYhhz20W3OcaUK4NipmnwjMuT5W20I0z2uzPse6vfqMZUPZzvwyIWSk12RtsA1duyu c/hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tjfI074WJBXqUMMVfbFHbN1VgKeep/RxPFLUmL671oQ=; b=Ym6RiGLM3vSsGS0czx3F96UXWbHboQUJzTQ514oIyTT9D3AHSo8QWijDpAKO5/QVaO 70QeKrouD9JjG83MCPRzWGVBtuHoW9jZNczXlQGIgwYrmqSd/1rxNXuGQdLZw+RAc7vN xgxoaMe26hwjH0Wp4/9YzNK6rl0RroL8Yv53Y4e8HxX352tAoxueE3mto0hxA0hHdoW0 Y6zcrl6a3y58ZCSpen2+1wFDhbHoovZVsPqDpF1QsjgfAJhJHt3U4brU8HsFsoEEon5N /9wdSloi3IUw+XkYqRCHX18HO2WguHY8gFynnoTHyd1+jS730zeJ0O3SETzR1kdUunYI wh5A== X-Gm-Message-State: APt69E0uJkKY76aT+kzXRAXJriAoqJIDS9G6QV5eHl8Lnb8qvRK3p8zO JFUmytWGNqT+yQ6q8Xqc+WXceMvy X-Google-Smtp-Source: AAOMgpcC2GDTl6aAuWxOQ3ObZ3dElvTuFdeFsV0fauAvNXee+YmgMXRbVWR7TG4Mj0cLcdpX8mftGQ== X-Received: by 2002:a5d:570a:: with SMTP id a10-v6mr204023wrv.130.1530339084511; Fri, 29 Jun 2018 23:11:24 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:34 +0200 Message-Id: <20180630061040.6018-42-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::235 Subject: [Qemu-devel] [PULL 41/47] cutils: Do not include "qemu/units.h" directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé All files using "qemu/units.h" definitions already include it directly, we can now remove it from "qemu/cutils.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marcel Apfelbaum Message-Id: <20180625124238.25339-41-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- include/qemu/cutils.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 056e662..cdb0f0d 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -2,7 +2,6 @@ #define QEMU_CUTILS_H #include "qemu/fprintf-fn.h" -#include "qemu/units.h" /** * pstrcpy: From patchwork Sat Jun 30 06:10:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JYQSBaBq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hkdz2sbxz9ry1 for ; Sat, 30 Jun 2018 16:49:43 +1000 (AEST) Received: from localhost ([::1]:45867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9hV-0003pR-4J for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:49:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96V-0004bc-LF for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96U-000327-P7 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:27 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:55238) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96U-000301-He for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:26 -0400 Received: by mail-wm0-x235.google.com with SMTP id i139-v6so4086173wmf.4 for ; Fri, 29 Jun 2018 23:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ARq/V/dSaQxoVfNeWVtFlk/ywnpP5riWQa6n8cn6FzU=; b=JYQSBaBqR1N+0JXSQqrQs71N2VjF995ShwoB8cx+J8DCFgXFAMWg+XE8EzKVgoB/GU N5pZ2aagyKGI5ZNkv3RtgPoehaWyHJzTtcRKilssAP/xEm97QNo9iPXmIQH0witIWr7F f9Rqhlz2nHyon03lR3h4Sd7jTSjVLhE/4hR0t/QWmZelx1zdYXOZznyvbNbXacJSrdmN TMwjfXPiKr9oItriZ/oqP40swHcC0PpArSRe2sG85ClrKuvSV+zpIRgxoSGerDqrPIyJ k2m8s8FCB3SBbIbd5xQF2OY5muZCfDSO2KMVLxzTedzkkrlUQKDxCwwSDK/fuaoz6s0n Niyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ARq/V/dSaQxoVfNeWVtFlk/ywnpP5riWQa6n8cn6FzU=; b=Nz6lVdq4GD2N6H2fKnFX8UDLEYC3RFOIeUPK5y3mFhpg9N5zwxaMY2gTZUUhBZl/0s BrGPEC8EBrsUgE/YasYnKGd72boOy74rCibObr/zfl5CLBNv8urLSvlBgDLXUpkj36Ct WVfUJALahlDpgxckANcfq7EjmouL+rMAInX5vrdDc9qo1ijp8d6fKlRJT/imNY627B8L 5JHLyLtDgzIZoc9b8vRmaaYjEXQA5opaK5fNq8EqMOCVRdmj+b0i+Q2ytJ/v0sSOmIp7 Bpea7nZJMBMN+EkQqkVJrlMJYek1CmDR6R7LLjCFLUZoNnlBN7OF5NMtGyWkzxUc/zKK YZEw== X-Gm-Message-State: APt69E19YlC9155WyyxDuMxqVcZG7/JnwB8MLlCK+MMmZSSzKeeIJNW4 f4MJC24gf6aZrXoYoCqeKjd6fDsT X-Google-Smtp-Source: AAOMgpfjeuWKniNGAi0gMhX1pWPX9xufJZ+Up0eH1RperwF6ZNmdw01gFbT0Zs1RtE0ZOj87LiZZ7A== X-Received: by 2002:a1c:7d47:: with SMTP id y68-v6mr3369876wmc.62.1530339085440; Fri, 29 Jun 2018 23:11:25 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:35 +0200 Message-Id: <20180630061040.6018-43-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::235 Subject: [Qemu-devel] [PULL 42/47] monitor: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Suggested-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-43-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor.c b/monitor.c index 0988eb4..61b727a 100644 --- a/monitor.c +++ b/monitor.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include #include "cpu.h" #include "hw/hw.h" @@ -3288,7 +3289,7 @@ static QDict *monitor_parse_arguments(Monitor *mon, monitor_printf(mon, "enter a positive value\n"); goto fail; } - val <<= 20; + val *= MiB; } qdict_put_int(qdict, key, val); } From patchwork Sat Jun 30 06:10:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dFdNoj2G"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkRb4z9Hz9ry1 for ; Sat, 30 Jun 2018 16:40:43 +1000 (AEST) Received: from localhost ([::1]:45818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Yn-0004h7-AW for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:40:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96a-0004hE-OU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96V-00034T-Pp for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:35835) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96V-00032e-JO for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:27 -0400 Received: by mail-wm0-x22c.google.com with SMTP id z137-v6so3958931wmc.0 for ; Fri, 29 Jun 2018 23:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AYeDQa9x4KUNBfhIJpOWL466AgJUKMTAwe4h8IAyZyo=; b=dFdNoj2GPxrp5kn9BYEdbc3e+ND87arRbgRoZTb8M37RTL4lIsn6my7/zaKMzMeieE qOG/zDezwIyyZ66AfE7e5CdFQQgUkTGU4BDFl8QJtTqGWF3kYZvd0vPGElBp9XZQfDj3 bdgEYOSZcAphHwfVVQEjNBHdD3hy5h5uy7uFfbHeOESP+2Z0bbR+ZaWF3aWHBqaTvc7/ ioevT4+mUf11rvE0FzPH5aV+zxjUv6S2jScC9iDDJ+tuKr3+1OxebIsvO64giKLgwNYQ uxz4rwu19ojXHydw8ZU0B3NJr1SmkqkH2nwR3570RWCpjq2BQ2gaIyXsdrDu4q3NInDP Qbiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AYeDQa9x4KUNBfhIJpOWL466AgJUKMTAwe4h8IAyZyo=; b=oNodAiPUvnG6psiicErhv+DBh1Cdp32KpXGQQfLGiGFudawlCYL+vlCArdGj0DSgAx 38Up8Mp9tMxUJEO02PA2j6rZK4Roq4FqjbrwLhy0ur/9cxFU1i69MJRlhv8kP0I8bRtZ 1F0USB5SGRCQ61BWU/Ro8nZRuY/pkpSXWvDRUbR3Y2umiESMnsjrGzoJ+iuE6YMSIPya tsSOW98yliUWG7+xm2iDUOhOWI8NhsgHYdsHj4RZVZqkQHCq2fyJjwcRTuf4WIDClVP8 Z8djRJZvJ1yjiiw5qk/ovqmccfxVIZDH02xpXy+RFuZ6ZSIX4QN0/6PO7bzdHRafRkFc OGBQ== X-Gm-Message-State: APt69E1ykcMzrhzm9q8xZTwXEzaafE07KsGTG3rIVt5whFusCkKDE43W bGvRoM8gb8VhjGJxG/HGPH7CsvPE X-Google-Smtp-Source: AAOMgpc9ZnK5zDe8stA4rcRaONaFeTvcNx940jp444NZalYMnRX//3fWnej9LIlztc+Y2pdzPt/SOg== X-Received: by 2002:a1c:ee5d:: with SMTP id m90-v6mr3569670wmh.113.1530339086453; Fri, 29 Jun 2018 23:11:26 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:36 +0200 Message-Id: <20180630061040.6018-44-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 43/47] vl: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Suggested-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-44-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- vl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index ef6cfce..93795c1 100644 --- a/vl.c +++ b/vl.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "qemu-version.h" #include "qemu/cutils.h" @@ -2808,8 +2809,8 @@ static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size, if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) { uint64_t overflow_check = sz; - sz <<= 20; - if ((sz >> 20) != overflow_check) { + sz *= MiB; + if (sz / MiB != overflow_check) { error_report("too large 'size' option value"); exit(EXIT_FAILURE); } From patchwork Sat Jun 30 06:10:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937314 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AAjdtm13"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkDf5Ln5z9s1B for ; Sat, 30 Jun 2018 16:31:14 +1000 (AEST) Received: from localhost ([::1]:45771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Pc-0005OQ-Cm for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:31:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96a-0004hF-Oj for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96W-00037P-QX for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:33913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96W-00034t-Iz for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:28 -0400 Received: by mail-wr0-x229.google.com with SMTP id a12-v6so10656909wro.1 for ; Fri, 29 Jun 2018 23:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aZEyCt1pqPdRmhk6V6gujUUSM3PRVc1sd5lh+bN2xwA=; b=AAjdtm13LtCYtzLga1wO04/l4vAWrPBPuIvgGqQsNlS4PaGDc+/OYYB89dUp243DSH lfUoaiq/2WZ3xUc8onbZf1VvlYkWbu8DyB5AVRRYaS2liQkFBQvU1j4ytHiwWmUkyO8z Zi6RGG2Jx/JRd/fUvgaaVdV9qkxxw0Ic8iEkrbsshyFhtyEzjP4G3Pmd2S5tTFLz2TdM ljyHxfvOEaG6Lq/2bzqrtq/5f5ycou8mkbWVcyR14qOeyK07bzoknCFxY6uuBEBaGNML AY2o6kQ4NH6JeuK9Vbt0hfIxXI0lZqlZHtsWzpUy0Wz/fH+x8JW0U7LqQu5p9zSZrPxD SZYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aZEyCt1pqPdRmhk6V6gujUUSM3PRVc1sd5lh+bN2xwA=; b=PUNEhpXcWaIVLJDCrm1ATLLFwtFAKnz75Tut/nvm4XqjP7sSMeXRB6Zrq0OLG332xK jlPjxs6dXG+RhbjVrxrHK5KsAeHwFcnTIQOPgUicDTNauYIkvxwht8CqwuESh8gSioC+ vwb/Z+cmHzLfXQrLx5bYiDJ54gne3CFRmsS+5B0MEJgSUAD9igvqNOiuphHTVYDbNxKx A9aC8gkbPpTiwL/QggBPO2xZA2jQD5vGJKdKEMQqFEDut6jkyRMomFvghAIYkym8TfHW Y20x8R6yCm5zJbB+BVFxwXkMdDJZ58sLiHL2t+G1StlxzEPQyiYMRIbRpG7LrvS8fVYl CaFg== X-Gm-Message-State: APt69E1v+zEo76CD3Ji9imbodbs14q74Wd7p48XWJO98zh9PWjUtLWVE ii5NRxlU0lY9tah8w29KhZLAzRvM X-Google-Smtp-Source: AAOMgpfqpqZMonvXJuvwFKMou/Mu6jPZm++xPI6EZ9mUpkrFQcsTK9aweFPh0RJuiisNeV7CSL9Hmg== X-Received: by 2002:adf:acc3:: with SMTP id o61-v6mr14781367wrc.34.1530339087373; Fri, 29 Jun 2018 23:11:27 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:37 +0200 Message-Id: <20180630061040.6018-45-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::229 Subject: [Qemu-devel] [PULL 44/47] tests/crypto: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Suggested-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-45-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- tests/benchmark-crypto-cipher.c | 6 +++--- tests/benchmark-crypto-hash.c | 5 +++-- tests/benchmark-crypto-hmac.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-cipher.c index cf98443..f5a0d0b 100644 --- a/tests/benchmark-crypto-cipher.c +++ b/tests/benchmark-crypto-cipher.c @@ -11,6 +11,7 @@ * top-level directory. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "crypto/init.h" #include "crypto/cipher.h" @@ -56,8 +57,7 @@ static void test_cipher_speed(const void *opaque) total += chunk_size; } while (g_test_timer_elapsed() < 5.0); - total /= 1024 * 1024; /* to MB */ - + total /= MiB; g_print("cbc(aes128): "); g_print("Testing chunk_size %zu bytes ", chunk_size); g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); @@ -78,7 +78,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_assert(qcrypto_init(NULL) == 0); - for (i = 512; i <= (64 * 1204); i *= 2) { + for (i = 512; i <= 64 * KiB; i *= 2) { memset(name, 0 , sizeof(name)); snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i); g_test_add_data_func(name, (void *)i, test_cipher_speed); diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c index 122bfb6..9b6f7a9 100644 --- a/tests/benchmark-crypto-hash.c +++ b/tests/benchmark-crypto-hash.c @@ -11,6 +11,7 @@ * top-level directory. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "crypto/init.h" #include "crypto/hash.h" @@ -39,7 +40,7 @@ static void test_hash_speed(const void *opaque) total += chunk_size; } while (g_test_timer_elapsed() < 5.0); - total /= 1024 * 1024; /* to MB */ + total /= MiB; g_print("sha256: "); g_print("Testing chunk_size %zu bytes ", chunk_size); g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); @@ -57,7 +58,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_assert(qcrypto_init(NULL) == 0); - for (i = 512; i <= (64 * 1204); i *= 2) { + for (i = 512; i <= 64 * KiB; i *= 2) { memset(name, 0 , sizeof(name)); snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i); g_test_add_data_func(name, (void *)i, test_hash_speed); diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c index c30250d..f1dfa24 100644 --- a/tests/benchmark-crypto-hmac.c +++ b/tests/benchmark-crypto-hmac.c @@ -11,6 +11,7 @@ * top-level directory. */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "crypto/init.h" #include "crypto/hmac.h" @@ -53,8 +54,7 @@ static void test_hmac_speed(const void *opaque) total += chunk_size; } while (g_test_timer_elapsed() < 5.0); - total /= 1024 * 1024; /* to MB */ - + total /= MiB; g_print("hmac(sha256): "); g_print("Testing chunk_size %zu bytes ", chunk_size); g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); @@ -72,7 +72,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_assert(qcrypto_init(NULL) == 0); - for (i = 512; i <= (64 * 1204); i *= 2) { + for (i = 512; i <= 64 * KiB; i *= 2) { memset(name, 0 , sizeof(name)); snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i); g_test_add_data_func(name, (void *)i, test_hmac_speed); From patchwork Sat Jun 30 06:10:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NuYb343p"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkVP52Pmz9ry1 for ; Sat, 30 Jun 2018 16:43:08 +1000 (AEST) Received: from localhost ([::1]:45831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9b6-0006UK-8w for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:43:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96a-0004hG-PD for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96X-00039B-LC for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:32909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96X-00037D-Df for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:29 -0400 Received: by mail-wr0-x22d.google.com with SMTP id k7-v6so7156195wrq.0 for ; Fri, 29 Jun 2018 23:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CtMU1Ey5z5RUkG4m9AD46PfjfnmkBdWrV4mqsLUA7oM=; b=NuYb343pn53lCzsK4GxxwgHBKVq46Gpya4xhDs1pCAz1zdtqvZhL6u4LqD5L5thhOB hEhNHkGgwRHy/4Yb0QxJxkgByjcQeTkYic9bWICKTM2sru45rrW3Ca+cQc4Gsl3exFHi ejCPW9lJrI2UZ27KcXhHJrpYofpJeeOBxsjtSeXmMqJGsGE6E/F4Eogw3uxEIp3vGOco qRYjLVqz6XpNoj6UiyeT9zSvWQrJt//BmnBi9QfQUJ4SOdGbUN70BpLfK1uzfaVtZXGM IT0WirTGjH2H5rLACUEEtj+pFoonJFeMgkDks+hgFsuBV9tz8qFtBk69fk/54dCzTWCk 7C1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CtMU1Ey5z5RUkG4m9AD46PfjfnmkBdWrV4mqsLUA7oM=; b=JuG8y6MDWLYPE1zOcQZouZDVBbyTQFabeCwcgmJgm1yychi0ccYp7CrtsMbNOx8dSb tL1OWnbXUqNx6K+A9jOPD6Fbz7nTwR1dlVd3ac4XsowYEOjEukz6jwdW5ujii7goshqV U0akGeyZhpKW/71+6FnV/e2r0fqxuLzE72GDknMErGtPYKFoKei4Q2hS/GpL4GJF+Qxq 27LFC0PoqaE2vBxM5KJdwsgbHO2q6rd7MsppPqKnMzMoezKaOJ9AB28Y82s8SthLr2QA pXCrw8X3FhW9UDRORqpNNP4tfTUfIDWG0gSQ7fbI++sh78+dX06MIUSlYewOCNhDhs/d /enQ== X-Gm-Message-State: APt69E3gKrvBniJa0PWlbRegeXlWi5AqqdxINYwZbjgPsud50ezZfbGd 74fTUrnWl+8TElUf7UaFBCfI/SXO X-Google-Smtp-Source: AAOMgpfrjJQDGTNQrRwC3kFbpyiO5TRnJTbVg0+GJAHkfW/diCNXNTQ0cbj+W0Tx0ZqbFNqbGCQbcg== X-Received: by 2002:adf:e841:: with SMTP id d1-v6mr550408wrn.269.1530339088204; Fri, 29 Jun 2018 23:11:28 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:38 +0200 Message-Id: <20180630061040.6018-46-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22d Subject: [Qemu-devel] [PULL 45/47] linux-user: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Suggested-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-46-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- linux-user/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 84e9ec9..52b5a61 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -17,6 +17,7 @@ * along with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-version.h" #include #include @@ -274,9 +275,9 @@ static void handle_arg_stack_size(const char *arg) } if (*p == 'M') { - guest_stack_size *= 1024 * 1024; + guest_stack_size *= MiB; } else if (*p == 'k' || *p == 'K') { - guest_stack_size *= 1024; + guest_stack_size *= KiB; } } From patchwork Sat Jun 30 06:10:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TEed2QiI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41HkbK1gD4z9ry1 for ; Sat, 30 Jun 2018 16:47:25 +1000 (AEST) Received: from localhost ([::1]:45852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9fG-00022h-Tt for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:47:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96a-0004h6-Mu for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96Y-0003Ai-Hz for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:42117) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96Y-00039L-B2 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:30 -0400 Received: by mail-wr0-x230.google.com with SMTP id p1-v6so10654366wrs.9 for ; Fri, 29 Jun 2018 23:11:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fchq+X8B50vhsKtmdIAIKz3+56TBGmRXG1cJXIioHdQ=; b=TEed2QiILYVqS2zfr+HwuDeJjFTnCkLJuUSspusUECZEvdCFcO8W1euy5UCg5lSXIb HREduXHK2igTeoraBaYmd/Je4a+2VJP1fYJVIjaqHYo+qo1Vxp8So7yLY462jiK3CC7b 4Dq9pnhrM9ccqQBuMTygbnHbWQ2sQoPxCibs+WP8yv/GrN8/dj+rx/WBVNd/jWTG5jPZ VpdXTBy6PoWSwzhFUCs4EjHb4Rc2P4QAqNMN/krXbO1z4ZBDqiKp08fx/u5QtbGl/HcB ODH1B78rQEK1k/xyRPCRHokKH1cxcaqSNkZcGWbBjKfEVszQYxv62HeYoToUBTOIZvZp dI/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Fchq+X8B50vhsKtmdIAIKz3+56TBGmRXG1cJXIioHdQ=; b=PYMZNiRZ25C71rOCOuu2oi6EezRsM58+P9G9J0yVMLu29t+r9LxEMoBoERnRPh2kq1 3kS2pt+vokKa1N3QjuvSNnByjelysjidCiveWRhzde+snbTbHdxIuVVCoRV35U5TBIVh 5vBTF/YOyQzUj1V89V1C4sjPsRXMzpHGdoPcVBXUxPOg//VDXzizkOexgqISVbEndgLh sJlCgLmlxomAa7dnElbnPtFnmVPTyMznAhwssQUll8hoUFnARMKL6S4dAcB7LTUBgXWy TyujlYqllYYSsNL0OAsm8l+SIU6r3SHPhtOUKeZCdpI5j7aXkpFT4b4MYwbUQ7MF1bzo oj7Q== X-Gm-Message-State: APt69E051EZOzCTFgTrY1Y5ySMS+Mp29RUsBP1GMdRz/4tX0UEk4CrdS RwaI5JtQgSPO0+5rBBhbP1ejhNV2 X-Google-Smtp-Source: AAOMgpctiDd9V1teKnHd3ZL5oh10v4ojMLN+cYpcVjfdKRXyYVQlepZAHT5NLE0ITOHfasC0YL4RXw== X-Received: by 2002:adf:d181:: with SMTP id h1-v6mr13974537wri.198.1530339089152; Fri, 29 Jun 2018 23:11:29 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:39 +0200 Message-Id: <20180630061040.6018-47-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::230 Subject: [Qemu-devel] [PULL 46/47] bsd-user: Use the IEC binary prefix definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé It eases code review, unit is explicit. Patch generated using: $ git grep -n '[<>][<>]= ?[1-5]0' and modified manually. Suggested-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180625124238.25339-47-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- bsd-user/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index da3b833..0d31569 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -17,6 +17,7 @@ * along with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-version.h" #include @@ -795,9 +796,9 @@ int main(int argc, char **argv) if (x86_stack_size <= 0) usage(); if (*r == 'M') - x86_stack_size *= 1024 * 1024; + x86_stack_size *= MiB; else if (*r == 'k' || *r == 'K') - x86_stack_size *= 1024; + x86_stack_size *= KiB; } else if (!strcmp(r, "L")) { interp_prefix = argv[optind++]; } else if (!strcmp(r, "p")) { From patchwork Sat Jun 30 06:10:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 937309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uuYoqLlS"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Hk9K6PTpz9s29 for ; Sat, 30 Jun 2018 16:28:21 +1000 (AEST) Received: from localhost ([::1]:45754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Mp-0002Ou-At for incoming@patchwork.ozlabs.org; Sat, 30 Jun 2018 02:28:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ96a-0004h5-Mk for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ96Z-0003Bj-AL for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:32 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:37052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ96Z-0003Ag-3t for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:31 -0400 Received: by mail-wr0-x244.google.com with SMTP id k6-v6so10646645wrp.4 for ; Fri, 29 Jun 2018 23:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=IGrPoG3FW8cCCf11OQa8mry+HXSemCrvfnZ4MxPIbBg=; b=uuYoqLlSYBkqK+h03h86kN9ZwKlATM7opKVnCAiwrYeAd+bVM/4iqNLKXX6NKpBZP1 vXNeIn+DegRswknrcmFEDh82RXf3K8ODfmscfZhatUSn1/H91uu2ZB7Cj5QuHzkl+AKP 3aK18viHmoUhtzBDcRCRINXebWH+c7+I7N/b10eGjsUVERD7S9PBmY3/QSKOsdNhdY25 QjbuX1gUJD/SvL0Va8Rqq401LPIOLI8onVTfRmjNEeLMIv8K/syLJ9jYFEw9ADsko8Tv bSHlpiRQ4x0qlBaFIQNtoKfI6B/a5NOeYHWFbgUS0xdT910VLR49ROMCwcqL3kGo62h0 CXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=IGrPoG3FW8cCCf11OQa8mry+HXSemCrvfnZ4MxPIbBg=; b=VSI0LjBED44yfyqojXooyU+8T+WmqYUC1Y7RpZZmv5zJphlQZgBhRhRXwGzf8YFBQU kHviia/khreFMdksrx8afKvOpvQELuDoZfdnGtNqs8BgrPKYnkfNpCUGIzTOFFNxn55P AgF8hmBTp3nPgfqq7IpXA4Vcj+XcqtFQ8NureKQfjT9ra89uN1A30OgpI5V3fcJQjnUF n7G2AeWydDCJZSv7b4SvTC2aHfKRzOPRi9j6/nB5thjvPW4GjfwiOsllirpczJgYuqlB ahbyLne1tr5Mt118RWlDoNOr0+HwHDDhymb1eaBYWFY+3HyexgXn0rQJtVZr1EjMNrRp zyXA== X-Gm-Message-State: APt69E1fyQ92PIilyloRXm1b+DwDEkQeYl0DqFgq8Wa9Fn7H0oNySIRc iRvozcHjT+ukBO471NoyKGZSHziU X-Google-Smtp-Source: AAOMgpdSzowDUYIcmBMMVRjirrLtlCfx3MoCj3yUmTvoGSnZIe48wKDLRqlWpEmLy7h+CvGu3ejlzQ== X-Received: by 2002:a5d:6841:: with SMTP id o1-v6mr974782wrw.159.1530339090002; Fri, 29 Jun 2018 23:11:30 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.11.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:11:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:40 +0200 Message-Id: <20180630061040.6018-48-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 47/47] serial: Open non-block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" On a real serial device, the open can block if the handshake lines are in a particular state. If a QEMU is passing the serial device to the guest, the QEMU startup is blocked opening the device (with a symptom seen as a timeout from libvirt). Open the serial port with O_NONBLOCK. Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini --- chardev/char-serial.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chardev/char-serial.c b/chardev/char-serial.c index ae548d2..3299b46 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -265,7 +265,8 @@ static void qmp_chardev_open_serial(Chardev *chr, ChardevHostdev *serial = backend->u.serial.data; int fd; - fd = qmp_chardev_open_file_source(serial->device, O_RDWR, errp); + fd = qmp_chardev_open_file_source(serial->device, O_RDWR | O_NONBLOCK, + errp); if (fd < 0) { return; }