From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jsnow@redhat.com
Subject: [Qemu-devel] [PULL 12/13] qtest/fdc: Support for 2.88MB drives
Date: Mon, 25 Jan 2016 14:41:24 -0500 [thread overview]
Message-ID: <1453750885-16066-13-git-send-email-jsnow@redhat.com> (raw)
In-Reply-To: <1453750885-16066-1-git-send-email-jsnow@redhat.com>
The old test assumes a 1.44MB drive.
Assert that the QEMU default drive is now either 1.44 or 2.88.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1453495865-9649-12-git-send-email-jsnow@redhat.com
---
tests/fdc-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/fdc-test.c b/tests/fdc-test.c
index b5a4696..526d459 100644
--- a/tests/fdc-test.c
+++ b/tests/fdc-test.c
@@ -267,7 +267,7 @@ static void test_cmos(void)
uint8_t cmos;
cmos = cmos_read(CMOS_FLOPPY);
- g_assert(cmos == 0x40);
+ g_assert(cmos == 0x40 || cmos == 0x50);
}
static void test_no_media_on_start(void)
--
2.4.3
next prev parent reply other threads:[~2016-01-25 19:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 19:41 [Qemu-devel] [PULL 00/13] IDE & FDC patches John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 01/13] ide: Correct the CHS 'cyls_max' limit to be 65535 John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 02/13] fdc: move pick_geometry John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 03/13] fdc: reduce number of pick_geometry arguments John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 04/13] fdc: add drive type qapi enum John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 05/13] fdc: add disk field John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 06/13] fdc: Throw an assertion on misconfigured fd_formats table John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 07/13] fdc: add pick_drive John Snow
2016-01-27 12:38 ` Paolo Bonzini
2016-01-27 15:17 ` John Snow
2016-01-27 23:57 ` John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 08/13] fdc: Add fallback option John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 09/13] fdc: add drive type option John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 10/13] fdc: add physical disk sizes John Snow
2016-01-25 19:41 ` [Qemu-devel] [PULL 11/13] fdc: rework pick_geometry John Snow
2016-01-25 19:41 ` John Snow [this message]
2016-01-25 19:41 ` [Qemu-devel] [PULL 13/13] fdc: change auto fallback drive for ISA FDC to 288 John Snow
2016-01-26 10:12 ` [Qemu-devel] [PULL 00/13] IDE & FDC patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453750885-16066-13-git-send-email-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).