From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Subject: [Qemu-devel] [PULL v3 04/21] virtio-balloon: rewrite get_current_ram_size()
Date: Thu, 25 Feb 2016 13:20:31 +0200 [thread overview]
Message-ID: <1456399032-6172-5-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1456399032-6172-1-git-send-email-mst@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Use pc_dimm_built_list() instead of qmp_pc_dimm_device_list()
Actually, Qapi is not related to this internal helper.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-balloon.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index d6d7e96..388e873 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -307,26 +307,15 @@ static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data)
static ram_addr_t get_current_ram_size(void)
{
- MemoryDeviceInfoList *info_list = NULL;
- MemoryDeviceInfoList **prev = &info_list;
- MemoryDeviceInfoList *info;
+ GSList *list = NULL, *item;
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;
- }
- }
+ pc_dimm_build_list(qdev_get_machine(), &list);
+ for (item = list; item; item = g_slist_next(item)) {
+ Object *obj = OBJECT(item->data);
+ size += object_property_get_int(obj, PC_DIMM_SIZE_PROP, &error_abort);
}
- qapi_free_MemoryDeviceInfoList(info_list);
+ g_slist_free(list);
return size;
}
--
MST
next prev parent reply other threads:[~2016-02-25 11:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 11:20 [Qemu-devel] [PULL v3 00/21] vhost, virtio, pci, pc Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 01/21] bios-linker-loader: document+validate input Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 02/21] vhost-user: don't merge regions with different fds Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 03/21] move get_current_ram_size to virtio-balloon.c Michael S. Tsirkin
2016-02-25 11:20 ` Michael S. Tsirkin [this message]
2016-03-01 16:28 ` [Qemu-devel] [PULL v3 04/21] virtio-balloon: rewrite get_current_ram_size() Vladimir Sementsov-Ogievskiy
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 05/21] balloon: Use only 'pc-dimm' type dimm for ballooning Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 06/21] pci core: function pci_host_bus_register() cleanup Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 07/21] pci core: function pci_bus_init() cleanup Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 08/21] block-migration: acquire AioContext as necessary Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 09/21] vring: make vring_enable_notification return void Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 10/21] virtio: add AioContext-specific function for host notifiers Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 11/21] virtio: export vring_notify as virtio_should_notify Michael S. Tsirkin
2016-02-25 11:20 ` [Qemu-devel] [PULL v3 12/21] virtio-blk: fix "disabled data plane" mode Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 13/21] virtio-blk: do not use vring in dataplane Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 14/21] virtio-scsi: " Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 15/21] vring: remove Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 16/21] tests/vhost-user-bridge: fix build on 32 bit systems Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 17/21] q35: Remove old machine versions Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 18/21] machine: Remove no_tco field Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 19/21] ich9: Remove enable_tco arguments from init functions Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 20/21] q35: Remove unused q35-acpi-dsdt.aml file Michael S. Tsirkin
2016-02-25 11:21 ` [Qemu-devel] [PULL v3 21/21] q35: No need to check gigabyte_align Michael S. Tsirkin
2016-02-25 12:57 ` [Qemu-devel] [PULL v3 00/21] vhost, virtio, pci, pc Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456399032-6172-5-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).