From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2nsx-00062o-Bp for qemu-devel@nongnu.org; Sun, 21 Dec 2014 16:18:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y2nsm-0002tC-UP for qemu-devel@nongnu.org; Sun, 21 Dec 2014 16:17:55 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:42481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y2nsm-0002sq-Nz for qemu-devel@nongnu.org; Sun, 21 Dec 2014 16:17:44 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 21 Dec 2014 14:17:43 -0700 Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 306353E4003B for ; Sun, 21 Dec 2014 14:17:40 -0700 (MST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sBLLHeFn32112762 for ; Sun, 21 Dec 2014 14:17:40 -0700 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sBLLHdlP007326 for ; Sun, 21 Dec 2014 14:17:40 -0700 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1417849159-6568-4-git-send-email-zhang.zhanghailiang@huawei.com> References: <1417849159-6568-1-git-send-email-zhang.zhanghailiang@huawei.com> <1417849159-6568-4-git-send-email-zhang.zhanghailiang@huawei.com> Message-ID: <20141221211734.15420.72276@loki> Date: Sun, 21 Dec 2014 15:17:34 -0600 Subject: Re: [Qemu-devel] [PATCH RFC for-2.3 3/6] qga: implement qmp_guest_get_memory_blocks() for Linux with sysfs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhanghailiang , qemu-devel@nongnu.org Cc: peter.huangpeng@huawei.com Quoting zhanghailiang (2014-12-06 00:59:16) > We can get guest's memory block information by using command > "guest-get-memory-blocks", the returned value contains a list of memory b= lock > info, such as phys_index, online state, can-offline info. > = > Signed-off-by: zhanghailiang > --- > qga/commands-posix.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++= +----- > 1 file changed, 60 insertions(+), 6 deletions(-) > = > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 8917dca..d3f7d4f 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -2005,6 +2005,60 @@ static void transfer_memory_block(GuestMemoryBlock= *mem_blk, bool sys2memblk, > g_assert(res =3D=3D 0); > } > = > +GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp) > +{ > + GuestMemoryBlockList *head, **link; > + Error *local_err =3D NULL; > + struct dirent *de; > + DIR *dp; > + > + head =3D NULL; > + link =3D &head; > + > + dp =3D opendir("/sys/devices/system/memory/"); > + if (!dp) { > + error_setg_errno(errp, errno, "Can't open directory" > + "\"/sys/devices/system/memory/\"\n"); > + return NULL; > + } > + > + /* Note: the phys_index of memory block may be discontinuous, > + * this is because a memblk is the unit of the Sparse Memory design,= which > + * allows discontinuous memory ranges (ex. NUMA), so here we should > + * traverse the memory block directory. > + */ > + while ((de =3D readdir(dp)) !=3D NULL) { > + GuestMemoryBlock *mem_blk; > + GuestMemoryBlockList *entry; > + > + if ((strncmp(de->d_name, "memory", 6) !=3D 0) || > + !(de->d_type & DT_DIR)) { > + continue; > + } > + > + mem_blk =3D g_malloc0(sizeof *mem_blk); > + /* The d_name is "memoryXXX", phys_index is block id, same as X= XX */ > + mem_blk->phys_index =3D strtoul(&de->d_name[6], NULL, 10); > + mem_blk->has_can_offline =3D true; /* lolspeak ftw */ My initial thought as well :P > + transfer_memory_block(mem_blk, true, &local_err); > + > + entry =3D g_malloc0(sizeof *entry); > + entry->value =3D mem_blk; > + > + *link =3D entry; > + link =3D &entry->next; > + } > + > + if (local_err =3D=3D NULL) { > + /* there's no guest with zero memroy blocks */ typo > + g_assert(head !=3D NULL); As commented on in earlier patches, guest errors shouldnt crash the guest a= gent if it can be avoided. > + return head; > + } > + > + qapi_free_GuestMemoryBlockList(head); > + error_propagate(errp, local_err); > + return NULL; > +} > #else /* defined(__linux__) */ > = > void qmp_guest_suspend_disk(Error **errp) > @@ -2040,6 +2094,12 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorL= ist *vcpus, Error **errp) > return -1; > } > = > +GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp) > +{ > + error_set(errp, QERR_UNSUPPORTED); > + return NULL; > +} > + > #endif > = > #if !defined(CONFIG_FSFREEZE) > @@ -2126,12 +2186,6 @@ GList *ga_command_blacklist_init(GList *blacklist) > return blacklist; > } > = > -GuestMemoryBlockList *qmp_guest_get_memory_blocks(Error **errp) > -{ > - error_set(errp, QERR_UNSUPPORTED); > - return NULL; > -} > - Looks like some unecessary code movement made it's way into the patch. Plea= se squash this change into original patch > int64_t qmp_guest_set_memory_blocks(GuestMemoryBlockList *mem_blks, > Error **errp) > { > -- = > 1.7.12.4