From nobody Tue Nov 4 19:05:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530340753529593.1793076155857; Fri, 29 Jun 2018 23:39:13 -0700 (PDT) Received: from localhost ([::1]:45808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9XM-00034c-Of for importer@patchew.org; Sat, 30 Jun 2018 02:39:12 -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) 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) 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) 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 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 @@ */ =20 #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 =20 -#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) =20 #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 @@ */ =20 #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 =3D 1522; /* this is the size past which hardware will drop packets when setting LPE=3D1 */ - static const int maximum_ethernet_lpe_size =3D 16384; + static const int maximum_ethernet_lpe_size =3D 16 * KiB; =20 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 @@ */ =20 #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 =20 -#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 =20 +#include "qemu/units.h" #include "hw/hw.h" #include "net/net.h" =20 -#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 =20 diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_ema= c.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 =20 +#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) =20 /* 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) =20 #define NUM_TX_FIFOS 2 #define RX_HDR_SIZE 8 --=20 1.8.3.1