External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-16 22:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Two bug fixes coming from RHEL and Markus being added to AUTHORS

Browse Source 
* src/xm_internal.c: two bug fixes coming from RHEL package
  posted by Markus Armbruster
* AUTHORS: adding Markus
daniel
This commit is contained in:
Daniel Veillard 2009-01-19 15:24:41 +00:00
parent 1fe181e36f
commit 99ed5b4bee
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -58,6 +58,7 @@ Patches have also been contributed by:
Gerd von Egidy <lists@egidy.de>
Itamar Heim <iheim@redhat.com>
Dave Allan <dallan@redhat.com>
Markus Armbruster <armbru@redhat.com>
[....send patches to get your name here....]

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Jan 19 16:18:46 CET 2009 Daniel Veillard <veillard@redhat.com>
* src/xm_internal.c: two bug fixes coming from RHEL package
posted by Markus Armbruster
* AUTHORS: adding Markus
Fri Jan 16 18:44:08 +0100 2009 Jim Meyering <meyering@redhat.com>
tests: virsh-all and virsh-synopsis were not being run

5
src/xm_internal.c
View File

@ -1808,6 +1808,7 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn,
virBuffer buf = VIR_BUFFER_INITIALIZER;
virConfValuePtr val, tmp;
char *str;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
virBufferVSprintf(&buf, "mac=%02x:%02x:%02x:%02x:%02x:%02x",
net->mac[0], net->mac[1],
@ -1836,7 +1837,7 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn,
goto cleanup;
}
if (hvm)
if (hvm && priv->xendConfigVersion < 4)
virBufferAddLit(&buf, ",type=ioemu");
if (net->model)
@ -2048,7 +2049,7 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
}
if (def->graphics) {
if (hvm || priv->xendConfigVersion < 3) {
if (priv->xendConfigVersion < (hvm ? 4 : 3)) {
if (def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
if (xenXMConfigSetInt(conf, "sdl", 1) < 0)
goto no_memory;