From nobody Thu May 2 07:33:02 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 ARC-Seal: i=1; a=rsa-sha256; t=1590318289; cv=none; d=zohomail.com; s=zohoarc; b=JJPm7LQIKmj8Pb8J2KM3Cnfzq2n9tt5y2jvsSz0m++l0gYFi3DMQMY9EMb9kf4KeCm/CWibYT2nnuI7YyQar1hzIGGCWFKWm6K5aCQiH+RkgCop3HmiVo6RgQ5KHATGMSEnHeacRL0lAZX8rVoB6zR3jj9K1NeEClRKLTsE09fw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590318289; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=41axihzEJ26JKyauJA6bDsNNxel2fB4u/PG7RrCHrg0=; b=c6XoPhsK5HzfpeNSaGghS7ufscGtwflMxTZZrRwhY44XETaUC2hWA/FVQEWPe6HrJe6qlb2ZvwjIMRVgmWxWfVIhakAKO/uCbCwxOYOftb7ZkWPx7ZL1u4nNuaaAoJpScaNys5DUfgGjRJFKzSP+dXLImlZ691yVDzRxtdnY4s4= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590318289148442.50135009109465; Sun, 24 May 2020 04:04:49 -0700 (PDT) Received: from localhost ([::1]:38096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcoQw-0005bq-Sg for importer@patchew.org; Sun, 24 May 2020 07:04:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcoNk-0002c6-DW; Sun, 24 May 2020 07:01:28 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:43720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcoNj-0007ld-9g; Sun, 24 May 2020 07:01:28 -0400 Received: by mail-wr1-x432.google.com with SMTP id i15so14536709wrx.10; Sun, 24 May 2020 04:01:26 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id r3sm14321555wmh.48.2020.05.24.04.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2020 04:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=41axihzEJ26JKyauJA6bDsNNxel2fB4u/PG7RrCHrg0=; b=A1epSgOjROfCuZPKT7yBSYOhtPMsBVi/IEKwX2m4/dMlBeBwRCLeopp7AkNDYM+wul uzIZqK2YaevS0HIHt/YTy5OJ5W+NrxemAI7e2/GUCsi5BCdnamQcYcz3bSsd5/0F7nb2 NmLKCtxueJ8vQ2b3I0O+EcDARNkM9Ztz5xdpUKUNMy1wWEfyHcX8qPpNSaa5eFqP8c3E 0FR+5h5oEelGNnxbvDTlese9BePsPmz1C3CIUabBQja6xA/NGybWhcYAQdb2yY0KywK5 FYcwpWhUI4zcLjhIwv6u++6ieCmH+LfpOTJY4DqicuWeHzgqjB1PLhR/0SI65ageehR8 kfuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=41axihzEJ26JKyauJA6bDsNNxel2fB4u/PG7RrCHrg0=; b=j7pWCC8kCvomZUbJ1o+NV3EhH/CQqUyrVvuNTZE4EJxWYhhpvb/HoJpa46qXxq7/Te 9mHzHOmGUmONjc4n1K+vIS+JygjZ7A2x44wCQh2iSfDZeBzqtlc70OJqOasUMZpMAQXu wNOrcOb1S5jEXQ3lWp4k2n/4hCHcOHXiQbZLO8Z0tQcpn+CzWgCHvAN4obHB1qFEmj5d 4VKsQqxu+r+5t2U5yMfeIi/8B4wx9qplrHYf0GB4AexP3zCPO1P60w/FBD9bgcnWTMil GpGhKNBOzGfV76WYb7dPR0BzrFHXFZC4IyvNO9k/qGZemhs8ShweQ1wwdB1EoX3soQQb IbKw== X-Gm-Message-State: AOAM532AsurFEbygPdcX5YrOGdVbq461WevmM7kjojtzolpOfFIXrdR8 j4UIUWWOcZeB7L1ksIDK//sD2iyw8K4= X-Google-Smtp-Source: ABdhPJw2xirs+a7lIXpjqrL6gHHqq5BciENNLT/rP347qWk892U+r7G97bidStYJsEf3DbcUW7QMNg== X-Received: by 2002:adf:a51a:: with SMTP id i26mr10198021wrb.332.1590318084800; Sun, 24 May 2020 04:01:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/4] hw/display/cirrus_vga: Convert debug printf() to trace event Date: Sun, 24 May 2020 13:01:18 +0200 Message-Id: <20200524110121.12686-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200524110121.12686-1-f4bug@amsat.org> References: <20200524110121.12686-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/cirrus_vga.c | 4 +--- hw/display/trace-events | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 1f29731ffe..33ccdde000 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -1512,9 +1512,7 @@ static int cirrus_vga_read_gr(CirrusVGAState * s, uns= igned reg_index) static void cirrus_vga_write_gr(CirrusVGAState * s, unsigned reg_index, int reg_value) { -#if defined(DEBUG_BITBLT) && 0 - printf("gr%02x: %02x\n", reg_index, reg_value); -#endif + trace_vga_cirrus_write_gr(reg_index, reg_value); switch (reg_index) { case 0x00: // Standard VGA, BGCOLOR 0x000000ff s->vga.gr[reg_index] =3D reg_value & gr_mask[reg_index]; diff --git a/hw/display/trace-events b/hw/display/trace-events index e6e22bef88..96bbf600f4 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -133,6 +133,7 @@ vga_vbe_write(uint32_t index, uint32_t val) "index 0x%x= , val 0x%x" vga_cirrus_read_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_cirrus_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_cirrus_write_blt(uint32_t offset, uint32_t val) "offset 0x%x, val 0x%x" +vga_cirrus_write_gr(uint8_t index, uint8_t val) "GR addr 0x%02x, val 0x%02= x" =20 # sii9022.c sii9022_read_reg(uint8_t addr, uint8_t val) "addr 0x%02x, val 0x%02x" --=20 2.21.3 From nobody Thu May 2 07:33:02 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 ARC-Seal: i=1; a=rsa-sha256; t=1590318367; cv=none; d=zohomail.com; s=zohoarc; b=aQBujF0U9HCzFfC/07S/oILZYJWR3RulmAv5cwJ7ysjOhJU2sjr1HEIdJlEshz1bDiPYXA3lXPH32d1xIC34Dc3xmBwIgFHboy8d7LuahA6vaa2t4tnVltFan7DtbXDCdm6RQqeHxkpKstOLDarS5LtnIRzE4qllzkVfyzGb0pU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590318367; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cAS9vKi2N/HAp/t/0K9X49WNII1M7/uVCyjiDB52u+M=; b=QqOs6weX/5wJglhT1t9ahhYEYhhmETFo0pA/Exi8rTIqP6kFX87nrrxfWjMYkfi3Y0bHT1HWQ5anoxYLLbOoiDM+adXbwhwLqnq43l0SfXe4K3CrBtcQ/mLAwViwAKhyC+n8a0fLHcadYrdnB6knATGp3JuZuDFRDQ3ynd2ydt0= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590318367868801.5680738208777; Sun, 24 May 2020 04:06:07 -0700 (PDT) Received: from localhost ([::1]:41892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcoSE-0007EG-K9 for importer@patchew.org; Sun, 24 May 2020 07:06:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcoNl-0002dp-3w; Sun, 24 May 2020 07:01:29 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcoNk-0007ln-7p; Sun, 24 May 2020 07:01:28 -0400 Received: by mail-wr1-x444.google.com with SMTP id i15so14536749wrx.10; Sun, 24 May 2020 04:01:27 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id r3sm14321555wmh.48.2020.05.24.04.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2020 04:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cAS9vKi2N/HAp/t/0K9X49WNII1M7/uVCyjiDB52u+M=; b=lo3lQdKe8TFpxIRIkqXBrjp4OBAQh5+3+uxNafsm/rR7iIx2eVdslobgev+I5n9+ps zoLnFI1gGZoEinXkJoCwPR0hB5xX6g39hUFkRYRzaFJOXvxf3zQ6n76ZJEIFr35extP5 XSvhOFtKPUapkfxCQYYV7BfoJ0nV0dGkB8emVQyTi3QKHo2qTZvDxGsW+bvaRebwR95O ZtJ19v6O/ypyMNKjhg1qe7ilKZTbnASqGAPDkiEX5cbn1ulyRKJc8Ef4nUMQcf5V6AIN WIuRGkIu4MGTOZLcrSQfYYuJ/8Dn0PlHOog8SsI2EyR+OA2yxJG5KnezIXvlS6ddhWxG uzaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cAS9vKi2N/HAp/t/0K9X49WNII1M7/uVCyjiDB52u+M=; b=Dxy0qpKUzlljo399CHns7J6m8VDqQRUOypHIBqiXfuw7pkXJvI+MoJ3To/InwQVZSJ jT+h1++VVdKRAcQ0S4Yy3k38dJ0C2u7bb5orbI3/Cai6akUaH+nbqdw1CJ4cvHrwts17 NqkKaXVYOTLvf4tkPvmyAPJonMpGiWw+1IYlst6MLzdznEP9anUMt/B6w8uBLF1/EbjE UzgTtgDHwS/69ccwheGcn+RISlPoecuiRwdKsNTfk4htkkABdWg6c+ZX6p2NPmeQFXem ZoVJ5ll/BfVXaAe3+40UECr+Ru45z2nO3OOYxfyexcy7q19lUZnbPdqvIdPmtzhSNDJ9 oFGw== X-Gm-Message-State: AOAM531nYwVC5SfwMoIFVb0JdafmgymGOp15RDpiuEaOLKq+tEwpRTeJ XBoEkCJeCMsCCiW7Xgo+bFeLDi9ZUbA= X-Google-Smtp-Source: ABdhPJwOSKNIQrq+4JyXAHkTCsw1WxiJFLhAXmiXwecpskUzlhVtgbSnYzxJSlkmdaRivgIPusj5cQ== X-Received: by 2002:a5d:5449:: with SMTP id w9mr10883881wrv.106.1590318086193; Sun, 24 May 2020 04:01:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/4] hw/display/cirrus_vga: Use qemu_log_mask(UNIMP) instead of debug printf Date: Sun, 24 May 2020 13:01:19 +0200 Message-Id: <20200524110121.12686-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200524110121.12686-1-f4bug@amsat.org> References: <20200524110121.12686-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Replace some debug printf() calls by qemu_log_mask(LOG_UNIMP), and add a new one in cirrus_linear_bitblt_read(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/cirrus_vga.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 33ccdde000..f9f837b850 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -35,6 +35,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" +#include "qemu/log.h" #include "sysemu/reset.h" #include "qapi/error.h" #include "trace.h" @@ -905,9 +906,8 @@ static int cirrus_bitblt_cputovideo(CirrusVGAState * s) static int cirrus_bitblt_videotocpu(CirrusVGAState * s) { /* XXX */ -#ifdef DEBUG_BITBLT - printf("cirrus: bitblt (video to cpu) is not implemented yet\n"); -#endif + qemu_log_mask(LOG_UNIMP, + "cirrus: bitblt (video to cpu) is not implemented\n"); return 0; } =20 @@ -989,9 +989,8 @@ static void cirrus_bitblt_start(CirrusVGAState * s) cirrus_blt_mode & (CIRRUS_BLTMODE_MEMSYSSRC | CIRRUS_BLTMODE_MEMSYSDEST)) =3D=3D (CIRRUS_BLTMODE_MEMSYSSRC | CIRRUS_BLTMODE_MEMSYSDEST)) { -#ifdef DEBUG_BITBLT - printf("cirrus: bitblt - memory-to-memory copy is requested\n"); -#endif + qemu_log_mask(LOG_UNIMP, + "cirrus: bitblt - memory-to-memory copy requested\n"= ); goto bitblt_ignore; } =20 @@ -2412,6 +2411,9 @@ static uint64_t cirrus_linear_bitblt_read(void *opaqu= e, =20 /* XXX handle bitblt */ (void)s; + qemu_log_mask(LOG_UNIMP, + "cirrus: linear bitblt is not implemented\n"); + return 0xff; } =20 --=20 2.21.3 From nobody Thu May 2 07:33:02 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 ARC-Seal: i=1; a=rsa-sha256; t=1590318403; cv=none; d=zohomail.com; s=zohoarc; b=OeAjAG6TWBSp8kTagr4gIoQ/dXuWNADKPwOZu6/kesNBmdu7x3rR5Fb7ohXC85+3vF4Y96RGjFCGKMEf5KFwwpK5bMHoFLvvcAdZQgRCRCBVQoU85FlIBCcyzmG170ZA6wkcs43Y7NbRjJwtO73DBD6UH5q10MN8syp2VqStj8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590318403; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u3oadF3lY7kJ7u32IbFBnTyzgbMxnriKTUoHa0TNDIA=; b=AKMVoS5VPNQpEZhWHPaHLc1cTcF6ic518PJkb7bjWZAcL6lRN9JxoSaNSQcOX9MCyZiZDUfoPw1HqOZ0pmAKb0hfQrGVSP9X2vwSdUhDpkOgCX1cPoPhyhlzsahlBTHjRbPGg7JDiEVhuiM9mL9UmaiRkqbxFBul/GAFDvK3fWI= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590318403419712.8057654090136; Sun, 24 May 2020 04:06:43 -0700 (PDT) Received: from localhost ([::1]:45074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcoSo-0008UI-7T for importer@patchew.org; Sun, 24 May 2020 07:06:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcoNw-0002jc-OC; Sun, 24 May 2020 07:01:40 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcoNl-0007mA-G6; Sun, 24 May 2020 07:01:33 -0400 Received: by mail-wr1-x442.google.com with SMTP id x14so9215268wrp.2; Sun, 24 May 2020 04:01:28 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id r3sm14321555wmh.48.2020.05.24.04.01.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2020 04:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u3oadF3lY7kJ7u32IbFBnTyzgbMxnriKTUoHa0TNDIA=; b=UOU6DMG41oHQWHARCytBY0Wt3GE8Vi7cWKQZKArDq5OcCsbUzI+WhCZH4nZ7Xw6kvW ziwKs/sinqurMKNqQKSZckw7mXls2PO981JPvSpukwGtMWcGbzO/iFja/xrdlcG1YH3u 73bOugj6kqkcR0jD4KmwVqYW447/okPCbvIqSqNhOpFb8/sOMncfxpj+e6FH3CjU1fAE nasy6bJGLJkyl8nCqpFJ3F4b2Tf3H6xyTbDZAQWVXsPEiRfOhzP/syY2tQ+o4zTzD0KR DZ70aSCB3G9xWoSV6S/wIZMjwDBk4CoY4/onPrBGb4Q2qz5+mxzg24FA0fpr2k0uEs7B 673w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u3oadF3lY7kJ7u32IbFBnTyzgbMxnriKTUoHa0TNDIA=; b=BwCPhJ3YaxHUCU/gldEgQZfQyVkuPl0q5EEsRzaE2hYnJJMSfS2QGAqAnkvoDLg/wB 2Z0eumUOHJ6GbATUq+yawLiaGcpcaqnjAIbcAEEaR0B7Ggbl+B8WcupNNc5D4MMsdZMt OPy6djFFG3FeuynYqmQIIaN/pa9uAaEyKoBKVKfV9iJCfjJgkV6jpKcj+rPRvf/iY9w4 xqR50B6HnWZLFY0xizzjiCXE0LS8xnjiV8JShvi51YIEtDC9haE2+ktRGYsKIdLiMsHj 3+XTonAV2eXurO/ApiW5a2NcoQeyWZopnSulQ4YQxe5+D0IhbvPOReQzcrIJ454XE1et UZIg== X-Gm-Message-State: AOAM530pOIIUjZmqs1a5o5ylgzrRh/Y/YMhtslrAOUDsjMJ6o7zutvmF xo/LgFGiCoAkw5N5rE/yAY8dloue9vY= X-Google-Smtp-Source: ABdhPJxSzQh29EBITshxn1SvD52UlZ54NpYK1JhTfqdeb+FMMNYekzZG1XWLheb4lFToz8JA1rpDCQ== X-Received: by 2002:adf:f205:: with SMTP id p5mr11531576wro.302.1590318087424; Sun, 24 May 2020 04:01:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/4] hw/display/cirrus_vga: Use qemu_log_mask(ERROR) instead of debug printf Date: Sun, 24 May 2020 13:01:20 +0200 Message-Id: <20200524110121.12686-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200524110121.12686-1-f4bug@amsat.org> References: <20200524110121.12686-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Replace some debug printf() calls by qemu_log_mask(LOG_GUEST_ERROR). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/cirrus_vga.c | 77 ++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index f9f837b850..76e2dc5bb6 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -978,9 +978,8 @@ static void cirrus_bitblt_start(CirrusVGAState * s) s->cirrus_blt_pixelwidth =3D 4; break; default: -#ifdef DEBUG_BITBLT - printf("cirrus: bitblt - pixel width is unknown\n"); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: bitblt - pixel width is unknown\n"); goto bitblt_ignore; } s->cirrus_blt_mode &=3D ~CIRRUS_BLTMODE_PIXELWIDTHMASK; @@ -1037,7 +1036,9 @@ static void cirrus_bitblt_start(CirrusVGAState * s) } else { if (s->cirrus_blt_mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) { if (s->cirrus_blt_pixelwidth > 2) { - printf("src transparent without colorexpand must be 8bpp or 16bpp\n"= ); + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: src transparent without colorexpand " + "must be 8bpp or 16bpp\n"); goto bitblt_ignore; } if (s->cirrus_blt_mode & CIRRUS_BLTMODE_BACKWARDS) { @@ -1135,10 +1136,9 @@ static uint32_t cirrus_get_bpp16_depth(CirrusVGAStat= e * s) ret =3D 16; break; /* XGA HiColor */ default: -#ifdef DEBUG_CIRRUS - printf("cirrus: invalid DAC value %x in 16bpp\n", - (s->cirrus_hidden_dac_data & 0xf)); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: invalid DAC value 0x%x in 16bpp\n", + (s->cirrus_hidden_dac_data & 0xf)); ret =3D 15; /* XXX */ break; } @@ -1307,11 +1307,9 @@ static int cirrus_vga_read_sr(CirrusVGAState * s) #endif return s->vga.sr[s->vga.sr_index]; default: -#ifdef DEBUG_CIRRUS - printf("cirrus: inport sr_index %02x\n", s->vga.sr_index); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: inport sr_index 0x%02x\n", s->vga.sr_index); return 0xff; - break; } } =20 @@ -1400,10 +1398,9 @@ static void cirrus_vga_write_sr(CirrusVGAState * s, = uint32_t val) cirrus_update_memory_access(s); break; default: -#ifdef DEBUG_CIRRUS - printf("cirrus: outport sr_index %02x, sr_value %02x\n", - s->vga.sr_index, val); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: outport sr_index 0x%02x, sr_value 0x%02x\n", + s->vga.sr_index, val); break; } } @@ -1501,9 +1498,8 @@ static int cirrus_vga_read_gr(CirrusVGAState * s, uns= igned reg_index) if (reg_index < 0x3a) { return s->vga.gr[reg_index]; } else { -#ifdef DEBUG_CIRRUS - printf("cirrus: inport gr_index %02x\n", reg_index); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: inport gr_index 0x%02x\n", reg_index); return 0xff; } } @@ -1590,10 +1586,9 @@ cirrus_vga_write_gr(CirrusVGAState * s, unsigned reg= _index, int reg_value) cirrus_write_bitblt(s, reg_value); break; default: -#ifdef DEBUG_CIRRUS - printf("cirrus: outport gr_index %02x, gr_value %02x\n", reg_index, - reg_value); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: outport gr_index 0x%02x, gr_value 0x%02x\n", + reg_index, reg_value); break; } } @@ -1648,9 +1643,8 @@ static int cirrus_vga_read_cr(CirrusVGAState * s, uns= igned reg_index) return s->vga.ar_index & 0x3f; break; default: -#ifdef DEBUG_CIRRUS - printf("cirrus: inport cr_index %02x\n", reg_index); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: inport cr_index 0x%02x\n", reg_index); return 0xff; } } @@ -1721,10 +1715,9 @@ static void cirrus_vga_write_cr(CirrusVGAState * s, = int reg_value) break; case 0x25: // Part Status default: -#ifdef DEBUG_CIRRUS - printf("cirrus: outport cr_index %02x, cr_value %02x\n", - s->vga.cr_index, reg_value); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: outport cr_index 0x%02x, cr_value 0x%02x\n", + s->vga.cr_index, reg_value); break; } } @@ -1834,9 +1827,8 @@ static uint8_t cirrus_mmio_blt_read(CirrusVGAState * = s, unsigned address) value =3D cirrus_vga_read_gr(s, 0x31); break; default: -#ifdef DEBUG_CIRRUS - printf("cirrus: mmio read - address 0x%04x\n", address); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: mmio read - address 0x%04x\n", address); break; } =20 @@ -1946,10 +1938,9 @@ static void cirrus_mmio_blt_write(CirrusVGAState * s= , unsigned address, cirrus_vga_write_gr(s, 0x31, value); break; default: -#ifdef DEBUG_CIRRUS - printf("cirrus: mmio write - addr 0x%04x val 0x%02x (ignored)\n", - address, value); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: mmio write - addr 0x%04x val 0x%02x (ignore= d)\n", + address, value); break; } } @@ -2047,9 +2038,8 @@ static uint64_t cirrus_vga_mem_read(void *opaque, } } else { val =3D 0xff; -#ifdef DEBUG_CIRRUS - printf("cirrus: mem_readb " TARGET_FMT_plx "\n", addr); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: mem_readb 0x" TARGET_FMT_plx "\n", addr); } return val; } @@ -2112,10 +2102,9 @@ static void cirrus_vga_mem_write(void *opaque, cirrus_mmio_blt_write(s, addr & 0xff, mem_value); } } else { -#ifdef DEBUG_CIRRUS - printf("cirrus: mem_writeb " TARGET_FMT_plx " value 0x%02" PRIu64 = "\n", addr, - mem_value); -#endif + qemu_log_mask(LOG_GUEST_ERROR, + "cirrus: mem_writeb 0x" TARGET_FMT_plx " " + "value 0x%02" PRIu64 "\n", addr, mem_value); } } =20 --=20 2.21.3 From nobody Thu May 2 07:33:02 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 ARC-Seal: i=1; a=rsa-sha256; t=1590318330; cv=none; d=zohomail.com; s=zohoarc; b=Xr6odrfGcayLEpA7eb0EdYOly4Ikx5hqkoBOR1ERB+T3yGmz5xjvsPpcW25hbpzpm3AdNXMFekbaw94vwNhLoOuw0kJULDzK3bNZsFO5/j9GB1yAoHyia0AxvQaZvRdDSC2zm2IRXeKl9lGiWNPj5zRKGWKcGeHV+eQmg51tjiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590318330; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=plkhAnUXiFwBad9mwWbwN/wJIwOw8aPJV1mi75fwVbY=; b=iFDO8t5Sl+KmWA8ZltQ+RiL8MGYjZyrOiFdSEBA0+s0nzBB9rWM0MnkuN5hEQU7AQJODsrKLcUoJfdqyjEimoiN/LGa7C1DG/O8MIKlOgZXl97WsLPSslJzoj8v3eBU+5nGl63jcxVemBvzuTJBAehuIMPR6TSEKvDJnxWyAzKw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590318330905128.35197640094304; Sun, 24 May 2020 04:05:30 -0700 (PDT) Received: from localhost ([::1]:39132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcoRd-00061B-8s for importer@patchew.org; Sun, 24 May 2020 07:05:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcoNo-0002iN-5F; Sun, 24 May 2020 07:01:32 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcoNn-0007mL-3W; Sun, 24 May 2020 07:01:31 -0400 Received: by mail-wm1-x341.google.com with SMTP id v19so7148339wmj.0; Sun, 24 May 2020 04:01:30 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id r3sm14321555wmh.48.2020.05.24.04.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2020 04:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=plkhAnUXiFwBad9mwWbwN/wJIwOw8aPJV1mi75fwVbY=; b=EkO6Ujx9gljaDSm7NHH7ni6gMS8Bf6TS7kABBNCViXaDkDjC5k0xBvD5VZ9oBfiW4m 995FWyd1Oo6Nlt6yxObOBDGGV7dgeVPwGKDOrikps8PKCasL2A+70MAwBeKmMRGfI61W 8auVSDWH7dOzFf8h+UMg0kA82y4DaPD3Dj6jkb/IJ0dN2IqlibtWbxU3SjDOZWZI1cOE 9tFw84B+XyPAnsDPwwCORAk4huXYHT2TowW63iloTgNLFJy4qcAGcMrCcTEz4FVZgmS+ g/2I0FFt2NExh/IlIBhPgMycxhygWpl5jnWuoXSjR+5U2iLZyEHPn3ZaBnEEanUp9JCZ fhRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=plkhAnUXiFwBad9mwWbwN/wJIwOw8aPJV1mi75fwVbY=; b=Gry//7WiD4G8Wj+S+ENkcVU1kb2FnKYpWtG3e/T5Mlvk7BkDK4MVNx1adon1N/UrHS xKNajbJR+WWHUTg4A/IzO4GqH85/zEYORcmo/Q6He2NwW42bn1G2LrSTsvL3F8p4SbnD SDJYetQ644LuptQ94iTUmD5XjunlK8DE2Xg7c2kHiDAL1B3tDlrJZABRIA/2GcAP4uRY rK9+n+E5dLvE7e65RGoZqO1qn2n4RPQ6AfQkP5XTLe6HYKWICm+086HJPfY1l83aFHDz KI3k6q55+h1WXxsTCBI05qtMPOHZ9wDZJTcKNwgXYYHowgZ6naL7PHa4XzNB8BJIODlY mCjQ== X-Gm-Message-State: AOAM531vCJcun0uMTHcDQNgwZK2360Y1UmAR//hV4GKLmgfswioWM726 CzlFZ1WvI8JOkctd7SsYQJtOuK87eV8= X-Google-Smtp-Source: ABdhPJwCR5o9Vbm4g2PadiG0M/QH2XWp9grEDf37ANt2ptSGdRhiKK+HdpbFPPAT4ethddQJIyZ11A== X-Received: by 2002:a05:600c:2146:: with SMTP id v6mr21602864wml.142.1590318088845; Sun, 24 May 2020 04:01:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/4] hw/display/cirrus_vga: Convert debug printf() to trace event Date: Sun, 24 May 2020 13:01:21 +0200 Message-Id: <20200524110121.12686-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200524110121.12686-1-f4bug@amsat.org> References: <20200524110121.12686-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Convert the final bit of DEBUG_BITBLT to a tracepoint. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/cirrus_vga.c | 24 ++++++++++-------------- hw/display/trace-events | 1 + 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 76e2dc5bb6..92c197cdde 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -53,7 +53,6 @@ */ =20 //#define DEBUG_CIRRUS -//#define DEBUG_BITBLT =20 /*************************************** * @@ -950,19 +949,16 @@ static void cirrus_bitblt_start(CirrusVGAState * s) s->cirrus_blt_dstaddr &=3D s->cirrus_addr_mask; s->cirrus_blt_srcaddr &=3D s->cirrus_addr_mask; =20 -#ifdef DEBUG_BITBLT - printf("rop=3D0x%02x mode=3D0x%02x modeext=3D0x%02x w=3D%d h=3D%d dpit= ch=3D%d spitch=3D%d daddr=3D0x%08x saddr=3D0x%08x writemask=3D0x%02x\n", - blt_rop, - s->cirrus_blt_mode, - s->cirrus_blt_modeext, - s->cirrus_blt_width, - s->cirrus_blt_height, - s->cirrus_blt_dstpitch, - s->cirrus_blt_srcpitch, - s->cirrus_blt_dstaddr, - s->cirrus_blt_srcaddr, - s->vga.gr[0x2f]); -#endif + trace_vga_cirrus_bitblt_start(blt_rop, + s->cirrus_blt_mode, + s->cirrus_blt_modeext, + s->cirrus_blt_width, + s->cirrus_blt_height, + s->cirrus_blt_dstpitch, + s->cirrus_blt_srcpitch, + s->cirrus_blt_dstaddr, + s->cirrus_blt_srcaddr, + s->vga.gr[0x2f]); =20 switch (s->cirrus_blt_mode & CIRRUS_BLTMODE_PIXELWIDTHMASK) { case CIRRUS_BLTMODE_PIXELWIDTH8: diff --git a/hw/display/trace-events b/hw/display/trace-events index 96bbf600f4..6bfc53973f 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -134,6 +134,7 @@ vga_cirrus_read_io(uint32_t addr, uint32_t val) "addr 0= x%x, val 0x%x" vga_cirrus_write_io(uint32_t addr, uint32_t val) "addr 0x%x, val 0x%x" vga_cirrus_write_blt(uint32_t offset, uint32_t val) "offset 0x%x, val 0x%x" vga_cirrus_write_gr(uint8_t index, uint8_t val) "GR addr 0x%02x, val 0x%02= x" +vga_cirrus_bitblt_start(uint8_t blt_rop, uint8_t blt_mode, uint8_t blt_mod= eext, int blt_width, int blt_height, int blt_dstpitch, int blt_srcpitch, ui= nt32_t blt_dstaddr, uint32_t blt_srcaddr, uint8_t gr_val) "rop=3D0x%02x mod= e=3D0x%02x modeext=3D0x%02x w=3D%d h=3D%d dpitch=3D%d spitch=3D%d daddr=3D0= x%08"PRIx32" saddr=3D0x%08"PRIx32" writemask=3D0x%02x" =20 # sii9022.c sii9022_read_reg(uint8_t addr, uint8_t val) "addr 0x%02x, val 0x%02x" --=20 2.21.3