From 57dac7ef8aeabcd17b1ceee2296917bc48ccd526 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 28 May 2010 15:38:46 +0200 Subject: 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 Signed-off-by: Kevin Wolf --- hw/ide/internal.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/ide/internal.h') diff --git a/hw/ide/internal.h b/hw/ide/internal.h index b4554cee32..cf7101924d 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -398,7 +398,6 @@ struct IDEState { /* set for lba48 access */ uint8_t lba48; BlockDriverState *bs; - BlockConf *conf; char version[9]; /* ATAPI specific */ uint8_t sense_key; @@ -555,8 +554,7 @@ 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, DriveInfo *dinfo, BlockConf *conf, - const char *version); +void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version); void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq); void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); -- cgit 1.4.1