From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 13 Apr 2016 08:13:16 +0000 (+0200)
Subject: QXL: fix reloading of vram64 attribute
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=de0b091ae08a38b13ea62b806e28666c51da198e;p=libvirt.git

QXL: fix reloading of vram64 attribute

Commit b4a5fd95 introduced vram64 attribute for QXL video device but
there were two issues.  Only function
qemuMonitorJSONUpdateVideoVram64Size should update the vram64 attribute
and also the value is in MiB, not in B.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 64827c342d..585b8822dc 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1483,17 +1483,6 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon,
         }
         video->vram = prop.val.ul / 1024;
 
-        if (video->vram64 != 0) {
-            if (qemuMonitorJSONGetObjectProperty(mon, path,
-                                                 "vram64_size_mb", &prop) < 0) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("QOM Object '%s' has no property 'vram64_size_mb'"),
-                               path);
-                return -1;
-            }
-            video->vram64 = prop.val.ul / 1024;
-        }
-
         if (qemuMonitorJSONGetObjectProperty(mon, path, "ram_size", &prop) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("QOM Object '%s' has no property 'ram_size'"),
@@ -1555,7 +1544,7 @@ qemuMonitorJSONUpdateVideoVram64Size(qemuMonitorPtr mon,
                                path);
                 return -1;
             }
-            video->vram64 = prop.val.ul / 1024;
+            video->vram64 = prop.val.ul * 1024;
         }
         break;
     case VIR_DOMAIN_VIDEO_TYPE_VGA: