[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/9] ccid-card-passthru: Replace assert() by QEMU
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 5/9] ccid-card-passthru: Replace assert() by QEMU_BUILD_BUG_ON() |
Date: |
Thu, 14 Feb 2019 21:19:35 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/usb/ccid-card-passthru.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index ba7c285ded..ccc3ffa7fa 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -29,6 +29,9 @@ do { \
#define D_MORE_INFO 3
#define D_VERBOSE 4
+/* maximum size of ATR - from 7816-3 */
+#define MAX_ATR_SIZE 40
+
/* TODO: do we still need this? */
static const uint8_t DEFAULT_ATR[] = {
/*
@@ -41,10 +44,9 @@ static const uint8_t DEFAULT_ATR[] = {
0x13, 0x08
};
-#define VSCARD_IN_SIZE (64 * KiB)
+QEMU_BUILD_BUG_ON(sizeof(DEFAULT_ATR) > MAX_ATR_SIZE);
-/* maximum size of ATR - from 7816-3 */
-#define MAX_ATR_SIZE 40
+#define VSCARD_IN_SIZE (64 * KiB)
typedef struct PassthruState PassthruState;
@@ -351,7 +353,6 @@ static void passthru_realize(CCIDCardState *base, Error
**errp)
}
card->debug = parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE,
card->debug);
- assert(sizeof(DEFAULT_ATR) <= MAX_ATR_SIZE);
memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR));
card->atr_length = sizeof(DEFAULT_ATR);
}
--
2.20.1
- Re: [Qemu-devel] [PATCH v2 1/9] ccid-card-passthru: Move assertion in read() to can_read(), (continued)
- [Qemu-devel] [PATCH v2 2/9] ccid-card-passthru: Replace never trigger if statement by an assertion, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 3/9] ccid-card-passthru: Assert on a stricter expression, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 4/9] ccid-card-passthru: Let the chardev::read() be more generic, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 5/9] ccid-card-passthru: Replace assert() by QEMU_BUILD_BUG_ON(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 7/9] ccid-card-passthru: Use QERR_MISSING_PARAMETER, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 6/9] ccid-card-passthru: Simplify the if() condition, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 9/9] ccid-card-passthru: Use size_t for index, Philippe Mathieu-Daudé, 2019/02/14
- [Qemu-devel] [PATCH v2 8/9] ccid-card-passthru: Use size_t to hold size argument, Philippe Mathieu-Daudé, 2019/02/14