]> git.proxmox.com Git - mirror_qemu.git/commit
ivshmem: Fix 64 bit memory bar configuration
authorZhuang Yanying <ann.zhuangyanying@huawei.com>
Thu, 17 Nov 2016 12:31:03 +0000 (20:31 +0800)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 12 Dec 2016 23:49:41 +0000 (17:49 -0600)
commit353801cde4e1e98cc1e2790f92cf934adac9f7dd
tree835ce00466d856c43892d2c6d8a2c9d93a896656
parentc8a3159df41f1da9f8b25b9d6387cd1b78b0f4b2
ivshmem: Fix 64 bit memory bar configuration

Device ivshmem property use64=0 is designed to make the device
expose a 32 bit shared memory BAR instead of 64 bit one.  The
default is a 64 bit BAR, except pc-1.2 and older retain a 32 bit
BAR.  A 32 bit BAR can support only up to 1 GiB of shared memory.

This worked as designed until commit 5400c02 accidentally flipped
its sense: since then, we misinterpret use64=0 as use64=1 and vice
versa.  Worse, the default got flipped as well.  Devices
ivshmem-plain and ivshmem-doorbell are not affected.

Fix by restoring the test of IVShmemState member not_legacy_32bit
that got messed up in commit 5400c02.  Also update its
initialization for devices ivhsmem-plain and ivshmem-doorbell.
Without that, they'd regress to 32 bit BARs.

Cc: qemu-stable@nongnu.org
Signed-off-by: Zhuang Yanying <ann.zhuangyanying@huawei.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
(cherry picked from commit be4e0d737527d8670dc271712faae0de6a181b4e)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/misc/ivshmem.c