From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51005)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WrqbM-0008Nm-3r
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 11:26:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WrqbG-0004JH-5Z
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 11:26:12 -0400
Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:38740 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WrqbF-0004JD-Vg
	for qemu-devel@nongnu.org; Tue, 03 Jun 2014 11:26:06 -0400
Date: Tue, 3 Jun 2014 17:26:04 +0200
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140603152604.GG21314@irqsave.net>
References: <1401801062-9154-1-git-send-email-kwolf@redhat.com>
	<1401801062-9154-20-git-send-email-kwolf@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1401801062-9154-20-git-send-email-kwolf@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v3 19/21] vpc: Handle failure for
 potentially large allocations
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>
Cc: benoit.canet@irqsave.net, mreitz@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com

The Tuesday 03 Jun 2014 =E0 15:11:00 (+0200), Kevin Wolf wrote :
> Some code in the block layer makes potentially huge allocations. Failur=
e
> is not completely unexpected there, so avoid aborting qemu and handle
> out-of-memory situations gracefully.
>=20
> This patch addresses the allocations in the vpc block driver.
>=20
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/vpc.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>=20
> diff --git a/block/vpc.c b/block/vpc.c
> index 2e25f57..a6346bb 100644
> --- a/block/vpc.c
> +++ b/block/vpc.c
> @@ -269,7 +269,11 @@ static int vpc_open(BlockDriverState *bs, QDict *o=
ptions, int flags,
>              goto fail;
>          }
> =20
> -        s->pagetable =3D qemu_blockalign(bs, s->max_table_entries * 4)=
;
> +        s->pagetable =3D qemu_try_blockalign(bs, s->max_table_entries =
* 4);
> +        if (s->pagetable =3D=3D NULL) {
> +            ret =3D -ENOMEM;
> +            goto fail;
> +        }
> =20
>          s->bat_offset =3D be64_to_cpu(dyndisk_header->table_offset);
> =20
> --=20
> 1.8.3.1
>=20
>=20
Reviewed-by: Benoit Canet <benoit@irqsave.net>