Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
7e58aaa7
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7e58aaa7
编写于
12月 17, 2008
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove use of anonymous unions for non-GCC (John Levon)
上级
6ded3eba
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
35 addition
and
25 deletion
+35
-25
ChangeLog
ChangeLog
+9
-0
src/domain_conf.c
src/domain_conf.c
+13
-13
src/domain_conf.h
src/domain_conf.h
+2
-1
src/qemu_conf.c
src/qemu_conf.c
+5
-5
src/qemu_driver.c
src/qemu_driver.c
+5
-5
src/remote_internal.c
src/remote_internal.c
+1
-1
未找到文件。
ChangeLog
浏览文件 @
7e58aaa7
Wed Dec 17 18:10:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Anonymous union fixes for non-GCC compilers (John Levon)
* domain_conf.c, qemu_conf.c, qemu_driver.c: Remove use
of anonymous union
* domain_conf.h: Give a name to the anonymous union for
host devices. Add 'dummy' field to avoid empty struct
* remote_internal.c: Remove gcc-ism in empty "x ? : y"
Wed Dec 17 19:06:53 +0100 2008 Jim Meyering <meyering@redhat.com>
portability: don't include <endian.h> or <byteswap.h>
...
...
src/domain_conf.c
浏览文件 @
7e58aaa7
...
...
@@ -1479,7 +1479,7 @@ virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn,
if
(
vendor
)
{
if
(
virStrToLong_ui
(
vendor
,
NULL
,
0
,
&
def
->
source
.
subsys
.
usb
.
vendor
)
<
0
)
{
&
def
->
source
.
subsys
.
u
.
u
sb
.
vendor
)
<
0
)
{
virDomainReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"cannot parse vendor id %s"
),
vendor
);
VIR_FREE
(
vendor
);
...
...
@@ -1496,7 +1496,7 @@ virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn,
if
(
product
)
{
if
(
virStrToLong_ui
(
product
,
NULL
,
0
,
&
def
->
source
.
subsys
.
usb
.
product
)
<
0
)
{
&
def
->
source
.
subsys
.
u
.
u
sb
.
product
)
<
0
)
{
virDomainReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"cannot parse product %s"
),
product
);
VIR_FREE
(
product
);
...
...
@@ -1514,7 +1514,7 @@ virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn,
bus
=
virXMLPropString
(
cur
,
"bus"
);
if
(
bus
)
{
if
(
virStrToLong_ui
(
bus
,
NULL
,
0
,
&
def
->
source
.
subsys
.
usb
.
bus
)
<
0
)
{
&
def
->
source
.
subsys
.
u
.
u
sb
.
bus
)
<
0
)
{
virDomainReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"cannot parse bus %s"
),
bus
);
VIR_FREE
(
bus
);
...
...
@@ -1530,7 +1530,7 @@ virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn,
device
=
virXMLPropString
(
cur
,
"device"
);
if
(
device
)
{
if
(
virStrToLong_ui
(
device
,
NULL
,
0
,
&
def
->
source
.
subsys
.
usb
.
device
)
<
0
)
{
&
def
->
source
.
subsys
.
u
.
u
sb
.
device
)
<
0
)
{
virDomainReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"cannot parse device %s"
),
device
);
...
...
@@ -1552,14 +1552,14 @@ virDomainHostdevSubsysUsbDefParseXML(virConnectPtr conn,
cur
=
cur
->
next
;
}
if
(
def
->
source
.
subsys
.
usb
.
vendor
==
0
&&
def
->
source
.
subsys
.
usb
.
product
!=
0
)
{
if
(
def
->
source
.
subsys
.
u
.
u
sb
.
vendor
==
0
&&
def
->
source
.
subsys
.
u
.
u
sb
.
product
!=
0
)
{
virDomainReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"missing vendor"
));
goto
out
;
}
if
(
def
->
source
.
subsys
.
usb
.
vendor
!=
0
&&
def
->
source
.
subsys
.
usb
.
product
==
0
)
{
if
(
def
->
source
.
subsys
.
u
.
u
sb
.
vendor
!=
0
&&
def
->
source
.
subsys
.
u
.
u
sb
.
product
==
0
)
{
virDomainReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"missing product"
));
goto
out
;
...
...
@@ -3004,15 +3004,15 @@ virDomainHostdevDefFormat(virConnectPtr conn,
virBufferVSprintf
(
buf
,
" <hostdev mode='%s' type='%s'>
\n
"
,
mode
,
type
);
virBufferAddLit
(
buf
,
" <source>
\n
"
);
if
(
def
->
source
.
subsys
.
usb
.
vendor
)
{
if
(
def
->
source
.
subsys
.
u
.
u
sb
.
vendor
)
{
virBufferVSprintf
(
buf
,
" <vendor id='0x%.4x'/>
\n
"
,
def
->
source
.
subsys
.
usb
.
vendor
);
def
->
source
.
subsys
.
u
.
u
sb
.
vendor
);
virBufferVSprintf
(
buf
,
" <product id='0x%.4x'/>
\n
"
,
def
->
source
.
subsys
.
usb
.
product
);
def
->
source
.
subsys
.
u
.
u
sb
.
product
);
}
else
{
virBufferVSprintf
(
buf
,
" <address bus='%d' device='%d'/>
\n
"
,
def
->
source
.
subsys
.
usb
.
bus
,
def
->
source
.
subsys
.
usb
.
device
);
def
->
source
.
subsys
.
u
.
u
sb
.
bus
,
def
->
source
.
subsys
.
u
.
u
sb
.
device
);
}
virBufferAddLit
(
buf
,
" </source>
\n
"
);
...
...
src/domain_conf.h
浏览文件 @
7e58aaa7
...
...
@@ -308,12 +308,13 @@ struct _virDomainHostdevDef {
unsigned
slot
;
unsigned
function
;
}
pci
;
};
}
u
;
}
subsys
;
struct
{
/* TBD: struct capabilities see:
* https://www.redhat.com/archives/libvir-list/2008-July/msg00429.html
*/
int
dummy
;
}
caps
;
}
source
;
char
*
target
;
...
...
src/qemu_conf.c
浏览文件 @
7e58aaa7
...
...
@@ -1263,15 +1263,15 @@ int qemudBuildCommandLine(virConnectPtr conn,
if
(
hostdev
->
mode
==
VIR_DOMAIN_HOSTDEV_MODE_SUBSYS
&&
hostdev
->
source
.
subsys
.
type
==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB
)
{
if
(
hostdev
->
source
.
subsys
.
usb
.
vendor
)
{
if
(
hostdev
->
source
.
subsys
.
u
.
u
sb
.
vendor
)
{
ret
=
asprintf
(
&
usbdev
,
"host:%.4x:%.4x"
,
hostdev
->
source
.
subsys
.
usb
.
vendor
,
hostdev
->
source
.
subsys
.
usb
.
product
);
hostdev
->
source
.
subsys
.
u
.
u
sb
.
vendor
,
hostdev
->
source
.
subsys
.
u
.
u
sb
.
product
);
}
else
{
ret
=
asprintf
(
&
usbdev
,
"host:%.3d.%.3d"
,
hostdev
->
source
.
subsys
.
usb
.
bus
,
hostdev
->
source
.
subsys
.
usb
.
device
);
hostdev
->
source
.
subsys
.
u
.
u
sb
.
bus
,
hostdev
->
source
.
subsys
.
u
.
u
sb
.
device
);
}
if
(
ret
<
0
)
{
usbdev
=
NULL
;
...
...
src/qemu_driver.c
浏览文件 @
7e58aaa7
...
...
@@ -3107,14 +3107,14 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
return
-
1
;
}
if
(
dev
->
data
.
hostdev
->
source
.
subsys
.
usb
.
vendor
)
{
if
(
dev
->
data
.
hostdev
->
source
.
subsys
.
u
.
u
sb
.
vendor
)
{
ret
=
asprintf
(
&
cmd
,
"usb_add host:%.4x:%.4x"
,
dev
->
data
.
hostdev
->
source
.
subsys
.
usb
.
vendor
,
dev
->
data
.
hostdev
->
source
.
subsys
.
usb
.
product
);
dev
->
data
.
hostdev
->
source
.
subsys
.
u
.
u
sb
.
vendor
,
dev
->
data
.
hostdev
->
source
.
subsys
.
u
.
u
sb
.
product
);
}
else
{
ret
=
asprintf
(
&
cmd
,
"usb_add host:%.3d.%.3d"
,
dev
->
data
.
hostdev
->
source
.
subsys
.
usb
.
bus
,
dev
->
data
.
hostdev
->
source
.
subsys
.
usb
.
device
);
dev
->
data
.
hostdev
->
source
.
subsys
.
u
.
u
sb
.
bus
,
dev
->
data
.
hostdev
->
source
.
subsys
.
u
.
u
sb
.
device
);
}
if
(
ret
==
-
1
)
{
qemudReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_NO_MEMORY
,
NULL
);
...
...
src/remote_internal.c
浏览文件 @
7e58aaa7
...
...
@@ -649,7 +649,7 @@ doRemoteOpen (virConnectPtr conn,
if
(
username
)
nr_args
+=
2
;
/* For -l username */
if
(
no_tty
)
nr_args
+=
5
;
/* For -T -o BatchMode=yes -e none */
command
=
command
?
:
strdup
(
"ssh"
);
command
=
command
?
command
:
strdup
(
"ssh"
);
if
(
command
==
NULL
)
goto
out_of_memory
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录