From patchwork Sat Jul 4 15:38:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 278581 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B905C433E0 for ; Sat, 4 Jul 2020 15:47:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22DAD207D4 for ; Sat, 4 Jul 2020 15:47:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QTvGTbU0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22DAD207D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrkOA-0006hh-Al for qemu-devel@archiver.kernel.org; Sat, 04 Jul 2020 11:47:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrkGx-0001xX-P9 for qemu-devel@nongnu.org; Sat, 04 Jul 2020 11:40:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21220 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 1jrkGv-0007j6-C4 for qemu-devel@nongnu.org; Sat, 04 Jul 2020 11:40:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593877208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=faJPKsgnKj1MSj1B3bxzpLa01+W3HhU/7Hynie77jqI=; b=QTvGTbU0FsA594nbpizQXCxVMsQeofTLwepRpExoxQp+2hOdJNxMbsl5+Pbnzo1hhKbvei Yu1EAO+1isTSs0V/IjI9WJ2Pedg/K0nuNny9adg1fWWrvxSkw20QAUYKzAiMtFttXk8RFB DtCUNIiOIGkqAayZJyKsSoZLx363CoQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-227-H-bzotlxMsKaQ64L0sXSHw-1; Sat, 04 Jul 2020 11:40:07 -0400 X-MC-Unique: H-bzotlxMsKaQ64L0sXSHw-1 Received: by mail-wr1-f69.google.com with SMTP id j5so35937404wro.6 for ; Sat, 04 Jul 2020 08:40:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=faJPKsgnKj1MSj1B3bxzpLa01+W3HhU/7Hynie77jqI=; b=DStzH4UrU8FaLtHWkOulGZcdgwxEYtfdMahSo5h59TTOD0R0zaIUCnin6wn3cs/Y4m eoGXUR+bBexWK39LXmhMTMEoPfSibCxjDI71EpHoPHpRfexWcTnnu779H7awoS0aIQbi 2fH6y8YEqDOqn6N7FUC2eve6fv7Z7ZJgtC7C4iS7K5PvRL1CmOj/HMACNzzuRqH+6mJJ yxQVua/EQg/SqA9WAG1uW3kpI15WcbJk61/RC+f8bOKCjyp7R8njSbtqZ+xonSNz7FvB qLEVKkMor+yF3rUPPZqvCDYVRThCmMNX4rVRz7POwTGV5AJRpkv5Tmrhfru10xMOKCz6 O0eQ== X-Gm-Message-State: AOAM530S2QC6V97YR3d/0gvr0q6vxKcxhY7LvosYLvmyj5lDExqyQSgc GWoHswPZQBY0K/JJkD08N+Kr9TQyz4/ApKuSQoBXeeinOjcphNd6vda7U+QTyPwTw/6Egf2aYo3 I72+pG3ZWDom+09Q= X-Received: by 2002:adf:e44c:: with SMTP id t12mr13768479wrm.103.1593877205945; Sat, 04 Jul 2020 08:40:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy098jPxb/frQeho469Gp43aPTWxVhQy55qlR1MGFXuliyYTgtCF30tAWMv6lLp78b+1yIBsQ== X-Received: by 2002:adf:e44c:: with SMTP id t12mr13768451wrm.103.1593877205790; Sat, 04 Jul 2020 08:40:05 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f186sm16650455wmf.29.2020.07.04.08.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 08:40:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 10/23] hw/display/vga-isa-mm: Emit warning when old code is used Date: Sat, 4 Jul 2020 17:38:55 +0200 Message-Id: <20200704153908.12118-11-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200704153908.12118-1-philmd@redhat.com> References: <20200704153908.12118-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 11:39:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-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: Peter Maydell , Sagar Karandikar , "Michael S. Tsirkin" , Max Filippov , Alistair Francis , Gerd Hoffmann , "Edgar E. Iglesias" , Yoshinori Sato , Magnus Damm , Palmer Dabbelt , Eduardo Habkost , Alistair Francis , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Thomas Huth , Bastian Koppelmann , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This code hasn't been QOM'ified yet. Warn the user. Signed-off-by: Philippe Mathieu-Daudé --- hw/display/vga-isa-mm.c | 5 +++++ hw/display/vga.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index 7321b7a06d..3e62389b63 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -29,6 +29,7 @@ #include "hw/display/vga.h" #include "vga_int.h" #include "ui/pixel_ops.h" +#include "hw/qdev-deprecated.h" #define VGA_RAM_SIZE (8 * MiB) @@ -71,6 +72,8 @@ static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base, { MemoryRegion *s_ioport_ctrl, *vga_io_memory; + qdev_warn_deprecated_function_used(); + s->it_shift = it_shift; s_ioport_ctrl = g_malloc(sizeof(*s_ioport_ctrl)); memory_region_init_io(s_ioport_ctrl, NULL, &vga_mm_ctrl_ops, s, @@ -99,6 +102,8 @@ int isa_vga_mm_init(hwaddr vram_base, s = g_malloc0(sizeof(*s)); + qdev_warn_deprecated_function_used(); + s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; s->vga.global_vmstate = true; vga_common_init(&s->vga, NULL); diff --git a/hw/display/vga.c b/hw/display/vga.c index 061fd9ab8f..d59a9c896b 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -35,6 +35,7 @@ #include "hw/xen/xen.h" #include "migration/vmstate.h" #include "trace.h" +#include "hw/qdev-deprecated.h" //#define DEBUG_VGA_MEM //#define DEBUG_VGA_REG @@ -2262,6 +2263,8 @@ MemoryRegion *vga_init_io(VGACommonState *s, Object *obj, { MemoryRegion *vga_mem; + qdev_warn_deprecated_function_used(); + *vga_ports = vga_portio_list; *vbe_ports = vbe_portio_list;