From patchwork Fri Feb 21 17:30:47 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: 1242267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HItnXlY0; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48PJWB0B90z9sR4 for ; Sat, 22 Feb 2020 04:35:02 +1100 (AEDT) Received: from localhost ([::1]:34186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5CCZ-0001r7-Py for incoming@patchwork.ozlabs.org; Fri, 21 Feb 2020 12:34:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38107) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5C8p-0006CG-FK for qemu-devel@nongnu.org; Fri, 21 Feb 2020 12:31:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5C8o-000807-B9 for qemu-devel@nongnu.org; Fri, 21 Feb 2020 12:31:07 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:54570 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j5C8o-0007zf-78 for qemu-devel@nongnu.org; Fri, 21 Feb 2020 12:31:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582306265; 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=VEFA07cxDExgBn425ggzA1li5B5q1BBqRYxz1LjraoI=; b=HItnXlY0Kxdz/YhP2oWzPJMnZLpaqZ6/kQ5MJ0Lkzr3PE2WbLu9gZCvblZ/r9uI4OMwVwb 4RQhotmbmxVx+drvaTQyEa1oeNhupW6/C3eep7pkTPte6Y2NDSQj8jryM1hLfIxfSvzG5T yo6kiW9qG2qe1lvVJd0XK1ekcf5+kow= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-Rw44Jy64Ovm_wcKR-QPNYQ-1; Fri, 21 Feb 2020 12:31:03 -0500 X-MC-Unique: Rw44Jy64Ovm_wcKR-QPNYQ-1 Received: by mail-wm1-f71.google.com with SMTP id y125so2067579wmg.1 for ; Fri, 21 Feb 2020 09:31:03 -0800 (PST) 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=EJXr99FJ98twgvm41idHKUIEhs+PYW203OES1NY0r5o=; b=ZdYUSxsRWw8k8bVxI/JpQVgBvo3jllUmnzKVjKjLvwzBnAj5F75IJnE3rGk6QVQA++ Da15nz7jb0aaNIWjrEL/Do7somTrt+mCXKmaPwRzEVKh+yVvqpMn2BoA9KdqYvwyJO5O 1eMiDaTIq3zxkkzWPHbVKogntYkQVlLBxlQ3IGxEfFEGIVY88Bzid7HouWPqbJ93wFxo YbV8KaQcAAdVvs/qqrDgs6Fglc442ZuNbr2TKxtnJW8XT3A8xJ+YlAqsX7rHWKI2pPFW LZBYh5vPRb1LQ01601vaR76kRnqh9U3to2qiLuFIwQD8xrVg2OUFgSBBUoCueMHeEpCm c38g== X-Gm-Message-State: APjAAAUStpd3nD92//bGGV/hUGk2jnuqWM34AgZq6XRx3MRZTPWj2EHi I8tqAIOelkHrfA46yTUwnklVLJCuzM4t56DwZAosyiCc7HpYEa+0Iua4dCwAy9gt8K+SESh7rpE 4aWxCf/Iu4mdCqxM= X-Received: by 2002:a1c:e388:: with SMTP id a130mr4895515wmh.176.1582306262287; Fri, 21 Feb 2020 09:31:02 -0800 (PST) X-Google-Smtp-Source: APXvYqzxKK4rofAtrCdp/lELRI9WruL74WpqyFZLmhDMq/d7/UXqXq6F7h1gVJASQwbnvwlXqxfsag== X-Received: by 2002:a1c:e388:: with SMTP id a130mr4895477wmh.176.1582306261997; Fri, 21 Feb 2020 09:31:01 -0800 (PST) Received: from x1w.redhat.com (78.red-88-21-202.staticip.rima-tde.net. [88.21.202.78]) by smtp.gmail.com with ESMTPSA id h18sm5000871wrv.78.2020.02.21.09.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 09:31:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/7] hw/display: Let devices own the MemoryRegion they create Date: Fri, 21 Feb 2020 18:30:47 +0100 Message-Id: <20200221173049.18134-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200221173049.18134-1-philmd@redhat.com> References: <20200221173049.18134-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/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: Peter Maydell , Sagar Karandikar , "Michael S. Tsirkin" , Mark Cave-Ayland , Alistair Francis , "Edgar E. Iglesias" , Jean-Christophe Dubois , =?utf-8?b?SGVydsOpIFBv?= =?utf-8?q?ussineau?= , Joel Stanley , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , qemu-arm@nongnu.org, Peter Chubb , qemu-riscv@nongnu.org, Igor Mitsyanko , Bastian Koppelmann , Laurent Vivier , Subbaraya Sundeep , Palmer Dabbelt , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To avoid orphean memory regions being added in the /unattached QOM container, use the memory_region_owner_nonnull.cocci script to set the correct ownership. Signed-off-by: Philippe Mathieu-Daudé --- hw/display/cg3.c | 4 ++-- hw/display/g364fb.c | 5 +++-- hw/display/macfb.c | 4 ++-- hw/display/vmware_vga.c | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 4fb67c6b1c..db2e291d16 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -315,8 +315,8 @@ static void cg3_realizefn(DeviceState *dev, Error **errp) } } - memory_region_init_ram(&s->vram_mem, NULL, "cg3.vram", s->vram_size, - &error_fatal); + memory_region_init_ram(&s->vram_mem, OBJECT(dev), "cg3.vram", + s->vram_size, &error_fatal); memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA); sysbus_init_mmio(sbd, &s->vram_mem); diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 55185c95c6..28785cceda 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -477,8 +477,9 @@ static void g364fb_init(DeviceState *dev, G364State *s) s->con = graphic_console_init(dev, 0, &g364fb_ops, s); - memory_region_init_io(&s->mem_ctrl, NULL, &g364fb_ctrl_ops, s, "ctrl", 0x180000); - memory_region_init_ram_ptr(&s->mem_vram, NULL, "vram", + memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &g364fb_ctrl_ops, s, + "ctrl", 0x180000); + memory_region_init_ram_ptr(&s->mem_vram, OBJECT(dev), "vram", s->vram_size, s->vram); vmstate_register_ram(&s->mem_vram, dev); memory_region_set_log(&s->mem_vram, true, DIRTY_MEMORY_VGA); diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 8bff16d535..b68faff4bb 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -362,8 +362,8 @@ static void macfb_common_realize(DeviceState *dev, MacfbState *s, Error **errp) return; } - memory_region_init_io(&s->mem_ctrl, NULL, &macfb_ctrl_ops, s, "macfb-ctrl", - 0x1000); + memory_region_init_io(&s->mem_ctrl, OBJECT(dev), &macfb_ctrl_ops, s, + "macfb-ctrl", 0x1000); memory_region_init_ram_nomigrate(&s->mem_vram, OBJECT(s), "macfb-vram", MACFB_VRAM_SIZE, errp); diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 58ea82e3e5..79574e3c46 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1238,8 +1238,8 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, s->vga.con = graphic_console_init(dev, 0, &vmsvga_ops, s); s->fifo_size = SVGA_FIFO_SIZE; - memory_region_init_ram(&s->fifo_ram, NULL, "vmsvga.fifo", s->fifo_size, - &error_fatal); + memory_region_init_ram(&s->fifo_ram, OBJECT(dev), "vmsvga.fifo", + s->fifo_size, &error_fatal); s->fifo_ptr = memory_region_get_ram_ptr(&s->fifo_ram); vga_common_init(&s->vga, OBJECT(dev));