[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/13] ide: Make ide_init_drive() return success
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 11/13] ide: Make ide_init_drive() return success |
Date: |
Tue, 6 Jul 2010 14:08:54 +0200 |
It still always succeeds. The next commits will add failures.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ide/core.c | 13 +++++++++----
hw/ide/internal.h | 4 ++--
hw/ide/qdev.c | 4 +++-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 58b88ee..dbb7acc 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -26,6 +26,7 @@
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/scsi.h>
+#include "qemu-error.h"
#include "qemu-timer.h"
#include "sysemu.h"
#include "dma.h"
@@ -2594,8 +2595,8 @@ void ide_bus_reset(IDEBus *bus)
ide_clear_hob(bus);
}
-void ide_init_drive(IDEState *s, BlockDriverState *bs,
- const char *version, const char *serial)
+int ide_init_drive(IDEState *s, BlockDriverState *bs,
+ const char *version, const char *serial)
{
int cylinders, heads, secs;
uint64_t nb_sectors;
@@ -2630,6 +2631,7 @@ void ide_init_drive(IDEState *s, BlockDriverState *bs,
}
ide_reset(s);
bdrv_set_removable(bs, s->drive_kind == IDE_CD);
+ return 0;
}
static void ide_init1(IDEBus *bus, int unit)
@@ -2669,8 +2671,11 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus,
DriveInfo *hd0,
dinfo = i == 0 ? hd0 : hd1;
ide_init1(bus, i);
if (dinfo) {
- ide_init_drive(&bus->ifs[i], dinfo->bdrv, NULL,
- *dinfo->serial ? dinfo->serial : NULL);
+ if (ide_init_drive(&bus->ifs[i], dinfo->bdrv, NULL,
+ *dinfo->serial ? dinfo->serial : NULL) < 0) {
+ error_report("Can't set up IDE drive %s", dinfo->id);
+ exit(1);
+ }
} else {
ide_reset(&bus->ifs[i]);
}
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index bd53660..4165543 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -556,8 +556,8 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr);
void ide_data_writel(void *opaque, uint32_t addr, uint32_t val);
uint32_t ide_data_readl(void *opaque, uint32_t addr);
-void ide_init_drive(IDEState *s, BlockDriverState *bs,
- const char *version, const char *serial);
+int ide_init_drive(IDEState *s, BlockDriverState *bs,
+ const char *version, const char *serial);
void ide_init2(IDEBus *bus, qemu_irq irq);
void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
DriveInfo *hd1, qemu_irq irq);
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 221f387..53468ed 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -118,7 +118,9 @@ static int ide_drive_initfn(IDEDevice *dev)
}
}
- ide_init_drive(s, dev->conf.bs, dev->version, serial);
+ if (ide_init_drive(s, dev->conf.bs, dev->version, serial) < 0) {
+ return -1;
+ }
if (!dev->version) {
dev->version = qemu_strdup(s->version);
--
1.6.6.1
- [Qemu-devel] [PATCH v2 00/13] Still more block related fixes and cleanups, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 08/13] scsi: Error locations for -drive if=scsi device initialization, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 12/13] ide: Reject readonly drives unless CD-ROM, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 13/13] ide: Reject invalid CHS geometry, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 10/13] ide: Replace IDEState members is_cdrom, is_cf by drive_kind, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 11/13] ide: Make ide_init_drive() return success,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 07/13] error: New qemu_opts_loc_restore(), Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 09/13] ide: Improve error messages, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 04/13] fdc: Reject unimplemented error actions, Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 05/13] qdev: Don't hw_error() in qdev_init_nofail(), Markus Armbruster, 2010/07/06
- [Qemu-devel] [PATCH v2 01/13] blockdev: Clean up how readonly persists across virtual media change, Markus Armbruster, 2010/07/06