Changeset
src/xenconfig/xen_xm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Git apply log
Switched to a new branch '20180512154502.1529-1-filipalac@gmail.com'
Applying: xenconfig: xm: Fix checking for extra in parser
Using index info to reconstruct a base tree...
M	src/xenconfig/xen_xm.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
To https://github.com/patchew-project/libvirt
 + 1c0896c...656151b patchew/20180512154502.1529-1-filipalac@gmail.com -> patchew/20180512154502.1529-1-filipalac@gmail.com (forced update)
Test passed: syntax-check

loading

[libvirt] [PATCH v2] xenconfig: xm: Fix checking for extra in parser
Posted by Filip Alac, 1 week ago
Parser assumed extra was always present when root was specified.
Fixed by handling root and extra separately.

Signed-off-by: Filip Alac <filipalac@gmail.com>
---
 src/xenconfig/xen_xm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
index 8ef68bbc..4becb40b 100644
--- a/src/xenconfig/xen_xm.c
+++ b/src/xenconfig/xen_xm.c
@@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
         if (xenConfigGetString(conf, "root", &root, NULL) < 0)
             return -1;
 
-        if (root) {
+        if (root && extra) {
             if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
                 return -1;
-        } else {
+        } else if (root) {
+            if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0)
+                return -1;
+        } else if (extra) {
             if (VIR_STRDUP(def->os.cmdline, extra) < 0)
                 return -1;
         }
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2] xenconfig: xm: Fix checking for extra in parser
Posted by Jim Fehlig, 1 week ago
On 05/12/2018 09:45 AM, Filip Alac wrote:
> Parser assumed extra was always present when root was specified.
> Fixed by handling root and extra separately.
> 
> Signed-off-by: Filip Alac <filipalac@gmail.com>

Reviewed-by: Jim Fehlig <jfehlig@suse.com>

and pushed. Thanks!

Regards,
Jim

> ---
>   src/xenconfig/xen_xm.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
> index 8ef68bbc..4becb40b 100644
> --- a/src/xenconfig/xen_xm.c
> +++ b/src/xenconfig/xen_xm.c
> @@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
>           if (xenConfigGetString(conf, "root", &root, NULL) < 0)
>               return -1;
>   
> -        if (root) {
> +        if (root && extra) {
>               if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
>                   return -1;
> -        } else {
> +        } else if (root) {
> +            if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0)
> +                return -1;
> +        } else if (extra) {
>               if (VIR_STRDUP(def->os.cmdline, extra) < 0)
>                   return -1;
>           }
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2] xenconfig: xm: Fix checking for extra in parser
Posted by Cole Robinson, 1 week ago
On 05/12/2018 11:45 AM, Filip Alac wrote:
> Parser assumed extra was always present when root was specified.
> Fixed by handling root and extra separately.
> 
> Signed-off-by: Filip Alac <filipalac@gmail.com>
> ---
>  src/xenconfig/xen_xm.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c
> index 8ef68bbc..4becb40b 100644
> --- a/src/xenconfig/xen_xm.c
> +++ b/src/xenconfig/xen_xm.c
> @@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
>          if (xenConfigGetString(conf, "root", &root, NULL) < 0)
>              return -1;
>  
> -        if (root) {
> +        if (root && extra) {
>              if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0)
>                  return -1;
> -        } else {
> +        } else if (root) {
> +            if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0)
> +                return -1;
> +        } else if (extra) {
>              if (VIR_STRDUP(def->os.cmdline, extra) < 0)
>                  return -1;
>          }
> 

I'm guessing you came to this issue via
https://bugzilla.redhat.com/show_bug.cgi?id=1327578 . In the future
please add a link to the bug report in the git commit message

Also this is a good candidate for extending the test suite,
tests/xmconfigdata and tests/xmconfigtest.c

Thanks,
Cole

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list