Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
64de0e46
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
64de0e46
编写于
7月 29, 2011
作者:
A
Anthony Liguori
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
上级
23487df8
ec67464c
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
30 addition
and
5 deletion
+30
-5
Makefile
Makefile
+4
-2
configure
configure
+23
-0
qmp-commands.hx
qmp-commands.hx
+1
-1
slirp/ip_input.c
slirp/ip_input.c
+2
-2
未找到文件。
Makefile
浏览文件 @
64de0e46
...
...
@@ -192,8 +192,10 @@ test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types
test-qmp-commands
:
test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
QGALIB
=
qga/guest-agent-command-state.o qga/guest-agent-commands.o
QGALIB_GEN
=
$(
addprefix
$
(
qapi-dir
)
/, qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c
)
qemu-ga.o
:
$(addprefix $(qapi-dir)/
,
qga-qapi-types.c qga-qapi-types.h qga-qapi-visit.c qga-qmp-marshal.c) $(qapi-obj-y)
$(QGALIB_GEN)
:
$(GENERATED_HEADERS)
$(QGALIB) qemu-ga.o
:
$(QGALIB_GEN) $(qapi-obj-y)
qemu-ga$(EXESUF)
:
qemu-ga.o $(QGALIB) qemu-tool.o qemu-error.o error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(qapi-obj-y) qemu-timer-common.o qemu-sockets.o module.o qapi/qmp-dispatch.o qapi/qmp-registry.o $(qapi-dir)/qga-qapi-visit.o $(qapi-dir)/qga-qapi-types.o $(qapi-dir)/qga-qmp-marshal.o
QEMULIBS
=
libhw32 libhw64 libuser libdis libdis-user
...
...
@@ -291,7 +293,7 @@ TAGS:
cscope
:
rm
-f
./cscope.
*
find
.
-name
"*.[ch
]"
-print
|
sed
's,^\./,,'
>
./cscope.files
find
"
$(SRC_PATH)
"
-name
"*.[chsS
]"
-print
|
sed
's,^\./,,'
>
./cscope.files
cscope
-b
# documentation
...
...
configure
浏览文件 @
64de0e46
...
...
@@ -2517,6 +2517,29 @@ if test "$trace_backend" = "dtrace"; then
fi
fi
##########################################
# __sync_fetch_and_and requires at least -march=i486. Many toolchains
# use i686 as default anyway, but for those that don't, an explicit
# specification is necessary
if
test
$vhost_net
=
"yes"
&&
test
$cpu
=
"i386"
;
then
cat
>
$TMPC
<<
EOF
int sfaa(unsigned *ptr)
{
return __sync_fetch_and_and(ptr, 0);
}
int main(int argc, char **argv)
{
int val = 42;
sfaa(&val);
return val;
}
EOF
if
!
compile_prog
""
""
;
then
CFLAGS+
=
"-march=i486"
fi
fi
##########################################
# End of CC checks
# After here, no more $cc or $ld runs
...
...
qmp-commands.hx
浏览文件 @
64de0e46
...
...
@@ -42,7 +42,7 @@ and we're going to establish a deprecation policy for badly defined commands.
If you'
re
planning
to
adopt
QMP
,
please
observe
the
following
:
1
.
The
deprecation
policy
will
take
efect
and
be
documented
soon
,
please
1
.
The
deprecation
policy
will
take
ef
f
ect
and
be
documented
soon
,
please
check
the
documentation
of
each
used
command
as
soon
as
a
new
release
of
QEMU
is
available
...
...
slirp/ip_input.c
浏览文件 @
64de0e46
...
...
@@ -511,7 +511,7 @@ typedef uint32_t n_time;
*/
break
;
}
off
--
;
/
*
0
origin
*
/
off
--
;
/* 0 origin *
/
if
(
off
>
optlen
-
sizeof
(
struct
in_addr
))
{
/*
* End of source route. Should be for us.
...
...
@@ -554,7 +554,7 @@ typedef uint32_t n_time;
/*
* If no space remains, ignore.
*/
off
--
;
*
0
origin
*
off
--
;
/* 0 origin */
if
(
off
>
optlen
-
sizeof
(
struct
in_addr
))
break
;
bcopy
((
caddr_t
)(
&
ip
->
ip_dst
),
(
caddr_t
)
&
ipaddr
.
sin_addr
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录