From nobody Mon May 6 18:22:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558688761; cv=none; d=zoho.com; s=zohoarc; b=ZmqXZNJ4KKpWFAl/xCAlYzroaMV02Vhvgg5f/hz9kSbcaJa6CBtmrMK5DP/19SYB/TLM8qxETlXrmYp3cCgt4gTDxQ0jL3LMdbmSP6bX+jSSYK5aRYQLFX+2chl4bubF8pKQML2HjI39or/+E0EzPeiWB/RV+M5Da06CykTvbQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558688761; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=hM9+FpNSW+W7Ez38HeFJNYxMtouaixmZap9/9cf39xs=; b=VA0CyfIk+tFtupuM7XsDNPsOFzT04a4JqxCgYneM6Emz/32QRMRRbnDFMwxy/4dVV1JnLdG+8sP1RdrA1azkfftCkS8KnAtE3chjeYTl69Qt9vEkd0SnCbRyzprjlhkDve190d2x26LDWL/cs3yLdNpw2lFWWhOy9aj1NMCaSEM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558688761302325.6551980714653; Fri, 24 May 2019 02:06:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:51292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU68j-0007kV-Ks for importer@patchew.org; Fri, 24 May 2019 05:05:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU636-0003f6-6M for qemu-devel@nongnu.org; Fri, 24 May 2019 04:59:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU60x-00007Y-Re for qemu-devel@nongnu.org; Fri, 24 May 2019 04:57:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35358) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU60x-000073-JT for qemu-devel@nongnu.org; Fri, 24 May 2019 04:57:23 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BCD4308FBA9; Fri, 24 May 2019 08:57:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AE0A679D6; Fri, 24 May 2019 08:57:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 75CB317536; Fri, 24 May 2019 10:57:17 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 10:57:15 +0200 Message-Id: <20190524085717.3493-2-kraxel@redhat.com> In-Reply-To: <20190524085717.3493-1-kraxel@redhat.com> References: <20190524085717.3493-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 24 May 2019 08:57:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] hw/display/ramfb: fix guest memory un-mapping X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , Gerd Hoffmann , Hou Qiming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Hou Qiming Pulled back the `qemu_create_displaysurface_guestmem` function to create the display surface so that the guest memory gets properly unmapped. Signed-off-by: HOU Qiming Signed-off-by: Marcel Apfelbaum Message-id: 20190513115731.17588-2-marcel.apfelbaum@gmail.com [rename the new functions and use QEMU coding style] Signed-off-by: Marcel Apfelbaum Signed-off-by: Gerd Hoffmann --- hw/display/ramfb.c | 51 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 25c8ad7c252e..1955b048dd24 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -32,33 +32,58 @@ struct RAMFBState { struct RAMFBCfg cfg; }; =20 +static void ramfb_unmap_display_surface(pixman_image_t *image, void *unuse= d) +{ + void *data =3D pixman_image_get_data(image); + uint32_t size =3D pixman_image_get_stride(image) * + pixman_image_get_height(image); + cpu_physical_memory_unmap(data, size, 0, 0); +} + +static DisplaySurface *ramfb_create_display_surface(int width, int height, + pixman_format_code_t f= ormat, + int linesize, uint64_t= addr) +{ + DisplaySurface *surface; + hwaddr size; + void *data; + + if (linesize =3D=3D 0) { + linesize =3D width * PIXMAN_FORMAT_BPP(format) / 8; + } + + size =3D (hwaddr)linesize * height; + data =3D cpu_physical_memory_map(addr, &size, 0); + if (size !=3D (hwaddr)linesize * height) { + cpu_physical_memory_unmap(data, size, 0, 0); + return NULL; + } + + surface =3D qemu_create_displaysurface_from(width, height, + format, linesize, data); + pixman_image_set_destroy_function(surface->image, + ramfb_unmap_display_surface, NULL); + + return surface; +} + static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len) { RAMFBState *s =3D dev; - void *framebuffer; uint32_t fourcc, format; - hwaddr stride, addr, length; + hwaddr stride, addr; =20 s->width =3D be32_to_cpu(s->cfg.width); s->height =3D be32_to_cpu(s->cfg.height); stride =3D be32_to_cpu(s->cfg.stride); fourcc =3D be32_to_cpu(s->cfg.fourcc); addr =3D be64_to_cpu(s->cfg.addr); - length =3D stride * s->height; format =3D qemu_drm_format_to_pixman(fourcc); =20 fprintf(stderr, "%s: %dx%d @ 0x%" PRIx64 "\n", __func__, s->width, s->height, addr); - framebuffer =3D address_space_map(&address_space_memory, - addr, &length, false, - MEMTXATTRS_UNSPECIFIED); - if (!framebuffer || length < stride * s->height) { - s->width =3D 0; - s->height =3D 0; - return; - } - s->ds =3D qemu_create_displaysurface_from(s->width, s->height, - format, stride, framebuffer); + s->ds =3D ramfb_create_display_surface(s->width, s->height, + format, stride, addr); } =20 void ramfb_display_update(QemuConsole *con, RAMFBState *s) --=20 2.18.1 From nobody Mon May 6 18:22:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558688625; cv=none; d=zoho.com; s=zohoarc; b=ifZnfeBP088H/DrfQj5iqj0nBR70VIwDaOnU1SRilOnI+g/IehG3Fk6za7LRouIkPouVfCWC5OSUjLO26yWseSz2NCPkEyqJ7/KCDggTOm2NzK7p6Ou1UB13vEPe+7JTPjULzXAR7Fa0HhoxCpUAy/IrvZCcYcal4MJFcAyEiBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558688625; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=pZ37UVMKKyiswbxBMCPZwjMP2Pp5673+rH+UJVnrzAs=; b=SKdWs5GpBhh/4l6AkyGLSeu0vR7KM2cpW7AIiY97e2U6BCCgF4A5iagyqwk93D8G+TqeQlqPZtiSoxyzZBr2cwKMcv08nG4P2rXdbLHYDrGyTZYpWaOczTdgcjiyyRHicrVbcjE//Z97T5XwFoKlEPxg6Hhv2UJRxJqHRjmM4yM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558688625842892.5003085604314; Fri, 24 May 2019 02:03:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:51280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU673-0006sT-VM for importer@patchew.org; Fri, 24 May 2019 05:03:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU62z-0003f6-CW for qemu-devel@nongnu.org; Fri, 24 May 2019 04:59:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU612-000095-BR for qemu-devel@nongnu.org; Fri, 24 May 2019 04:57:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44308) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU612-00008r-3w for qemu-devel@nongnu.org; Fri, 24 May 2019 04:57:28 -0400 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 76C535946F; Fri, 24 May 2019 08:57:27 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E3645B695; Fri, 24 May 2019 08:57:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7DF3C17538; Fri, 24 May 2019 10:57:17 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 10:57:16 +0200 Message-Id: <20190524085717.3493-3-kraxel@redhat.com> In-Reply-To: <20190524085717.3493-1-kraxel@redhat.com> References: <20190524085717.3493-1-kraxel@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]); Fri, 24 May 2019 08:57:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/3] hw/display/ramfb: lock guest resolution after it's set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , Gerd Hoffmann , Hou Qiming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Hou Qiming Only allow one resolution change per guest boot, which prevents a crash when the guest writes garbage to the configuration space (e.g. when rebooting). Signed-off-by: HOU Qiming Signed-off-by: Marcel Apfelbaum Message-id: 20190513115731.17588-3-marcel.apfelbaum@gmail.com [fixed malformed patch] Signed-off-by: Marcel Apfelbaum Signed-off-by: Gerd Hoffmann --- hw/display/ramfb.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 1955b048dd24..0fe79aa8565f 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -30,6 +30,7 @@ struct RAMFBState { DisplaySurface *ds; uint32_t width, height; struct RAMFBCfg cfg; + bool locked; }; =20 static void ramfb_unmap_display_surface(pixman_image_t *image, void *unuse= d) @@ -70,18 +71,25 @@ static DisplaySurface *ramfb_create_display_surface(int= width, int height, static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len) { RAMFBState *s =3D dev; - uint32_t fourcc, format; + uint32_t fourcc, format, width, height; hwaddr stride, addr; =20 - s->width =3D be32_to_cpu(s->cfg.width); - s->height =3D be32_to_cpu(s->cfg.height); + width =3D be32_to_cpu(s->cfg.width); + height =3D be32_to_cpu(s->cfg.height); stride =3D be32_to_cpu(s->cfg.stride); fourcc =3D be32_to_cpu(s->cfg.fourcc); addr =3D be64_to_cpu(s->cfg.addr); format =3D qemu_drm_format_to_pixman(fourcc); =20 fprintf(stderr, "%s: %dx%d @ 0x%" PRIx64 "\n", __func__, - s->width, s->height, addr); + width, height, addr); + if (s->locked) { + fprintf(stderr, "%s: resolution locked, change rejected\n", __func= __); + return; + } + s->locked =3D true; + s->width =3D width; + s->height =3D height; s->ds =3D ramfb_create_display_surface(s->width, s->height, format, stride, addr); } @@ -101,6 +109,13 @@ void ramfb_display_update(QemuConsole *con, RAMFBState= *s) dpy_gfx_update_full(con); } =20 +static void ramfb_reset(void *opaque) +{ + RAMFBState *s =3D (RAMFBState *)opaque; + s->locked =3D false; + memset(&s->cfg, 0, sizeof(s->cfg)); +} + RAMFBState *ramfb_setup(Error **errp) { FWCfgState *fw_cfg =3D fw_cfg_find(); @@ -113,9 +128,12 @@ RAMFBState *ramfb_setup(Error **errp) =20 s =3D g_new0(RAMFBState, 1); =20 + s->locked =3D false; + rom_add_vga("vgabios-ramfb.bin"); fw_cfg_add_file_callback(fw_cfg, "etc/ramfb", NULL, ramfb_fw_cfg_write, s, &s->cfg, sizeof(s->cfg), false); + qemu_register_reset(ramfb_reset, s); return s; } --=20 2.18.1 From nobody Mon May 6 18:22:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558688507; cv=none; d=zoho.com; s=zohoarc; b=PouAYsQnwSFX67nrDyHjRnS7JSmqv8lxk76kuoMwQtoRMGrvH7r2eHdG2yhsDgz/Jp518BmSf00pPGhLRVcNo+dBGUdUn+ubH6CO3N/EWAcATA58jRB5i7yP4EQifk2VelzZver6KaAQCfNOXjmWHb1ffYM+sQUd6X6tEV8PjGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558688507; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=34IIAiA6bmTNw42FskemEsIQ2LU8uaoH7i6FeORfUPk=; b=A46w+9E1MPimQaz2qSBUV3kR79h/YTvrPAYoTqYAMFY/GGkVZBSb0wmioCpfhR9qnsTK1gMzeSxXipHOC4ayFOLJZ96usYLgRNkTL9pAtW4ww26PLt5/iNZcYCzvolHKLki8tr0xvpg3Wiu6zeslFgl9kbSh7/1ywAPbm6aeaXE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558688507341860.7978174006051; Fri, 24 May 2019 02:01:47 -0700 (PDT) Received: from localhost ([127.0.0.1]:51252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU654-0004uj-Jc for importer@patchew.org; Fri, 24 May 2019 05:01:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU631-0003f6-Gj for qemu-devel@nongnu.org; Fri, 24 May 2019 04:59:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU60y-00007i-6k for qemu-devel@nongnu.org; Fri, 24 May 2019 04:57:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU60x-00007K-VN for qemu-devel@nongnu.org; Fri, 24 May 2019 04:57:24 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4DA823086239; Fri, 24 May 2019 08:57:23 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 843AB19728; Fri, 24 May 2019 08:57:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8B33B1753A; Fri, 24 May 2019 10:57:17 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 10:57:17 +0200 Message-Id: <20190524085717.3493-4-kraxel@redhat.com> In-Reply-To: <20190524085717.3493-1-kraxel@redhat.com> References: <20190524085717.3493-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 24 May 2019 08:57:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] hw/display/ramfb: initialize fw-config space with xres/ yres X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , Gerd Hoffmann , Hou Qiming Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Hou Qiming If xres / yres were specified in QEMU command line, write them as an initial resolution to the fw-config space on guest reset, which a later BIOS / OVMF patch can take advantage of. Signed-off-by: HOU Qiming Signed-off-by: Marcel Apfelbaum Message-id: 20190513115731.17588-4-marcel.apfelbaum@gmail.com [fixed malformed patch] Signed-off-by: Marcel Apfelbaum Signed-off-by: Gerd Hoffmann --- include/hw/display/ramfb.h | 2 +- hw/display/ramfb-standalone.c | 12 +++++++++++- hw/display/ramfb.c | 16 +++++++++++++++- hw/vfio/display.c | 4 ++-- stubs/ramfb.c | 2 +- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/include/hw/display/ramfb.h b/include/hw/display/ramfb.h index b33a2c467b28..f6c2de93b222 100644 --- a/include/hw/display/ramfb.h +++ b/include/hw/display/ramfb.h @@ -4,7 +4,7 @@ /* ramfb.c */ typedef struct RAMFBState RAMFBState; void ramfb_display_update(QemuConsole *con, RAMFBState *s); -RAMFBState *ramfb_setup(Error **errp); +RAMFBState *ramfb_setup(DeviceState *dev, Error **errp); =20 /* ramfb-standalone.c */ #define TYPE_RAMFB_DEVICE "ramfb" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index da3229a1f6cb..6441449e7bc1 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/loader.h" +#include "hw/isa/isa.h" #include "hw/display/ramfb.h" #include "ui/console.h" #include "sysemu/sysemu.h" @@ -11,6 +12,8 @@ typedef struct RAMFBStandaloneState { SysBusDevice parent_obj; QemuConsole *con; RAMFBState *state; + uint32_t xres; + uint32_t yres; } RAMFBStandaloneState; =20 static void display_update_wrapper(void *dev) @@ -33,15 +36,22 @@ static void ramfb_realizefn(DeviceState *dev, Error **e= rrp) RAMFBStandaloneState *ramfb =3D RAMFB(dev); =20 ramfb->con =3D graphic_console_init(dev, 0, &wrapper_ops, dev); - ramfb->state =3D ramfb_setup(errp); + ramfb->state =3D ramfb_setup(dev, errp); } =20 +static Property ramfb_properties[] =3D { + DEFINE_PROP_UINT32("xres", RAMFBStandaloneState, xres, 0), + DEFINE_PROP_UINT32("yres", RAMFBStandaloneState, yres, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void ramfb_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->realize =3D ramfb_realizefn; + dc->props =3D ramfb_properties; dc->desc =3D "ram framebuffer standalone device"; dc->user_creatable =3D true; } diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 0fe79aa8565f..b4eb283ef8cf 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/option.h" #include "hw/loader.h" #include "hw/display/ramfb.h" #include "ui/console.h" @@ -29,6 +30,7 @@ struct QEMU_PACKED RAMFBCfg { struct RAMFBState { DisplaySurface *ds; uint32_t width, height; + uint32_t starting_width, starting_height; struct RAMFBCfg cfg; bool locked; }; @@ -114,9 +116,11 @@ static void ramfb_reset(void *opaque) RAMFBState *s =3D (RAMFBState *)opaque; s->locked =3D false; memset(&s->cfg, 0, sizeof(s->cfg)); + s->cfg.width =3D s->starting_width; + s->cfg.height =3D s->starting_height; } =20 -RAMFBState *ramfb_setup(Error **errp) +RAMFBState *ramfb_setup(DeviceState* dev, Error **errp) { FWCfgState *fw_cfg =3D fw_cfg_find(); RAMFBState *s; @@ -128,6 +132,16 @@ RAMFBState *ramfb_setup(Error **errp) =20 s =3D g_new0(RAMFBState, 1); =20 + const char *s_fb_width =3D qemu_opt_get(dev->opts, "xres"); + const char *s_fb_height =3D qemu_opt_get(dev->opts, "yres"); + if (s_fb_width) { + s->cfg.width =3D atoi(s_fb_width); + s->starting_width =3D s->cfg.width; + } + if (s_fb_height) { + s->cfg.height =3D atoi(s_fb_height); + s->starting_height =3D s->cfg.height; + } s->locked =3D false; =20 rom_add_vga("vgabios-ramfb.bin"); diff --git a/hw/vfio/display.c b/hw/vfio/display.c index a3d9c8f5beac..2c2d3e5b71d6 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -352,7 +352,7 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev= , Error **errp) &vfio_display_dmabuf_ops, vdev); if (vdev->enable_ramfb) { - vdev->dpy->ramfb =3D ramfb_setup(errp); + vdev->dpy->ramfb =3D ramfb_setup(DEVICE(vdev), errp); } vfio_display_edid_init(vdev); return 0; @@ -478,7 +478,7 @@ static int vfio_display_region_init(VFIOPCIDevice *vdev= , Error **errp) &vfio_display_region_ops, vdev); if (vdev->enable_ramfb) { - vdev->dpy->ramfb =3D ramfb_setup(errp); + vdev->dpy->ramfb =3D ramfb_setup(DEVICE(vdev), errp); } return 0; } diff --git a/stubs/ramfb.c b/stubs/ramfb.c index 48143f33542f..0799093a5d6e 100644 --- a/stubs/ramfb.c +++ b/stubs/ramfb.c @@ -6,7 +6,7 @@ void ramfb_display_update(QemuConsole *con, RAMFBState *s) { } =20 -RAMFBState *ramfb_setup(Error **errp) +RAMFBState *ramfb_setup(DeviceState* dev, Error **errp) { error_setg(errp, "ramfb support not available"); return NULL; --=20 2.18.1