mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: Turn drive serial into a qdev property ide-drive.serial

Browse Source 
It needs to be a qdev property, because it belongs to the drive's
guest part.

Bonus: info qtree now shows the serial number.

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-01 20:32:32 +02:00 committed by Kevin Wolf
parent d21357df9a
commit 6ced55a57d
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ide/core.c
View File

@ -2596,7 +2596,8 @@ void ide_bus_reset(IDEBus *bus)
ide_clear_hob(bus); ide_clear_hob(bus);
} }
void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version) void ide_init_drive(IDEState *s, DriveInfo *dinfo,
const char *version, const char *serial)
{ {
int cylinders, heads, secs; int cylinders, heads, secs;
uint64_t nb_sectors; uint64_t nb_sectors;
@ -2618,9 +2619,9 @@ void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version)
s->is_cdrom = 1; s->is_cdrom = 1;
bdrv_set_change_cb(s->bs, cdrom_change_cb, s); bdrv_set_change_cb(s->bs, cdrom_change_cb, s);
} }
strncpy(s->drive_serial_str, drive_get_serial(s->bs), if (serial && *serial) {
sizeof(s->drive_serial_str)); strncpy(s->drive_serial_str, serial, sizeof(s->drive_serial_str));
if (!*s->drive_serial_str) { } else {
snprintf(s->drive_serial_str, sizeof(s->drive_serial_str), snprintf(s->drive_serial_str, sizeof(s->drive_serial_str),
"QM%05d", s->drive_serial); "QM%05d", s->drive_serial);
} }
@ -2669,7 +2670,7 @@ 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, NULL); ide_init_drive(&bus->ifs[i], dinfo, NULL, dinfo->serial);
} else { } else {
ide_reset(&bus->ifs[i]); ide_reset(&bus->ifs[i]);
} }

4
hw/ide/internal.h
View File

@ -457,6 +457,7 @@ struct IDEDevice {
uint32_t unit; uint32_t unit;
BlockConf conf; BlockConf conf;
char *version; char *version;
char *serial;
}; };
typedef int (*ide_qdev_initfn)(IDEDevice *dev); typedef int (*ide_qdev_initfn)(IDEDevice *dev);
@ -554,7 +555,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, DriveInfo *dinfo, const char *version); void ide_init_drive(IDEState *s, DriveInfo *dinfo,
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);

16
hw/ide/qdev.c
View File

@ -99,7 +99,20 @@ 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->version); IDEState *s = bus->ifs + dev->unit;
const char *serial;
serial = dev->serial;
if (!serial) {
/* try to fall back to value set with legacy -drive serial=... */
serial = dev->conf.dinfo->serial;
}
ide_init_drive(s, dev->conf.dinfo, dev->version, serial);
if (!dev->serial) {
dev->serial = qemu_strdup(s->drive_serial_str);
}
return 0; return 0;
} }
@ -111,6 +124,7 @@ static IDEDeviceInfo ide_drive_info = {
DEFINE_PROP_UINT32("unit", IDEDrive, dev.unit, -1), DEFINE_PROP_UINT32("unit", IDEDrive, dev.unit, -1),
DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf), DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),
DEFINE_PROP_STRING("ver", IDEDrive, dev.version), DEFINE_PROP_STRING("ver", IDEDrive, dev.version),
DEFINE_PROP_STRING("serial", IDEDrive, dev.serial),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
} }
}; };