]> xenbits.xensource.com Git - libvirt.git/commitdiff
vbox: Use correct VRAM size unit
authorMatthias Bolte <matthias.bolte@googlemail.com>
Thu, 30 Dec 2010 14:18:27 +0000 (15:18 +0100)
committerMatthias Bolte <matthias.bolte@googlemail.com>
Thu, 6 Jan 2011 17:18:35 +0000 (18:18 +0100)
VirtualBox uses megabyte, libvirt uses kilobyte.

src/vbox/vbox_tmpl.c

index f45e8ed3a000d4cd95d6605e73a0ee9f999c703a..5ac94c356df0d8cea5c348e01fba75c14653d61c 100644 (file)
@@ -2225,7 +2225,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
                 if (VIR_ALLOC_N(def->videos, def->nvideos) >= 0) {
                     if (VIR_ALLOC(def->videos[0]) >= 0) {
                         /* the default is: vram is 8MB, One monitor, 3dAccel Off */
-                        PRUint32 VRAMSize          = 8 * 1024;
+                        PRUint32 VRAMSize          = 8;
                         PRUint32 monitorCount      = 1;
                         PRBool accelerate3DEnabled = PR_FALSE;
                         PRBool accelerate2DEnabled = PR_FALSE;
@@ -2238,7 +2238,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
 #endif /* VBOX_API_VERSION >= 3001 */
 
                         def->videos[0]->type            = VIR_DOMAIN_VIDEO_TYPE_VBOX;
-                        def->videos[0]->vram            = VRAMSize;
+                        def->videos[0]->vram            = VRAMSize * 1024;
                         def->videos[0]->heads           = monitorCount;
                         if (VIR_ALLOC(def->videos[0]->accel) >= 0) {
                             def->videos[0]->accel->support3d = accelerate3DEnabled;
@@ -4397,7 +4397,7 @@ vboxAttachVideo(virDomainDefPtr def, IMachine *machine)
 {
     if ((def->nvideos == 1) &&
         (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_VBOX)) {
-        machine->vtbl->SetVRAMSize(machine, def->videos[0]->vram);
+        machine->vtbl->SetVRAMSize(machine, def->videos[0]->vram / 1024);
         machine->vtbl->SetMonitorCount(machine, def->videos[0]->heads);
         if (def->videos[0]->accel) {
             machine->vtbl->SetAccelerate3DEnabled(machine,