summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarc MarĂ­ <markmb@redhat.com>2016-05-23 19:11:33 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-07-14 15:50:52 +0200
commitb2a575a1c652904600869e774e45bf4c9ed72c55 (patch)
tree8e513030be9a11c9bc6d971812a01d2e8d1725ef /include
parenta91a4e7d8cfe6ece610aacf7c52738188f5b5cb5 (diff)
downloadqemu-b2a575a1c652904600869e774e45bf4c9ed72c55.tar.gz
qemu-b2a575a1c652904600869e774e45bf4c9ed72c55.tar.bz2
qemu-b2a575a1c652904600869e774e45bf4c9ed72c55.zip
Add optionrom compatible with fw_cfg DMA version
This optionrom is based on linuxboot.S. Signed-off-by: Marc MarĂ­ <markmb@redhat.com> Signed-off-by: Richard W.M. Jones <rjones@redhat.com> Message-Id: <1464027093-24073-2-git-send-email-rjones@redhat.com> [Add -fno-toplevel-reorder, support clang without -m16. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/hw/i386/pc.h4
-rw-r--r--include/hw/nvram/fw_cfg.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 21235322fd..e38c95a4da 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -366,6 +366,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
#define PC_COMPAT_2_6 \
HW_COMPAT_2_6 \
{\
+ .driver = "fw_cfg_io",\
+ .property = "dma_enabled",\
+ .value = "off",\
+ },{\
.driver = TYPE_X86_CPU,\
.property = "cpuid-0xb",\
.value = "off",\
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index d00811258d..5c27a1f0d5 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -182,5 +182,6 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
hwaddr dma_addr, AddressSpace *dma_as);
FWCfgState *fw_cfg_find(void);
+bool fw_cfg_dma_enabled(void *opaque);
#endif