提交 14435163 编写于 作者: D Daniel Veillard

* src/xend_internal.c: avoid a segfault when dumping XML with recent

  xen versions, patch by Sascha, fixes #503254
daniel
上级 fd90b67a
Fri Jun 26 20:11:38 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/xend_internal.c: avoid a segfault when dumping XML with recent
xen versions, patch by Sascha, fixes #503254
Fri Jun 26 18:15:08 CEST 2009 Daniel Veillard <veillard@redhat.com> Fri Jun 26 18:15:08 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/libvirt_private.syms src/parthelper.c src/storage_backend_disk.c * src/libvirt_private.syms src/parthelper.c src/storage_backend_disk.c
......
...@@ -2079,7 +2079,15 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn, ...@@ -2079,7 +2079,15 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn,
if (sexpr_lookup(node, "device/vfb")) { if (sexpr_lookup(node, "device/vfb")) {
/* New style graphics config for PV guests in >= 3.0.4, /* New style graphics config for PV guests in >= 3.0.4,
* or for HVM guests in >= 3.0.5 */ * or for HVM guests in >= 3.0.5 */
tmp = sexpr_node(node, "device/vfb/type"); if (sexpr_node(node, "device/vfb/type")) {
tmp = sexpr_node(node, "device/vfb/type");
} else if (sexpr_node(node, "device/vfb/vnc")) {
tmp = "vnc";
} else if (sexpr_node(node, "device/vfb/sdl")) {
tmp = "sdl";
} else {
tmp = "unknown";
}
if (VIR_ALLOC(graphics) < 0) if (VIR_ALLOC(graphics) < 0)
goto no_memory; goto no_memory;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册