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

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>
This commit is contained in:
Markus Armbruster 2010-05-28 15:38:46 +02:00 committed by Kevin Wolf
parent 124964b54e
commit 57dac7ef8a
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/ide/core.c
View File

@ -98,6 +98,7 @@ static void ide_identify(IDEState *s)
{ {
uint16_t *p; uint16_t *p;
unsigned int oldsize; unsigned int oldsize;
IDEDevice *dev;
if (s->identify_set) { if (s->identify_set) {
memcpy(s->io_buffer, s->identify_data, sizeof(s->identify_data)); memcpy(s->io_buffer, s->identify_data, sizeof(s->identify_data));
@ -165,8 +166,9 @@ static void ide_identify(IDEState *s)
put_le16(p + 101, s->nb_sectors >> 16); put_le16(p + 101, s->nb_sectors >> 16);
put_le16(p + 102, s->nb_sectors >> 32); put_le16(p + 102, s->nb_sectors >> 32);
put_le16(p + 103, s->nb_sectors >> 48); put_le16(p + 103, s->nb_sectors >> 48);
if (s->conf && s->conf->physical_block_size) dev = s->unit ? s->bus->slave : s->bus->master;
put_le16(p + 106, 0x6000 | get_physical_block_exp(s->conf)); if (dev && dev->conf.physical_block_size)
put_le16(p + 106, 0x6000 | get_physical_block_exp(&dev->conf));
memcpy(s->identify_data, p, sizeof(s->identify_data)); memcpy(s->identify_data, p, sizeof(s->identify_data));
s->identify_set = 1; s->identify_set = 1;
@ -2594,8 +2596,7 @@ void ide_bus_reset(IDEBus *bus)
ide_clear_hob(bus); ide_clear_hob(bus);
} }
void ide_init_drive(IDEState *s, DriveInfo *dinfo, BlockConf *conf, void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version)
const char *version)
{ {
int cylinders, heads, secs; int cylinders, heads, secs;
uint64_t nb_sectors; uint64_t nb_sectors;
@ -2620,9 +2621,6 @@ void ide_init_drive(IDEState *s, DriveInfo *dinfo, BlockConf *conf,
} }
strncpy(s->drive_serial_str, drive_get_serial(s->bs), strncpy(s->drive_serial_str, drive_get_serial(s->bs),
sizeof(s->drive_serial_str)); sizeof(s->drive_serial_str));
if (conf) {
s->conf = conf;
}
} }
if (strlen(s->drive_serial_str) == 0) if (strlen(s->drive_serial_str) == 0)
snprintf(s->drive_serial_str, sizeof(s->drive_serial_str), snprintf(s->drive_serial_str, sizeof(s->drive_serial_str),
@ -2653,9 +2651,9 @@ void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,
s->sector_write_timer = qemu_new_timer(vm_clock, s->sector_write_timer = qemu_new_timer(vm_clock,
ide_sector_write_timer_cb, s); ide_sector_write_timer_cb, s);
if (i == 0) if (i == 0)
ide_init_drive(s, hd0, NULL, NULL); ide_init_drive(s, hd0, NULL);
if (i == 1) if (i == 1)
ide_init_drive(s, hd1, NULL, NULL); ide_init_drive(s, hd1, NULL);
} }
bus->irq = irq; bus->irq = irq;
} }

4
hw/ide/internal.h
View File

@ -398,7 +398,6 @@ struct IDEState {
/* set for lba48 access */ /* set for lba48 access */
uint8_t lba48; uint8_t lba48;
BlockDriverState *bs; BlockDriverState *bs;
BlockConf *conf;
char version[9]; char version[9];
/* ATAPI specific */ /* ATAPI specific */
uint8_t sense_key; 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); 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, DriveInfo *dinfo, BlockConf *conf, void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version);
const char *version);
void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,
qemu_irq irq); qemu_irq irq);
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); void ide_init_ioport(IDEBus *bus, int iobase, int iobase2);

3
hw/ide/qdev.c
View File

@ -99,8 +99,7 @@ typedef struct IDEDrive {
static int ide_drive_initfn(IDEDevice *dev) static int ide_drive_initfn(IDEDevice *dev)
{ {
IDEBus *bus = DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); IDEBus *bus = DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus);
ide_init_drive(bus->ifs + dev->unit, dev->conf.dinfo, &dev->conf, ide_init_drive(bus->ifs + dev->unit, dev->conf.dinfo, dev->version);
dev->version);
return 0; return 0;
} }