From nobody Sat May 18 09:22:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1587549937; cv=none; d=zohomail.com; s=zohoarc; b=dDLciRDzsQT5SsLgURCAlDvrWRUujwmxoUVxO7+wFa6ZxZH9aFSaPM+4377rqfGMftk8kjyoFuJfV/aSBC5OnckLAErZlMVxGQMmhs1fuwdeTBFeULhliIZGW2XBc6BzDdq/5kLfloMKhtT0wTChWR1rwtTpIwOLK1ZzEUxZd7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587549937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3J8pPcuhS23IWtytmG7wvtEEgU47Agbr5ox09wa5pSE=; b=m2Dlkf3VN1OJkepTzPNlrL7UKPGgsm7GP4xX96bGsYjTfz8zJNBXfZs4sgzo+dMwbNKMUHPIexrhFzm0nz6pyeumHdm9iJN1jVCJ3SUHEjELxsxy0/7I1T0n8bAhNcEWx0qXsV8xtCTaqHVYVsDQPyqq6Ih4Ezqfz4PyA19qe4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 15875499375544.818899584549172; Wed, 22 Apr 2020 03:05:37 -0700 (PDT) Received: from localhost ([::1]:47114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCG8-0005de-7R for importer@patchew.org; Wed, 22 Apr 2020 06:05:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40892) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD4-0002OI-5P for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004RK-Td for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:25 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23422 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004F6-9t for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-472-nFqpcQ71P6KZV6PPP0N2Tw-1; Wed, 22 Apr 2020 06:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA9EF8015CB; Wed, 22 Apr 2020 10:02:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBBFD6084A; Wed, 22 Apr 2020 10:02:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CFCE19D99; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3J8pPcuhS23IWtytmG7wvtEEgU47Agbr5ox09wa5pSE=; b=cQ7NtwtmHSpssMqlmfH9/xBY/mZ2rnpw/355lBv6ddsMWdjGv6rBSmX39mjh7e4Olrb9Hp hXFNTbi9u1sIXySyPT3Lirb6MN8nbb9HXdMgVjsafZ+Hqs5NW/3+lUeAWWY113mJVcF9MG zTbf2IqScYTtZylYKHVkP/mRLZj8YhI= X-MC-Unique: nFqpcQ71P6KZV6PPP0N2Tw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/5] Revert "hw/display/ramfb: initialize fw-config space with xres/ yres" Date: Wed, 22 Apr 2020 12:02:07 +0200 Message-Id: <20200422100211.30614-2-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 04:15:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This reverts commit f79081b4b71b72640bedd40a7cd76f864c8287f1. Patch has broken byteorder handling: RAMFBCfg fields are in bigendian byteorder, the reset function doesn't care so native byteorder is used instead. Given this went unnoticed so far the feature is obviously unused, so just revert the patch. Cc: Hou Qiming Signed-off-by: Gerd Hoffmann Acked-by: Laszlo Ersek --- 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, 6 insertions(+), 30 deletions(-) diff --git a/include/hw/display/ramfb.h b/include/hw/display/ramfb.h index f6c2de93b222..b33a2c467b28 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(DeviceState *dev, Error **errp); +RAMFBState *ramfb_setup(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 d76a9d0fe2c9..b18db97eeb1b 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -3,7 +3,6 @@ #include "qemu/module.h" #include "hw/loader.h" #include "hw/qdev-properties.h" -#include "hw/isa/isa.h" #include "hw/display/ramfb.h" #include "ui/console.h" =20 @@ -13,8 +12,6 @@ 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) @@ -37,22 +34,15 @@ 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(dev, errp); + ramfb->state =3D ramfb_setup(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; - device_class_set_props(dc, 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 7ba07c80f6e1..bd4746dc1768 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -13,7 +13,6 @@ =20 #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" @@ -31,7 +30,6 @@ struct QEMU_PACKED RAMFBCfg { struct RAMFBState { DisplaySurface *ds; uint32_t width, height; - uint32_t starting_width, starting_height; struct RAMFBCfg cfg; bool locked; }; @@ -117,11 +115,9 @@ 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(DeviceState* dev, Error **errp) +RAMFBState *ramfb_setup(Error **errp) { FWCfgState *fw_cfg =3D fw_cfg_find(); RAMFBState *s; @@ -133,16 +129,6 @@ RAMFBState *ramfb_setup(DeviceState* dev, 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 f4977c66e1b5..a57a22674d62 100644 --- a/hw/vfio/display.c +++ b/hw/vfio/display.c @@ -353,7 +353,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(DEVICE(vdev), errp); + vdev->dpy->ramfb =3D ramfb_setup(errp); } vfio_display_edid_init(vdev); return 0; @@ -479,7 +479,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(DEVICE(vdev), errp); + vdev->dpy->ramfb =3D ramfb_setup(errp); } return 0; } diff --git a/stubs/ramfb.c b/stubs/ramfb.c index 0799093a5d6e..48143f33542f 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(DeviceState* dev, Error **errp) +RAMFBState *ramfb_setup(Error **errp) { error_setg(errp, "ramfb support not available"); return NULL; --=20 2.18.2 From nobody Sat May 18 09:22:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1587550022; cv=none; d=zohomail.com; s=zohoarc; b=UxnPFi4N5QZ2vGtvtgN/3Dj8J0t6bG0Af/Y35jujqF4WC/m10bCZSiTi1BL6zMa9rrFoCGML/B2irs9IQlz+1QYRVQCb5IDsA81K53BWkXt4ZTjUwXDoi4jGoW5Ipq2pKucvBIJ0KF5XwjvhxPc/2x3ywqrCyFK2fuibZtB5K2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587550022; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=c4+U+IFAQKG2D0+8CRwtUCE59kHFkczepZEFwLCC2K8=; b=a1WVzTRNPvKSHLoBLdBBmIvmFw44FukV+2cNMm/FkJk0Ln0qhRdIlmWt531vQosKOO8GzP+LIPl87N1oX8nZE2PLHpP5wH0zyItD/pzTL5swZB0R47Az2insZAQu32LHsHFohzvTrKK8z4SE5DAFpI50YdEqxycl2ccxvyx2z3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1587550022550873.4416893718504; Wed, 22 Apr 2020 03:07:02 -0700 (PDT) Received: from localhost ([::1]:47144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCHV-0007ct-Au for importer@patchew.org; Wed, 22 Apr 2020 06:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD5-0002Oh-4K for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD4-0004aF-MW for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32452 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD4-0004SP-5q for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-kp7trzsTOxy_h0srseXFww-1; Wed, 22 Apr 2020 06:02:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A6258017F5; Wed, 22 Apr 2020 10:02:22 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id B166F600D2; Wed, 22 Apr 2020 10:02:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D83369D9B; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c4+U+IFAQKG2D0+8CRwtUCE59kHFkczepZEFwLCC2K8=; b=S3Awnl1/yxsG7ab/siJ8ybbWHw0aojTSrSg0fr/SpWSVzXJVnhyoK/14i/JCFifI6oJZmY DoR8OkgHdIQYwWDv6XjAsVckt811dYaN94fF+tkoyjHhkhUGoAiaPn5kZZFhKW4Kll45Sh XwHtC/XUtAtxSd/DeDxJJCRhL3UmdY8= X-MC-Unique: kp7trzsTOxy_h0srseXFww-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/5] Revert "hw/display/ramfb: lock guest resolution after it's set" Date: Wed, 22 Apr 2020 12:02:08 +0200 Message-Id: <20200422100211.30614-3-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:57:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This reverts commit a9e0cb67b7f4c485755659f9b764c38b5f970de4. This breaks OVMF. Reproducer: Just hit 'ESC' at early boot to enter firmware setup. OVMF wants switch from (default) 800x600 to 640x480 for that, and this patch blocks it. Cc: Hou Qiming Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek --- hw/display/ramfb.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index bd4746dc1768..9d41c2ad2868 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -31,7 +31,6 @@ 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) @@ -72,25 +71,18 @@ 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, width, height; + uint32_t fourcc, format; hwaddr stride, addr; =20 - width =3D be32_to_cpu(s->cfg.width); - height =3D be32_to_cpu(s->cfg.height); + 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); format =3D qemu_drm_format_to_pixman(fourcc); =20 fprintf(stderr, "%s: %dx%d @ 0x%" PRIx64 "\n", __func__, - 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->width, s->height, addr); s->ds =3D ramfb_create_display_surface(s->width, s->height, format, stride, addr); } @@ -110,13 +102,6 @@ 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(); @@ -129,12 +114,9 @@ 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.2 From nobody Sat May 18 09:22:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1587549830; cv=none; d=zohomail.com; s=zohoarc; b=bvYSJXTS3y/Qac2yNyMsKzLc5DO19YYpZnL8rIOUWUCntfA11u0MuuxL8JcRw1ztwvlJP3wbljfNJ6fvTh0e78CLhS+L2aIFDa+5regrVaPibYz8KPBM/Z8j9RJFBr0lkMS/t8rEX39SGgAVJo6TzGbEuKafJZbeD9NUtr62DHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587549830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=j+sx8e7RqLsFNXEP5CtlRYH6haipWbEa+wPrC7e/3pA=; b=G9CG5G2vzgCJqLMV2epPJSIS3x3+KE0XjHSAozPAY9pKpWFDp6ZKyRrb6yFeqxqkkmBUxifCYa0L10EhPX/mb2eQQP1nhNRFnsVZWFAuQTOE8pP/kMqLM8IRTObeocmcZ0jUDYPD9awNBuu4u9/bYyL7rgjMK4CuqHxzlD0E2b8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1587549830784430.2462376909966; Wed, 22 Apr 2020 03:03:50 -0700 (PDT) Received: from localhost ([::1]:47092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCEO-0003pn-Nt for importer@patchew.org; Wed, 22 Apr 2020 06:03:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40874) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD3-0002OC-Nn for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004Qf-RI for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:25 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:25689 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004HE-Bz for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-sAjro906PlClybH0ge5fEQ-1; Wed, 22 Apr 2020 06:02:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C760318C35A0; Wed, 22 Apr 2020 10:02:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id D44E95DA85; Wed, 22 Apr 2020 10:02:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E085F9D9C; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j+sx8e7RqLsFNXEP5CtlRYH6haipWbEa+wPrC7e/3pA=; b=JG34LizkRkd5/bd+hnhnahRdk1eXFSUeYiJ5ZfIE2xJnJ5/vUKrM5m5RCIAQn5SKNLB047 6gI83Tv2lDeL5oUVhqpovaOJ6rq6kjOoHkMLeEEr4fDPxk2ncwToIOPaXoKyCVUVvnhsc4 VVkIOCCEw2JNuzLEzxKJKLuxysQXLDk= X-MC-Unique: sAjro906PlClybH0ge5fEQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 3/5] ramfb: don't update RAMFBState on errors Date: Wed, 22 Apr 2020 12:02:09 +0200 Message-Id: <20200422100211.30614-4-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:12:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Store width & height & surface in local variables. Update RAMFBState with the new values only in case the ramfb_create_display_surface() call succeeds. Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ramfb.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 9d41c2ad2868..fbe959147dc9 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -71,20 +71,27 @@ 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; + DisplaySurface *surface; + 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); - 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); + 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); - s->ds =3D ramfb_create_display_surface(s->width, s->height, - format, stride, addr); + surface =3D ramfb_create_display_surface(width, height, + format, stride, addr); + if (!surface) + return; + + s->width =3D width; + s->height =3D height; + s->ds =3D surface; } =20 void ramfb_display_update(QemuConsole *con, RAMFBState *s) --=20 2.18.2 From nobody Sat May 18 09:22:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1587549939; cv=none; d=zohomail.com; s=zohoarc; b=QNPz/ALrG3Z9WDlhlXaShMSmg+MxyjjjL+6pNqhnqh+8kdIz7d2YnFG19o4DP9eTRr9DTwaaxx5ylYOCySVFTH3mPcakQc/cceAtqVi2O5cL9ZtpLLV4qeO0TuYeNPA6IXyrqaf8KFnOPXqgYWY4NpVm5gBn1X1+RwMff6BvaWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587549939; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=COLeT8C7dZdU7ueIahTw8R7I0fDiCeF7bAesFEK6p08=; b=DQYthvKJD9dcNCYFgCjXGk1SFu8Yt41KTp6zfPmPfKYB9205lAKJZAKSnaUodIO/sNSC0xiXq51SGTZWC0QZlLfCQisGXYAX4BiJTUACICeNsoaZOFUy3aXaBb+fMdGKcK+2J+yEujVi/uL65rrfjtbmsElwW+XfV+Vauc6PSl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1587549939111177.82760256041888; Wed, 22 Apr 2020 03:05:39 -0700 (PDT) Received: from localhost ([::1]:47110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCG9-0005cc-TD for importer@patchew.org; Wed, 22 Apr 2020 06:05:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40876) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD3-0002OD-OE for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004Qr-Rb for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:25 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31171 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD2-0004HP-DT for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-eu3el2BHMBSmk3RpvPEDZg-1; Wed, 22 Apr 2020 06:02:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A47FD8017F5; Wed, 22 Apr 2020 10:02:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05E63600D2; Wed, 22 Apr 2020 10:02:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E8E419D9D; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=COLeT8C7dZdU7ueIahTw8R7I0fDiCeF7bAesFEK6p08=; b=aS4d/SZ2WAm4bvaMsY+LOe4AQ3XpQ2cYVApF/hWbDxBqYVdxl/ExTj0kmkOq0z3tXxU+tt eHGuobovJQSWC8lPT3/xO5tcmqRs1PA72MeNJYDP37ybuJv6OWOM3nQ4yBY2jD0UCDl/rW 5o6wJVDZgDjnZXpWJXwIXWyERo3FJgY= X-MC-Unique: eu3el2BHMBSmk3RpvPEDZg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface Date: Wed, 22 Apr 2020 12:02:10 +0200 Message-Id: <20200422100211.30614-5-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:57:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Acked-by: Laszlo Ersek --- hw/display/ramfb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index fbe959147dc9..d1b1cb9bb294 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "hw/loader.h" #include "hw/display/ramfb.h" +#include "hw/display/bochs-vbe.h" /* for limits */ #include "ui/console.h" #include "sysemu/reset.h" =20 @@ -49,6 +50,11 @@ static DisplaySurface *ramfb_create_display_surface(int = width, int height, hwaddr size; void *data; =20 + if (width < 16 || width > VBE_DISPI_MAX_XRES || + height < 16 || height > VBE_DISPI_MAX_YRES || + format =3D=3D 0 /* unknown format */) + return NULL; + if (linesize =3D=3D 0) { linesize =3D width * PIXMAN_FORMAT_BPP(format) / 8; } --=20 2.18.2 From nobody Sat May 18 09:22:58 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1587550088; cv=none; d=zohomail.com; s=zohoarc; b=n1UlDHlTsycnqNcY5iPji3DiV+4vd235yuolQ7k7ukwsDccoSuxpAKEia0CZq4590bB+9cYcxbYLVUuUVIaOGZPHCi/maOvpdkd3843wGUwW++EzaG7oXYNlJjGp3DNJABPc76j09pTlFC9rRvA8Fn9mnXQg+xisNLFmrBJBURU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587550088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=zuWjTNacGN/P940gLDLAUtY2OcW3hRziwkgJsSOLJZ4=; b=XSIF9L4AerjMxhPHY9T54sQqNTgEu0e02iMgAsJUtwZt/VeO9E//w7WHs/mDlxF9i2VCt0zZ9DtBOmpVVfm5qvA1V+E/TgrmPNnsJpPqbrZAe6IK0KOdY7zcbjmeuuslA8HA6W4JdsR9aQLUG8ilUFGrf8PPQQOADFC6g2VxiNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1587550088937776.2912682840134; Wed, 22 Apr 2020 03:08:08 -0700 (PDT) Received: from localhost ([::1]:47162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCIZ-0000aR-La for importer@patchew.org; Wed, 22 Apr 2020 06:08:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40956) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRCD8-0002Vg-H6 for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRCD8-0004sv-1S for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20979 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jRCD7-0004kz-IT for qemu-devel@nongnu.org; Wed, 22 Apr 2020 06:02:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-3hltm4uHO_KsmyxOS04OUA-1; Wed, 22 Apr 2020 06:02:26 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D41408018A6; Wed, 22 Apr 2020 10:02:25 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B6E05D710; Wed, 22 Apr 2020 10:02:19 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id F12BF9D9E; Wed, 22 Apr 2020 12:02:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587549748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zuWjTNacGN/P940gLDLAUtY2OcW3hRziwkgJsSOLJZ4=; b=XIVUXH7YjqNptxpJ+DmFRUxaRw1qEMJWO+8cus7/Wb/kP9xvCqt/U4hCx1+ATZWWP/yOcY ptDJbDTcBVsGOL0XFbW0FgnOywEL96/FTqzCOvCMeJm+GisKONbKbrYz6+HWFaOpDxrOBE l3Yy/V/D3EJmbaHGmuGpgh3BDdb9sSo= X-MC-Unique: 3hltm4uHO_KsmyxOS04OUA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 5/5] ramfb: drop leftover debug message Date: Wed, 22 Apr 2020 12:02:11 +0200 Message-Id: <20200422100211.30614-6-kraxel@redhat.com> In-Reply-To: <20200422100211.30614-1-kraxel@redhat.com> References: <20200422100211.30614-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/22 02:04:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alex Williamson , lersek@redhat.com, hqm03ster@gmail.com, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/ramfb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index d1b1cb9bb294..be884c9ea837 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -88,8 +88,6 @@ static void ramfb_fw_cfg_write(void *dev, off_t offset, s= ize_t len) 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); surface =3D ramfb_create_display_surface(width, height, format, stride, addr); if (!surface) --=20 2.18.2