diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-16 11:06:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-16 11:06:06 +0100 |
| commit | 0bbac62618356794097b99a9b8b7634357170b03 (patch) | |
| tree | 3861bb55883487e6d57385ee750d675c6e37c27e /hw/ide/ich.c | |
| parent | 06a59afac4505f5ed942db4200e5ca16fcbba74d (diff) | |
| parent | db80facefa62dff42bb50c73b0f03eda5f732b49 (diff) | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140616' into staging
migration/next for 20140616
# gpg: Signature made Mon 16 Jun 2014 04:10:18 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140616:
migration: catch unknown flags in ram_load
rdma: Fix block during rdma migration
migration: Increase default max_downtime from 30ms to 300ms
vmstate: Refactor opening of files
savevm: Remove all the unneeded version_minimum_id_old (x86)
savevm: Remove all the unneeded version_minimum_id_old (ppc)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/ich.c')
| -rw-r--r-- | hw/ide/ich.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 1c7c05810d..a2f1639310 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -83,7 +83,7 @@ static const VMStateDescription vmstate_ich9_ahci = { .name = "ich9_ahci", .unmigratable = 1, /* Still buggy under I/O load */ .version_id = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, AHCIPCIState), VMSTATE_AHCI(ahci, AHCIPCIState), VMSTATE_END_OF_LIST() |