Revision 7bc2c097

b/lib/constants.py
615 615
# file backend driver
616 616
FD_LOOP = "loop"
617 617
FD_BLKTAP = "blktap"
618
FD_BLKTAP2 = "blktap2"
618 619
FD_DEFAULT = FD_LOOP
619 620

  
620 621
# the set of drbd-like disk types
......
674 675
#: Give child process up to 5 seconds to exit after sending a signal
675 676
CHILD_LINGER_TIMEOUT = 5.0
676 677

  
677
FILE_DRIVER = compat.UniqueFrozenset([FD_LOOP, FD_BLKTAP])
678
FILE_DRIVER = compat.UniqueFrozenset([FD_LOOP, FD_BLKTAP, FD_BLKTAP2])
678 679

  
679 680
# import/export config options
680 681
INISECT_EXP = "export"
b/lib/hypervisor/hv_xen.py
47 47
_FILE_DRIVER_MAP = {
48 48
  constants.FD_LOOP: "file",
49 49
  constants.FD_BLKTAP: "tap:aio",
50
  constants.FD_BLKTAP2: "tap2:tapdisk:aio",
50 51
  }
51 52

  
52 53

  
b/man/ganeti-os-interface.rst
91 91
DISK_%N_BACKEND_TYPE
92 92
    How files are visible on the node side. This can be either
93 93
    ``block`` (when using block devices) or ``file:type``, where
94
    ``type`` is either ``loop`` or ``blktap`` depending on how the
95
    hypervisor will be configured.  Note that not all backend types
96
    apply to all hypervisors.
94
    ``type`` is either ``loop``, ``blktap`` or ``blktap2``, depending on how the
95
    hypervisor will be configured.  Note that not all backend types apply to all
96
    hypervisors.
97 97

  
98 98
NIC_COUNT
99 99
    Similar to the ``DISK_COUNT``, this represents the number of NICs
b/man/gnt-instance.rst
37 37
| [{-B|\--backend-parameters} *BEPARAMS*]
38 38
| [{-H|\--hypervisor-parameters} *HYPERVISOR* [: option=*value*... ]]
39 39
| [{-O|\--os-parameters} *param*=*value*... ]
40
| [\--file-storage-dir *dir\_path*] [\--file-driver {loop \| blktap}]
40
| [\--file-storage-dir *dir\_path*] [\--file-driver {loop \| blktap \| blktap2}]
41 41
| {{-n|\--node} *node[:secondary-node]* \| {-I|\--iallocator} *name*}
42 42
| {{-o|\--os-type} *os-type*}
43 43
| [\--submit]
......
844 844
    better performance. Especially if you use a network file system
845 845
    (e.g. NFS) to store your instances this is the recommended choice.
846 846

  
847
blktap2
848
    Analogous to the blktap driver, but used by newer versions of Xen.
849

  
847 850
If ``--ignore-ipolicy`` is given any instance policy violations occuring
848 851
during this operation are ignored.
849 852

  
b/test/py/ganeti.hypervisor.hv_xen_unittest.py
274 274
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDWR,
275 275
                    physical_id=[constants.FD_LOOP]),
276 276
       "/tmp/diskThree"),
277
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDONLY,
278
                    physical_id=[constants.FD_BLKTAP2]),
279
       "/tmp/diskFour"),
277 280
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDWR,
278 281
                    physical_id=[constants.FD_BLKTAP]),
279 282
       "/tmp/diskLast"),
......
284 287
      "'file:/tmp/diskFirst,sda,w'",
285 288
      "'tap:aio:/tmp/diskTwo,sdb,r'",
286 289
      "'file:/tmp/diskThree,sdc,w'",
287
      "'tap:aio:/tmp/diskLast,sdd,w'",
290
      "'tap2:tapdisk:aio:/tmp/diskFour,sdd,r'",
291
      "'tap:aio:/tmp/diskLast,sde,w'",
288 292
      ])
289 293

  
290 294
  def testInvalidFileDisk(self):

Also available in: Unified diff