diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-12 17:36:12 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-12 17:36:12 +0000 |
| commit | a5af12871fd4601c44f08d9e49131e9ca13ef102 (patch) | |
| tree | 8fbce807434fa43e8ce83db79841e0ea5beebdda /include/hw/xen/xen.h | |
| parent | fc1ec1acffd29d54c0c4266d30d38b2399d42f4f (diff) | |
| parent | 47d3df2387ed6927732584ffa4159c26d9f4dee8 (diff) | |
| download | focaccia-qemu-a5af12871fd4601c44f08d9e49131e9ca13ef102.tar.gz focaccia-qemu-a5af12871fd4601c44f08d9e49131e9ca13ef102.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2016-02-12' into staging
Xen 2016-02-12 # gpg: Signature made Fri 12 Feb 2016 17:28:09 GMT using RSA key ID 70E1AE90 # gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>" * remotes/sstabellini/tags/xen-2016-02-12: xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2 xen: move xenforeignmemory compat layer into common place xen: drop XenXC and associated interface wrappers xen: drop xen_xc_hvm_inject_msi wrapper xen: drop support for Xen 4.1 and older. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/xen/xen.h')
| -rw-r--r-- | include/hw/xen/xen.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index c57735419c..df334818c1 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -48,8 +48,4 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length); void xen_register_framebuffer(struct MemoryRegion *mr); -#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400 -# define HVM_MAX_VCPUS 32 -#endif - #endif /* QEMU_HW_XEN_H */ |