[PATCH] Align help text of virt-aa-helper with actual expectated input

Erik Huelsmann posted 1 patch 2 weeks, 5 days ago
Failed in applying to current master (apply log)
src/security/virt-aa-helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] Align help text of virt-aa-helper with actual expectated input
Posted by Erik Huelsmann 2 weeks, 5 days ago
When virt-aa-helper is invoked with a -u parameter followed by an actual UUID
as suggested by the help text, it throws an 'invalid UUID' error, even when the
UUID is the UUID of an existing VM.  With this adjustment of the help text,
there's a better chance of users providing the correct input.

Signed-off-by: Erik Huelsmann <ehuels@gmail.com>
---
 src/security/virt-aa-helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index de0a826063..3f8dec98cc 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -105,7 +105,7 @@ vah_usage(void)
             "    -R | --remove                  unload profile\n"
             "  Options:\n"
             "    -d | --dryrun                  dry run\n"
-            "    -u | --uuid <uuid>             uuid (profile name)\n"
+            "    -u | --uuid libvirt-<uuid>   AppArmor profile name\n"
             "    -h | --help                    this help\n"
             "  Extra File:\n"
             "    -f | --add-file <file>         add file to a profile
generated from XML\n"
-- 
2.43.0
Re: [PATCH] Align help text of virt-aa-helper with actual expectated input
Posted by Michal Prívozník via Devel 2 weeks, 3 days ago
On 1/13/26 21:10, Erik Huelsmann wrote:
> When virt-aa-helper is invoked with a -u parameter followed by an actual UUID
> as suggested by the help text, it throws an 'invalid UUID' error, even when the
> UUID is the UUID of an existing VM.  With this adjustment of the help text,
> there's a better chance of users providing the correct input.
> 
> Signed-off-by: Erik Huelsmann <ehuels@gmail.com>
> ---
>  src/security/virt-aa-helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
> index de0a826063..3f8dec98cc 100644
> --- a/src/security/virt-aa-helper.c
> +++ b/src/security/virt-aa-helper.c
> @@ -105,7 +105,7 @@ vah_usage(void)
>              "    -R | --remove                  unload profile\n"
>              "  Options:\n"
>              "    -d | --dryrun                  dry run\n"
> -            "    -u | --uuid <uuid>             uuid (profile name)\n"
> +            "    -u | --uuid libvirt-<uuid>   AppArmor profile name\n"

This is now not aligned ;-)

>              "    -h | --help                    this help\n"
>              "  Extra File:\n"
>              "    -f | --add-file <file>         add file to a profile
> generated from XML\n"

And this line break makes the patch fail to apply. Just for future,
using git send-email is the way to go, when sending patches ;-)

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

and merged. Congratulations on your first libvirt contribution!

Michal
Re: [PATCH] Align help text of virt-aa-helper with actual expectated input
Posted by Erik Huelsmann 2 weeks, 2 days ago
On Thu, Jan 15, 2026 at 11:45 AM Michal Prívozník <mprivozn@redhat.com> wrote:
>
> On 1/13/26 21:10, Erik Huelsmann wrote:
> > When virt-aa-helper is invoked with a -u parameter followed by an actual UUID
> > as suggested by the help text, it throws an 'invalid UUID' error, even when the
> > UUID is the UUID of an existing VM.  With this adjustment of the help text,
> > there's a better chance of users providing the correct input.
> >
> > Signed-off-by: Erik Huelsmann <ehuels@gmail.com>
> > ---
> >  src/security/virt-aa-helper.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
> > index de0a826063..3f8dec98cc 100644
> > --- a/src/security/virt-aa-helper.c
> > +++ b/src/security/virt-aa-helper.c
> > @@ -105,7 +105,7 @@ vah_usage(void)
> >              "    -R | --remove                  unload profile\n"
> >              "  Options:\n"
> >              "    -d | --dryrun                  dry run\n"
> > -            "    -u | --uuid <uuid>             uuid (profile name)\n"
> > +            "    -u | --uuid libvirt-<uuid>   AppArmor profile name\n"
>
> This is now not aligned ;-)

Bah. I experimented with '-u "libvirt-<uuid>"' (quoted) and the
version you see above. I noticed the alignment problem and fixed it
when I added the double quotes, but apparently, I didn't (completely)
fix it when I removed them again. Sorry about that.

> >              "    -h | --help                    this help\n"
> >              "  Extra File:\n"
> >              "    -f | --add-file <file>         add file to a profile
> > generated from XML\n"
>
> And this line break makes the patch fail to apply. Just for future,
> using git send-email is the way to go, when sending patches ;-)
>
> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
>
> and merged. Congratulations on your first libvirt contribution!

Thanks! Happy to have made this step! In the past, I've contributed to
libvirt-perl and more recently, I wrote Sys::Async::Virt, a Perl
client implementation that is entirely future based. It implements all
client functionality, except authentication (other than AUTH_NONE) and
migration. The rest (including streams, callbacks and cpu maps) works.
I'm almost done implementing the foundation for the further work I
have planned, of which the "I'd like to see issue #135 fixed, if I can
help it" is part.

Thanks again and I hope I can contribute more!

-- 
Bye,

Erik.

http://efficito.com -- Hosted accounting and ERP.
Robust and Flexible. No vendor lock-in.