Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
3d5c29a1
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
3d5c29a1
编写于
4月 21, 2014
作者:
N
Nehal J Wani
提交者:
Eric Blake
4月 21, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typos in src/*
Fix minor typos in source comments Signed-off-by:
N
Eric Blake
<
eblake@redhat.com
>
上级
45e134d6
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
45 addition
and
44 deletion
+45
-44
ChangeLog-old
ChangeLog-old
+4
-4
docs/news.html.in
docs/news.html.in
+7
-7
src/esx/esx_driver.c
src/esx/esx_driver.c
+1
-1
src/esx/esx_storage_backend_iscsi.c
src/esx/esx_storage_backend_iscsi.c
+1
-1
src/esx/esx_storage_driver.c
src/esx/esx_storage_driver.c
+1
-1
src/interface/interface_backend_netcf.c
src/interface/interface_backend_netcf.c
+1
-1
src/interface/interface_backend_udev.c
src/interface/interface_backend_udev.c
+1
-1
src/locking/lock_protocol.x
src/locking/lock_protocol.x
+1
-1
src/lxc/lxc_conf.c
src/lxc/lxc_conf.c
+2
-2
src/openvz/openvz_conf.c
src/openvz/openvz_conf.c
+3
-3
src/parallels/parallels_network.c
src/parallels/parallels_network.c
+2
-2
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.c
+1
-1
src/qemu/qemu_cgroup.c
src/qemu/qemu_cgroup.c
+1
-1
src/qemu/qemu_command.h
src/qemu/qemu_command.h
+1
-1
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+3
-3
src/rpc/virnettlscontext.c
src/rpc/virnettlscontext.c
+2
-1
src/security/security_selinux.c
src/security/security_selinux.c
+1
-1
src/storage/storage_backend.c
src/storage/storage_backend.c
+1
-1
src/storage/storage_backend_fs.c
src/storage/storage_backend_fs.c
+1
-1
src/uml/uml_driver.c
src/uml/uml_driver.c
+1
-1
src/util/virfile.c
src/util/virfile.c
+1
-1
src/util/virstring.c
src/util/virstring.c
+1
-1
src/vmware/vmware_conf.c
src/vmware/vmware_conf.c
+1
-1
src/xen/xend_internal.c
src/xen/xend_internal.c
+1
-1
src/xen/xs_internal.c
src/xen/xs_internal.c
+2
-2
tests/virt-aa-helper-test
tests/virt-aa-helper-test
+1
-1
tools/virsh.pod
tools/virsh.pod
+2
-2
未找到文件。
ChangeLog-old
浏览文件 @
3d5c29a1
...
...
@@ -4286,7 +4286,7 @@ Wed Dec 17 21:45:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Wed Dec 17 21:41:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
* src/libvirt_sym.version.in: Remove non-exist
a
nt symbols
* src/libvirt_sym.version.in: Remove non-exist
e
nt symbols
(John Levon)
Wed Dec 17 21:35:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
...
...
@@ -12415,7 +12415,7 @@ Thu Jul 12 11:02:17 EST 2007 Daniel P. Berrange <berrange@redhat.com>
Thu Jul 12 11:00:17 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* qemud/qemud.c: Add explicit checks for exist
a
nce of x509
* qemud/qemud.c: Add explicit checks for exist
e
nce of x509
certificate & key files to get better error reporting than
GNU TLS offers when it can't load a file
...
...
@@ -13276,7 +13276,7 @@ Tue Apr 17 11:30:46 CEST 2007 Daniel Veillard <veillard@redhat.com>
Mon Apr 16 09:11:04 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* qemud/conf.c: Check for exist
a
nce of QEMU binary path. Fix check
* qemud/conf.c: Check for exist
e
nce of QEMU binary path. Fix check
for -no-kqemu flag to work with x86_64 on i386
Mon Apr 16 09:09:04 EST 2007 Daniel P. Berrange <berrange@redhat.com>
...
...
@@ -15020,7 +15020,7 @@ Tue Nov 7 16:33:43 CET 2006 Daniel Veillard <veillard@redhat.com>
Tue Oct 31 10:31:34 CET 2006 Daniel Veillard <veillard@redhat.com>
* src/xend_internal.c: when getting informations about a non
exist
a
nt domain, it is not a good idea to raise the HTTP
exist
e
nt domain, it is not a good idea to raise the HTTP
404 GET error, the handling is better done somewhere up in
the stack.
...
...
docs/news.html.in
浏览文件 @
3d5c29a1
...
...
@@ -2424,7 +2424,7 @@ Security:<br/>
Auto-detect existing cgroup placement (Daniel P. Berrange),<br/>
Add API for checking if a cgroup is valid for a domain (Daniel P. Berrange),<br/>
Add a virCgroupNewDetect API for finding cgroup placement (Daniel P. Berrange),<br/>
Add logic for handling systemd-machined non-exist
a
nce (Daniel P. Berrange),<br/>
Add logic for handling systemd-machined non-exist
e
nce (Daniel P. Berrange),<br/>
Fix handling of DBus errors emitted by the bus itself (Daniel P. Berrange),<br/>
storage: Add connection for autostart storage pool (John Ferlan),<br/>
Adjust 'ceph' authentication secret usage for rbd pool. (John Ferlan),<br/>
...
...
@@ -3898,7 +3898,7 @@ Security:<br/>
Use separate symbol file for GNUTLS symbols (Daniel P. Berrange),<br/>
Apply security label when entering LXC namespaces (Daniel P. Berrange),<br/>
virCaps: conf: start splitting out irrelevant data (Peter Krempa),<br/>
Remove hack using exist
a
nce of an 'identity' string to disable auth (Daniel P. Berrange),<br/>
Remove hack using exist
e
nce of an 'identity' string to disable auth (Daniel P. Berrange),<br/>
Convert HAVE_SELINUX to WITH_SELINUX (Guido Günther),<br/>
capabilities: add NUMA memory information (Dusty Mabe),<br/>
apparmor: use AppArmorSetFDLabel for both imageFD and tapFD (Guannan Ren),<br/>
...
...
@@ -4014,7 +4014,7 @@ Security:<br/>
qemu: Don't fail to shutdown domains with unresponsive agent (Michal Privoznik),<br/>
qemu: virConnectGetVersion returns bogus value (Viktor Mihajlovski),<br/>
qemu: fix use-after-free when parsing NBD disk (Paolo Bonzini),<br/>
Don't try to add non-exist
a
nt devices to ACL (Daniel P. Berrange),<br/>
Don't try to add non-exist
e
nt devices to ACL (Daniel P. Berrange),<br/>
Fix typo in internal VIR_QEMU_PROCESS_START_AUTODESROY constant (Daniel P. Berrange),<br/>
Fix autodestroy of QEMU guests (Daniel P. Berrange),<br/>
qemu: -numa doesn't (yet) support disjoint range (Eric Blake),<br/>
...
...
@@ -4367,7 +4367,7 @@ Security:<br/>
qemu_monitor: Fix tray-open attribute in query-block (Michal Privoznik),<br/>
Fix bogus reporting of KVM support for non-native emulators (Daniel P. Berrange),<br/>
Move QEMU capabilities initialization later in QEMU startup (Daniel P. Berrange),<br/>
Fix performance & reliabilty of QMP probing (Daniel P. Berrange),<br/>
Fix performance & reliabil
i
ty of QMP probing (Daniel P. Berrange),<br/>
qemu: escape ipv6 for rbd network disk hosts (Josh Durgin),<br/>
snapshot: fix state after external snapshot of S3 domain (Eric Blake),<br/>
python: Fix bindings for virDomainSnapshotGet{Domain,Connect} (Jiri Denemark),<br/>
...
...
@@ -6402,7 +6402,7 @@ Security:<br/>
python: Don't generate bodies for close callback functions (Peter Krempa),<br/>
maint: regenerate bootstrap (Eric Blake),<br/>
Remove accidentally committed virNetClientSetEOFNotify symbol (Daniel P. Berrange),<br/>
Remove two non-exist
a
nt NWFilter driver symbols from .syms (Daniel P. Berrange),<br/>
Remove two non-exist
e
nt NWFilter driver symbols from .syms (Daniel P. Berrange),<br/>
tests: reduce length of nodeinfodata test names (Eric Blake),<br/>
rpc: remove trailing whitespace character in error string (Guannan Ren),<br/>
po: avoid spurious double spaces in messages (Eric Blake),<br/>
...
...
@@ -9238,7 +9238,7 @@ Security:<br/>
Make hvsupport.pl pick up the host device drivers (Matthias Bolte)
</li>
<li> Portability:<br/>
Explicit
e
ly invoke python for API doc generator (Daniel Veillard),<br/>
Explicitly invoke python for API doc generator (Daniel Veillard),<br/>
fix virParseVersionString with linux 3.0 (Scott Moser),<br/>
Add conditionals to allow build without SASL (Daniel P. Berrange),<br/>
Add missing include of signal.h in virnetsocket.c (Daniel P. Berrange),<br/>
...
...
@@ -14263,7 +14263,7 @@ Security:<br/>
Factor qemudMonitorSend() out of qemudMonitorCommandExtra() (Mark
McLoughlin), Fix cgroup compile warnings (Daniel P. Berrange),
Fix misc build problems due to new drivers (Daniel P. Berrange),
Fix w
ie
rd build problems due to autopoint overwriting gnulib m4
Fix w
ei
rd build problems due to autopoint overwriting gnulib m4
(Daniel P. Berrange), Makefile.cfg: Rename to... (Jim Meyering),
make .gnulib a submodule (Jim Meyering), make "make syntax-check"
consistent with "git diff --check" (Jim Meyering), Minor qemu
src/esx/esx_driver.c
浏览文件 @
3d5c29a1
...
...
@@ -3109,7 +3109,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml)
/*
* Build VMX datastore URL. Use the source of the first file-based harddisk
* to deduce the datastore and path for the VMX file. Don't just use the
* first disk, because it may be CDROM disk and ISO images are normaly not
* first disk, because it may be CDROM disk and ISO images are normal
l
y not
* located in the virtual machine's directory. This approach to deduce the
* datastore isn't perfect but should work in the majority of cases.
*/
...
...
src/esx/esx_storage_backend_iscsi.c
浏览文件 @
3d5c29a1
...
...
@@ -460,7 +460,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool,
scsiLun
=
scsiLun
->
_next
)
{
if
(
STREQ
(
scsiLun
->
deviceName
,
name
))
{
/*
* ScsiLun provides a
n UUID field that is unique ac
cross
* ScsiLun provides a
UUID field that is unique a
cross
* multiple servers. But this field length is ~55 characters
* compute MD5 hash to transform it to an acceptable
* libvirt format
...
...
src/esx/esx_storage_driver.c
浏览文件 @
3d5c29a1
...
...
@@ -386,7 +386,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
/*
* FIXME: calling backends blindly may set unwanted error codes
*
* VMFS Datastore path follows can
n
onical format i.e.:
* VMFS Datastore path follows canonical format i.e.:
* [<datastore_name>] <file_path>
* WHEREAS
* iSCSI LUNs device path follows normal linux path convention
...
...
src/interface/interface_backend_netcf.c
浏览文件 @
3d5c29a1
...
...
@@ -151,7 +151,7 @@ netcfStateReload(void)
/*
* Get a minimal virInterfaceDef containing enough metadata
* for access control checks to be performed. Currently
* this implies exist
a
nce of name and mac address attributes
* this implies exist
e
nce of name and mac address attributes
*/
static
virInterfaceDef
*
ATTRIBUTE_NONNULL
(
1
)
netcfGetMinimalDefForDevice
(
struct
netcf_if
*
iface
)
...
...
src/interface/interface_backend_udev.c
浏览文件 @
3d5c29a1
...
...
@@ -66,7 +66,7 @@ virUdevStatusString(virUdevStatus status)
/*
* Get a minimal virInterfaceDef containing enough metadata
* for access control checks to be performed. Currently
* this implies exist
a
nce of name and mac address attributes
* this implies exist
e
nce of name and mac address attributes
*/
static
virInterfaceDef
*
ATTRIBUTE_NONNULL
(
1
)
udevGetMinimalDefForDevice
(
struct
udev_device
*
dev
)
...
...
src/locking/lock_protocol.x
浏览文件 @
3d5c29a1
...
...
@@ -77,7 +77,7 @@ const VIR_LOCK_SPACE_PROTOCOL_PROGRAM = 0xEA7BEEF;
const
VIR_LOCK_SPACE_PROTOCOL_PROGRAM_VERSION
=
1
;
enum
virLockSpaceProtocolProcedure
{
/* Each function must be prece
e
ded by a comment providing one or
/* Each function must be preceded by a comment providing one or
* more annotations:
*
* - @generate: none|client|server|both
...
...
src/lxc/lxc_conf.c
浏览文件 @
3d5c29a1
/*
* Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2010
, 2014
Red Hat, Inc.
* Copyright IBM Corp. 2008
*
* lxc_conf.c: config functions for managing linux containers
...
...
@@ -242,7 +242,7 @@ virLXCLoadDriverConfig(virLXCDriverConfigPtr cfg,
virConfPtr
conf
;
virConfValuePtr
p
;
/* Avoid error from non-exist
a
nt or unreadable file. */
/* Avoid error from non-exist
e
nt or unreadable file. */
if
(
access
(
filename
,
R_OK
)
==
-
1
)
goto
done
;
conf
=
virConfReadFile
(
filename
,
0
);
...
...
src/openvz/openvz_conf.c
浏览文件 @
3d5c29a1
...
...
@@ -215,7 +215,7 @@ openvzReadNetworkConf(virDomainDefPtr def,
/*parse routing network configuration*
* Sample from config:
* IP_ADDRESS="1.1.1.1 1.1.1.2"
*
splited IPs
by space
*
IPs split
by space
*/
ret
=
openvzReadVPSConfigParam
(
veid
,
"IP_ADDRESS"
,
&
temp
);
if
(
ret
<
0
)
{
...
...
@@ -242,8 +242,8 @@ openvzReadNetworkConf(virDomainDefPtr def,
/*parse bridge devices*/
/*Sample from config:
*NETIF="ifname=eth10,mac=00:18:51:C1:05:EE,host_ifname=veth105.10,host_mac=00:18:51:8F:D9:F3"
*devices split
ed
by ';'
*
NETIF="ifname=eth10,mac=00:18:51:C1:05:EE,host_ifname=veth105.10,host_mac=00:18:51:8F:D9:F3"
*devices split by ';'
*/
ret
=
openvzReadVPSConfigParam
(
veid
,
"NETIF"
,
&
temp
);
if
(
ret
<
0
)
{
...
...
src/parallels/parallels_network.c
浏览文件 @
3d5c29a1
...
...
@@ -2,7 +2,7 @@
* parallels_network.c: core privconn functions for managing
* Parallels Cloud Server hosts
*
* Copyright (C) 2013 Red Hat, Inc.
* Copyright (C) 2013
-2014
Red Hat, Inc.
* Copyright (C) 2012 Parallels, Inc.
*
* This library is free software; you can redistribute it and/or
...
...
@@ -201,7 +201,7 @@ parallelsLoadNetwork(parallelsConnPtr privconn, virJSONValuePtr jobj)
goto
cleanup
;
/* Network names are unique in Parallels Cloud Server, so we can make
* a
n
UUID from it */
* a UUID from it */
md5_buffer
(
tmp
,
strlen
(
tmp
),
md5
);
memcpy
(
def
->
uuid
,
md5
,
VIR_UUID_BUFLEN
);
def
->
uuid_specified
=
1
;
...
...
src/qemu/qemu_capabilities.c
浏览文件 @
3d5c29a1
...
...
@@ -2296,7 +2296,7 @@ virQEMUCapsProbeQMPKVMState(virQEMUCapsPtr qemuCaps,
/* The QEMU_CAPS_KVM flag was initially set according to the QEMU
* reporting the recognition of 'query-kvm' QMP command. That merely
* indicates exist
a
nce of the command though, not whether KVM support
* indicates exist
e
nce of the command though, not whether KVM support
* is actually available, nor whether it is enabled by default.
*
* If it is not present we need to clear the flag, and if it is
...
...
src/qemu/qemu_cgroup.c
浏览文件 @
3d5c29a1
...
...
@@ -527,7 +527,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
for
(
i
=
0
;
deviceACL
[
i
]
!=
NULL
;
i
++
)
{
if
(
!
virFileExists
(
deviceACL
[
i
]))
{
VIR_DEBUG
(
"Ignoring non-exist
a
nt device %s"
,
deviceACL
[
i
]);
VIR_DEBUG
(
"Ignoring non-exist
e
nt device %s"
,
deviceACL
[
i
]);
continue
;
}
...
...
src/qemu/qemu_command.h
浏览文件 @
3d5c29a1
...
...
@@ -39,7 +39,7 @@
# define QEMU_FSDEV_HOST_PREFIX "fsdev-"
/* These are only defaults, they can be changed now in qemu.conf and
* explicit
e
ly specified port is checked against these two (makes
* explicitly specified port is checked against these two (makes
* sense to limit the values).
*
* This limitation is mentioned in qemu.conf, so bear in mind that the
...
...
src/qemu/qemu_driver.c
浏览文件 @
3d5c29a1
...
...
@@ -1304,7 +1304,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss,
/* We got jiffies
* We want nanoseconds
* _SC_CLK_TCK is jiffies per second
* So calulate thus....
* So cal
c
ulate thus....
*/
if (cpuTime)
*cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK);
...
...
@@ -2934,7 +2934,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
* we don't have an explicit offset in the header, so we fake
* it by padding the XML string with NUL bytes. Additionally,
* we want to ensure that virDomainSaveImageDefineXML can supply
* slightly larger XML, so we add a mi
min
um padding prior to
* slightly larger XML, so we add a mi
nim
um padding prior to
* rounding out to page boundaries.
*/
pad = 1024;
...
...
@@ -12509,7 +12509,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn,
{
int actualType;
/* active disks are hand
e
led by qemu itself so no need to worry about those */
/* active disks are handled by qemu itself so no need to worry about those */
if (active)
return 0;
...
...
src/rpc/virnettlscontext.c
浏览文件 @
3d5c29a1
...
...
@@ -693,7 +693,8 @@ static int virNetTLSContextLoadCredentials(virNetTLSContextPtr ctxt,
goto
cleanup
;
}
}
else
{
VIR_DEBUG
(
"Skipping non-existant cert %s key %s on client"
,
cert
,
key
);
VIR_DEBUG
(
"Skipping non-existent cert %s key %s on client"
,
cert
,
key
);
}
}
...
...
src/security/security_selinux.c
浏览文件 @
3d5c29a1
...
...
@@ -178,7 +178,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr,
* the category part, since that's what we're really
* interested in. This won't work in Enforcing mode,
* but will prevent libvirtd breaking in Permissive
* mode when run with a w
ie
rd process label.
* mode when run with a w
ei
rd process label.
*/
static
int
virSecuritySELinuxMCSGetProcessRange
(
char
**
sens
,
...
...
src/storage/storage_backend.c
浏览文件 @
3d5c29a1
...
...
@@ -482,7 +482,7 @@ virStorageGenerateSecretUUID(virConnectPtr conn,
}
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"too many conflicts when generating a
n
uuid"
));
_
(
"too many conflicts when generating a uuid"
));
return
-
1
;
}
...
...
src/storage/storage_backend_fs.c
浏览文件 @
3d5c29a1
...
...
@@ -1196,7 +1196,7 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn,
if
(
ret
<
0
)
return
ret
;
/* Load any secrets if posible */
/* Load any secrets if pos
s
ible */
if
(
vol
->
target
.
encryption
&&
vol
->
target
.
encryption
->
format
==
VIR_STORAGE_ENCRYPTION_FORMAT_QCOW
&&
vol
->
target
.
encryption
->
nsecrets
==
0
)
{
...
...
src/uml/uml_driver.c
浏览文件 @
3d5c29a1
...
...
@@ -1337,7 +1337,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid)
/* We got jiffies
* We want nanoseconds
* _SC_CLK_TCK is jiffies per second
* So calulate thus....
* So cal
c
ulate thus....
*/
*
cpuTime
=
1000ull
*
1000ull
*
1000ull
*
(
usertime
+
systime
)
/
(
unsigned
long
long
)
sysconf
(
_SC_CLK_TCK
);
...
...
src/util/virfile.c
浏览文件 @
3d5c29a1
...
...
@@ -545,7 +545,7 @@ int virFileUpdatePerm(const char *path,
# if HAVE_DECL_LOOP_CTL_GET_FREE
/* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occured
/* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occur
r
ed
* while in the process of allocating or opening the loop device. On success
* we return 0 and modify the fd to the appropriate file descriptor.
* If /dev/loop-control does not exist, we return 0 and do not set fd. */
...
...
src/util/virstring.c
浏览文件 @
3d5c29a1
...
...
@@ -758,7 +758,7 @@ virStringSearch(const char *str,
* @oldneedle: the substring to locate
* @newneedle: the substring to insert
*
* Search @haystack and replace all occurences of @oldneedle with @newneedle.
* Search @haystack and replace all occur
r
ences of @oldneedle with @newneedle.
*
* Returns: a new string with all the replacements, or NULL on error
*/
...
...
src/vmware/vmware_conf.c
浏览文件 @
3d5c29a1
...
...
@@ -392,7 +392,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath)
/*
* Build VMX URL. Use the source of the first file-based harddisk
* to deduce the path for the VMX file. Don't just use the
* first disk, because it may be CDROM disk and ISO images are normaly not
* first disk, because it may be CDROM disk and ISO images are normal
l
y not
* located in the virtual machine's directory. This approach
* isn't perfect but should work in the majority of cases.
*/
...
...
src/xen/xend_internal.c
浏览文件 @
3d5c29a1
...
...
@@ -597,7 +597,7 @@ sexpr_get(virConnectPtr xend, const char *fmt, ...)
* @sexpr: an S-Expression
* @name: the name for the value
*
* convenience function to lookup a
n
UUID value from the S-Expression
* convenience function to lookup a UUID value from the S-Expression
*
* Returns a -1 on error, 0 on success
*/
...
...
src/xen/xs_internal.c
浏览文件 @
3d5c29a1
...
...
@@ -355,7 +355,7 @@ xenStoreDomainGetVNCPort(virConnectPtr conn, int domid)
* serial console is attached.
*
* Returns the path to the serial console. It is the callers
* responsibilty to free() the return string. Returns NULL
* responsibil
i
ty to free() the return string. Returns NULL
* on error
*
* The caller must hold the lock on the privateData
...
...
@@ -376,7 +376,7 @@ xenStoreDomainGetConsolePath(virConnectPtr conn, int domid)
* serial console is attached.
*
* Returns the path to the serial console. It is the callers
* responsibilty to free() the return string. Returns NULL
* responsibil
i
ty to free() the return string. Returns NULL
* on error
*
* The caller must hold the lock on the privateData
...
...
tests/virt-aa-helper-test
浏览文件 @
3d5c29a1
...
...
@@ -56,7 +56,7 @@ uuid="00000000-0000-0000-0000-0123456789ab"
disk1
=
"
$tmpdir
/1.img"
disk2
=
"
$tmpdir
/2.img"
relative_disk1
=
"
$tmpdir
/./../
`
basename
$tmpdir
`
//./1.img"
nonexistent
=
"
$tmpdir
/nonexist
a
nt.img"
nonexistent
=
"
$tmpdir
/nonexist
e
nt.img"
bad_disk
=
"/etc/passwd"
valid_uuid
=
"libvirt-
$uuid
"
nonexistent_uuid
=
"libvirt-00000000-0000-0000-0000-000000000001"
...
...
tools/virsh.pod
浏览文件 @
3d5c29a1
...
...
@@ -2936,7 +2936,7 @@ B<blockresize> for live resizing.
The following commands manipulate "secrets" (e.g. passwords, passphrases and
encryption keys). Libvirt can store secrets independently from their use, and
other objects (e.g. volumes or domains) can refer to the secrets for encryption
or possibly other uses. Secrets are identified using a
n
UUID. See
or possibly other uses. Secrets are identified using a UUID. See
L<http://libvirt.org/formatsecret.html> for documentation of the XML format
used to represent properties of secrets.
...
...
@@ -2946,7 +2946,7 @@ used to represent properties of secrets.
Create a secret with the properties specified in I<file>, with no associated
secret value. If I<file> does not specify a UUID, choose one automatically.
If I<file> specifies a
n
UUID of an existing secret, replace its properties by
If I<file> specifies a UUID of an existing secret, replace its properties by
properties defined in I<file>, without affecting the secret value.
=item B<secret-dumpxml> I<secret>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录