* [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging
@ 2012-06-03 17:38 Blue Swirl
2012-06-04 9:36 ` Kevin Wolf
0 siblings, 1 reply; 6+ messages in thread
From: Blue Swirl @ 2012-06-03 17:38 UTC (permalink / raw)
To: qemu-devel, Kevin Wolf, Paolo Bonzini, Peter Maydell
[-- Attachment #1: Type: text/plain, Size: 5118 bytes --]
Convert uses of FLOPPY_ERROR to either FLOPPY_DPRINTF
(for implemented cases) or to use LOG_UNIMP (unimplemented).
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
hw/fdc.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 30d34e3..48803ec 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -36,6 +36,7 @@
#include "qdev-addr.h"
#include "blockdev.h"
#include "sysemu.h"
+#include "qemu-log.h"
/********************************************************/
/* debug Floppy devices */
@@ -48,9 +49,6 @@
#define FLOPPY_DPRINTF(fmt, ...)
#endif
-#define FLOPPY_ERROR(fmt, ...) \
- do { printf("FLOPPY ERROR: %s: " fmt, __func__ , ## __VA_ARGS__);
} while (0)
-
/********************************************************/
/* Floppy drive emulation */
@@ -147,8 +145,10 @@ static int fd_seek(FDrive *drv, uint8_t head,
uint8_t track, uint8_t sect,
if (sector != fd_sector(drv)) {
#if 0
if (!enable_seek) {
- FLOPPY_ERROR("no implicit seek %d %02x %02x (max=%d %02x %02x)\n",
- head, track, sect, 1, drv->max_track, drv->last_sect);
+ FLOPPY_DPRINTF("no implicit seek %d %02x %02x"
+ " (max=%d %02x %02x)\n",
+ head, track, sect, 1, drv->max_track,
+ drv->last_sect);
return 4;
}
#endif
@@ -987,7 +987,8 @@ static void fdctrl_set_fifo(FDCtrl *fdctrl, int
fifo_len, int do_irq)
/* Set an error: unimplemented/unknown command */
static void fdctrl_unimplemented(FDCtrl *fdctrl, int direction)
{
- FLOPPY_ERROR("unimplemented command 0x%02x\n", fdctrl->fifo[0]);
+ qemu_log_mask(LOG_UNIMP, "fdc: unimplemented command 0x%02x\n",
+ fdctrl->fifo[0]);
fdctrl->fifo[0] = FD_SR0_INVCMD;
fdctrl_set_fifo(fdctrl, 1, 0);
}
@@ -1155,7 +1156,7 @@ static void fdctrl_start_transfer(FDCtrl
*fdctrl, int direction)
DMA_schedule(fdctrl->dma_chann);
return;
} else {
- FLOPPY_ERROR("dma_mode=%d direction=%d\n", dma_mode, direction);
+ FLOPPY_DPRINTF("dma_mode=%d direction=%d\n", dma_mode, direction);
}
}
FLOPPY_DPRINTF("start non-DMA transfer\n");
@@ -1171,7 +1172,7 @@ static void fdctrl_start_transfer(FDCtrl
*fdctrl, int direction)
/* Prepare a transfer of deleted data */
static void fdctrl_start_transfer_del(FDCtrl *fdctrl, int direction)
{
- FLOPPY_ERROR("fdctrl_start_transfer_del() unimplemented\n");
+ qemu_log_mask(LOG_UNIMP, "fdctrl_start_transfer_del() unimplemented\n");
/* We don't handle deleted data,
* so we don't return *ANYTHING*
@@ -1250,7 +1251,7 @@ static int fdctrl_transfer_handler (void
*opaque, int nchan,
fdctrl->data_pos, len);
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("writing sector %d\n", fd_sector(cur_drv));
fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM |
FD_SR0_SEEK, 0x00, 0x00);
goto transfer_error;
}
@@ -1309,7 +1310,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
cur_drv = get_cur_drv(fdctrl);
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
if (!(fdctrl->msr & FD_MSR_RQM) || !(fdctrl->msr & FD_MSR_DIO)) {
- FLOPPY_ERROR("controller not ready for reading\n");
+ FLOPPY_DPRINTF("controller not ready for reading\n");
return 0;
}
pos = fdctrl->data_pos;
@@ -1393,7 +1394,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl)
memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
if (cur_drv->bs == NULL ||
bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("formatting sector %d\n", fd_sector(cur_drv));
fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00);
} else {
if (cur_drv->sect == cur_drv->last_sect) {
@@ -1768,7 +1769,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl,
uint32_t value)
return;
}
if (!(fdctrl->msr & FD_MSR_RQM) || (fdctrl->msr & FD_MSR_DIO)) {
- FLOPPY_ERROR("controller not ready for writing\n");
+ FLOPPY_DPRINTF("controller not ready for writing\n");
return;
}
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
@@ -1782,7 +1783,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl,
uint32_t value)
fdctrl->data_pos == fdctrl->data_len) {
cur_drv = get_cur_drv(fdctrl);
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("writing sector %d\n", fd_sector(cur_drv));
return;
}
if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
--
1.7.10
[-- Attachment #2: 0005-fdc-use-LOG_UNIMP-logging.patch --]
[-- Type: text/plain, Size: 5596 bytes --]
From 6ed3bd5271a978867367450f290de1d7d2104d6f Mon Sep 17 00:00:00 2001
Message-Id: <6ed3bd5271a978867367450f290de1d7d2104d6f.1338744586.git.blauwirbel@gmail.com>
In-Reply-To: <2a5b75851062503741f9e6a95e3087361959257d.1338744586.git.blauwirbel@gmail.com>
References: <2a5b75851062503741f9e6a95e3087361959257d.1338744586.git.blauwirbel@gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 3 Jun 2012 17:16:14 +0000
Subject: [PATCH 5/6] fdc: use LOG_UNIMP logging
Convert uses of FLOPPY_ERROR to either FLOPPY_DPRINTF
(for implemented cases) or to use LOG_UNIMP (unimplemented).
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
hw/fdc.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 30d34e3..48803ec 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -36,6 +36,7 @@
#include "qdev-addr.h"
#include "blockdev.h"
#include "sysemu.h"
+#include "qemu-log.h"
/********************************************************/
/* debug Floppy devices */
@@ -48,9 +49,6 @@
#define FLOPPY_DPRINTF(fmt, ...)
#endif
-#define FLOPPY_ERROR(fmt, ...) \
- do { printf("FLOPPY ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0)
-
/********************************************************/
/* Floppy drive emulation */
@@ -147,8 +145,10 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t track, uint8_t sect,
if (sector != fd_sector(drv)) {
#if 0
if (!enable_seek) {
- FLOPPY_ERROR("no implicit seek %d %02x %02x (max=%d %02x %02x)\n",
- head, track, sect, 1, drv->max_track, drv->last_sect);
+ FLOPPY_DPRINTF("no implicit seek %d %02x %02x"
+ " (max=%d %02x %02x)\n",
+ head, track, sect, 1, drv->max_track,
+ drv->last_sect);
return 4;
}
#endif
@@ -987,7 +987,8 @@ static void fdctrl_set_fifo(FDCtrl *fdctrl, int fifo_len, int do_irq)
/* Set an error: unimplemented/unknown command */
static void fdctrl_unimplemented(FDCtrl *fdctrl, int direction)
{
- FLOPPY_ERROR("unimplemented command 0x%02x\n", fdctrl->fifo[0]);
+ qemu_log_mask(LOG_UNIMP, "fdc: unimplemented command 0x%02x\n",
+ fdctrl->fifo[0]);
fdctrl->fifo[0] = FD_SR0_INVCMD;
fdctrl_set_fifo(fdctrl, 1, 0);
}
@@ -1155,7 +1156,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
DMA_schedule(fdctrl->dma_chann);
return;
} else {
- FLOPPY_ERROR("dma_mode=%d direction=%d\n", dma_mode, direction);
+ FLOPPY_DPRINTF("dma_mode=%d direction=%d\n", dma_mode, direction);
}
}
FLOPPY_DPRINTF("start non-DMA transfer\n");
@@ -1171,7 +1172,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
/* Prepare a transfer of deleted data */
static void fdctrl_start_transfer_del(FDCtrl *fdctrl, int direction)
{
- FLOPPY_ERROR("fdctrl_start_transfer_del() unimplemented\n");
+ qemu_log_mask(LOG_UNIMP, "fdctrl_start_transfer_del() unimplemented\n");
/* We don't handle deleted data,
* so we don't return *ANYTHING*
@@ -1250,7 +1251,7 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
fdctrl->data_pos, len);
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("writing sector %d\n", fd_sector(cur_drv));
fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00);
goto transfer_error;
}
@@ -1309,7 +1310,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
cur_drv = get_cur_drv(fdctrl);
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
if (!(fdctrl->msr & FD_MSR_RQM) || !(fdctrl->msr & FD_MSR_DIO)) {
- FLOPPY_ERROR("controller not ready for reading\n");
+ FLOPPY_DPRINTF("controller not ready for reading\n");
return 0;
}
pos = fdctrl->data_pos;
@@ -1393,7 +1394,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl)
memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
if (cur_drv->bs == NULL ||
bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("formatting sector %d\n", fd_sector(cur_drv));
fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00);
} else {
if (cur_drv->sect == cur_drv->last_sect) {
@@ -1768,7 +1769,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
return;
}
if (!(fdctrl->msr & FD_MSR_RQM) || (fdctrl->msr & FD_MSR_DIO)) {
- FLOPPY_ERROR("controller not ready for writing\n");
+ FLOPPY_DPRINTF("controller not ready for writing\n");
return;
}
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
@@ -1782,7 +1783,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
fdctrl->data_pos == fdctrl->data_len) {
cur_drv = get_cur_drv(fdctrl);
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("writing sector %d\n", fd_sector(cur_drv));
return;
}
if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging
2012-06-03 17:38 [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging Blue Swirl
@ 2012-06-04 9:36 ` Kevin Wolf
2012-06-07 21:07 ` Blue Swirl
0 siblings, 1 reply; 6+ messages in thread
From: Kevin Wolf @ 2012-06-04 9:36 UTC (permalink / raw)
To: Blue Swirl; +Cc: Paolo Bonzini, qemu-devel, Peter Maydell
Am 03.06.2012 19:38, schrieb Blue Swirl:
> Convert uses of FLOPPY_ERROR to either FLOPPY_DPRINTF
> (for implemented cases) or to use LOG_UNIMP (unimplemented).
>
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
I would suggest that you check the messages of those cases that became
FLOPPY_DPRINTF(). Originally the macro printed "FLOPPY ERROR: " and now
it's not even mentioned any more that it is an error message, making
messages like "writing sector %d" totally misleading.
If you fix that up:
Acked-by: Kevin Wolf <kwolf@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging
2012-06-04 9:36 ` Kevin Wolf
@ 2012-06-07 21:07 ` Blue Swirl
2012-06-08 8:56 ` Kevin Wolf
0 siblings, 1 reply; 6+ messages in thread
From: Blue Swirl @ 2012-06-07 21:07 UTC (permalink / raw)
To: Kevin Wolf; +Cc: Paolo Bonzini, qemu-devel, Peter Maydell
On Mon, Jun 4, 2012 at 9:36 AM, Kevin Wolf <kwolf@redhat.com> wrote:
> Am 03.06.2012 19:38, schrieb Blue Swirl:
>> Convert uses of FLOPPY_ERROR to either FLOPPY_DPRINTF
>> (for implemented cases) or to use LOG_UNIMP (unimplemented).
>>
>> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
>
> I would suggest that you check the messages of those cases that became
> FLOPPY_DPRINTF(). Originally the macro printed "FLOPPY ERROR: " and now
> it's not even mentioned any more that it is an error message, making
> messages like "writing sector %d" totally misleading.
Is that an error condition at all? It looks like just debugging.
>
> If you fix that up:
>
> Acked-by: Kevin Wolf <kwolf@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging
2012-06-07 21:07 ` Blue Swirl
@ 2012-06-08 8:56 ` Kevin Wolf
0 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2012-06-08 8:56 UTC (permalink / raw)
To: Blue Swirl; +Cc: Paolo Bonzini, qemu-devel, Peter Maydell
Am 07.06.2012 23:07, schrieb Blue Swirl:
> On Mon, Jun 4, 2012 at 9:36 AM, Kevin Wolf <kwolf@redhat.com> wrote:
>> Am 03.06.2012 19:38, schrieb Blue Swirl:
>>> Convert uses of FLOPPY_ERROR to either FLOPPY_DPRINTF
>>> (for implemented cases) or to use LOG_UNIMP (unimplemented).
>>>
>>> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
>>
>> I would suggest that you check the messages of those cases that became
>> FLOPPY_DPRINTF(). Originally the macro printed "FLOPPY ERROR: " and now
>> it's not even mentioned any more that it is an error message, making
>> messages like "writing sector %d" totally misleading.
>
> Is that an error condition at all? It looks like just debugging.
Not sure if all of them are error conditions (that's why I asked you to
check), and yes, they are just debugging. But for example have a look at
this code:
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) {
FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
The debug message says "FLOPPY ERROR: writing sector 42" today, which is
correct because the message is printed only if bdrv_write() fails. After
your change it would say "FLOPPY: writing sector 42", which has a
completely different meaning - it implies that the message is printed on
each write and it doesn't make obvious that an error occurred.
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 0/6] Log unimplemented functionality
@ 2012-06-09 12:12 Blue Swirl
2012-06-09 12:12 ` [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging Blue Swirl
0 siblings, 1 reply; 6+ messages in thread
From: Blue Swirl @ 2012-06-09 12:12 UTC (permalink / raw)
To: qemu-devel
v2: address Kevin's comments to 5/6
Blue Swirl (6):
qemu-log: move logging to qemu-log.c
qemu-log: cleanup
qemu-log: add log category for unimplemented functionality
qemu-log: use LOG_UNIMP for some target CPU cases
fdc: use LOG_UNIMP logging
qtest: add a fuzz test to fdc-test
Makefile.objs | 1 +
cpu-all.h | 24 ------
exec.c | 122 -----------------------------
hw/fdc.c | 30 ++++---
linux-user/main.c | 3 +-
linux-user/signal.c | 12 +--
qemu-log.c | 170 +++++++++++++++++++++++++++++++++++++++++
qemu-log.h | 145 ++++++++++++++++++++++++-----------
qemu-tool.c | 2 -
target-i386/op_helper.c | 1 +
target-microblaze/translate.c | 11 ++-
target-ppc/helper.c | 2 +-
target-s390x/translate.c | 2 +-
target-sparc/ldst_helper.c | 80 ++++++++++++--------
tcg/tcg.c | 92 ++++++++++++----------
tcg/tcg.h | 2 +-
tcg/tci/tcg-target.c | 2 +-
tests/fdc-test.c | 17 ++++
18 files changed, 419 insertions(+), 299 deletions(-)
create mode 100644 qemu-log.c
--
1.7.2.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging
2012-06-09 12:12 [Qemu-devel] [PATCH v2 0/6] Log unimplemented functionality Blue Swirl
@ 2012-06-09 12:12 ` Blue Swirl
2012-06-11 13:09 ` Kevin Wolf
0 siblings, 1 reply; 6+ messages in thread
From: Blue Swirl @ 2012-06-09 12:12 UTC (permalink / raw)
To: qemu-devel
Convert uses of FLOPPY_ERROR to either FLOPPY_DPRINTF
(for implemented cases) or to use LOG_UNIMP (unimplemented).
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
hw/fdc.c | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 30d34e3..6625fcb 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -36,6 +36,7 @@
#include "qdev-addr.h"
#include "blockdev.h"
#include "sysemu.h"
+#include "qemu-log.h"
/********************************************************/
/* debug Floppy devices */
@@ -48,9 +49,6 @@
#define FLOPPY_DPRINTF(fmt, ...)
#endif
-#define FLOPPY_ERROR(fmt, ...) \
- do { printf("FLOPPY ERROR: %s: " fmt, __func__ , ## __VA_ARGS__); } while (0)
-
/********************************************************/
/* Floppy drive emulation */
@@ -147,8 +145,10 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t track, uint8_t sect,
if (sector != fd_sector(drv)) {
#if 0
if (!enable_seek) {
- FLOPPY_ERROR("no implicit seek %d %02x %02x (max=%d %02x %02x)\n",
- head, track, sect, 1, drv->max_track, drv->last_sect);
+ FLOPPY_DPRINTF("error: no implicit seek %d %02x %02x"
+ " (max=%d %02x %02x)\n",
+ head, track, sect, 1, drv->max_track,
+ drv->last_sect);
return 4;
}
#endif
@@ -987,7 +987,8 @@ static void fdctrl_set_fifo(FDCtrl *fdctrl, int fifo_len, int do_irq)
/* Set an error: unimplemented/unknown command */
static void fdctrl_unimplemented(FDCtrl *fdctrl, int direction)
{
- FLOPPY_ERROR("unimplemented command 0x%02x\n", fdctrl->fifo[0]);
+ qemu_log_mask(LOG_UNIMP, "fdc: unimplemented command 0x%02x\n",
+ fdctrl->fifo[0]);
fdctrl->fifo[0] = FD_SR0_INVCMD;
fdctrl_set_fifo(fdctrl, 1, 0);
}
@@ -1155,7 +1156,8 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
DMA_schedule(fdctrl->dma_chann);
return;
} else {
- FLOPPY_ERROR("dma_mode=%d direction=%d\n", dma_mode, direction);
+ FLOPPY_DPRINTF("bad dma_mode=%d direction=%d\n", dma_mode,
+ direction);
}
}
FLOPPY_DPRINTF("start non-DMA transfer\n");
@@ -1171,7 +1173,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
/* Prepare a transfer of deleted data */
static void fdctrl_start_transfer_del(FDCtrl *fdctrl, int direction)
{
- FLOPPY_ERROR("fdctrl_start_transfer_del() unimplemented\n");
+ qemu_log_mask(LOG_UNIMP, "fdctrl_start_transfer_del() unimplemented\n");
/* We don't handle deleted data,
* so we don't return *ANYTHING*
@@ -1250,7 +1252,8 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
fdctrl->data_pos, len);
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("error writing sector %d\n",
+ fd_sector(cur_drv));
fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00);
goto transfer_error;
}
@@ -1309,7 +1312,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
cur_drv = get_cur_drv(fdctrl);
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
if (!(fdctrl->msr & FD_MSR_RQM) || !(fdctrl->msr & FD_MSR_DIO)) {
- FLOPPY_ERROR("controller not ready for reading\n");
+ FLOPPY_DPRINTF("error: controller not ready for reading\n");
return 0;
}
pos = fdctrl->data_pos;
@@ -1393,7 +1396,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl)
memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
if (cur_drv->bs == NULL ||
bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("error formatting sector %d\n", fd_sector(cur_drv));
fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00);
} else {
if (cur_drv->sect == cur_drv->last_sect) {
@@ -1768,7 +1771,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
return;
}
if (!(fdctrl->msr & FD_MSR_RQM) || (fdctrl->msr & FD_MSR_DIO)) {
- FLOPPY_ERROR("controller not ready for writing\n");
+ FLOPPY_DPRINTF("error: controller not ready for writing\n");
return;
}
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
@@ -1782,7 +1785,8 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
fdctrl->data_pos == fdctrl->data_len) {
cur_drv = get_cur_drv(fdctrl);
if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
- FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
+ FLOPPY_DPRINTF("error writing sector %d\n",
+ fd_sector(cur_drv));
return;
}
if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-11 13:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-03 17:38 [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging Blue Swirl
2012-06-04 9:36 ` Kevin Wolf
2012-06-07 21:07 ` Blue Swirl
2012-06-08 8:56 ` Kevin Wolf
-- strict thread matches above, loose matches on Subject: below --
2012-06-09 12:12 [Qemu-devel] [PATCH v2 0/6] Log unimplemented functionality Blue Swirl
2012-06-09 12:12 ` [Qemu-devel] [PATCH 5/6] fdc: use LOG_UNIMP logging Blue Swirl
2012-06-11 13:09 ` Kevin Wolf
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).