acpi-inverted.diff

Proposed fix - Redmine Admin, 03/13/2009 11:58 AM

Download (1.85 KB)

View differences:

one-1.2.ubuntu.acpi/src/vmm/LibVirtDriver.cc 2009-03-13 08:36:13.759710356 +0100
72 72
     
73 73
     string     pae     = "";
74 74
     string     acpi    = "";
75
     bool       use_pae  = false;
76
     bool       use_acpi = true;
75 77

  
76 78
     const VectorAttribute * raw;
77 79
     string data;
......
470 472

  
471 473
     if ( num > 0 ) 
472 474
     {         
473
     	features = dynamic_cast<const VectorAttribute *>(attrs[0]);
474
     	
475
     	if ( features != 0 )
476
     	{
477
     	    pae  = features->vector_value("PAE");
478
     	    acpi = features->vector_value("ACPI");
475
       features = dynamic_cast<const VectorAttribute *>(attrs[0]);
479 476

  
480
            file << "\t<features>" << endl;
481
         	
482
         	if ( pae == "yes" )
483
     		{
484
     			file << "\t\t<pae/>" << endl;
485
     		}
486
     		
487
     		if ( acpi == "no" )
488
     		{
489
     			file << "\t\t<acpi/>" << endl;
490
     		}
491
     
492
            file << "\t</features>" << endl;
493
     	}
477
       if ( features != 0 )
478
       {
479
         pae  = features->vector_value("PAE");
480
         acpi = features->vector_value("ACPI");
481

  
482
         if ( pae == "yes" )
483
         {
484
           use_pae = true;
485
         }
486

  
487
         if ( acpi == "no" )
488
         {
489
           use_acpi = false;
490
         }
491
       }
494 492
     }
495
     
493

  
494
     if (use_pae || use_acpi)
495
     {
496
       file << "\t<features>" << endl;
497

  
498
       if (use_pae)
499
       {
500
         file << "\t\t<pae/>" << endl;
501
       }
502

  
503
       if (use_acpi)
504
       {
505
         file << "\t\t<acpi/>" << endl;
506
       }
507

  
508
       file << "\t</features>" << endl;
509
     }
510

  
496 511
     attrs.clear();
497 512

  
498 513
     // ------------------------------------------------------------------------