[libvirt] [PATCH] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for powerpc

2014-04-03 Thread Olivia Yin 
This patch define CPUINFO_FILE_LEN as 2KB which is enough for most 
architectures.

For the 24 cores PowerPC machines, the file of /proc/cpuinfo will be larger 
than 2KB.
It will fail to start libvirtd with the error message as below:
virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large for 
defined data type
virSysinfoRead: internal error Failed to open /proc/cpuinfo

So this patch increases the maxlen of cpuinfo for PowerPC architecture.

Signed-off-by: Olivia Yin hong-hua@freescale.com
---
 src/util/virsysinfo.c | 6 +++---
 src/util/virsysinfo.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 7b16157..33c4bc6 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -223,7 +223,7 @@ virSysinfoRead(void)
 if (VIR_ALLOC(ret)  0)
 goto no_memory;
 
-if (virFileReadAll(CPUINFO, 2048, outbuf)  0) {
+if (virFileReadAll(CPUINFO, 2 * CPUINFO_FILE_LEN, outbuf)  0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(Failed to open %s), CPUINFO);
 return NULL;
@@ -341,7 +341,7 @@ virSysinfoRead(void)
 if (VIR_ALLOC(ret)  0)
 goto no_memory;
 
-if (virFileReadAll(CPUINFO, 2048, outbuf)  0) {
+if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, outbuf)  0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(Failed to open %s), CPUINFO);
 return NULL;
@@ -470,7 +470,7 @@ virSysinfoRead(void)
 goto no_memory;
 
 /* Gather info from /proc/cpuinfo */
-if (virFileReadAll(CPUINFO, 8192, outbuf)  0) {
+if (virFileReadAll(CPUINFO, 4 * CPUINFO_FILE_LEN, outbuf)  0) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_(Failed to open %s), CPUINFO);
 return NULL;
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index fbb505b..630b9ce 100644
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src,
 
 VIR_ENUM_DECL(virSysinfo)
 
+#define CPUINFO_FILE_LEN   2048/*2KB limit for normal cpuinfo file*/
+
 #endif /* __VIR_SYSINFOS_H__ */
-- 
1.8.5


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for powerpc

2014-04-03 Thread Eric Blake 
On 04/03/2014 12:43 AM, Olivia Yin wrote:
 This patch define CPUINFO_FILE_LEN as 2KB which is enough for most 
 architectures.
 
 For the 24 cores PowerPC machines, the file of /proc/cpuinfo will be larger 
 than 2KB.
 It will fail to start libvirtd with the error message as below:
 virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large for 
 defined data type
 virSysinfoRead: internal error Failed to open /proc/cpuinfo
 
 So this patch increases the maxlen of cpuinfo for PowerPC architecture.
 
 Signed-off-by: Olivia Yin hong-hua@freescale.com
 ---
  src/util/virsysinfo.c | 6 +++---
  src/util/virsysinfo.h | 2 ++
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
 index 7b16157..33c4bc6 100644
 --- a/src/util/virsysinfo.c
 +++ b/src/util/virsysinfo.c
 @@ -223,7 +223,7 @@ virSysinfoRead(void)
  if (VIR_ALLOC(ret)  0)
  goto no_memory;
  
 -if (virFileReadAll(CPUINFO, 2048, outbuf)  0) {
 +if (virFileReadAll(CPUINFO, 2 * CPUINFO_FILE_LEN, outbuf)  0) {

Uggh.  Having to multiply the constant means you defined the constant
wrong.  Just make CPUINFO_FILE_LEN big enough.  Even as large as 1M, for
ALL uses, is not a burden.

 +++ b/src/util/virsysinfo.h
 @@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src,
  
  VIR_ENUM_DECL(virSysinfo)
  
 +#define CPUINFO_FILE_LEN 2048/*2KB limit for normal cpuinfo file*/
 +
  #endif /* __VIR_SYSINFOS_H__ */
 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for powerpc

2014-04-03 Thread hong-hua....@freescale.com 
Hi Eric,

Thanks for comments. I'll submit a new revision of this patch.

Best Regards,
Olivia

 -Original Message-
 From: Eric Blake [mailto:ebl...@redhat.com]
 Sent: Thursday, April 03, 2014 8:25 PM
 To: Yin Olivia-R63875; libvir-list@redhat.com
 Subject: Re: [libvirt] [PATCH] Define CPUINFO_FILE_LEN and fix maxlen of
 cpuinfo file for powerpc
 
 On 04/03/2014 12:43 AM, Olivia Yin wrote:
  This patch define CPUINFO_FILE_LEN as 2KB which is enough for most
 architectures.
 
  For the 24 cores PowerPC machines, the file of /proc/cpuinfo will be
 larger than 2KB.
  It will fail to start libvirtd with the error message as below:
  virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large
  for defined data type
  virSysinfoRead: internal error Failed to open /proc/cpuinfo
 
  So this patch increases the maxlen of cpuinfo for PowerPC architecture.
 
  Signed-off-by: Olivia Yin hong-hua@freescale.com
  ---
   src/util/virsysinfo.c | 6 +++---
   src/util/virsysinfo.h | 2 ++
   2 files changed, 5 insertions(+), 3 deletions(-)
 
  diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index
  7b16157..33c4bc6 100644
  --- a/src/util/virsysinfo.c
  +++ b/src/util/virsysinfo.c
  @@ -223,7 +223,7 @@ virSysinfoRead(void)
   if (VIR_ALLOC(ret)  0)
   goto no_memory;
 
  -if (virFileReadAll(CPUINFO, 2048, outbuf)  0) {
  +if (virFileReadAll(CPUINFO, 2 * CPUINFO_FILE_LEN, outbuf)  0) {
 
 Uggh.  Having to multiply the constant means you defined the constant wrong.
 Just make CPUINFO_FILE_LEN big enough.  Even as large as 1M, for ALL uses,
 is not a burden.
 
  +++ b/src/util/virsysinfo.h
  @@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src,
 
   VIR_ENUM_DECL(virSysinfo)
 
  +#define CPUINFO_FILE_LEN   2048/*2KB limit for normal cpuinfo file*/
  +
   #endif /* __VIR_SYSINFOS_H__ */
 
 
 --
 Eric Blake   eblake redhat com+1-919-301-3266
 Libvirt virtualization library http://libvirt.org


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list