ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qxl: switch to constants within BUILD_BUG_ON 

We are switching BUILD_BUG_ON to verify that it's parameter is a
compile-time constant, and it turns out that some gcc versions
(specifically gcc (Ubuntu 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609) are
not smart enough to figure it out for expressions involving local
variables. This is harmless but means that the check is ineffective for
these platforms.  To fix, replace variables with macros.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2017-01-25 23:48:51 +02:00
parent f298318284
commit df45892c12
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/display/qxl.c
View File

@ -306,12 +306,11 @@ void qxl_spice_reset_cursor(PCIQXLDevice *qxl)
static ram_addr_t qxl_rom_size(void) static ram_addr_t qxl_rom_size(void)
{ {
uint32_t required_rom_size = sizeof(QXLRom) + sizeof(QXLModes) + #define QXL_REQUIRED_SZ (sizeof(QXLRom) + sizeof(QXLModes) + sizeof(qxl_modes))
sizeof(qxl_modes); #define QXL_ROM_SZ 8192
uint32_t rom_size = 8192; /* two pages */
QEMU_BUILD_BUG_ON(required_rom_size > rom_size); QEMU_BUILD_BUG_ON(QXL_REQUIRED_SZ > QXL_ROM_SZ);
return rom_size; return QXL_ROM_SZ;
} }
static void init_qxl_rom(PCIQXLDevice *d) static void init_qxl_rom(PCIQXLDevice *d)