* [Qemu-devel] [PULL 1/6] atapi: add byte_count_limit helper
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
@ 2015-11-13 20:16 ` John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 2/6] atapi: Prioritize unknown cmd error over BCL error John Snow
` (5 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-13 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
Signed-off-by: John Snow <jsnow@redhat.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-id: 1447095959-10046-2-git-send-email-jsnow@redhat.com
---
hw/ide/atapi.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index cf0b78e..42f78fb 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -170,6 +170,17 @@ void ide_atapi_io_error(IDEState *s, int ret)
}
}
+static uint16_t atapi_byte_count_limit(IDEState *s)
+{
+ uint16_t bcl;
+
+ bcl = s->lcyl | (s->hcyl << 8);
+ if (bcl == 0xffff) {
+ return 0xfffe;
+ }
+ return bcl;
+}
+
/* The whole ATAPI transfer logic is handled in this function */
void ide_atapi_cmd_reply_end(IDEState *s)
{
@@ -212,12 +223,10 @@ void ide_atapi_cmd_reply_end(IDEState *s)
} else {
/* a new transfer is needed */
s->nsector = (s->nsector & ~7) | ATAPI_INT_REASON_IO;
- byte_count_limit = s->lcyl | (s->hcyl << 8);
+ byte_count_limit = atapi_byte_count_limit(s);
#ifdef DEBUG_IDE_ATAPI
printf("byte_count_limit=%d\n", byte_count_limit);
#endif
- if (byte_count_limit == 0xffff)
- byte_count_limit--;
size = s->packet_transfer_size;
if (size > byte_count_limit) {
/* byte count limit must be even if this case */
@@ -1272,8 +1281,7 @@ void ide_atapi_cmd(IDEState *s)
* See ATA8 ACS3 section 7.17.6.49 and 7.21.5 */
if (!(atapi_cmd_table[s->io_buffer[0]].flags & NONDATA)) {
/* TODO: Check IDENTIFY data word 125 for default BCL (currently 0) */
- uint16_t byte_count_limit = s->lcyl | (s->hcyl << 8);
- if (!(byte_count_limit || s->atapi_dma)) {
+ if (!(atapi_byte_count_limit(s) || s->atapi_dma)) {
/* TODO: Move abort back into core.c and make static inline again */
ide_abort_command(s);
return;
--
2.4.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PULL 2/6] atapi: Prioritize unknown cmd error over BCL error
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 1/6] atapi: add byte_count_limit helper John Snow
@ 2015-11-13 20:16 ` John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 3/6] ahci/qtest: don't use tcp sockets for migration tests John Snow
` (4 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-13 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
If we don't know about the command at all, we need to prioritize
that failure above the zero byte-count-limit failure.
This fixes a failure in the sparc64 NetBSD 7.0 installer bootup.
Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: John Snow <jsnow@redhat.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-id: 1447095959-10046-3-git-send-email-jsnow@redhat.com
---
hw/ide/atapi.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 42f78fb..ed8bb2c 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -1195,7 +1195,7 @@ enum {
NONDATA = 0x04,
};
-static const struct {
+static const struct AtapiCmd {
void (*handler)(IDEState *s, uint8_t *buf);
int flags;
} atapi_cmd_table[0x100] = {
@@ -1222,9 +1222,9 @@ static const struct {
void ide_atapi_cmd(IDEState *s)
{
- uint8_t *buf;
+ uint8_t *buf = s->io_buffer;
+ const struct AtapiCmd *cmd = &atapi_cmd_table[s->io_buffer[0]];
- buf = s->io_buffer;
#ifdef DEBUG_IDE_ATAPI
{
int i;
@@ -1235,14 +1235,14 @@ void ide_atapi_cmd(IDEState *s)
printf("\n");
}
#endif
+
/*
* If there's a UNIT_ATTENTION condition pending, only command flagged with
* ALLOW_UA are allowed to complete. with other commands getting a CHECK
* condition response unless a higher priority status, defined by the drive
* here, is pending.
*/
- if (s->sense_key == UNIT_ATTENTION &&
- !(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA)) {
+ if (s->sense_key == UNIT_ATTENTION && !(cmd->flags & ALLOW_UA)) {
ide_atapi_cmd_check_status(s);
return;
}
@@ -1253,7 +1253,7 @@ void ide_atapi_cmd(IDEState *s)
* GET_EVENT_STATUS_NOTIFICATION to detect such tray open/close
* states rely on this behavior.
*/
- if (!(atapi_cmd_table[s->io_buffer[0]].flags & ALLOW_UA) &&
+ if (!(cmd->flags & ALLOW_UA) &&
!s->tray_open && blk_is_inserted(s->blk) && s->cdrom_changed) {
if (s->cdrom_changed == 1) {
@@ -1268,7 +1268,7 @@ void ide_atapi_cmd(IDEState *s)
}
/* Report a Not Ready condition if appropriate for the command */
- if ((atapi_cmd_table[s->io_buffer[0]].flags & CHECK_READY) &&
+ if ((cmd->flags & CHECK_READY) &&
(!media_present(s) || !blk_is_inserted(s->blk)))
{
ide_atapi_cmd_error(s, NOT_READY, ASC_MEDIUM_NOT_PRESENT);
@@ -1279,7 +1279,7 @@ void ide_atapi_cmd(IDEState *s)
* If this is a data-transferring PIO command and BCL is 0,
* we abort at the /ATA/ level, not the ATAPI level.
* See ATA8 ACS3 section 7.17.6.49 and 7.21.5 */
- if (!(atapi_cmd_table[s->io_buffer[0]].flags & NONDATA)) {
+ if (cmd->handler && !(cmd->flags & NONDATA)) {
/* TODO: Check IDENTIFY data word 125 for default BCL (currently 0) */
if (!(atapi_byte_count_limit(s) || s->atapi_dma)) {
/* TODO: Move abort back into core.c and make static inline again */
@@ -1289,8 +1289,8 @@ void ide_atapi_cmd(IDEState *s)
}
/* Execute the command */
- if (atapi_cmd_table[s->io_buffer[0]].handler) {
- atapi_cmd_table[s->io_buffer[0]].handler(s, buf);
+ if (cmd->handler) {
+ cmd->handler(s, buf);
return;
}
--
2.4.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PULL 3/6] ahci/qtest: don't use tcp sockets for migration tests
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 1/6] atapi: add byte_count_limit helper John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 2/6] atapi: Prioritize unknown cmd error over BCL error John Snow
@ 2015-11-13 20:16 ` John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 4/6] qtest/ahci: always specify image format John Snow
` (3 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-13 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1447108074-20609-1-git-send-email-jsnow@redhat.com
---
tests/ahci-test.c | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 59d387c..1bb7410 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -47,6 +47,7 @@
/*** Globals ***/
static char tmp_path[] = "/tmp/qtest.XXXXXX";
static char debug_path[] = "/tmp/qtest-blkdebug.XXXXXX";
+static char mig_socket[] = "/tmp/qtest-migration.XXXXXX";
static bool ahci_pedantic;
/*** Function Declarations ***/
@@ -114,8 +115,11 @@ static void ahci_migrate(AHCIQState *from, AHCIQState *to, const char *uri)
{
QOSState *tmp = to->parent;
QPCIDevice *dev = to->dev;
+ char *uri_local = NULL;
+
if (uri == NULL) {
- uri = "tcp:127.0.0.1:1234";
+ uri_local = g_strdup_printf("%s%s", "unix:", mig_socket);
+ uri = uri_local;
}
/* context will be 'to' after completion. */
@@ -135,6 +139,7 @@ static void ahci_migrate(AHCIQState *from, AHCIQState *to, const char *uri)
from->dev = dev;
verify_state(to);
+ g_free(uri_local);
}
/*** Test Setup & Teardown ***/
@@ -1105,7 +1110,7 @@ static void test_flush_retry(void)
static void test_migrate_sanity(void)
{
AHCIQState *src, *dst;
- const char *uri = "tcp:127.0.0.1:1234";
+ char *uri = g_strdup_printf("unix:%s", mig_socket);
src = ahci_boot("-m 1024 -M q35 "
"-hda %s ", tmp_path);
@@ -1117,6 +1122,7 @@ static void test_migrate_sanity(void)
ahci_shutdown(src);
ahci_shutdown(dst);
+ g_free(uri);
}
/**
@@ -1129,7 +1135,7 @@ static void ahci_migrate_simple(uint8_t cmd_read, uint8_t cmd_write)
size_t bufsize = 4096;
unsigned char *tx = g_malloc(bufsize);
unsigned char *rx = g_malloc0(bufsize);
- const char *uri = "tcp:127.0.0.1:1234";
+ char *uri = g_strdup_printf("unix:%s", mig_socket);
src = ahci_boot_and_enable("-m 1024 -M q35 "
"-hda %s ", tmp_path);
@@ -1158,6 +1164,7 @@ static void ahci_migrate_simple(uint8_t cmd_read, uint8_t cmd_write)
ahci_shutdown(dst);
g_free(rx);
g_free(tx);
+ g_free(uri);
}
static void test_migrate_dma(void)
@@ -1251,7 +1258,7 @@ static void ahci_migrate_halted_io(uint8_t cmd_read, uint8_t cmd_write)
unsigned char *rx = g_malloc0(bufsize);
uint64_t ptr;
AHCICommand *cmd;
- const char *uri = "tcp:127.0.0.1:1234";
+ char *uri = g_strdup_printf("unix:%s", mig_socket);
prepare_blkdebug_script(debug_path, "write_aio");
@@ -1301,6 +1308,7 @@ static void ahci_migrate_halted_io(uint8_t cmd_read, uint8_t cmd_write)
ahci_shutdown(dst);
g_free(rx);
g_free(tx);
+ g_free(uri);
}
static void test_migrate_halted_dma(void)
@@ -1322,7 +1330,7 @@ static void test_flush_migrate(void)
AHCICommand *cmd;
uint8_t px;
const char *s;
- const char *uri = "tcp:127.0.0.1:1234";
+ char *uri = g_strdup_printf("unix:%s", mig_socket);
prepare_blkdebug_script(debug_path, "flush_to_disk");
@@ -1360,6 +1368,7 @@ static void test_flush_migrate(void)
ahci_command_free(cmd);
ahci_shutdown(src);
ahci_shutdown(dst);
+ g_free(uri);
}
static void test_max(void)
@@ -1626,6 +1635,11 @@ int main(int argc, char **argv)
g_assert(fd >= 0);
close(fd);
+ /* Reserve a hollow file to use as a socket for migration tests */
+ fd = mkstemp(mig_socket);
+ g_assert(fd >= 0);
+ close(fd);
+
/* Run the tests */
qtest_add_func("/ahci/sanity", test_sanity);
qtest_add_func("/ahci/pci_spec", test_pci_spec);
@@ -1668,6 +1682,7 @@ int main(int argc, char **argv)
/* Cleanup */
unlink(tmp_path);
unlink(debug_path);
+ unlink(mig_socket);
return ret;
}
--
2.4.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PULL 4/6] qtest/ahci: always specify image format
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
` (2 preceding siblings ...)
2015-11-13 20:16 ` [Qemu-devel] [PULL 3/6] ahci/qtest: don't use tcp sockets for migration tests John Snow
@ 2015-11-13 20:16 ` John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 5/6] libqos: add qemu-img presence check John Snow
` (2 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-13 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1447439479-16775-2-git-send-email-jsnow@redhat.com
---
tests/ahci-test.c | 51 +++++++++++++++++++++++++++++----------------------
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 1bb7410..9bf5f2c 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -49,6 +49,7 @@ static char tmp_path[] = "/tmp/qtest.XXXXXX";
static char debug_path[] = "/tmp/qtest-blkdebug.XXXXXX";
static char mig_socket[] = "/tmp/qtest-migration.XXXXXX";
static bool ahci_pedantic;
+static const char *imgfmt;
/*** Function Declarations ***/
static void ahci_test_port_spec(AHCIQState *ahci, uint8_t port);
@@ -175,11 +176,11 @@ static AHCIQState *ahci_boot(const char *cli, ...)
va_end(ap);
} else {
cli = "-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s"
- ",format=qcow2"
+ ",format=%s"
" -M q35 "
"-device ide-hd,drive=drive0 "
"-global ide-hd.ver=%s";
- s = ahci_boot(cli, tmp_path, "testdisk", "version");
+ s = ahci_boot(cli, tmp_path, "testdisk", imgfmt, "version");
}
return s;
@@ -1078,12 +1079,12 @@ static void test_flush_retry(void)
prepare_blkdebug_script(debug_path, "flush_to_disk");
ahci = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0,"
- "format=qcow2,cache=writeback,"
+ "format=%s,cache=writeback,"
"rerror=stop,werror=stop "
"-M q35 "
"-device ide-hd,drive=drive0 ",
debug_path,
- tmp_path);
+ tmp_path, imgfmt);
/* Issue Flush Command and wait for error */
port = ahci_port_select(ahci);
@@ -1113,10 +1114,10 @@ static void test_migrate_sanity(void)
char *uri = g_strdup_printf("unix:%s", mig_socket);
src = ahci_boot("-m 1024 -M q35 "
- "-hda %s ", tmp_path);
+ "-drive if=ide,file=%s,format=%s ", tmp_path, imgfmt);
dst = ahci_boot("-m 1024 -M q35 "
- "-hda %s "
- "-incoming %s", tmp_path, uri);
+ "-drive if=ide,file=%s,format=%s "
+ "-incoming %s", tmp_path, imgfmt, uri);
ahci_migrate(src, dst, uri);
@@ -1138,10 +1139,11 @@ static void ahci_migrate_simple(uint8_t cmd_read, uint8_t cmd_write)
char *uri = g_strdup_printf("unix:%s", mig_socket);
src = ahci_boot_and_enable("-m 1024 -M q35 "
- "-hda %s ", tmp_path);
+ "-drive if=ide,format=%s,file=%s ",
+ imgfmt, tmp_path);
dst = ahci_boot("-m 1024 -M q35 "
- "-hda %s "
- "-incoming %s", tmp_path, uri);
+ "-drive if=ide,format=%s,file=%s "
+ "-incoming %s", imgfmt, tmp_path, uri);
set_context(src->parent);
@@ -1197,12 +1199,12 @@ static void ahci_halted_io_test(uint8_t cmd_read, uint8_t cmd_write)
prepare_blkdebug_script(debug_path, "write_aio");
ahci = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0,"
- "format=qcow2,cache=writeback,"
+ "format=%s,cache=writeback,"
"rerror=stop,werror=stop "
"-M q35 "
"-device ide-hd,drive=drive0 ",
debug_path,
- tmp_path);
+ tmp_path, imgfmt);
/* Initialize and prepare */
port = ahci_port_select(ahci);
@@ -1263,20 +1265,20 @@ static void ahci_migrate_halted_io(uint8_t cmd_read, uint8_t cmd_write)
prepare_blkdebug_script(debug_path, "write_aio");
src = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0,"
- "format=qcow2,cache=writeback,"
+ "format=%s,cache=writeback,"
"rerror=stop,werror=stop "
"-M q35 "
"-device ide-hd,drive=drive0 ",
debug_path,
- tmp_path);
+ tmp_path, imgfmt);
dst = ahci_boot("-drive file=%s,if=none,id=drive0,"
- "format=qcow2,cache=writeback,"
+ "format=%s,cache=writeback,"
"rerror=stop,werror=stop "
"-M q35 "
"-device ide-hd,drive=drive0 "
"-incoming %s",
- tmp_path, uri);
+ tmp_path, imgfmt, uri);
set_context(src->parent);
@@ -1335,15 +1337,17 @@ static void test_flush_migrate(void)
prepare_blkdebug_script(debug_path, "flush_to_disk");
src = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0,"
- "cache=writeback,rerror=stop,werror=stop "
+ "cache=writeback,rerror=stop,werror=stop,"
+ "format=%s "
"-M q35 "
"-device ide-hd,drive=drive0 ",
- debug_path, tmp_path);
+ debug_path, tmp_path, imgfmt);
dst = ahci_boot("-drive file=%s,if=none,id=drive0,"
- "cache=writeback,rerror=stop,werror=stop "
+ "cache=writeback,rerror=stop,werror=stop,"
+ "format=%s "
"-M q35 "
"-device ide-hd,drive=drive0 "
- "-incoming %s", tmp_path, uri);
+ "-incoming %s", tmp_path, imgfmt, uri);
set_context(src->parent);
@@ -1626,9 +1630,12 @@ int main(int argc, char **argv)
return 0;
}
- /* Create a temporary qcow2 image */
- close(mkstemp(tmp_path));
+ /* Create a temporary image */
+ fd = mkstemp(tmp_path);
+ g_assert(fd >= 0);
+ imgfmt = "qcow2";
mkqcow2(tmp_path, TEST_IMAGE_SIZE_MB);
+ close(fd);
/* Create temporary blkdebug instructions */
fd = mkstemp(debug_path);
--
2.4.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PULL 5/6] libqos: add qemu-img presence check
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
` (3 preceding siblings ...)
2015-11-13 20:16 ` [Qemu-devel] [PULL 4/6] qtest/ahci: always specify image format John Snow
@ 2015-11-13 20:16 ` John Snow
2015-11-13 20:16 ` [Qemu-devel] [PULL 6/6] qtest/ahci: use raw format when qemu-img is absent John Snow
2015-11-16 11:07 ` [Qemu-devel] [PULL 0/6] Ide patches Peter Maydell
6 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-13 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
To allow tests to optionally exercise additional tests
that require the qemu-img tool that may not be present
in all builds.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1447439479-16775-3-git-send-email-jsnow@redhat.com
---
tests/libqos/libqos.c | 28 +++++++++++++++++++++++-----
tests/libqos/libqos.h | 1 +
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
index 8d7c5a9..2d1a802 100644
--- a/tests/libqos/libqos.c
+++ b/tests/libqos/libqos.c
@@ -147,6 +147,23 @@ void migrate(QOSState *from, QOSState *to, const char *uri)
set_context(to);
}
+bool have_qemu_img(void)
+{
+ char *rpath;
+ const char *path = getenv("QTEST_QEMU_IMG");
+ if (!path) {
+ return false;
+ }
+
+ rpath = realpath(path, NULL);
+ if (!rpath) {
+ return false;
+ } else {
+ free(rpath);
+ return true;
+ }
+}
+
void mkimg(const char *file, const char *fmt, unsigned size_mb)
{
gchar *cli;
@@ -155,13 +172,14 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb)
GError *err = NULL;
char *qemu_img_path;
gchar *out, *out2;
- char *abs_path;
+ char *qemu_img_abs_path;
qemu_img_path = getenv("QTEST_QEMU_IMG");
- abs_path = realpath(qemu_img_path, NULL);
- assert(qemu_img_path);
+ g_assert(qemu_img_path);
+ qemu_img_abs_path = realpath(qemu_img_path, NULL);
+ g_assert(qemu_img_abs_path);
- cli = g_strdup_printf("%s create -f %s %s %uM", abs_path,
+ cli = g_strdup_printf("%s create -f %s %s %uM", qemu_img_abs_path,
fmt, file, size_mb);
ret = g_spawn_command_line_sync(cli, &out, &out2, &rc, &err);
if (err) {
@@ -183,7 +201,7 @@ void mkimg(const char *file, const char *fmt, unsigned size_mb)
g_free(out);
g_free(out2);
g_free(cli);
- free(abs_path);
+ free(qemu_img_abs_path);
}
void mkqcow2(const char *file, unsigned size_mb)
diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h
index 492a651..ca14d2e 100644
--- a/tests/libqos/libqos.h
+++ b/tests/libqos/libqos.h
@@ -19,6 +19,7 @@ typedef struct QOSState {
QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap);
QOSState *qtest_boot(QOSOps *ops, const char *cmdline_fmt, ...);
void qtest_shutdown(QOSState *qs);
+bool have_qemu_img(void);
void mkimg(const char *file, const char *fmt, unsigned size_mb);
void mkqcow2(const char *file, unsigned size_mb);
void set_context(QOSState *s);
--
2.4.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PULL 6/6] qtest/ahci: use raw format when qemu-img is absent
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
` (4 preceding siblings ...)
2015-11-13 20:16 ` [Qemu-devel] [PULL 5/6] libqos: add qemu-img presence check John Snow
@ 2015-11-13 20:16 ` John Snow
2015-11-16 11:07 ` [Qemu-devel] [PULL 0/6] Ide patches Peter Maydell
6 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-13 20:16 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
If we don't have the qemu-img tool, use the raw format
for tests and skip the high-sector LBA48 tests.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1447439479-16775-4-git-send-email-jsnow@redhat.com
---
tests/ahci-test.c | 41 ++++++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 9bf5f2c..0888506 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -39,10 +39,9 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_regs.h"
-/* Test-specific defines -- in MiB */
-#define TEST_IMAGE_SIZE_MB (200 * 1024)
-#define TEST_IMAGE_SECTORS ((TEST_IMAGE_SIZE_MB / AHCI_SECTOR_SIZE) \
- * 1024 * 1024)
+/* Test images sizes in MB */
+#define TEST_IMAGE_SIZE_MB_LARGE (200 * 1024)
+#define TEST_IMAGE_SIZE_MB_SMALL 64
/*** Globals ***/
static char tmp_path[] = "/tmp/qtest.XXXXXX";
@@ -50,6 +49,7 @@ static char debug_path[] = "/tmp/qtest-blkdebug.XXXXXX";
static char mig_socket[] = "/tmp/qtest-migration.XXXXXX";
static bool ahci_pedantic;
static const char *imgfmt;
+static unsigned test_image_size_mb;
/*** Function Declarations ***/
static void ahci_test_port_spec(AHCIQState *ahci, uint8_t port);
@@ -62,6 +62,11 @@ static void ahci_test_pmcap(AHCIQState *ahci, uint8_t offset);
/*** Utilities ***/
+static uint64_t mb_to_sectors(uint64_t image_size_mb)
+{
+ return (image_size_mb * 1024 * 1024) / AHCI_SECTOR_SIZE;
+}
+
static void string_bswap16(uint16_t *s, size_t bytes)
{
g_assert_cmphex((bytes & 1), ==, 0);
@@ -906,7 +911,7 @@ static void ahci_test_max(AHCIQState *ahci)
uint64_t nsect;
uint8_t port;
uint8_t cmd;
- uint64_t config_sect = TEST_IMAGE_SECTORS - 1;
+ uint64_t config_sect = mb_to_sectors(test_image_size_mb) - 1;
if (config_sect > 0xFFFFFF) {
cmd = CMD_READ_MAX_EXT;
@@ -1489,7 +1494,7 @@ static uint64_t offset_sector(enum OffsetType ofst,
return 1;
case OFFSET_HIGH:
ceil = (addr_type == ADDR_MODE_LBA28) ? 0xfffffff : 0xffffffffffff;
- ceil = MIN(ceil, TEST_IMAGE_SECTORS - 1);
+ ceil = MIN(ceil, mb_to_sectors(test_image_size_mb) - 1);
nsectors = buffsize / AHCI_SECTOR_SIZE;
return ceil - nsectors + 1;
default:
@@ -1571,8 +1576,9 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr,
enum BuffLen len, enum OffsetType offset)
{
char *name;
- AHCIIOTestOptions *opts = g_malloc(sizeof(AHCIIOTestOptions));
+ AHCIIOTestOptions *opts;
+ opts = g_malloc(sizeof(AHCIIOTestOptions));
opts->length = len;
opts->address_type = addr;
opts->io_type = type;
@@ -1584,6 +1590,13 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr,
buff_len_str[len],
offset_str[offset]);
+ if ((addr == ADDR_MODE_LBA48) && (offset == OFFSET_HIGH) &&
+ (mb_to_sectors(test_image_size_mb) <= 0xFFFFFFF)) {
+ g_test_message("%s: skipped; test image too small", name);
+ g_free(name);
+ return;
+ }
+
qtest_add_data_func(name, opts, test_io_interface);
g_free(name);
}
@@ -1633,8 +1646,18 @@ int main(int argc, char **argv)
/* Create a temporary image */
fd = mkstemp(tmp_path);
g_assert(fd >= 0);
- imgfmt = "qcow2";
- mkqcow2(tmp_path, TEST_IMAGE_SIZE_MB);
+ if (have_qemu_img()) {
+ imgfmt = "qcow2";
+ test_image_size_mb = TEST_IMAGE_SIZE_MB_LARGE;
+ mkqcow2(tmp_path, TEST_IMAGE_SIZE_MB_LARGE);
+ } else {
+ g_test_message("QTEST_QEMU_IMG not set or qemu-img missing; "
+ "skipping LBA48 high-sector tests");
+ imgfmt = "raw";
+ test_image_size_mb = TEST_IMAGE_SIZE_MB_SMALL;
+ ret = ftruncate(fd, test_image_size_mb * 1024 * 1024);
+ g_assert(ret == 0);
+ }
close(fd);
/* Create temporary blkdebug instructions */
--
2.4.3
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PULL 0/6] Ide patches
2015-11-13 20:16 [Qemu-devel] [PULL 0/6] Ide patches John Snow
` (5 preceding siblings ...)
2015-11-13 20:16 ` [Qemu-devel] [PULL 6/6] qtest/ahci: use raw format when qemu-img is absent John Snow
@ 2015-11-16 11:07 ` Peter Maydell
2015-11-16 11:32 ` Peter Maydell
6 siblings, 1 reply; 14+ messages in thread
From: Peter Maydell @ 2015-11-16 11:07 UTC (permalink / raw)
To: John Snow; +Cc: QEMU Developers
On 13 November 2015 at 20:16, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit 8337c6cbc37c6b2184f41bab3eaff47d5e68012a:
>
> Update version for v2.5.0-rc0 release (2015-11-13 17:10:36 +0000)
>
> are available in the git repository at:
>
> https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to 917158dc3b22924922dc1f3b9d4049a4fc83d926:
>
> qtest/ahci: use raw format when qemu-img is absent (2015-11-13 14:31:43 -0500)
>
> ----------------------------------------------------------------
I get assertion failures on OSX:
ERROR:/Users/pm215/src/qemu-for-merges/tests/hd-geo-test.c:33:char
*create_test_img(int): assertion failed: (ret == 0)
That might be "build box ran out of diskspace because test
wants to create multi-gigabyte test image" again, but it's
a bit hard to tell since the assert doesn't print the errno
for whatever failed...
thanks
-- PMM
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PULL 0/6] Ide patches
2015-11-16 11:07 ` [Qemu-devel] [PULL 0/6] Ide patches Peter Maydell
@ 2015-11-16 11:32 ` Peter Maydell
2015-11-16 16:29 ` John Snow
0 siblings, 1 reply; 14+ messages in thread
From: Peter Maydell @ 2015-11-16 11:32 UTC (permalink / raw)
To: John Snow; +Cc: QEMU Developers
On 16 November 2015 at 11:07, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 13 November 2015 at 20:16, John Snow <jsnow@redhat.com> wrote:
>> The following changes since commit 8337c6cbc37c6b2184f41bab3eaff47d5e68012a:
>>
>> Update version for v2.5.0-rc0 release (2015-11-13 17:10:36 +0000)
>>
>> are available in the git repository at:
>>
>> https://github.com/jnsnow/qemu.git tags/ide-pull-request
>>
>> for you to fetch changes up to 917158dc3b22924922dc1f3b9d4049a4fc83d926:
>>
>> qtest/ahci: use raw format when qemu-img is absent (2015-11-13 14:31:43 -0500)
>>
>> ----------------------------------------------------------------
>
> I get assertion failures on OSX:
>
> ERROR:/Users/pm215/src/qemu-for-merges/tests/hd-geo-test.c:33:char
> *create_test_img(int): assertion failed: (ret == 0)
>
> That might be "build box ran out of diskspace because test
> wants to create multi-gigabyte test image" again, but it's
> a bit hard to tell since the assert doesn't print the errno
> for whatever failed...
Retry was ok, so I guess it was the disk space thing. Applied.
thanks
-- PMM
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [PULL 0/6] Ide patches
2015-11-16 11:32 ` Peter Maydell
@ 2015-11-16 16:29 ` John Snow
0 siblings, 0 replies; 14+ messages in thread
From: John Snow @ 2015-11-16 16:29 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 11/16/2015 06:32 AM, Peter Maydell wrote:
> On 16 November 2015 at 11:07, Peter Maydell <peter.maydell@linaro.org> wrote:
>> On 13 November 2015 at 20:16, John Snow <jsnow@redhat.com> wrote:
>>> The following changes since commit 8337c6cbc37c6b2184f41bab3eaff47d5e68012a:
>>>
>>> Update version for v2.5.0-rc0 release (2015-11-13 17:10:36 +0000)
>>>
>>> are available in the git repository at:
>>>
>>> https://github.com/jnsnow/qemu.git tags/ide-pull-request
>>>
>>> for you to fetch changes up to 917158dc3b22924922dc1f3b9d4049a4fc83d926:
>>>
>>> qtest/ahci: use raw format when qemu-img is absent (2015-11-13 14:31:43 -0500)
>>>
>>> ----------------------------------------------------------------
>>
>> I get assertion failures on OSX:
>>
>> ERROR:/Users/pm215/src/qemu-for-merges/tests/hd-geo-test.c:33:char
>> *create_test_img(int): assertion failed: (ret == 0)
>>
>> That might be "build box ran out of diskspace because test
>> wants to create multi-gigabyte test image" again, but it's
>> a bit hard to tell since the assert doesn't print the errno
>> for whatever failed...
>
> Retry was ok, so I guess it was the disk space thing. Applied.
>
> thanks
> -- PMM
>
I'll get back to fixing that one.
Thanks,
--js
^ permalink raw reply [flat|nested] 14+ messages in thread