[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 34/41] hw/usb: Use the BYTE-based definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 34/41] hw/usb: Use the BYTE-based definitions |
Date: |
Sun, 15 Apr 2018 20:43:00 -0300 |
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é <address@hidden>
---
hw/usb/ccid-card-passthru.c | 5 +++--
hw/usb/combined-packet.c | 3 ++-
hw/usb/dev-smartcard-reader.c | 3 ++-
hw/usb/redirect.c | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index b7dd3602dc..4bd1e2232e 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 <cacard/vscard_common.h>
#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 * K_BYTE)
/* maximum size of ATR - from 7816-3 */
#define MAX_ATR_SIZE 40
@@ -276,7 +277,7 @@ static void ccid_card_vscard_read(void *opaque, const
uint8_t *buf, int size)
if (card->vscard_in_pos + size > VSCARD_IN_SIZE) {
error_report(
- "no room for data: pos %d + size %d > %d. dropping connection.",
+ "no room for data: pos %d + size %d > %llu. 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 48cac87f6a..2f068af927 100644
--- a/hw/usb/combined-packet.c
+++ b/hw/usb/combined-packet.c
@@ -20,6 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#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 * K_BYTE - 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 e6468057a0..0cdee70f82 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 * K_BYTE)
#define PENDING_ANSWERS_NUM 128
#define BULK_IN_BUF_SIZE 384
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 65a9196c1a..3ed4a39be1 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 * M_BYTE;
}
static void usbredir_chardev_read(void *opaque, const uint8_t *buf, int size)
--
2.17.0
- [Qemu-devel] [PATCH v3 26/41] hw/cris: Use the BYTE-based definitions, (continued)
- [Qemu-devel] [PATCH v3 26/41] hw/cris: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 27/41] hw/lm32: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 28/41] hw/sh4: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 29/41] hw/mips: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 30/41] hw/arm: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 33/41] hw/net: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 34/41] hw/usb: Use the BYTE-based definitions,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 35/41] hw/sd: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 36/41] hw/vfio: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 37/41] hw/virtio: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 38/41] hw/rdma: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 39/41] hw/nvdimm: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 40/41] hw/loader: Use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/04/15
- [Qemu-devel] [PATCH v3 41/41] cutils: Do not include "qemu/units.h" directly, Philippe Mathieu-Daudé, 2018/04/15