Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull Hyper-V fixes from Sasha Levin:
- A few fixes for the userspace hyper-v tools from Adrian Vladu.
- A fix for the hyper-v MAINTAINERs entry from Lan Tianyu.
- Fix for SPDX license identifier in the userspace tools from Nishad
Kamdar.
* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
MAINTAINERS: Fix Hyperv vIOMMU driver file name
tools: hv: Use the correct style for SPDX License Identifier
tools: hv: fix typos in toolchain
tools: hv: fix KVP and VSS daemons exit code
tools: hv: fixed Python pep8/flake8 warnings for lsvmbus
+54
-41
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
7460
7460
F: drivers/scsi/storvsc_drv.c
7461
7461
F: drivers/uio/uio_hv_generic.c
7462
7462
F: drivers/video/fbdev/hyperv_fb.c
7463
-
F: drivers/iommu/hyperv_iommu.c
7463
+
F: drivers/iommu/hyperv-iommu.c
7464
7464
F: net/vmw_vsock/hyperv_transport.c
7465
7465
F: include/clocksource/hyperv_timer.h
7466
7466
F: include/linux/hyperv.h
+1
-1
drivers/hv/hv_trace.h
+1
-1
drivers/hv/hv_trace.h
+1
-1
tools/hv/hv_get_dhcp_info.sh
+1
-1
tools/hv/hv_get_dhcp_info.sh
···
13
13
# the script prints the string "Disabled" to stdout.
14
14
#
15
15
# Each Distro is expected to implement this script in a distro specific
16
-
# fashion. For instance on Distros that ship with Network Manager enabled,
16
+
# fashion. For instance, on Distros that ship with Network Manager enabled,
17
17
# this script can be based on the Network Manager APIs for retrieving DHCP
18
18
# information.
19
19
+5
-3
tools/hv/hv_kvp_daemon.c
+5
-3
tools/hv/hv_kvp_daemon.c
···
700
700
701
701
702
702
/*
703
-
* Gather the DNS state.
703
+
* Gather the DNS state.
704
704
* Since there is no standard way to get this information
705
705
* across various distributions of interest; we just invoke
706
706
* an external script that needs to be ported across distros
···
1051
1051
char *start;
1052
1052
1053
1053
/*
1054
-
* in_buf has sequence of characters that are seperated by
1054
+
* in_buf has sequence of characters that are separated by
1055
1055
* the character ';'. The last sequence does not have the
1056
1056
* terminating ";" character.
1057
1057
*/
···
1386
1386
daemonize = 0;
1387
1387
break;
1388
1388
case 'h':
1389
+
print_usage(argv);
1390
+
exit(0);
1389
1391
default:
1390
1392
print_usage(argv);
1391
1393
exit(EXIT_FAILURE);
···
1492
1490
case KVP_OP_GET_IP_INFO:
1493
1491
kvp_ip_val = &hv_msg->body.kvp_ip_val;
1494
1492
1495
-
error = kvp_mac_to_ip(kvp_ip_val);
1493
+
error = kvp_mac_to_ip(kvp_ip_val);
1496
1494
1497
1495
if (error)
1498
1496
hv_msg->error = error;
+1
-1
tools/hv/hv_set_ifconfig.sh
+1
-1
tools/hv/hv_set_ifconfig.sh
···
12
12
# be used to configure the interface.
13
13
#
14
14
# Each Distro is expected to implement this script in a distro specific
15
-
# fashion. For instance on Distros that ship with Network Manager enabled,
15
+
# fashion. For instance, on Distros that ship with Network Manager enabled,
16
16
# this script can be based on the Network Manager APIs for configuring the
17
17
# interface.
18
18
#
+3
-1
tools/hv/hv_vss_daemon.c
+3
-1
tools/hv/hv_vss_daemon.c
···
42
42
* If a partition is mounted more than once, only the first
43
43
* FREEZE/THAW can succeed and the later ones will get
44
44
* EBUSY/EINVAL respectively: there could be 2 cases:
45
-
* 1) a user may mount the same partition to differnt directories
45
+
* 1) a user may mount the same partition to different directories
46
46
* by mistake or on purpose;
47
47
* 2) The subvolume of btrfs appears to have the same partition
48
48
* mounted more than once.
···
218
218
daemonize = 0;
219
219
break;
220
220
case 'h':
221
+
print_usage(argv);
222
+
exit(0);
221
223
default:
222
224
print_usage(argv);
223
225
exit(EXIT_FAILURE);
+42
-33
tools/hv/lsvmbus
+42
-33
tools/hv/lsvmbus
···
4
4
import os
5
5
from optparse import OptionParser
6
6
7
+
help_msg = "print verbose messages. Try -vv, -vvv for more verbose messages"
7
8
parser = OptionParser()
8
-
parser.add_option("-v", "--verbose", dest="verbose",
9
-
help="print verbose messages. Try -vv, -vvv for \
10
-
more verbose messages", action="count")
9
+
parser.add_option(
10
+
"-v", "--verbose", dest="verbose", help=help_msg, action="count")
11
11
12
12
(options, args) = parser.parse_args()
13
13
···
21
21
exit(-1)
22
22
23
23
vmbus_dev_dict = {
24
-
'{0e0b6031-5213-4934-818b-38d90ced39db}' : '[Operating system shutdown]',
25
-
'{9527e630-d0ae-497b-adce-e80ab0175caf}' : '[Time Synchronization]',
26
-
'{57164f39-9115-4e78-ab55-382f3bd5422d}' : '[Heartbeat]',
27
-
'{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}' : '[Data Exchange]',
28
-
'{35fa2e29-ea23-4236-96ae-3a6ebacba440}' : '[Backup (volume checkpoint)]',
29
-
'{34d14be3-dee4-41c8-9ae7-6b174977c192}' : '[Guest services]',
30
-
'{525074dc-8985-46e2-8057-a307dc18a502}' : '[Dynamic Memory]',
31
-
'{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}' : 'Synthetic mouse',
32
-
'{f912ad6d-2b17-48ea-bd65-f927a61c7684}' : 'Synthetic keyboard',
33
-
'{da0a7802-e377-4aac-8e77-0558eb1073f8}' : 'Synthetic framebuffer adapter',
34
-
'{f8615163-df3e-46c5-913f-f2d2f965ed0e}' : 'Synthetic network adapter',
35
-
'{32412632-86cb-44a2-9b5c-50d1417354f5}' : 'Synthetic IDE Controller',
36
-
'{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}' : 'Synthetic SCSI Controller',
37
-
'{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}' : 'Synthetic fiber channel adapter',
38
-
'{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}' : 'Synthetic RDMA adapter',
39
-
'{44c4f61d-4444-4400-9d52-802e27ede19f}' : 'PCI Express pass-through',
40
-
'{276aacf4-ac15-426c-98dd-7521ad3f01fe}' : '[Reserved system device]',
41
-
'{f8e65716-3cb3-4a06-9a60-1889c5cccab5}' : '[Reserved system device]',
42
-
'{3375baf4-9e15-4b30-b765-67acb10d607b}' : '[Reserved system device]',
24
+
'{0e0b6031-5213-4934-818b-38d90ced39db}': '[Operating system shutdown]',
25
+
'{9527e630-d0ae-497b-adce-e80ab0175caf}': '[Time Synchronization]',
26
+
'{57164f39-9115-4e78-ab55-382f3bd5422d}': '[Heartbeat]',
27
+
'{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}': '[Data Exchange]',
28
+
'{35fa2e29-ea23-4236-96ae-3a6ebacba440}': '[Backup (volume checkpoint)]',
29
+
'{34d14be3-dee4-41c8-9ae7-6b174977c192}': '[Guest services]',
30
+
'{525074dc-8985-46e2-8057-a307dc18a502}': '[Dynamic Memory]',
31
+
'{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}': 'Synthetic mouse',
32
+
'{f912ad6d-2b17-48ea-bd65-f927a61c7684}': 'Synthetic keyboard',
33
+
'{da0a7802-e377-4aac-8e77-0558eb1073f8}': 'Synthetic framebuffer adapter',
34
+
'{f8615163-df3e-46c5-913f-f2d2f965ed0e}': 'Synthetic network adapter',
35
+
'{32412632-86cb-44a2-9b5c-50d1417354f5}': 'Synthetic IDE Controller',
36
+
'{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}': 'Synthetic SCSI Controller',
37
+
'{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}': 'Synthetic fiber channel adapter',
38
+
'{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}': 'Synthetic RDMA adapter',
39
+
'{44c4f61d-4444-4400-9d52-802e27ede19f}': 'PCI Express pass-through',
40
+
'{276aacf4-ac15-426c-98dd-7521ad3f01fe}': '[Reserved system device]',
41
+
'{f8e65716-3cb3-4a06-9a60-1889c5cccab5}': '[Reserved system device]',
42
+
'{3375baf4-9e15-4b30-b765-67acb10d607b}': '[Reserved system device]',
43
43
}
44
+
44
45
45
46
def get_vmbus_dev_attr(dev_name, attr):
46
47
try:
···
52
51
lines = []
53
52
54
53
return lines
54
+
55
55
56
56
class VMBus_Dev:
57
57
pass
···
68
66
69
67
chn_vp_mapping = get_vmbus_dev_attr(f, 'channel_vp_mapping')
70
68
chn_vp_mapping = [c.strip() for c in chn_vp_mapping]
71
-
chn_vp_mapping = sorted(chn_vp_mapping,
72
-
key = lambda c : int(c.split(':')[0]))
69
+
chn_vp_mapping = sorted(
70
+
chn_vp_mapping, key=lambda c: int(c.split(':')[0]))
73
71
74
-
chn_vp_mapping = ['\tRel_ID=%s, target_cpu=%s' %
75
-
(c.split(':')[0], c.split(':')[1])
76
-
for c in chn_vp_mapping]
72
+
chn_vp_mapping = [
73
+
'\tRel_ID=%s, target_cpu=%s' %
74
+
(c.split(':')[0], c.split(':')[1]) for c in chn_vp_mapping
75
+
]
77
76
d = VMBus_Dev()
78
77
d.sysfs_path = '%s/%s' % (vmbus_sys_path, f)
79
78
d.vmbus_id = vmbus_id
···
88
85
vmbus_dev_list.append(d)
89
86
90
87
91
-
vmbus_dev_list = sorted(vmbus_dev_list, key = lambda d : int(d.vmbus_id))
88
+
vmbus_dev_list = sorted(vmbus_dev_list, key=lambda d: int(d.vmbus_id))
92
89
93
90
format0 = '%2s: %s'
94
91
format1 = '%2s: Class_ID = %s - %s\n%s'
···
98
95
if verbose == 0:
99
96
print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
100
97
elif verbose == 1:
101
-
print (('VMBUS ID ' + format1) % \
102
-
(d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
98
+
print(
99
+
('VMBUS ID ' + format1) %
100
+
(d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
101
+
)
103
102
else:
104
-
print (('VMBUS ID ' + format2) % \
105
-
(d.vmbus_id, d.class_id, d.dev_desc, \
106
-
d.device_id, d.sysfs_path, d.chn_vp_mapping))
103
+
print(
104
+
('VMBUS ID ' + format2) %
105
+
(
106
+
d.vmbus_id, d.class_id, d.dev_desc,
107
+
d.device_id, d.sysfs_path, d.chn_vp_mapping
108
+
)
109
+
)