[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] ide: Improve error messages
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 07/11] ide: Improve error messages |
Date: |
Wed, 30 Jun 2010 13:55:38 +0200 |
Use error_report(), because it points to the error location.
Reword "tried to assign twice" messages to make it clear that we're
complaining about the unit property.
Report invalid unit property instead of failing silently.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ide/qdev.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 2977a16..221f387 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -18,7 +18,7 @@
*/
#include <hw/hw.h>
#include "dma.h"
-
+#include "qemu-error.h"
#include <hw/ide/internal.h>
/* --------------------------------- */
@@ -40,7 +40,7 @@ static int ide_qdev_init(DeviceState *qdev, DeviceInfo *base)
IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev->parent_bus);
if (!dev->conf.bs) {
- fprintf(stderr, "%s: no drive specified\n", qdev->info->name);
+ error_report("No drive specified");
goto err;
}
if (dev->unit == -1) {
@@ -49,19 +49,20 @@ static int ide_qdev_init(DeviceState *qdev, DeviceInfo
*base)
switch (dev->unit) {
case 0:
if (bus->master) {
- fprintf(stderr, "ide: tried to assign master twice\n");
+ error_report("IDE unit %d is in use", dev->unit);
goto err;
}
bus->master = dev;
break;
case 1:
if (bus->slave) {
- fprintf(stderr, "ide: tried to assign slave twice\n");
+ error_report("IDE unit %d is in use", dev->unit);
goto err;
}
bus->slave = dev;
break;
default:
+ error_report("Invalid IDE unit %d", dev->unit);
goto err;
}
return info->init(dev);
--
1.6.6.1
- [Qemu-devel] [PATCH 00/11] Still more block related fixes and cleanups, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 02/11] block migration: Fix test for read-only drive, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 01/11] blockdev: Clean up how readonly persists across virtual media change, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 10/11] ide: Reject readonly drives unless CD-ROM, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 07/11] ide: Improve error messages,
Markus Armbruster <=
- [Qemu-devel] [PATCH 03/11] raw-posix: Don't "try harder" for BDRV_TYPE_CDROM, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 08/11] ide: Replace IDEState members is_cdrom, is_cf by drive_kind, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 09/11] ide: Make ide_init_drive() return success, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 05/11] fdc: Reject unimplemented error actions, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 11/11] ide: Reject invalid CHS geometry, Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 06/11] qdev: Don't hw_error() in qdev_init_nofail(), Markus Armbruster, 2010/06/30
- [Qemu-devel] [PATCH 04/11] scsi: Reject unimplemented error actions, Markus Armbruster, 2010/06/30