[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] qtest/ahci: export generate_pattern
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 03/11] qtest/ahci: export generate_pattern |
Date: |
Fri, 18 Sep 2015 11:04:33 -0400 |
Share the pattern function for ide and ahci test.
Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
---
tests/ahci-test.c | 26 --------------------------
tests/libqos/libqos.c | 26 ++++++++++++++++++++++++++
tests/libqos/libqos.h | 1 +
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index b1a785c..59d387c 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -71,32 +71,6 @@ static void string_bswap16(uint16_t *s, size_t bytes)
}
}
-static void generate_pattern(void *buffer, size_t len, size_t cycle_len)
-{
- int i, j;
- unsigned char *tx = (unsigned char *)buffer;
- unsigned char p;
- size_t *sx;
-
- /* Write an indicative pattern that varies and is unique per-cycle */
- p = rand() % 256;
- for (i = 0; i < len; i++) {
- tx[i] = p++ % 256;
- if (i % cycle_len == 0) {
- p = rand() % 256;
- }
- }
-
- /* force uniqueness by writing an id per-cycle */
- for (i = 0; i < len / cycle_len; i++) {
- j = i * cycle_len;
- if (j + sizeof(*sx) <= len) {
- sx = (size_t *)&tx[j];
- *sx = i;
- }
- }
-}
-
/**
* Verify that the transfer did not corrupt our state at all.
*/
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
index fce625b..8d7c5a9 100644
--- a/tests/libqos/libqos.c
+++ b/tests/libqos/libqos.c
@@ -212,3 +212,29 @@ void prepare_blkdebug_script(const char *debug_fn, const
char *event)
ret = fclose(debug_file);
g_assert(ret == 0);
}
+
+void generate_pattern(void *buffer, size_t len, size_t cycle_len)
+{
+ int i, j;
+ unsigned char *tx = (unsigned char *)buffer;
+ unsigned char p;
+ size_t *sx;
+
+ /* Write an indicative pattern that varies and is unique per-cycle */
+ p = rand() % 256;
+ for (i = 0; i < len; i++) {
+ tx[i] = p++ % 256;
+ if (i % cycle_len == 0) {
+ p = rand() % 256;
+ }
+ }
+
+ /* force uniqueness by writing an id per-cycle */
+ for (i = 0; i < len / cycle_len; i++) {
+ j = i * cycle_len;
+ if (j + sizeof(*sx) <= len) {
+ sx = (size_t *)&tx[j];
+ *sx = i;
+ }
+ }
+}
diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h
index e1f14ea..492a651 100644
--- a/tests/libqos/libqos.h
+++ b/tests/libqos/libqos.h
@@ -24,6 +24,7 @@ void mkqcow2(const char *file, unsigned size_mb);
void set_context(QOSState *s);
void migrate(QOSState *from, QOSState *to, const char *uri);
void prepare_blkdebug_script(const char *debug_fn, const char *event);
+void generate_pattern(void *buffer, size_t len, size_t cycle_len);
static inline uint64_t qmalloc(QOSState *q, size_t bytes)
{
--
2.4.3
- [Qemu-devel] [PULL 08/11] ahci: remove dead reset code, (continued)
- [Qemu-devel] [PULL 08/11] ahci: remove dead reset code, John Snow, 2015/09/18
- [Qemu-devel] [PULL 05/11] ide-test: add cdrom dma test, John Snow, 2015/09/18
- [Qemu-devel] [PULL 01/11] ide: unify io_buffer_offset increments, John Snow, 2015/09/18
- [Qemu-devel] [PULL 02/11] qtest/ahci: use generate_pattern everywhere, John Snow, 2015/09/18
- [Qemu-devel] [PULL 10/11] ahci: remove cmd_fis argument from write_fis_d2h, John Snow, 2015/09/18
- [Qemu-devel] [PULL 09/11] ahci: fix signature generation, John Snow, 2015/09/18
- [Qemu-devel] [PULL 07/11] atapi: abort transfers with 0 byte limits, John Snow, 2015/09/18
- [Qemu-devel] [PULL 06/11] ide: fix ATAPI command permissions, John Snow, 2015/09/18
- [Qemu-devel] [PULL 11/11] ahci: clean up initial d2h semantics, John Snow, 2015/09/18
- [Qemu-devel] [PULL 04/11] ide-test: add cdrom pio test, John Snow, 2015/09/18
- [Qemu-devel] [PULL 03/11] qtest/ahci: export generate_pattern,
John Snow <=
- Re: [Qemu-devel] [PULL 00/11] Ide patches, Peter Maydell, 2015/09/18