diff options
| author | Peter Maydell | 2016-02-29 12:24:36 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-29 12:24:36 +0100 |
| commit | 3ff430aa91f33388cce88d81edcad8b2ac5a7a9f (patch) | |
| tree | c1492be36a503161385a851ded731f8b8648ae32 /include/hw | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160229' into... (diff) | |
| parent | fw_cfg: unbreak migration compatibility for 2.4 and earlier machines (diff) | |
| download | qemu-3ff430aa91f33388cce88d81edcad8b2ac5a7a9f.tar.gz qemu-3ff430aa91f33388cce88d81edcad8b2ac5a7a9f.tar.xz qemu-3ff430aa91f33388cce88d81edcad8b2ac5a7a9f.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw-cfg-20160226-1' into staging
fw_cfg: unbreak migration compatibility for 2.4 and earlier machines
# gpg: Signature made Fri 26 Feb 2016 09:45:50 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-fw-cfg-20160226-1:
fw_cfg: unbreak migration compatibility for 2.4 and earlier machines
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/compat.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/hw/compat.h b/include/hw/compat.h index 2ebe739fcb..a5dbbf8984 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -42,6 +42,14 @@ .driver = "virtio-pci",\ .property = "migrate-extra",\ .value = "off",\ + },{\ + .driver = "fw_cfg_mem",\ + .property = "dma_enabled",\ + .value = "off",\ + },{\ + .driver = "fw_cfg_io",\ + .property = "dma_enabled",\ + .value = "off",\ }, #define HW_COMPAT_2_3 \ |