← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Main/xml/VirtualBox-settings-common.xsd

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/xml/VirtualBox-settings-common.xsd
81
81
  </xsd:union>
82
82
</xsd:simpleType>
83
83
 
 
84
<xsd:simpleType name="TUInt32Hex">
 
85
  <xsd:restriction base="xsd:string">
 
86
    <xsd:pattern value="0x[A-Fa-f0-9]{1,8}"/>
 
87
  </xsd:restriction>
 
88
</xsd:simpleType>
 
89
 
84
90
<xsd:simpleType name="TUInt64Hex">
85
91
  <xsd:restriction base="xsd:string">
86
92
    <xsd:pattern value="0x[A-Fa-f0-9]{1,16}"/>
215
221
    <xsd:enumeration value="82540EM"/>
216
222
    <xsd:enumeration value="82543GC"/>
217
223
    <xsd:enumeration value="82545EM"/>
 
224
    <xsd:enumeration value="virtio"/>
218
225
  </xsd:restriction>
219
226
</xsd:simpleType>
220
227
 
432
439
</xsd:complexType>
433
440
 
434
441
<xsd:complexType name="THWVirtExType">
435
 
  <xsd:attribute name="enabled" type="TTriStateBoolType" default="default"/>
 
442
  <xsd:attribute name="enabled" type="TTriStateBoolType"/>
 
443
  <xsd:attribute name="exclusive" type="xsd:boolean"/>
436
444
</xsd:complexType>
437
445
 
438
446
<xsd:complexType name="THWVirtExNestedPagingType">
439
 
  <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
 
447
  <xsd:attribute name="enabled" type="xsd:boolean"/>
440
448
</xsd:complexType>
441
449
 
442
450
<xsd:complexType name="THWVirtExVPIDType">
443
 
  <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
 
451
  <xsd:attribute name="enabled" type="xsd:boolean"/>
 
452
</xsd:complexType>
 
453
 
 
454
<xsd:complexType name="TSyntheticCpuType">
 
455
  <xsd:attribute name="enabled" type="xsd:boolean"/>
444
456
</xsd:complexType>
445
457
 
446
458
<xsd:complexType name="TPAEType">
447
 
  <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
 
459
  <xsd:attribute name="enabled" type="xsd:boolean"/>
448
460
</xsd:complexType>
449
461
 
450
462
<xsd:simpleType name="TCPUCount">
454
466
  </xsd:restriction>
455
467
</xsd:simpleType>
456
468
 
 
469
<xsd:complexType name="TCpuIdLeaf">
 
470
  <xsd:attribute name="id"        type="TUInt32Hex"       use="required"/>
 
471
  <xsd:attribute name="eax"       type="TUInt32Hex"       use="required"/>
 
472
  <xsd:attribute name="ebx"       type="TUInt32Hex"       use="required"/>
 
473
  <xsd:attribute name="ecx"       type="TUInt32Hex"       use="required"/>
 
474
  <xsd:attribute name="edx"       type="TUInt32Hex"       use="required"/>
 
475
</xsd:complexType>
 
476
 
 
477
<xsd:complexType name="TCpuIdTree">
 
478
  <xsd:sequence>
 
479
    <xsd:element name="CpuIdLeaf" type="TCpuIdLeaf"
 
480
                 minOccurs="0" maxOccurs="unbounded"/>
 
481
  </xsd:sequence>
 
482
</xsd:complexType>
 
483
 
457
484
<xsd:complexType name="TCPU">
458
485
  <xsd:sequence>
459
486
    <xsd:element name="HardwareVirtEx" type="THWVirtExType" minOccurs="0"/>
460
487
    <xsd:element name="HardwareVirtExNestedPaging" type="THWVirtExNestedPagingType" minOccurs="0"/>
461
488
    <xsd:element name="HardwareVirtExVPID" type="THWVirtExVPIDType" minOccurs="0"/>
462
489
    <xsd:element name="PAE" type="TPAEType" minOccurs="0"/>
 
490
    <xsd:element name="SyntheticCpu" type="TSyntheticCpuType" minOccurs="0"/>
 
491
    <xsd:element name="CpuIdTree" type="TCpuIdTree" minOccurs="0">
 
492
      <xsd:unique name="TCPU-CpuIdTree-CpuIdLeaf">
 
493
        <xsd:selector xpath="vb:CpuIdLeaf"/>
 
494
        <xsd:field xpath="@id"/>
 
495
      </xsd:unique>
 
496
    </xsd:element>
463
497
  </xsd:sequence>
464
498
  <xsd:attribute name="count" type="TCPUCount" default="1"/>
465
499
</xsd:complexType>
499
533
    </xsd:simpleType>
500
534
  </xsd:attribute>
501
535
  <xsd:attribute name="accelerate3D" type="xsd:boolean" default="false"/>
 
536
  <xsd:attribute name="accelerate2DVideo" type="xsd:boolean" default="false"/>
502
537
</xsd:complexType>
503
538
 
504
539
<xsd:complexType name="TRemoteDisplay">
505
540
  <xsd:attribute name="enabled" type="xsd:boolean" use="required"/>
506
 
  <xsd:attribute name="port" type="xsd:unsignedInt" default="0"/>
 
541
  <xsd:attribute name="port" type="xsd:token" default="0"/>
507
542
  <xsd:attribute name="netAddress" type="xsd:token" default=""/>
508
543
  <xsd:attribute name="authType" type="TVRDPAuthType" default="Null"/>
509
544
  <xsd:attribute name="authTimeout" type="xsd:unsignedInt" default="5000"/>