Re: libxl: cannot start guest

[Christoph Egger <Christoph.Egger@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 954 bytes --]

On 05/22/12 17:21, Ian Campbell wrote:

> On Tue, 2012-05-22 at 16:16 +0100, Christoph Egger wrote:
>> On 05/22/12 16:20, Ian Campbell wrote:
>>> All the >= checks on *xcg_handle seem wrong to me. Really they should be
>>> checking != NULL, since otherwise they don't actually discriminate the
>>> two cases! Does making that change help?
>>
>> Yes, that helps! I can start guests again.
> 
> Excellent, I assume you are going to submit the patch (i.e. I don't need
> to..)

Yes, patch attached.

Fix pointer checks introduced in changeset 24757:aae516b78fce.
This fixes xenstored crash on platforms with no gnttap implementation.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_tools_xenstore.diff --]
[-- Type: text/plain, Size: 780 bytes --]

diff -r 99263132665b tools/xenstore/xenstored_domain.c
--- a/tools/xenstore/xenstored_domain.c	Fri May 18 12:38:55 2012 +0200
+++ b/tools/xenstore/xenstored_domain.c	Tue May 22 17:25:03 2012 +0200
@@ -167,7 +167,7 @@ static int readchn(struct connection *co
 
 static void *map_interface(domid_t domid, unsigned long mfn)
 {
-	if (*xcg_handle >= 0) {
+	if (*xcg_handle != NULL) {
 		/* this is the preferred method */
 		return xc_gnttab_map_grant_ref(*xcg_handle, domid,
 			GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE);
@@ -179,7 +179,7 @@ static void *map_interface(domid_t domid
 
 static void unmap_interface(void *interface)
 {
-	if (*xcg_handle >= 0)
+	if (*xcg_handle != NULL)
 		xc_gnttab_munmap(*xcg_handle, interface, 1);
 	else
 		munmap(interface, getpagesize());

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel