Patchwork [v2,2/2] qxl: change rom size to 8192

login
register
mail settings
Submitter Alon Levy
Date Jan. 16, 2013, 5:59 p.m.
Message ID <1358359170-19271-3-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/212903/
State New
Headers show

Comments

Alon Levy - Jan. 16, 2013, 5:59 p.m.
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 <alevy@redhat.com>
---
 hw/qxl.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Patch

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;
 }