-
Notifications
You must be signed in to change notification settings - Fork 0
/
scsi-disk.patch
82 lines (82 loc) · 3.86 KB
/
scsi-disk.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
diff --git a/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcopy.cfg b/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcopy.cfg
index 1b33e4d..a3ae291 100644
--- a/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcopy.cfg
+++ b/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcopy.cfg
@@ -1,6 +1,6 @@
- virsh.blockcopy:
type = virsh_blockcopy
- target_disk = "vda"
+ target_disk = "sda"
blockcopy_options = ""
dest_path = ""
dest_format = ""
diff --git a/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockpull.cfg b/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockpull.cfg
index cedb334..5746427 100644
--- a/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockpull.cfg
+++ b/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockpull.cfg
@@ -2,6 +2,7 @@
type = virsh_blockpull
kill_vm_on_error = "no"
restart_tgtd = "yes"
+ disk_target = "sda"
variants:
- normal_test:
status_error = "no"
diff --git a/libvirt/tests/cfg/virsh_cmd/snapshot/virsh_snapshot_create_as.cfg b/libvirt/tests/cfg/virsh_cmd/snapshot/virsh_snapshot_create_as.cfg
index c2dc528..da2ff25 100644
--- a/libvirt/tests/cfg/virsh_cmd/snapshot/virsh_snapshot_create_as.cfg
+++ b/libvirt/tests/cfg/virsh_cmd/snapshot/virsh_snapshot_create_as.cfg
@@ -90,7 +90,7 @@
snap_createas_opts = "a--a a--a--snap1"
- disk_only_spec:
snap_createas_opts = "--disk-only"
- diskspec_opts = "vda,snapshot=external,driver=qcow2,file=disk-snap.img"
+ diskspec_opts = "sda,snapshot=external,driver=qcow2,file=disk-snap.img"
- check_libvirtd_log:
check_json_no_savevm = "yes"
snap_createas_opts = "--disk-only"
diff --git a/libvirt/tests/cfg/virsh_cmd/domain/virsh_attach_detach_disk.cfg b/libvirt/tests/cfg/virsh_cmd/domain/virsh_attach_detach_disk.cfg
index c1fcc02..6ef6649 100644
--- a/libvirt/tests/cfg/virsh_cmd/domain/virsh_attach_detach_disk.cfg
+++ b/libvirt/tests/cfg/virsh_cmd/domain/virsh_attach_detach_disk.cfg
@@ -9,8 +9,8 @@
at_dt_disk_no_attach = 'no'
at_dt_disk_test_twice = 'no'
at_dt_disk_device = disk
- at_dt_disk_device_target = vdb
- at_dt_disk_bus_type = virtio
+ at_dt_disk_device_target = sdb
+ at_dt_disk_bus_type = scsi
at_dt_disk_device_source = "attach.img"
at_dt_disk_device_source_format = "raw"
at_dt_disk_device_source_path = 'yes'
diff --git a/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcommit.cfg b/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcommit.cfg
index e843c92..2731007 100644
--- a/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcommit.cfg
+++ b/libvirt/tests/cfg/virsh_cmd/domain/virsh_blockcommit.cfg
@@ -40,8 +40,8 @@
disk_source_protocol = "netfs"
export_options = "rw,no_root_squash,fsid=0"
disk_type = "file"
- disk_target = "vda"
- disk_target_bus = "virtio"
+ disk_target = "sda"
+ disk_target_bus = "scsi"
disk_format = "qcow2"
image_size = "10G"
- network_disk:
diff --git a/libvirt/tests/cfg/virsh_cmd/domain/virsh_detach_device.cfg b/libvirt/tests/cfg/virsh_cmd/domain/virsh_detach_device.cfg
index 0718172..3574ac2 100644
--- a/libvirt/tests/cfg/virsh_cmd/domain/virsh_detach_device.cfg
+++ b/libvirt/tests/cfg/virsh_cmd/domain/virsh_detach_device.cfg
@@ -17,8 +17,8 @@
dt_device_bus_type = ide
- disk_test:
dt_device_device = disk
- dt_device_device_target = vdb
- dt_device_bus_type = virtio
+ dt_device_device_target = sdb
+ dt_device_bus_type = scsi
dt_device_device_source = "attach.img"
variants:
- block_type: