diff options
| author | Peter Maydell | 2020-11-16 16:33:05 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-11-16 16:33:05 +0100 |
| commit | f41ae328ba1519147c5083cb96137c86e8659c61 (patch) | |
| tree | 4d9cdc00593e005585db3800411eb0b391361a4b /include/hw/xen/xen.h | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20201116-pull-request... (diff) | |
| parent | .gitlab-ci.d/check-patch: tweak output for CI logs (diff) | |
| download | qemu-f41ae328ba1519147c5083cb96137c86e8659c61.tar.gz qemu-f41ae328ba1519147c5083cb96137c86e8659c61.tar.xz qemu-f41ae328ba1519147c5083cb96137c86e8659c61.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-misc-161120-1' into staging
Various fixes
- fix resource leak in a couple of plugin
- fix build of Xen enabled i386 image on Aarch64
- maybe unitialized warning fix
- disable unstable Spartan-3A acceptance test
- terser output of gitlab checkpatch check
# gpg: Signature made Mon 16 Nov 2020 11:11:05 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-and-misc-161120-1:
.gitlab-ci.d/check-patch: tweak output for CI logs
tests/acceptance: Disable Spartan-3A DSP 1800A test
hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off
accel/stubs: drop unused cpu.h include
stubs/xen-hw-stub: drop xenstore_store_pv_console_info stub
include/hw/xen.h: drop superfluous struct
meson.build: fix building of Xen support for aarch64
plugins: Fix two resource leaks in setup_socket()
plugins: Fix resource leak in connect_socket()
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 1406648ca5..0f9962b1c1 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -28,7 +28,7 @@ int xen_is_pirq_msi(uint32_t msi_data); qemu_irq *xen_interrupt_controller_init(void); -void xenstore_store_pv_console_info(int i, struct Chardev *chr); +void xenstore_store_pv_console_info(int i, Chardev *chr); void xen_register_framebuffer(struct MemoryRegion *mr); |