[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 03/21] move get_current_ram_size to virtio-balloon
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 03/21] move get_current_ram_size to virtio-balloon.c |
Date: |
Thu, 25 Feb 2016 13:20:27 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
get_current_ram_size() is used only in virtio-balloon.c
This patch moves it into virtio-balloon and make it static, to allow
some balloon-specific tuning.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/exec/cpu-common.h | 1 -
hw/mem/pc-dimm.c | 26 --------------------------
hw/virtio/virtio-balloon.c | 26 ++++++++++++++++++++++++++
stubs/qmp_pc_dimm_device_list.c | 5 -----
4 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 85aa403..a0ad2ac 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -54,7 +54,6 @@ typedef uintptr_t ram_addr_t;
#endif
extern ram_addr_t ram_size;
-ram_addr_t get_current_ram_size(void);
/* memory API */
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 1aa12c6..650f0f8 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -192,32 +192,6 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque)
return 0;
}
-ram_addr_t get_current_ram_size(void)
-{
- MemoryDeviceInfoList *info_list = NULL;
- MemoryDeviceInfoList **prev = &info_list;
- MemoryDeviceInfoList *info;
- ram_addr_t size = ram_size;
-
- qmp_pc_dimm_device_list(qdev_get_machine(), &prev);
- for (info = info_list; info; info = info->next) {
- MemoryDeviceInfo *value = info->value;
-
- if (value) {
- switch (value->type) {
- case MEMORY_DEVICE_INFO_KIND_DIMM:
- size += value->u.dimm->size;
- break;
- default:
- break;
- }
- }
- }
- qapi_free_MemoryDeviceInfoList(info_list);
-
- return size;
-}
-
static int pc_dimm_slot2bitmap(Object *obj, void *opaque)
{
unsigned long *bitmap = opaque;
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index a382f43..d6d7e96 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -305,6 +305,32 @@ static void virtio_balloon_get_config(VirtIODevice *vdev,
uint8_t *config_data)
memcpy(config_data, &config, sizeof(struct virtio_balloon_config));
}
+static ram_addr_t get_current_ram_size(void)
+{
+ MemoryDeviceInfoList *info_list = NULL;
+ MemoryDeviceInfoList **prev = &info_list;
+ MemoryDeviceInfoList *info;
+ ram_addr_t size = ram_size;
+
+ qmp_pc_dimm_device_list(qdev_get_machine(), &prev);
+ for (info = info_list; info; info = info->next) {
+ MemoryDeviceInfo *value = info->value;
+
+ if (value) {
+ switch (value->type) {
+ case MEMORY_DEVICE_INFO_KIND_DIMM:
+ size += value->u.dimm->size;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ qapi_free_MemoryDeviceInfoList(info_list);
+
+ return size;
+}
+
static void virtio_balloon_set_config(VirtIODevice *vdev,
const uint8_t *config_data)
{
diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm_device_list.c
index a4af7fe..def2115 100644
--- a/stubs/qmp_pc_dimm_device_list.c
+++ b/stubs/qmp_pc_dimm_device_list.c
@@ -6,8 +6,3 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque)
{
return 0;
}
-
-ram_addr_t get_current_ram_size(void)
-{
- return ram_size;
-}
--
MST
- [Qemu-devel] [PULL v3 00/21] vhost, virtio, pci, pc, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 02/21] vhost-user: don't merge regions with different fds, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 03/21] move get_current_ram_size to virtio-balloon.c,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 01/21] bios-linker-loader: document+validate input, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 04/21] virtio-balloon: rewrite get_current_ram_size(), Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 05/21] balloon: Use only 'pc-dimm' type dimm for ballooning, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 06/21] pci core: function pci_host_bus_register() cleanup, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 07/21] pci core: function pci_bus_init() cleanup, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 10/21] virtio: add AioContext-specific function for host notifiers, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 11/21] virtio: export vring_notify as virtio_should_notify, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 09/21] vring: make vring_enable_notification return void, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 08/21] block-migration: acquire AioContext as necessary, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 12/21] virtio-blk: fix "disabled data plane" mode, Michael S. Tsirkin, 2016/02/25