From patchwork Tue Jul 23 16:23:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 261158 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 BFFC92C00D5 for ; Wed, 24 Jul 2013 02:50:18 +1000 (EST) Received: from localhost ([::1]:52334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1fSb-0006cn-Cl for incoming@patchwork.ozlabs.org; Tue, 23 Jul 2013 12:29:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1fNn-0006KK-2o for qemu-devel@nongnu.org; Tue, 23 Jul 2013 12:24:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1fNk-00074k-II for qemu-devel@nongnu.org; Tue, 23 Jul 2013 12:24:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1fNk-00074V-7x for qemu-devel@nongnu.org; Tue, 23 Jul 2013 12:24:12 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6NGO7HL009399 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 23 Jul 2013 12:24:08 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r6NGNV1X018088; Tue, 23 Jul 2013 12:24:05 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2013 18:23:05 +0200 Message-Id: <1374596592-7027-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1374596592-7027-1-git-send-email-imammedo@redhat.com> References: <1374596592-7027-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: vasilis.liaskovitis@profitbricks.com, hutao@cn.fujitsu.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 09/16] pc: i440fx: add DimmBus to chipset and map it into hotplug memory region 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 it makes hot-plugged DimmDevices visible in guest address space. Signed-off-by: Igor Mammedov --- hw/pci-host/piix.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 26bb844..2ac7587 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -32,6 +32,7 @@ #include "hw/xen/xen.h" #include "hw/pci-host/pam.h" #include "sysemu/sysemu.h" +#include "hw/mem-hotplug/dimm.h" /* * I440FX chipset data sheet. @@ -96,6 +97,7 @@ struct PCII440FXState { PAMMemoryRegion pam_regions[13]; MemoryRegion smram_region; uint8_t smm_enabled; + DimmBus dimm_bus; }; @@ -221,6 +223,8 @@ static int i440fx_initfn(PCIDevice *dev) d->dev.config[I440FX_SMRAM] = 0x02; cpu_smm_register(&i440fx_set_smm, d); + + qbus_create_inplace(&d->dimm_bus, TYPE_DIMM_BUS, DEVICE(d), "membus"); return 0; } @@ -244,6 +248,7 @@ static PCIBus *i440fx_common_init(const char *device_name, PIIX3State *piix3; PCII440FXState *f; Range *pci_hole64 = &guest_info->pci_info.w64; + Range *hotplug_mem = &guest_info->hotplug_mem_win; unsigned i; dev = qdev_create(NULL, "i440FX-pcihost"); @@ -260,6 +265,13 @@ static PCIBus *i440fx_common_init(const char *device_name, f->system_memory = address_space_mem; f->pci_address_space = pci_address_space; f->ram_memory = ram_memory; + + f->dimm_bus.base = hotplug_mem->begin; + memory_region_init(&f->dimm_bus.as, "hotplug-memory", + hotplug_mem->end - hotplug_mem->begin); + memory_region_add_subregion(f->system_memory, f->dimm_bus.base, + &f->dimm_bus.as); + memory_region_init_alias(&f->pci_hole, "pci-hole", f->pci_address_space, pci_hole_start, pci_hole_size); memory_region_add_subregion(f->system_memory, pci_hole_start, &f->pci_hole);