405ca57e69
- Include upstream patches targeted for the next stable release (bug fixes only) audio-oss-fix-buffer-pos-calculation.patch blkdebug-Allow-taking-unsharing-permissi.patch block-Add-bdrv_qapi_perm_to_blk_perm.patch block-backup-top-fix-failure-path.patch block-block-copy-fix-progress-calculatio.patch block-fix-crash-on-zero-length-unaligned.patch block-fix-memleaks-in-bdrv_refresh_filen.patch block-Fix-VM-size-field-width-in-snapsho.patch block-nbd-extract-the-common-cleanup-cod.patch block-nbd-fix-memory-leak-in-nbd_open.patch block-qcow2-threads-fix-qcow2_decompress.patch hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch iotests-add-test-for-backup-top-failure-.patch iotests-Fix-nonportable-use-of-od-endian.patch job-refactor-progress-to-separate-object.patch target-arm-Correct-definition-of-PMCRDP.patch target-arm-fix-TCG-leak-for-fcvt-half-do.patch tpm-ppi-page-align-PPI-RAM.patch vhost-user-blk-delete-virtioqueues-in-un.patch virtio-add-ability-to-delete-vq-through-.patch virtio-crypto-do-delete-ctrl_vq-in-virti.patch virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch - Add Obsoletes directive for qemu-audio-sdl and qemu-ui-sdl since for a qemu package upgrade from SLE12-SP5, support for SDL is dropped OBS-URL: https://build.opensuse.org/request/show/784401 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=534
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Fri, 3 Jan 2020 11:39:59 +0400
|
|
Subject: tpm-ppi: page-align PPI RAM
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 71e415c8a75c130875f14d6b2136825789feb297
|
|
|
|
post-copy migration fails on destination with error such as:
|
|
2019-12-26T10:22:44.714644Z qemu-kvm: ram_block_discard_range:
|
|
Unaligned start address: 0x559d2afae9a0
|
|
|
|
Use qemu_memalign() to constrain the PPI RAM memory alignment.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Message-id: 20200103074000.1006389-3-marcandre.lureau@redhat.com
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/tpm/tpm_ppi.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
|
|
index ff314592b497b36853494c9600d7..6d9c1a3e40ee6f76d0b582d13f5b 100644
|
|
--- a/hw/tpm/tpm_ppi.c
|
|
+++ b/hw/tpm/tpm_ppi.c
|
|
@@ -43,7 +43,8 @@ void tpm_ppi_reset(TPMPPI *tpmppi)
|
|
void tpm_ppi_init(TPMPPI *tpmppi, struct MemoryRegion *m,
|
|
hwaddr addr, Object *obj)
|
|
{
|
|
- tpmppi->buf = g_malloc0(HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE));
|
|
+ tpmppi->buf = qemu_memalign(qemu_real_host_page_size,
|
|
+ HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE));
|
|
memory_region_init_ram_device_ptr(&tpmppi->ram, obj, "tpm-ppi",
|
|
TPM_PPI_ADDR_SIZE, tpmppi->buf);
|
|
vmstate_register_ram(&tpmppi->ram, DEVICE(obj));
|