ide: Remove redundant IDEState member conf
authorMarkus Armbruster <armbru@redhat.com>
Fri, 28 May 2010 13:38:46 +0000 (15:38 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 4 Jun 2010 09:43:39 +0000 (11:43 +0200)
commit31a96b5aba87c92e680aeffffa5ea28f1ca2819c
tree62a7cb2ca6be6c87b5f87849860a05105eda13a9
parenta4ee03c161e368746241c10acbcf431412ab737b
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>
hw/ide/core.c
hw/ide/internal.h
hw/ide/qdev.c