diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-05-28 15:38:46 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-06-04 11:43:39 +0200 |
| commit | 57dac7ef8aeabcd17b1ceee2296917bc48ccd526 (patch) | |
| tree | 62a7cb2ca6be6c87b5f87849860a05105eda13a9 /hw/ide/qdev.c | |
| parent | 124964b54e0c50706385691142795b6e43dad817 (diff) | |
| download | focaccia-qemu-57dac7ef8aeabcd17b1ceee2296917bc48ccd526.tar.gz focaccia-qemu-57dac7ef8aeabcd17b1ceee2296917bc48ccd526.zip | |
ide: Remove redundant IDEState member conf
Commit 428c149b added IDEState member conf to let commit 0009baf1 find the BlockConf from there. It exists only for qdev drives, created via ide_drive_initfn(), not for drives created via ide_init2(). But for a qdev drive, we can just as well reach its IDEDevice, which contains the BlockConf. Do that, and revert the parts of commit 428c149b that add IDEState member conf. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/qdev.c')
| -rw-r--r-- | hw/ide/qdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index b18693d945..9ebb906cc3 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -99,8 +99,7 @@ typedef struct IDEDrive { static int ide_drive_initfn(IDEDevice *dev) { IDEBus *bus = DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); - ide_init_drive(bus->ifs + dev->unit, dev->conf.dinfo, &dev->conf, - dev->version); + ide_init_drive(bus->ifs + dev->unit, dev->conf.dinfo, dev->version); return 0; } |