ahci: Add migration support
Jason tested these patches by migrating Windows 7 and Fedora 17 guests (while under I/O) on both piix with ahci attached and on q35 (which has a built-in AHCI controller). Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
4ac557c89b
commit
a26230218d
|
@ -1199,6 +1199,82 @@ void ahci_reset(AHCIState *s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const VMStateDescription vmstate_ahci_device = {
|
||||||
|
.name = "ahci port",
|
||||||
|
.version_id = 1,
|
||||||
|
.fields = (VMStateField []) {
|
||||||
|
VMSTATE_IDE_BUS(port, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_state, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(finished, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.lst_addr, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.lst_addr_hi, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.fis_addr, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.fis_addr_hi, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.irq_stat, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.irq_mask, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.cmd, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.tfdata, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.sig, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.scr_stat, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.scr_ctl, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.scr_err, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.scr_act, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(port_regs.cmd_issue, AHCIDevice),
|
||||||
|
VMSTATE_BOOL(done_atapi_packet, AHCIDevice),
|
||||||
|
VMSTATE_INT32(busy_slot, AHCIDevice),
|
||||||
|
VMSTATE_BOOL(init_d2h_sent, AHCIDevice),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static int ahci_state_post_load(void *opaque, int version_id)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
struct AHCIDevice *ad;
|
||||||
|
AHCIState *s = opaque;
|
||||||
|
|
||||||
|
for (i = 0; i < s->ports; i++) {
|
||||||
|
ad = &s->dev[i];
|
||||||
|
AHCIPortRegs *pr = &ad->port_regs;
|
||||||
|
|
||||||
|
map_page(&ad->lst,
|
||||||
|
((uint64_t)pr->lst_addr_hi << 32) | pr->lst_addr, 1024);
|
||||||
|
map_page(&ad->res_fis,
|
||||||
|
((uint64_t)pr->fis_addr_hi << 32) | pr->fis_addr, 256);
|
||||||
|
/*
|
||||||
|
* All pending i/o should be flushed out on a migrate. However,
|
||||||
|
* we might not have cleared the busy_slot since this is done
|
||||||
|
* in a bh. Also, issue i/o against any slots that are pending.
|
||||||
|
*/
|
||||||
|
if ((ad->busy_slot != -1) &&
|
||||||
|
!(ad->port.ifs[0].status & (BUSY_STAT|DRQ_STAT))) {
|
||||||
|
pr->cmd_issue &= ~(1 << ad->busy_slot);
|
||||||
|
ad->busy_slot = -1;
|
||||||
|
}
|
||||||
|
check_cmd(s, i);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const VMStateDescription vmstate_ahci = {
|
||||||
|
.name = "ahci",
|
||||||
|
.version_id = 1,
|
||||||
|
.post_load = ahci_state_post_load,
|
||||||
|
.fields = (VMStateField []) {
|
||||||
|
VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports,
|
||||||
|
vmstate_ahci_device, AHCIDevice),
|
||||||
|
VMSTATE_UINT32(control_regs.cap, AHCIState),
|
||||||
|
VMSTATE_UINT32(control_regs.ghc, AHCIState),
|
||||||
|
VMSTATE_UINT32(control_regs.irqstatus, AHCIState),
|
||||||
|
VMSTATE_UINT32(control_regs.impl, AHCIState),
|
||||||
|
VMSTATE_UINT32(control_regs.version, AHCIState),
|
||||||
|
VMSTATE_UINT32(idp_index, AHCIState),
|
||||||
|
VMSTATE_INT32(ports, AHCIState),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
typedef struct SysbusAHCIState {
|
typedef struct SysbusAHCIState {
|
||||||
SysBusDevice busdev;
|
SysBusDevice busdev;
|
||||||
AHCIState ahci;
|
AHCIState ahci;
|
||||||
|
@ -1207,7 +1283,11 @@ typedef struct SysbusAHCIState {
|
||||||
|
|
||||||
static const VMStateDescription vmstate_sysbus_ahci = {
|
static const VMStateDescription vmstate_sysbus_ahci = {
|
||||||
.name = "sysbus-ahci",
|
.name = "sysbus-ahci",
|
||||||
.unmigratable = 1,
|
.unmigratable = 1, /* Still buggy under I/O load */
|
||||||
|
.fields = (VMStateField []) {
|
||||||
|
VMSTATE_AHCI(ahci, AHCIPCIState),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void sysbus_ahci_reset(DeviceState *dev)
|
static void sysbus_ahci_reset(DeviceState *dev)
|
||||||
|
|
|
@ -305,6 +305,16 @@ typedef struct AHCIPCIState {
|
||||||
AHCIState ahci;
|
AHCIState ahci;
|
||||||
} AHCIPCIState;
|
} AHCIPCIState;
|
||||||
|
|
||||||
|
extern const VMStateDescription vmstate_ahci;
|
||||||
|
|
||||||
|
#define VMSTATE_AHCI(_field, _state) { \
|
||||||
|
.name = (stringify(_field)), \
|
||||||
|
.size = sizeof(AHCIState), \
|
||||||
|
.vmsd = &vmstate_ahci, \
|
||||||
|
.flags = VMS_STRUCT, \
|
||||||
|
.offset = vmstate_offset_value(_state, _field, AHCIState), \
|
||||||
|
}
|
||||||
|
|
||||||
typedef struct NCQFrame {
|
typedef struct NCQFrame {
|
||||||
uint8_t fis_type;
|
uint8_t fis_type;
|
||||||
uint8_t c;
|
uint8_t c;
|
||||||
|
|
14
hw/ide/ich.c
14
hw/ide/ich.c
|
@ -79,9 +79,15 @@
|
||||||
#define ICH9_IDP_INDEX 0x10
|
#define ICH9_IDP_INDEX 0x10
|
||||||
#define ICH9_IDP_INDEX_LOG2 0x04
|
#define ICH9_IDP_INDEX_LOG2 0x04
|
||||||
|
|
||||||
static const VMStateDescription vmstate_ahci = {
|
static const VMStateDescription vmstate_ich9_ahci = {
|
||||||
.name = "ahci",
|
.name = "ich9_ahci",
|
||||||
.unmigratable = 1,
|
.unmigratable = 1, /* Still buggy under I/O load */
|
||||||
|
.version_id = 1,
|
||||||
|
.fields = (VMStateField []) {
|
||||||
|
VMSTATE_PCI_DEVICE(card, AHCIPCIState),
|
||||||
|
VMSTATE_AHCI(ahci, AHCIPCIState),
|
||||||
|
VMSTATE_END_OF_LIST()
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static void pci_ich9_reset(DeviceState *dev)
|
static void pci_ich9_reset(DeviceState *dev)
|
||||||
|
@ -152,7 +158,7 @@ static void ich_ahci_class_init(ObjectClass *klass, void *data)
|
||||||
k->device_id = PCI_DEVICE_ID_INTEL_82801IR;
|
k->device_id = PCI_DEVICE_ID_INTEL_82801IR;
|
||||||
k->revision = 0x02;
|
k->revision = 0x02;
|
||||||
k->class_id = PCI_CLASS_STORAGE_SATA;
|
k->class_id = PCI_CLASS_STORAGE_SATA;
|
||||||
dc->vmsd = &vmstate_ahci;
|
dc->vmsd = &vmstate_ich9_ahci;
|
||||||
dc->reset = pci_ich9_reset;
|
dc->reset = pci_ich9_reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue