Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
0a755f66
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看板
提交
0a755f66
编写于
6月 27, 2011
作者:
M
Minoru Usui
提交者:
Eric Blake
6月 27, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sysinfo: cleanup function/struct names.
Fix lack of 'virSysinfo' prefix of functions/structs in src/util/sysinfo.[ch]
上级
a6c85d44
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
28 deletion
+32
-28
src/util/sysinfo.c
src/util/sysinfo.c
+24
-20
src/util/sysinfo.h
src/util/sysinfo.h
+8
-8
未找到文件。
src/util/sysinfo.c
浏览文件 @
0a755f66
...
...
@@ -128,7 +128,7 @@ virSysinfoRead(void) {
#else
/* !WIN32 */
static
char
*
parseBIOSInfo
(
char
*
base
,
virSysinfoDefPtr
ret
)
virSysinfoParseBIOS
(
char
*
base
,
virSysinfoDefPtr
ret
)
{
char
*
cur
,
*
eol
;
...
...
@@ -164,7 +164,7 @@ no_memory:
}
static
char
*
parseSystemInfo
(
char
*
base
,
virSysinfoDefPtr
ret
)
virSysinfoParseSystem
(
char
*
base
,
virSysinfoDefPtr
ret
)
{
char
*
cur
,
*
eol
;
...
...
@@ -222,10 +222,10 @@ no_memory:
}
static
char
*
parseProcessorInfo
(
char
*
base
,
virSysinfoDefPtr
ret
)
virSysinfoParseProcessor
(
char
*
base
,
virSysinfoDefPtr
ret
)
{
char
*
cur
,
*
eol
,
*
tmp_base
;
vir
Processorinfo
DefPtr
processor
;
vir
SysinfoProcessor
DefPtr
processor
;
while
((
tmp_base
=
strstr
(
base
,
"Processor Information"
))
!=
NULL
)
{
base
=
tmp_base
;
...
...
@@ -323,10 +323,10 @@ no_memory:
}
static
char
*
parseMemoryDeviceInfo
(
char
*
base
,
virSysinfoDefPtr
ret
)
virSysinfoParseMemory
(
char
*
base
,
virSysinfoDefPtr
ret
)
{
char
*
cur
,
*
eol
,
*
tmp_base
;
vir
MemoryDeviceinfo
DefPtr
memory
;
vir
SysinfoMemory
DefPtr
memory
;
while
((
tmp_base
=
strstr
(
base
,
"Memory Device"
))
!=
NULL
)
{
base
=
tmp_base
;
...
...
@@ -452,20 +452,20 @@ virSysinfoRead(void) {
base
=
outbuf
;
if
((
base
=
parseBIOSInfo
(
base
,
ret
))
==
NULL
)
if
((
base
=
virSysinfoParseBIOS
(
base
,
ret
))
==
NULL
)
goto
no_memory
;
if
((
base
=
parseSystemInfo
(
base
,
ret
))
==
NULL
)
if
((
base
=
virSysinfoParseSystem
(
base
,
ret
))
==
NULL
)
goto
no_memory
;
ret
->
nprocessor
=
0
;
ret
->
processor
=
NULL
;
if
((
base
=
parseProcessorInfo
(
base
,
ret
))
==
NULL
)
if
((
base
=
virSysinfoParseProcessor
(
base
,
ret
))
==
NULL
)
goto
no_memory
;
ret
->
nmemory
=
0
;
ret
->
memory
=
NULL
;
if
((
base
=
parseMemoryDeviceInfo
(
base
,
ret
))
==
NULL
)
if
((
base
=
virSysinfoParseMemory
(
base
,
ret
))
==
NULL
)
goto
no_memory
;
cleanup:
...
...
@@ -484,7 +484,8 @@ no_memory:
#endif
/* !WIN32 */
static
void
BIOSInfoFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
virSysinfoBIOSFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
{
int
len
=
strlen
(
prefix
);
...
...
@@ -522,7 +523,8 @@ BIOSInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf)
}
static
void
SystemInfoFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
virSysinfoSystemFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
{
int
len
=
strlen
(
prefix
);
...
...
@@ -580,11 +582,12 @@ SystemInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf)
}
static
void
ProcessorInfoFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
virSysinfoProcessorFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
{
int
i
;
int
len
=
strlen
(
prefix
);
vir
Processorinfo
DefPtr
processor
;
vir
SysinfoProcessor
DefPtr
processor
;
for
(
i
=
0
;
i
<
def
->
nprocessor
;
i
++
)
{
processor
=
&
def
->
processor
[
i
];
...
...
@@ -675,11 +678,12 @@ ProcessorInfoFormat(virSysinfoDefPtr def, const char *prefix, virBufferPtr buf)
}
static
void
MemoryDeviceInfoFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
virSysinfoMemoryFormat
(
virSysinfoDefPtr
def
,
const
char
*
prefix
,
virBufferPtr
buf
)
{
int
i
;
int
len
=
strlen
(
prefix
);
vir
MemoryDeviceinfo
DefPtr
memory
;
vir
SysinfoMemory
DefPtr
memory
;
for
(
i
=
0
;
i
<
def
->
nmemory
;
i
++
)
{
memory
=
&
def
->
memory
[
i
];
...
...
@@ -785,10 +789,10 @@ virSysinfoFormat(virSysinfoDefPtr def, const char *prefix)
virBufferAsprintf
(
&
buf
,
"%s<sysinfo type='%s'>
\n
"
,
prefix
,
type
);
BIOSInfo
Format
(
def
,
prefix
,
&
buf
);
SystemInfo
Format
(
def
,
prefix
,
&
buf
);
ProcessorInfo
Format
(
def
,
prefix
,
&
buf
);
MemoryDeviceInfo
Format
(
def
,
prefix
,
&
buf
);
virSysinfoBIOS
Format
(
def
,
prefix
,
&
buf
);
virSysinfoSystem
Format
(
def
,
prefix
,
&
buf
);
virSysinfoProcessor
Format
(
def
,
prefix
,
&
buf
);
virSysinfoMemory
Format
(
def
,
prefix
,
&
buf
);
virBufferAsprintf
(
&
buf
,
"%s</sysinfo>
\n
"
,
prefix
);
...
...
src/util/sysinfo.h
浏览文件 @
0a755f66
...
...
@@ -33,9 +33,9 @@ enum virSysinfoType {
VIR_SYSINFO_LAST
};
typedef
struct
_vir
ProcessorinfoDef
virProcessorinfo
Def
;
typedef
vir
ProcessorinfoDef
*
virProcessorinfo
DefPtr
;
struct
_vir
Processorinfo
Def
{
typedef
struct
_vir
SysinfoProcessorDef
virSysinfoProcessor
Def
;
typedef
vir
SysinfoProcessorDef
*
virSysinfoProcessor
DefPtr
;
struct
_vir
SysinfoProcessor
Def
{
char
*
processor_socket_destination
;
char
*
processor_type
;
char
*
processor_family
;
...
...
@@ -49,9 +49,9 @@ struct _virProcessorinfoDef {
char
*
processor_part_number
;
};
typedef
struct
_vir
MemoryDeviceinfoDef
virMemoryDeviceinfo
Def
;
typedef
vir
MemoryDeviceinfoDef
*
virMemoryDeviceinfo
DefPtr
;
struct
_vir
MemoryDeviceinfo
Def
{
typedef
struct
_vir
SysinfoMemoryDef
virSysinfoMemory
Def
;
typedef
vir
SysinfoMemoryDef
*
virSysinfoMemory
DefPtr
;
struct
_vir
SysinfoMemory
Def
{
char
*
memory_size
;
char
*
memory_form_factor
;
char
*
memory_locator
;
...
...
@@ -83,10 +83,10 @@ struct _virSysinfoDef {
char
*
system_family
;
size_t
nprocessor
;
vir
Processorinfo
DefPtr
processor
;
vir
SysinfoProcessor
DefPtr
processor
;
size_t
nmemory
;
vir
MemoryDeviceinfo
DefPtr
memory
;
vir
SysinfoMemory
DefPtr
memory
;
};
virSysinfoDefPtr
virSysinfoRead
(
void
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录