From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjmCF-00067h-Ud for qemu-devel@nongnu.org; Mon, 12 May 2014 05:07:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjmCA-0001iO-Jc for qemu-devel@nongnu.org; Mon, 12 May 2014 05:06:55 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48491 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjmCA-0001iJ-Cv for qemu-devel@nongnu.org; Mon, 12 May 2014 05:06:50 -0400 Message-ID: <53708F27.8040703@suse.de> Date: Mon, 12 May 2014 11:06:47 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1399878638-11292-1-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1399878638-11292-1-git-send-email-arei.gonglei@huawei.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3] cirrus_vga: adding sanity check for vram size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: arei.gonglei@huawei.com, qemu-devel@nongnu.org, kraxel@redhat.com Cc: blauwirbel@gmail.com, pbonzini@redhat.com, mjt@tls.msk.ru, weidong.huang@huawei.com, mst@redhat.com Am 12.05.2014 09:10, schrieb arei.gonglei@huawei.com: > From: Gonglei >=20 > when configure a invalid vram size for cirrus card, such as less > 2 MB, which will crash qemu. Follow the real hardware, the cirrus > card has 4 MB video memory. Also for backward compatibility, accept > 8 MB and 16 MB vram size. >=20 > Signed-off-by: Gonglei > --- > v3:=20 > - fix logic bug pointed out by Michael Tokarev > - add the same restriction for ISA cirrus device, thanks Andreas > v2:=20 > - fix checkpatch fails. > "WARNING: suspect code indent for conditional statements (5, 9)" > maybe not a real warning. > =20 > hw/display/cirrus_vga.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) Thanks, Reviewed-by: Andreas F=E4rber > diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c > index d1afc76..ca0d786 100644 > --- a/hw/display/cirrus_vga.c > +++ b/hw/display/cirrus_vga.c > @@ -2913,6 +2913,14 @@ static void isa_cirrus_vga_realizefn(DeviceState= *dev, Error **errp) > ISACirrusVGAState *d =3D ISA_CIRRUS_VGA(dev); > VGACommonState *s =3D &d->cirrus_vga.vga; > =20 > + /* follow real hardware, cirrus card emulated has 4 MB video memor= y. > + Also accept 8 MB/16 MB for backward compatibility. */ > + if (s->vram_size_mb !=3D 4 && s->vram_size_mb !=3D 8 && > + s->vram_size_mb !=3D 16) { > + error_setg(errp, "Invalid cirrus_vga ram size '%u'", > + s->vram_size_mb); > + return; > + } > vga_common_init(s, OBJECT(dev), true); > cirrus_init_common(&d->cirrus_vga, OBJECT(dev), CIRRUS_ID_CLGD5430= , 0, > isa_address_space(isadev), > @@ -2959,6 +2967,14 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) > PCIDeviceClass *pc =3D PCI_DEVICE_GET_CLASS(dev); > int16_t device_id =3D pc->device_id; > =20 > + /* follow real hardware, cirrus card emulated has 4 MB video memo= ry. > + Also accept 8 MB/16 MB for backward compatibility. */ This line looks off by one, maybe Gerd can edit before applying? Note that in general /* * */ comment style is preferred (stars on each line) but I don't spot a hard requirement in CODING_STYLE or HACKING. :) Cheers, Andreas > + if (s->vga.vram_size_mb !=3D 4 && s->vga.vram_size_mb !=3D 8 && > + s->vga.vram_size_mb !=3D 16) { > + error_report("Invalid cirrus_vga ram size '%u'", > + s->vga.vram_size_mb); > + return -1; > + } > /* setup VGA */ > vga_common_init(&s->vga, OBJECT(dev), true); > cirrus_init_common(s, OBJECT(dev), device_id, 1, pci_address_spac= e(dev), --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg