[libvirt] [PATCH] xenconfig: fix boot device parsing

The original code always checked *boot which was in effect boot[0]. It should use boot[i]. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- src/xenconfig/xen_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 7f4ec89..48431a7 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1071,7 +1071,7 @@ xenParseOS(virConfPtr conf, virDomainDefPtr def) return -1; for (i = 0; i < VIR_DOMAIN_BOOT_LAST && boot[i]; i++) { - switch (*boot) { + switch (boot[i]) { case 'a': def->os.bootDevs[i] = VIR_DOMAIN_BOOT_FLOPPY; break; -- 1.7.10.4

On Sun, 2014-12-14 at 14:58 +0000, Wei Liu wrote:
The original code always checked *boot which was in effect boot[0]. It should use boot[i].
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

On 12/14/2014 09:58 AM, Wei Liu wrote:
The original code always checked *boot which was in effect boot[0]. It should use boot[i].
In the future, when you do the investigation, just reference the commit id that caused the regression. In this case it seems to be commit id '547bd71a' (7/25/08 - quite a while ago)! I'll work on getting this pushed shortly - John
Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- src/xenconfig/xen_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 7f4ec89..48431a7 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1071,7 +1071,7 @@ xenParseOS(virConfPtr conf, virDomainDefPtr def) return -1;
for (i = 0; i < VIR_DOMAIN_BOOT_LAST && boot[i]; i++) { - switch (*boot) { + switch (boot[i]) { case 'a': def->os.bootDevs[i] = VIR_DOMAIN_BOOT_FLOPPY; break;
participants (3)
-
Ian Campbell
-
John Ferlan
-
Wei Liu