From nobody Wed May 14 20:26:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528102782477692.4100928190513; Mon, 4 Jun 2018 01:59:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97012E9A22; Mon, 4 Jun 2018 08:59:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 634B95D6A8; Mon, 4 Jun 2018 08:59:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0A78618033F3; Mon, 4 Jun 2018 08:59:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w548xAxH018664 for ; Mon, 4 Jun 2018 04:59:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC6052026E0E; Mon, 4 Jun 2018 08:59:09 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 911F32026DEF for ; Mon, 4 Jun 2018 08:59:09 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 4 Jun 2018 10:58:47 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/10] security: aa-helper: Remove the -p parameter X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 04 Jun 2018 08:59:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" As the aa-helper binary is supposed to be used only with libvirt, we can fully remove it. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/security/virt-aa-helper.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index d0f9876da5..37fe36a329 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -63,7 +63,6 @@ static char *progname; typedef struct { - bool allowDiskFormatProbing; char uuid[PROFILE_NAME_SIZE]; /* UUID of vm */ bool dryrun; /* dry run */ char cmd; /* 'c' create @@ -115,7 +114,6 @@ vah_usage(void) " -r | --replace reload profile\n" " -R | --remove unload profile\n" " -h | --help this help\n" - " -p | --probing [0|1] allow disk format probing\= n" " -u | --uuid uuid (profile name)\n" "\n"), progname); @@ -975,10 +973,8 @@ get_files(vahControl * ctl) /* XXX - if we knew the qemu user:group here we could send it in * so that the open could be re-tried as that user:group. */ - if (!virStorageSourceHasBacking(disk->src)) { - bool probe =3D ctl->allowDiskFormatProbing; - virStorageFileGetMetadata(disk->src, -1, -1, probe, false); - } + if (!virStorageSourceHasBacking(disk->src)) + virStorageFileGetMetadata(disk->src, -1, -1, false, false); /* XXX passing ignoreOpenFailure =3D true to get back to the behav= ior * from before using virDomainDiskDefForeachPath. actually we shou= ld @@ -1228,7 +1224,6 @@ vahParseArgv(vahControl * ctl, int argc, char **argv) { int arg, idx =3D 0; struct option opt[] =3D { - {"probing", 1, 0, 'p' }, {"add", 0, 0, 'a'}, {"create", 0, 0, 'c'}, {"dryrun", 0, 0, 'd'}, @@ -1280,12 +1275,6 @@ vahParseArgv(vahControl * ctl, int argc, char **argv) PROFILE_NAME_SIZE) =3D=3D NULL) vah_error(ctl, 1, _("error copying UUID")); break; - case 'p': - if (STREQ(optarg, "1")) - ctl->allowDiskFormatProbing =3D true; - else - ctl->allowDiskFormatProbing =3D false; - break; default: vah_error(ctl, 1, _("unsupported option")); break; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list