From patchwork Sun Jun 2 15:43:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CA9912C0090 for ; Mon, 3 Jun 2013 01:46:06 +1000 (EST) Received: from localhost ([::1]:35247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjATs-0003lZ-V4 for incoming@patchwork.ozlabs.org; Sun, 02 Jun 2013 11:46:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjARp-0000lu-5R for qemu-devel@nongnu.org; Sun, 02 Jun 2013 11:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjARn-0000T2-K5 for qemu-devel@nongnu.org; Sun, 02 Jun 2013 11:43:57 -0400 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]:65346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjARn-0000Sq-Cc for qemu-devel@nongnu.org; Sun, 02 Jun 2013 11:43:55 -0400 Received: by mail-we0-f170.google.com with SMTP id w57so1003299wes.1 for ; Sun, 02 Jun 2013 08:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=+x7O6Ht0n0Miu6ZXvEHzTCtzvVCqrzsohbIFg0b6t5U=; b=c74w9hOPw7fbZV8HDD0efUij7VCxwg8SzgCq5ROTCt5HQI9toISsdKrlbMNhbp89ZN d3Lu60ji+cflDhD/wjGe284XS+M3Lzzlr7amjJBJuc5JENjy8U8h1XdzAHJJsWv3je88 UsbDfSlko2UAjyKu7FaBo6vVHE/h2UXgWdJ+KyyNf+L94MMuMTKfWkzrTS7eOeAtly3s /hD26yifXhNYgrPBKfkAkP+d6X57qjNtKOiwz3n6kJ1/6Cqn3Ny/QpwQmRl8ztj45Mex /4DCIDc6h30quxpakbQuuT2ScZJ0eYhg3iaKSJaj58Q6XNSyso1hZVgHtTLupTBu9DAs qfyQ== X-Received: by 10.194.235.130 with SMTP id um2mr15870606wjc.30.1370187834647; Sun, 02 Jun 2013 08:43:54 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id en3sm17384245wid.1.2013.06.02.08.43.52 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 02 Jun 2013 08:43:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 2 Jun 2013 17:43:24 +0200 Message-Id: <1370187812-13191-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370187812-13191-1-git-send-email-pbonzini@redhat.com> References: <1370187812-13191-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22a Cc: peter.maydell@linaro.org, Liu Ping Fan , jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH 07/15] acpi: add memory_region_set_owner calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ACPI regions are added directly to the I/O address space, without going through BARs. Thus they need the owner to be set directly. Signed-off-by: Paolo Bonzini --- hw/acpi/ich9.c | 1 + hw/acpi/piix4.c | 5 +++++ hw/isa/apm.c | 1 + 3 files changed, 7 insertions(+) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4a17f32..0b19864 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -223,6 +223,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, 8); memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); + memory_region_set_owner(&pm->io, OBJECT(lpc_pci)); pm->irq = sci_irq; qemu_register_reset(pm_reset, pm); pm->powerdown_notifier.notify = pm_powerdown_req; diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c4af1cc..d097592 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -433,6 +433,8 @@ static int piix4_pm_initfn(PCIDevice *dev) acpi_pm1_cnt_init(&s->ar, &s->io, s->s4_val); acpi_gpe_init(&s->ar, GPE_LEN); + memory_region_set_owner(&s->io, OBJECT(s)); + s->powerdown_notifier.notify = piix4_pm_powerdown_req; qemu_register_powerdown_notifier(&s->powerdown_notifier); @@ -672,10 +674,12 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, { memory_region_init_io(&s->io_gpe, &piix4_gpe_ops, s, "apci-gpe0", GPE_LEN); + memory_region_set_owner(&s->io_gpe, OBJECT(s)); memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe); memory_region_init_io(&s->io_pci, &piix4_pci_ops, s, "apci-pci-hotplug", PCI_HOTPLUG_SIZE); + memory_region_set_owner(&s->io_pci, OBJECT(s)); memory_region_add_subregion(parent, PCI_HOTPLUG_ADDR, &s->io_pci); pci_bus_hotplug(bus, piix4_device_hotplug, &s->dev.qdev); @@ -683,6 +687,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, qemu_for_each_cpu(piix4_init_cpu_status, &s->gpe_cpu); memory_region_init_io(&s->io_cpu, &cpu_hotplug_ops, s, "apci-cpu-hotplug", PIIX4_PROC_LEN); + memory_region_set_owner(&s->io_cpu, OBJECT(s)); memory_region_add_subregion(parent, PIIX4_PROC_BASE, &s->io_cpu); s->cpu_added_notifier.notify = piix4_cpu_added_req; qemu_register_cpu_added_notifier(&s->cpu_added_notifier); diff --git a/hw/isa/apm.c b/hw/isa/apm.c index 5f21d21..376c564 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -97,6 +97,7 @@ void apm_init(PCIDevice *dev, APMState *apm, apm_ctrl_changed_t callback, /* ioport 0xb2, 0xb3 */ memory_region_init_io(&apm->io, &apm_ops, apm, "apm-io", 2); + memory_region_set_owner(&apm->io, OBJECT(dev)); memory_region_add_subregion(pci_address_space_io(dev), APM_CNT_IOPORT, &apm->io); }