ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ide: Make ide_init_drive() return success 

It still always succeeds.  The next commits will add failures.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2010-06-28 19:07:51 +02:00 committed by Kevin Wolf
parent cd8722bb22
commit c4d74df726
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/ide/core.c
View File

@ -26,6 +26,7 @@
#include <hw/pc.h> #include <hw/pc.h>
#include <hw/pci.h> #include <hw/pci.h>
#include <hw/scsi.h> #include <hw/scsi.h>
#include "qemu-error.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "sysemu.h" #include "sysemu.h"
#include "dma.h" #include "dma.h"
@ -2594,8 +2595,8 @@ void ide_bus_reset(IDEBus *bus)
ide_clear_hob(bus); ide_clear_hob(bus);
} }
void ide_init_drive(IDEState *s, BlockDriverState *bs, int ide_init_drive(IDEState *s, BlockDriverState *bs,
const char *version, const char *serial) const char *version, const char *serial)
{ {
int cylinders, heads, secs; int cylinders, heads, secs;
uint64_t nb_sectors; uint64_t nb_sectors;
@ -2630,6 +2631,7 @@ void ide_init_drive(IDEState *s, BlockDriverState *bs,
} }
ide_reset(s); ide_reset(s);
bdrv_set_removable(bs, s->drive_kind == IDE_CD); bdrv_set_removable(bs, s->drive_kind == IDE_CD);
return 0;
} }
static void ide_init1(IDEBus *bus, int unit) 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; dinfo = i == 0 ? hd0 : hd1;
ide_init1(bus, i); ide_init1(bus, i);
if (dinfo) { if (dinfo) {
ide_init_drive(&bus->ifs[i], dinfo->bdrv, NULL, if (ide_init_drive(&bus->ifs[i], dinfo->bdrv, NULL,
*dinfo->serial ? dinfo->serial : NULL); *dinfo->serial ? dinfo->serial : NULL) < 0) {
error_report("Can't set up IDE drive %s", dinfo->id);
exit(1);
}
} else { } else {
ide_reset(&bus->ifs[i]); ide_reset(&bus->ifs[i]);
} }

4
hw/ide/internal.h
View File

@ -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); void ide_data_writel(void *opaque, uint32_t addr, uint32_t val);
uint32_t ide_data_readl(void *opaque, uint32_t addr); uint32_t ide_data_readl(void *opaque, uint32_t addr);
void ide_init_drive(IDEState *s, BlockDriverState *bs, int ide_init_drive(IDEState *s, BlockDriverState *bs,
const char *version, const char *serial); const char *version, const char *serial);
void ide_init2(IDEBus *bus, qemu_irq irq); void ide_init2(IDEBus *bus, qemu_irq irq);
void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
DriveInfo *hd1, qemu_irq irq); DriveInfo *hd1, qemu_irq irq);

4
hw/ide/qdev.c
View File

@ -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) { if (!dev->version) {
dev->version = qemu_strdup(s->version); dev->version = qemu_strdup(s->version);