diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-11 15:20:29 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-11 15:20:29 +0000 |
| commit | b0a7b120a357733d9c554a1a3b125991114a1135 (patch) | |
| tree | ffbfbcd4bb19dd5b6f2e047a47668e35f715f62a | |
| parent | b01b11113c32425e888139d8e99e699f90da3a8d (diff) | |
qemu: record devfn on block driver instance (Marcelo Tosatti)
Record PCIDev on the BlockDriverState structure to locate for release
on hot-removal.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6597 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | block_int.h | 1 | ||||
| -rw-r--r-- | hw/ide.c | 6 | ||||
| -rw-r--r-- | hw/lsi53c895a.c | 2 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/block_int.h b/block_int.h index e83fd2c077..781789c9e1 100644 --- a/block_int.h +++ b/block_int.h @@ -127,6 +127,7 @@ struct BlockDriverState { int type; char device_name[32]; BlockDriverState *next; + void *private; }; struct BlockDriverAIOCB { @@ -28,6 +28,7 @@ #include "scsi-disk.h" #include "pcmcia.h" #include "block.h" +#include "block_int.h" #include "qemu-timer.h" #include "sysemu.h" #include "ppc_mac.h" @@ -3352,6 +3353,7 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn, { PCIIDEState *d; uint8_t *pci_conf; + int i; /* register a function 1 of PIIX3 */ d = (PCIIDEState *)pci_register_device(bus, "PIIX3 IDE", @@ -3378,6 +3380,10 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn, ide_init_ioport(&d->ide_if[0], 0x1f0, 0x3f6); ide_init_ioport(&d->ide_if[2], 0x170, 0x376); + for (i = 0; i < 4; i++) + if (hd_table[i]) + hd_table[i]->private = &d->dev; + register_savevm("ide", 0, 2, pci_ide_save, pci_ide_load, d); } diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index b42ab84687..6991a60325 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -13,6 +13,7 @@ #include "hw.h" #include "pci.h" #include "scsi-disk.h" +#include "block_int.h" //#define DEBUG_LSI //#define DEBUG_LSI_REG @@ -1958,6 +1959,7 @@ void lsi_scsi_attach(void *opaque, BlockDriverState *bd, int id) s->scsi_dev[id] = scsi_generic_init(bd, 1, lsi_command_complete, s); if (s->scsi_dev[id] == NULL) s->scsi_dev[id] = scsi_disk_init(bd, 1, lsi_command_complete, s); + bd->private = &s->pci_dev; } void *lsi_scsi_init(PCIBus *bus, int devfn) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index a7b1146afd..520ad1bf21 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -314,6 +314,7 @@ void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs) s->vdev.reset = virtio_blk_reset; s->bs = bs; s->rq = NULL; + bs->private = &s->vdev.pci_dev; bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); bdrv_set_geometry_hint(s->bs, cylinders, heads, secs); |