External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: Return tap2 for tap2 disks

Browse Source 
For some versions of Xen the difference between "tap" and "tap2" is
important. When converting back from xen-sxpr to libvirt-xml, that
information is lost, which breaks re-defining the domain using that
data.

Explicitly return "tap2" for disks defined as "device/tap2".

Signed-off-by: Philipp Hahn <hahn@univention.de>
This commit is contained in:
Philipp Hahn 2011-10-12 10:55:37 +02:00 committed by Eric Blake
parent c2969ec7ae
commit c490b469ce
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xenxs/xen_sxpr.c
View File

@ -397,14 +397,20 @@ xenParseSxprDisks(virDomainDefPtr def,
goto error;
}
if (VIR_ALLOC_N(disk->driverName, (offset-src)+1) < 0)
goto no_memory;
if (virStrncpy(disk->driverName, src, offset-src,
(offset-src)+1) == NULL) {
XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Driver name %s too big for destination"),
src);
goto error;
if (sexpr_lookup(node, "device/tap2") &&
STRPREFIX(src, "tap:")) {
if (!(disk->driverName = strdup("tap2")))
goto no_memory;
} else {
if (VIR_ALLOC_N(disk->driverName, (offset-src)+1) < 0)
goto no_memory;
if (virStrncpy(disk->driverName, src, offset-src,
(offset-src)+1) == NULL) {
XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Driver name %s too big for destination"),
src);
goto error;
}
}
src = offset + 1;