Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
49411f02
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看板
提交
49411f02
编写于
4月 02, 2010
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unnecessary trailing \n in log messages
上级
d2e0bd17
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
42 addition
and
42 deletion
+42
-42
daemon/libvirtd.c
daemon/libvirtd.c
+4
-4
src/lxc/lxc_driver.c
src/lxc/lxc_driver.c
+1
-1
src/node_device/node_device_linux_sysfs.c
src/node_device/node_device_linux_sysfs.c
+2
-2
src/node_device/node_device_udev.c
src/node_device/node_device_udev.c
+8
-8
src/nwfilter/nwfilter_ebiptables_driver.c
src/nwfilter/nwfilter_ebiptables_driver.c
+1
-1
src/nwfilter/nwfilter_gentech_driver.c
src/nwfilter/nwfilter_gentech_driver.c
+2
-2
src/qemu/qemu_conf.c
src/qemu/qemu_conf.c
+1
-1
src/remote/remote_driver.c
src/remote/remote_driver.c
+1
-1
src/storage/storage_backend_disk.c
src/storage/storage_backend_disk.c
+3
-3
src/storage/storage_driver.c
src/storage/storage_driver.c
+1
-1
src/xen/proxy_internal.c
src/xen/proxy_internal.c
+7
-7
src/xen/xen_hypervisor.c
src/xen/xen_hypervisor.c
+10
-10
src/xen/xs_internal.c
src/xen/xs_internal.c
+1
-1
未找到文件。
daemon/libvirtd.c
浏览文件 @
49411f02
...
...
@@ -2308,7 +2308,7 @@ static void *qemudRunLoop(void *opaque) {
virMutexUnlock
(
&
server
->
lock
);
if
(
qemudOneLoop
()
<
0
)
{
virMutexLock
(
&
server
->
lock
);
DEBUG0
(
"Loop iteration error, exiting
\n
"
);
DEBUG0
(
"Loop iteration error, exiting"
);
break
;
}
virMutexLock
(
&
server
->
lock
);
...
...
@@ -2482,7 +2482,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
for
(
i
=
0
,
pp
=
p
->
list
;
pp
;
++
i
,
pp
=
pp
->
next
)
{
if
(
pp
->
type
!=
VIR_CONF_STRING
)
{
VIR_ERROR
(
_
(
"remoteReadConfigFile: %s: %s:"
" must be a string or list of strings
\n
"
),
" must be a string or list of strings"
),
filename
,
key
);
VIR_FREE
(
list
);
return
-
1
;
...
...
@@ -2505,7 +2505,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
default:
VIR_ERROR
(
_
(
"remoteReadConfigFile: %s: %s:"
" must be a string or list of strings
\n
"
),
" must be a string or list of strings"
),
filename
,
key
);
return
-
1
;
}
...
...
@@ -2521,7 +2521,7 @@ checkType (virConfValuePtr p, const char *filename,
{
if
(
p
->
type
!=
required_type
)
{
VIR_ERROR
(
_
(
"remoteReadConfigFile: %s: %s: invalid type:"
" got %s; expected %s
\n
"
),
filename
,
key
,
" got %s; expected %s"
),
filename
,
key
,
virConfTypeName
(
p
->
type
),
virConfTypeName
(
required_type
));
return
-
1
;
...
...
src/lxc/lxc_driver.c
浏览文件 @
49411f02
...
...
@@ -634,7 +634,7 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
if
(
virCgroupForDomain
(
driver
->
cgroup
,
vm
->
def
->
name
,
&
cgroup
,
0
)
!=
0
)
{
lxcError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Unable to get cgroup for %s
\n
"
),
vm
->
def
->
name
);
_
(
"Unable to get cgroup for %s"
),
vm
->
def
->
name
);
goto
cleanup
;
}
...
...
src/node_device/node_device_linux_sysfs.c
浏览文件 @
49411f02
...
...
@@ -302,7 +302,7 @@ int get_physical_function_linux(const char *sysfs_path,
char
*
device_link
=
NULL
;
VIR_DEBUG
(
"Attempting to get SR IOV physical function for device "
"with sysfs path '%s'
\n
"
,
sysfs_path
);
"with sysfs path '%s'"
,
sysfs_path
);
if
(
virBuildPath
(
&
device_link
,
sysfs_path
,
"physfn"
)
==
-
1
)
{
virReportOOMError
();
...
...
@@ -327,7 +327,7 @@ int get_virtual_functions_linux(const char *sysfs_path,
char
*
device_link
=
NULL
;
VIR_DEBUG
(
"Attempting to get SR IOV virtual functions for device"
"with sysfs path '%s'
\n
"
,
sysfs_path
);
"with sysfs path '%s'"
,
sysfs_path
);
dir
=
opendir
(
sysfs_path
);
if
(
dir
==
NULL
)
{
...
...
src/node_device/node_device_udev.c
浏览文件 @
49411f02
...
...
@@ -131,7 +131,7 @@ static int udevGetDeviceProperty(struct udev_device *udev_device,
}
VIR_DEBUG
(
"Found property key '%s' value '%s' "
"for device with sysname '%s'
\n
"
,
"for device with sysname '%s'"
,
property_key
,
*
property_value
,
udev_device_get_sysname
(
udev_device
));
...
...
@@ -220,7 +220,7 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device,
}
VIR_DEBUG
(
"Found sysfs attribute '%s' value '%s' "
"for device with sysname '%s'
\n
"
,
"for device with sysname '%s'"
,
attr_name
,
*
attr_value
,
udev_device_get_sysname
(
udev_device
));
...
...
@@ -330,7 +330,7 @@ static int udevGenerateDeviceName(struct udev_device *device,
if
(
virBufferError
(
&
buf
))
{
virBufferFreeAndReset
(
&
buf
);
VIR_ERROR
(
"Buffer error when generating device name for device "
"with sysname '%s'
\n
"
,
udev_device_get_sysname
(
device
));
"with sysname '%s'"
,
udev_device_get_sysname
(
device
));
ret
=
-
1
;
}
...
...
@@ -642,7 +642,7 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
if
(
!
STRPREFIX
(
filename
,
"host"
))
{
VIR_ERROR
(
"SCSI host found, but its udev name '%s' does "
"not begin with 'host'
\n
"
,
filename
);
"not begin with 'host'"
,
filename
);
goto
out
;
}
...
...
@@ -949,7 +949,7 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def)
int
ret
=
-
1
;
VIR_INFO
(
"Could not find definitive storage type for device "
"with sysfs path '%s', trying to guess it
\n
"
,
"with sysfs path '%s', trying to guess it"
,
def
->
sysfs_path
);
if
(
STRPREFIX
(
def
->
caps
->
data
.
storage
.
block
,
"/dev/vd"
))
{
...
...
@@ -962,10 +962,10 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def)
if
(
ret
!=
0
)
{
VIR_INFO
(
"Could not determine storage type for device "
"with sysfs path '%s'
\n
"
,
def
->
sysfs_path
);
"with sysfs path '%s'"
,
def
->
sysfs_path
);
}
else
{
VIR_DEBUG
(
"Found storage type '%s' for device "
"with sysfs path '%s'
\n
"
,
"with sysfs path '%s'"
,
def
->
caps
->
data
.
storage
.
drive_type
,
def
->
sysfs_path
);
}
...
...
@@ -1131,7 +1131,7 @@ static int udevGetDeviceType(struct udev_device *device,
}
VIR_INFO
(
"Could not determine device type for device "
"with sysfs path '%s'
\n
"
,
"with sysfs path '%s'"
,
udev_device_get_sysname
(
device
));
ret
=
-
1
;
...
...
src/nwfilter/nwfilter_ebiptables_driver.c
浏览文件 @
49411f02
...
...
@@ -2116,7 +2116,7 @@ ebiptablesExecCLI(virBufferPtr buf,
*
status
>>=
8
;
VIR_DEBUG
(
"rc = %d, status = %d
\n
"
,
rc
,
*
status
);
VIR_DEBUG
(
"rc = %d, status = %d"
,
rc
,
*
status
);
unlink
(
filename
);
...
...
src/nwfilter/nwfilter_gentech_driver.c
浏览文件 @
49411f02
...
...
@@ -310,7 +310,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn,
(
*
insts
)[(
*
nEntries
)
++
]
=
inst
;
}
else
if
(
inc
)
{
VIR_DEBUG
(
"Instantiating filter %s
\n
"
,
inc
->
filterref
);
VIR_DEBUG
(
"Instantiating filter %s"
,
inc
->
filterref
);
obj
=
virNWFilterPoolObjFindByName
(
&
driver
->
pools
,
inc
->
filterref
);
if
(
obj
)
{
...
...
@@ -514,7 +514,7 @@ _virNWFilterInstantiateFilter(virConnectPtr conn,
return
1
;
}
VIR_DEBUG
(
"filter name: %s
\n
"
,
net
->
filter
);
VIR_DEBUG
(
"filter name: %s"
,
net
->
filter
);
obj
=
virNWFilterPoolObjFindByName
(
&
driver
->
pools
,
net
->
filter
);
if
(
!
obj
)
{
...
...
src/qemu/qemu_conf.c
浏览文件 @
49411f02
...
...
@@ -140,7 +140,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \
qemuReportError(VIR_ERR_INTERNAL_ERROR, \
"remoteReadConfigFile: %s: %s: expected type " #typ
"\n"
, \
"remoteReadConfigFile: %s: %s: expected type " #typ, \
filename, (name)); \
virConfFree(conf); \
return -1; \
...
...
src/remote/remote_driver.c
浏览文件 @
49411f02
...
...
@@ -1288,7 +1288,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn,
}
if
(
len
!=
1
||
buf
[
0
]
!=
'\1'
)
{
error
(
conn
,
VIR_ERR_RPC
,
_
(
"server verification (of our certificate or IP address) failed
\n
"
));
_
(
"server verification (of our certificate or IP address) failed"
));
return
NULL
;
}
...
...
src/storage/storage_backend_disk.c
浏览文件 @
49411f02
...
...
@@ -455,7 +455,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
unsigned
long
long
cylinderSize
=
dev
->
geometry
.
heads
*
dev
->
geometry
.
sectors
*
SECTOR_SIZE
;
DEBUG
(
"find free area: allocation %llu,
cyl size %llu
\n
"
,
allocation
,
cylinderSize
);
DEBUG
(
"find free area: allocation %llu,
cyl size %llu
"
,
allocation
,
cylinderSize
);
int
partType
=
virStorageBackendDiskPartTypeToCreate
(
pool
);
/* how many extra bytes we have since we allocate
...
...
@@ -508,7 +508,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
return
-
1
;
}
DEBUG
(
"aligned alloc %llu
\n
"
,
alignedAllocation
);
DEBUG
(
"aligned alloc %llu"
,
alignedAllocation
);
*
start
=
dev
->
freeExtents
[
smallestExtent
].
start
;
if
(
partType
==
VIR_STORAGE_VOL_DISK_TYPE_LOGICAL
)
{
...
...
@@ -524,7 +524,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
/* counting in byte, we want the last byte of the current sector */
*
end
-=
1
;
DEBUG
(
"final aligned start %llu, end %llu
\n
"
,
*
start
,
*
end
);
DEBUG
(
"final aligned start %llu, end %llu"
,
*
start
,
*
end
);
return
0
;
}
...
...
src/storage/storage_driver.c
浏览文件 @
49411f02
...
...
@@ -1557,7 +1557,7 @@ storageVolumeZeroSparseFile(virStorageVolDefPtr vol,
if
(
ret
==
-
1
)
{
virReportSystemError
(
errno
,
_
(
"Failed to truncate volume with "
"path '%s' to %ju bytes
\n
"
),
"path '%s' to %ju bytes"
),
vol
->
target
.
path
,
(
intmax_t
)
size
);
}
...
...
src/xen/proxy_internal.c
浏览文件 @
49411f02
...
...
@@ -217,7 +217,7 @@ retry:
return
(
-
1
);
}
DEBUG
(
"connected to unix socket %s via %d
\n
"
,
path
,
fd
);
DEBUG
(
"connected to unix socket %s via %d"
,
path
,
fd
);
return
(
fd
);
}
...
...
@@ -395,14 +395,14 @@ retry:
}
if
(
ret
!=
sizeof
(
virProxyPacket
))
{
virProxyError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Communication error with proxy: got %d bytes of %d
\n
"
),
_
(
"Communication error with proxy: got %d bytes of %d"
),
ret
,
(
int
)
sizeof
(
virProxyPacket
));
goto
error
;
}
res
=
request
;
if
(
res
->
len
!=
sizeof
(
virProxyPacket
))
{
virProxyError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Communication error with proxy: expected %d bytes got %d
\n
"
),
_
(
"Communication error with proxy: expected %d bytes got %d"
),
(
int
)
sizeof
(
virProxyPacket
),
res
->
len
);
goto
error
;
}
...
...
@@ -418,7 +418,7 @@ retry:
}
if
(
ret
!=
sizeof
(
virProxyPacket
))
{
virProxyError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Communication error with proxy: got %d bytes of %d
\n
"
),
_
(
"Communication error with proxy: got %d bytes of %d"
),
ret
,
(
int
)
sizeof
(
virProxyPacket
));
goto
error
;
}
...
...
@@ -426,7 +426,7 @@ retry:
if
((
res
->
len
<
sizeof
(
virProxyPacket
))
||
(
res
->
len
>
sizeof
(
virProxyFullPacket
)))
{
virProxyError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Communication error with proxy: got %d bytes packet
\n
"
),
_
(
"Communication error with proxy: got %d bytes packet"
),
res
->
len
);
goto
error
;
}
...
...
@@ -436,7 +436,7 @@ retry:
res
->
len
-
ret
);
if
(
ret
!=
(
int
)
(
res
->
len
-
sizeof
(
virProxyPacket
)))
{
virProxyError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"Communication error with proxy: got %d bytes of %d
\n
"
),
_
(
"Communication error with proxy: got %d bytes of %d"
),
ret
,
(
int
)
sizeof
(
virProxyPacket
));
goto
error
;
}
...
...
@@ -448,7 +448,7 @@ retry:
if
((
res
->
version
!=
PROXY_PROTO_VERSION
)
||
(
res
->
len
<
sizeof
(
virProxyPacket
)))
{
virProxyError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Communication error with proxy: malformed packet
\n
"
));
_
(
"Communication error with proxy: malformed packet"
));
goto
error
;
}
if
(
res
->
serial
!=
serial
)
{
...
...
src/xen/xen_hypervisor.c
浏览文件 @
49411f02
...
...
@@ -2009,7 +2009,7 @@ xenHypervisorInit(void)
ret
=
ioctl
(
fd
,
cmd
,
(
unsigned
long
)
&
hc
);
if
((
ret
!=
-
1
)
&&
(
ret
!=
0
))
{
DEBUG
(
"Using new hypervisor call: %X
\n
"
,
ret
);
DEBUG
(
"Using new hypervisor call: %X"
,
ret
);
hv_version
=
ret
;
xen_ioctl_hypercall_cmd
=
cmd
;
goto
detect_v2
;
...
...
@@ -2025,7 +2025,7 @@ xenHypervisorInit(void)
cmd
=
_IOC
(
_IOC_NONE
,
'P'
,
0
,
sizeof
(
v0_hypercall_t
));
ret
=
ioctl
(
fd
,
cmd
,
(
unsigned
long
)
&
v0_hc
);
if
((
ret
!=
-
1
)
&&
(
ret
!=
0
))
{
DEBUG
(
"Using old hypervisor call: %X
\n
"
,
ret
);
DEBUG
(
"Using old hypervisor call: %X"
,
ret
);
hv_version
=
ret
;
xen_ioctl_hypercall_cmd
=
cmd
;
hypervisor_version
=
0
;
...
...
@@ -2062,13 +2062,13 @@ xenHypervisorInit(void)
/* RHEL 5.0 */
dom_interface_version
=
3
;
/* XEN_DOMCTL_INTERFACE_VERSION */
if
(
virXen_getvcpusinfo
(
fd
,
0
,
0
,
ipt
,
NULL
,
0
)
==
0
){
DEBUG0
(
"Using hypervisor call v2, sys ver2 dom ver3
\n
"
);
DEBUG0
(
"Using hypervisor call v2, sys ver2 dom ver3"
);
goto
done
;
}
/* Fedora 7 */
dom_interface_version
=
4
;
/* XEN_DOMCTL_INTERFACE_VERSION */
if
(
virXen_getvcpusinfo
(
fd
,
0
,
0
,
ipt
,
NULL
,
0
)
==
0
){
DEBUG0
(
"Using hypervisor call v2, sys ver2 dom ver4
\n
"
);
DEBUG0
(
"Using hypervisor call v2, sys ver2 dom ver4"
);
goto
done
;
}
}
...
...
@@ -2078,7 +2078,7 @@ xenHypervisorInit(void)
/* xen-3.1 */
dom_interface_version
=
5
;
/* XEN_DOMCTL_INTERFACE_VERSION */
if
(
virXen_getvcpusinfo
(
fd
,
0
,
0
,
ipt
,
NULL
,
0
)
==
0
){
DEBUG0
(
"Using hypervisor call v2, sys ver3 dom ver5
\n
"
);
DEBUG0
(
"Using hypervisor call v2, sys ver3 dom ver5"
);
goto
done
;
}
}
...
...
@@ -2088,7 +2088,7 @@ xenHypervisorInit(void)
/* Fedora 8 */
dom_interface_version
=
5
;
/* XEN_DOMCTL_INTERFACE_VERSION */
if
(
virXen_getvcpusinfo
(
fd
,
0
,
0
,
ipt
,
NULL
,
0
)
==
0
){
DEBUG0
(
"Using hypervisor call v2, sys ver4 dom ver5
\n
"
);
DEBUG0
(
"Using hypervisor call v2, sys ver4 dom ver5"
);
goto
done
;
}
}
...
...
@@ -2098,7 +2098,7 @@ xenHypervisorInit(void)
/* Xen 3.2, Fedora 9 */
dom_interface_version
=
5
;
/* XEN_DOMCTL_INTERFACE_VERSION */
if
(
virXen_getvcpusinfo
(
fd
,
0
,
0
,
ipt
,
NULL
,
0
)
==
0
){
DEBUG0
(
"Using hypervisor call v2, sys ver6 dom ver5
\n
"
);
DEBUG0
(
"Using hypervisor call v2, sys ver6 dom ver5"
);
goto
done
;
}
}
...
...
@@ -2107,14 +2107,14 @@ xenHypervisorInit(void)
sys_interface_version
=
7
;
/* XEN_SYSCTL_INTERFACE_VERSION */
if
(
virXen_getdomaininfo
(
fd
,
0
,
&
info
)
==
1
)
{
dom_interface_version
=
6
;
/* XEN_DOMCTL_INTERFACE_VERSION */
DEBUG0
(
"Using hypervisor call v2, sys ver7 dom ver6
\n
"
);
DEBUG0
(
"Using hypervisor call v2, sys ver7 dom ver6"
);
goto
done
;
}
hypervisor_version
=
1
;
sys_interface_version
=
-
1
;
if
(
virXen_getdomaininfo
(
fd
,
0
,
&
info
)
==
1
)
{
DEBUG0
(
"Using hypervisor call v1
\n
"
);
DEBUG0
(
"Using hypervisor call v1"
);
goto
done
;
}
...
...
@@ -2122,7 +2122,7 @@ xenHypervisorInit(void)
* we failed to make the getdomaininfolist hypercall
*/
DEBUG0
(
"Failed to find any Xen hypervisor method
\n
"
);
DEBUG0
(
"Failed to find any Xen hypervisor method"
);
hypervisor_version
=
-
1
;
virXenError
(
NULL
,
VIR_ERR_XEN_CALL
,
" ioctl %lu"
,
(
unsigned
long
)
IOCTL_PRIVCMD_HYPERCALL
);
...
...
src/xen/xs_internal.c
浏览文件 @
49411f02
...
...
@@ -342,7 +342,7 @@ xenStoreOpen(virConnectPtr conn,
xenStoreWatchEvent
,
conn
,
NULL
))
<
0
)
DEBUG0
(
"Failed to add event handle, disabling events
\n
"
);
DEBUG0
(
"Failed to add event handle, disabling events"
);
#endif //PROXY
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录