Message ID | 20180630061040.6018-31-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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 <incoming@patchwork.ozlabs.org>; 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 <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) 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 <paolo.bonzini@gmail.com>) 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 <paolo.bonzini@gmail.com>) 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 <paolo.bonzini@gmail.com>) 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 <qemu-devel@nongnu.org>; 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 <pbonzini@redhat.com> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/47] i386/kvm: add support for Hyper-V TLB flush
|
expand
|
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);