From patchwork Wed Jan 16 17:59:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,2/2] qxl: change rom size to 8192 Date: Wed, 16 Jan 2013 07:59:30 -0000 From: Alon Levy X-Patchwork-Id: 212903 Message-Id: <1358359170-19271-3-git-send-email-alevy@redhat.com> To: qemu-devel@nongnu.org Cc: kraxel@redhat.com This is a simpler solution to 869981, where migration breaks since qxl's rom bar size has changed. Instead of ignoring fields in QXLRom, which is what has actually changed, we remove some of the modes, a mechanism already accounted for by the guest. Added assert so that rom size will fit the future QXLRom increases via spice-protocol changes. Signed-off-by: Alon Levy --- hw/qxl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 0d81816..0cd854a 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -79,10 +79,7 @@ QXL_MODE(x_res, y_res, 32, orientation) #define QXL_MODE_EX(x_res, y_res) \ - QXL_MODE_16_32(x_res, y_res, 0), \ - QXL_MODE_16_32(y_res, x_res, 1), \ - QXL_MODE_16_32(x_res, y_res, 2), \ - QXL_MODE_16_32(y_res, x_res, 3) + QXL_MODE_16_32(x_res, y_res, 0) static QXLMode qxl_modes[] = { QXL_MODE_EX(640, 480), @@ -306,10 +303,13 @@ static inline uint32_t msb_mask(uint32_t val) static ram_addr_t qxl_rom_size(void) { - uint32_t rom_size = sizeof(QXLRom) + sizeof(QXLModes) + sizeof(qxl_modes); + uint32_t required_rom_size = sizeof(QXLRom) + sizeof(QXLModes) + + sizeof(qxl_modes); + uint32_t rom_size = 8192; /* two pages */ - rom_size = MAX(rom_size, TARGET_PAGE_SIZE); - rom_size = msb_mask(rom_size * 2 - 1); + required_rom_size = MAX(required_rom_size, TARGET_PAGE_SIZE); + required_rom_size = msb_mask(required_rom_size * 2 - 1); + assert(required_rom_size <= rom_size); return rom_size; }