diff --git a/ChangeLog b/ChangeLog index 1064db459f73fc4ca5b28bb8bc474e72c052507d..fdab46b7344dc0319404920b317515edababe11b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ +Fri Apr 13 10:07:04 EST 2007 Daniel P. Berrange + + * src/xend_internal.c: Back out accidental commit of code which + added an block for dom0. + Fri Apr 13 10:00:04 CEST 2007 Daniel Veillard * src/virsh.c: fixed a bad messaging mechanism preventing localization and raised by Thomas Canniot -Thu Apr 12 19:51:00 EST 2007 Daniel Berrange +Thu Apr 12 19:51:00 EST 2007 Daniel P. Berrange * src/xen_internal.c: Updated structs to work with new Xen 3.0.5 hypercall ABI. Mask out HVM bit when determining domain status. diff --git a/src/xend_internal.c b/src/xend_internal.c index 66a2e4a42f04cabbd44d39a79ffecb0b57a7434d..7de277d801c5cbf5964fe8b8bd80eee35fb5dd61 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1399,11 +1399,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, int xendConfigVersi virBufferVSprintf(&buf, " %s\n", tmp); } - if (domid == 0) { - virBufferAdd(&buf, " \n", -1); - virBufferAdd(&buf, " linux\n", -1); - virBufferAdd(&buf, " \n", -1); - } else { + if (domid != 0) { if (sexpr_lookup(root, "domain/image")) { hvm = sexpr_lookup(root, "domain/image/hvm") ? 1 : 0; xend_parse_sexp_desc_os(conn, root, &buf, hvm, bootloader);