From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNH6S-00032A-Oj for qemu-devel@nongnu.org; Thu, 15 Nov 2018 07:50:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNH6Q-0005B6-5q for qemu-devel@nongnu.org; Thu, 15 Nov 2018 07:50:36 -0500 Date: Thu, 15 Nov 2018 13:49:49 +0100 From: Igor Mammedov Message-ID: <20181115134949.7767589d@redhat.com> In-Reply-To: <20181105014047.26447-15-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> <20181105014047.26447-15-sameo@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 14/24] hw: i386: Make the hotpluggable memory size property more generic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Samuel Ortiz Cc: qemu-devel@nongnu.org, Shannon Zhao , Stefano Stabellini , Anthony Perard , Richard Henderson , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Paolo Bonzini , "Michael S. Tsirkin" , qemu-arm@nongnu.org, Peter Maydell , Eduardo Habkost On Mon, 5 Nov 2018 02:40:37 +0100 Samuel Ortiz wrote: > This property is currently defined under i386/pc while it only describes > a region size that's eventually fetched from the AML ACPI code. > > We can make it more generic and shareable across machine types by moving > it to memory-device.h instead. > > Signed-off-by: Samuel Ortiz not sure it belong to this series, but regardless where it end-ups Reviewed-by: Igor Mammedov > --- > include/hw/i386/pc.h | 1 - > include/hw/mem/memory-device.h | 2 ++ > hw/i386/acpi-build.c | 2 +- > hw/i386/pc.c | 3 ++- > 4 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index bbbdb33ea3..44cb6bf3f3 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -62,7 +62,6 @@ struct PCMachineState { > }; > > #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" > -#define PC_MACHINE_DEVMEM_REGION_SIZE "device-memory-region-size" > #define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g" > #define PC_MACHINE_VMPORT "vmport" > #define PC_MACHINE_SMM "smm" > diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h > index e904e194d5..d9a4fc7c3e 100644 > --- a/include/hw/mem/memory-device.h > +++ b/include/hw/mem/memory-device.h > @@ -97,6 +97,8 @@ typedef struct MemoryDeviceClass { > MemoryDeviceInfo *info); > } MemoryDeviceClass; > > +#define MEMORY_DEVICE_REGION_SIZE "memory-device-region-size" > + > MemoryDeviceInfoList *qmp_memory_device_list(void); > uint64_t get_plugged_memory_size(void); > void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index d8bba16776..1ef1a38441 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1628,7 +1628,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, > MachineClass *mc = MACHINE_GET_CLASS(machine); > const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine); > ram_addr_t hotplugabble_address_space_size = > - object_property_get_int(OBJECT(machine), PC_MACHINE_DEVMEM_REGION_SIZE, > + object_property_get_int(OBJECT(machine), MEMORY_DEVICE_REGION_SIZE, > NULL); > > srat_start = table_data->len; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 090f969933..c9ffc8cff6 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -67,6 +67,7 @@ > #include "hw/boards.h" > #include "acpi-build.h" > #include "hw/mem/pc-dimm.h" > +#include "hw/mem/memory-device.h" > #include "qapi/error.h" > #include "qapi/qapi-visit-common.h" > #include "qapi/visitor.h" > @@ -2443,7 +2444,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) > nc->nmi_monitor_handler = x86_nmi; > mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; > > - object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int", > + object_class_property_add(oc, MEMORY_DEVICE_REGION_SIZE, "int", > pc_machine_get_device_memory_region_size, NULL, > NULL, NULL, &error_abort); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Mammedov Subject: Re: [PATCH v5 14/24] hw: i386: Make the hotpluggable memory size property more generic Date: Thu, 15 Nov 2018 13:49:49 +0100 Message-ID: <20181115134949.7767589d@redhat.com> References: <20181105014047.26447-1-sameo@linux.intel.com> <20181105014047.26447-15-sameo@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gNH61-0000sU-J6 for xen-devel@lists.xenproject.org; Thu, 15 Nov 2018 12:50:09 +0000 In-Reply-To: <20181105014047.26447-15-sameo@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Samuel Ortiz Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Shannon Zhao , qemu-arm@nongnu.org, Marcel Apfelbaum , Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org T24gTW9uLCAgNSBOb3YgMjAxOCAwMjo0MDozNyArMDEwMApTYW11ZWwgT3J0aXogPHNhbWVvQGxp bnV4LmludGVsLmNvbT4gd3JvdGU6Cgo+IFRoaXMgcHJvcGVydHkgaXMgY3VycmVudGx5IGRlZmlu ZWQgdW5kZXIgaTM4Ni9wYyB3aGlsZSBpdCBvbmx5IGRlc2NyaWJlcwo+IGEgcmVnaW9uIHNpemUg dGhhdCdzIGV2ZW50dWFsbHkgZmV0Y2hlZCBmcm9tIHRoZSBBTUwgQUNQSSBjb2RlLgo+IAo+IFdl IGNhbiBtYWtlIGl0IG1vcmUgZ2VuZXJpYyBhbmQgc2hhcmVhYmxlIGFjcm9zcyBtYWNoaW5lIHR5 cGVzIGJ5IG1vdmluZwo+IGl0IHRvIG1lbW9yeS1kZXZpY2UuaCBpbnN0ZWFkLgo+IAo+IFNpZ25l ZC1vZmYtYnk6IFNhbXVlbCBPcnRpeiA8c2FtZW9AbGludXguaW50ZWwuY29tPgpub3Qgc3VyZSBp dCBiZWxvbmcgdG8gdGhpcyBzZXJpZXMsIGJ1dCByZWdhcmRsZXNzIHdoZXJlIGl0IGVuZC11cHMK ClJldmlld2VkLWJ5OiBJZ29yIE1hbW1lZG92IDxpbWFtbWVkb0ByZWRoYXQuY29tPgoKPiAtLS0K PiAgaW5jbHVkZS9ody9pMzg2L3BjLmggICAgICAgICAgIHwgMSAtCj4gIGluY2x1ZGUvaHcvbWVt L21lbW9yeS1kZXZpY2UuaCB8IDIgKysKPiAgaHcvaTM4Ni9hY3BpLWJ1aWxkLmMgICAgICAgICAg IHwgMiArLQo+ICBody9pMzg2L3BjLmMgICAgICAgICAgICAgICAgICAgfCAzICsrLQo+ICA0IGZp bGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0t Z2l0IGEvaW5jbHVkZS9ody9pMzg2L3BjLmggYi9pbmNsdWRlL2h3L2kzODYvcGMuaAo+IGluZGV4 IGJiYmRiMzNlYTMuLjQ0Y2I2YmYzZjMgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9ody9pMzg2L3Bj LmgKPiArKysgYi9pbmNsdWRlL2h3L2kzODYvcGMuaAo+IEBAIC02Miw3ICs2Miw2IEBAIHN0cnVj dCBQQ01hY2hpbmVTdGF0ZSB7Cj4gIH07Cj4gIAo+ICAjZGVmaW5lIFBDX01BQ0hJTkVfQUNQSV9E RVZJQ0VfUFJPUCAiYWNwaS1kZXZpY2UiCj4gLSNkZWZpbmUgUENfTUFDSElORV9ERVZNRU1fUkVH SU9OX1NJWkUgImRldmljZS1tZW1vcnktcmVnaW9uLXNpemUiCj4gICNkZWZpbmUgUENfTUFDSElO RV9NQVhfUkFNX0JFTE9XXzRHICJtYXgtcmFtLWJlbG93LTRnIgo+ICAjZGVmaW5lIFBDX01BQ0hJ TkVfVk1QT1JUICAgICAgICAgICAidm1wb3J0Igo+ICAjZGVmaW5lIFBDX01BQ0hJTkVfU01NICAg ICAgICAgICAgICAic21tIgo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L21lbS9tZW1vcnktZGV2 aWNlLmggYi9pbmNsdWRlL2h3L21lbS9tZW1vcnktZGV2aWNlLmgKPiBpbmRleCBlOTA0ZTE5NGQ1 Li5kOWE0ZmM3YzNlIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvaHcvbWVtL21lbW9yeS1kZXZpY2Uu aAo+ICsrKyBiL2luY2x1ZGUvaHcvbWVtL21lbW9yeS1kZXZpY2UuaAo+IEBAIC05Nyw2ICs5Nyw4 IEBAIHR5cGVkZWYgc3RydWN0IE1lbW9yeURldmljZUNsYXNzIHsKPiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBNZW1vcnlEZXZpY2VJbmZvICppbmZvKTsKPiAgfSBNZW1vcnlEZXZpY2VD bGFzczsKPiAgCj4gKyNkZWZpbmUgTUVNT1JZX0RFVklDRV9SRUdJT05fU0laRSAibWVtb3J5LWRl dmljZS1yZWdpb24tc2l6ZSIKPiArCj4gIE1lbW9yeURldmljZUluZm9MaXN0ICpxbXBfbWVtb3J5 X2RldmljZV9saXN0KHZvaWQpOwo+ICB1aW50NjRfdCBnZXRfcGx1Z2dlZF9tZW1vcnlfc2l6ZSh2 b2lkKTsKPiAgdm9pZCBtZW1vcnlfZGV2aWNlX3ByZV9wbHVnKE1lbW9yeURldmljZVN0YXRlICpt ZCwgTWFjaGluZVN0YXRlICptcywKPiBkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMg Yi9ody9pMzg2L2FjcGktYnVpbGQuYwo+IGluZGV4IGQ4YmJhMTY3NzYuLjFlZjFhMzg0NDEgMTAw NjQ0Cj4gLS0tIGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMKPiArKysgYi9ody9pMzg2L2FjcGktYnVp bGQuYwo+IEBAIC0xNjI4LDcgKzE2MjgsNyBAQCBidWlsZF9zcmF0KEdBcnJheSAqdGFibGVfZGF0 YSwgQklPU0xpbmtlciAqbGlua2VyLAo+ICAgICAgTWFjaGluZUNsYXNzICptYyA9IE1BQ0hJTkVf R0VUX0NMQVNTKG1hY2hpbmUpOwo+ICAgICAgY29uc3QgQ1BVQXJjaElkTGlzdCAqYXBpY19pZHMg PSBtYy0+cG9zc2libGVfY3B1X2FyY2hfaWRzKG1hY2hpbmUpOwo+ICAgICAgcmFtX2FkZHJfdCBo b3RwbHVnYWJibGVfYWRkcmVzc19zcGFjZV9zaXplID0KPiAtICAgICAgICBvYmplY3RfcHJvcGVy dHlfZ2V0X2ludChPQkpFQ1QobWFjaGluZSksIFBDX01BQ0hJTkVfREVWTUVNX1JFR0lPTl9TSVpF LAo+ICsgICAgICAgIG9iamVjdF9wcm9wZXJ0eV9nZXRfaW50KE9CSkVDVChtYWNoaW5lKSwgTUVN T1JZX0RFVklDRV9SRUdJT05fU0laRSwKPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBOVUxMKTsKPiAgCj4gICAgICBzcmF0X3N0YXJ0ID0gdGFibGVfZGF0YS0+bGVuOwo+IGRpZmYg LS1naXQgYS9ody9pMzg2L3BjLmMgYi9ody9pMzg2L3BjLmMKPiBpbmRleCAwOTBmOTY5OTMzLi5j OWZmYzhjZmY2IDEwMDY0NAo+IC0tLSBhL2h3L2kzODYvcGMuYwo+ICsrKyBiL2h3L2kzODYvcGMu Ywo+IEBAIC02Nyw2ICs2Nyw3IEBACj4gICNpbmNsdWRlICJody9ib2FyZHMuaCIKPiAgI2luY2x1 ZGUgImFjcGktYnVpbGQuaCIKPiAgI2luY2x1ZGUgImh3L21lbS9wYy1kaW1tLmgiCj4gKyNpbmNs dWRlICJody9tZW0vbWVtb3J5LWRldmljZS5oIgo+ICAjaW5jbHVkZSAicWFwaS9lcnJvci5oIgo+ ICAjaW5jbHVkZSAicWFwaS9xYXBpLXZpc2l0LWNvbW1vbi5oIgo+ICAjaW5jbHVkZSAicWFwaS92 aXNpdG9yLmgiCj4gQEAgLTI0NDMsNyArMjQ0NCw3IEBAIHN0YXRpYyB2b2lkIHBjX21hY2hpbmVf Y2xhc3NfaW5pdChPYmplY3RDbGFzcyAqb2MsIHZvaWQgKmRhdGEpCj4gICAgICBuYy0+bm1pX21v bml0b3JfaGFuZGxlciA9IHg4Nl9ubWk7Cj4gICAgICBtYy0+ZGVmYXVsdF9jcHVfdHlwZSA9IFRB UkdFVF9ERUZBVUxUX0NQVV9UWVBFOwo+ICAKPiAtICAgIG9iamVjdF9jbGFzc19wcm9wZXJ0eV9h ZGQob2MsIFBDX01BQ0hJTkVfREVWTUVNX1JFR0lPTl9TSVpFLCAiaW50IiwKPiArICAgIG9iamVj dF9jbGFzc19wcm9wZXJ0eV9hZGQob2MsIE1FTU9SWV9ERVZJQ0VfUkVHSU9OX1NJWkUsICJpbnQi LAo+ICAgICAgICAgIHBjX21hY2hpbmVfZ2V0X2RldmljZV9tZW1vcnlfcmVnaW9uX3NpemUsIE5V TEwsCj4gICAgICAgICAgTlVMTCwgTlVMTCwgJmVycm9yX2Fib3J0KTsKPiAgCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9q ZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==