diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-10 10:29:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-10 10:29:11 +0100 |
| commit | 77d472291812cf04f97974dadbda767e59e31fde (patch) | |
| tree | 50dd98f02bd609d870d0d49460749b07a7462018 /include | |
| parent | b11365867568ba954de667a0bfe0945b8f78d6bd (diff) | |
| parent | 4daf62594d13dfca2ce3a74dd3bddee5f54d7127 (diff) | |
| download | qemu-77d472291812cf04f97974dadbda767e59e31fde.zip qemu-77d472291812cf04f97974dadbda767e59e31fde.tar.gz qemu-77d472291812cf04f97974dadbda767e59e31fde.tar.bz2 | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170707-tag' into staging
Xen 2017/07/07
# gpg: Signature made Fri 07 Jul 2017 19:21:22 BST
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg: aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20170707-tag:
xen/pt: Fixup addr validation in xen_pt_pci_config_access_check
xen-platform: Cleanup network infrastructure when emulated NICs are unplugged
xenfb: remove xen_init_display "temporary" hack
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/xen_backend.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h index 852c2ea..8a6fbcb 100644 --- a/include/hw/xen/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -55,8 +55,6 @@ extern struct XenDevOps xen_netdev_ops; /* xen_nic.c */ extern struct XenDevOps xen_usb_ops; /* xen-usb.c */ #endif -void xen_init_display(int domid); - /* configuration (aka xenbus setup) */ void xen_config_cleanup(void); int xen_config_dev_blk(DriveInfo *disk); |