diff -r 6ddeca313ce9 xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c	Wed Dec 03 13:23:34 2008 +0000
+++ b/xen/arch/x86/domctl.c	Wed Dec 03 15:12:02 2008 +0000
@@ -377,6 +377,8 @@ long arch_do_domctl(
     { 
         struct hvm_domain_context c;
         struct domain             *d;
+        c.data = NULL;
+        c.cur = 0;
 
         ret = -ESRCH;
         if ( (d = rcu_lock_domain_by_id(domctl->domain)) == NULL )
@@ -390,9 +392,7 @@ long arch_do_domctl(
         if ( !is_hvm_domain(d) ) 
             goto gethvmcontext_out;
 
-        c.cur = 0;
         c.size = hvm_save_size(d);
-        c.data = NULL;
 
         if ( guest_handle_is_null(domctl->u.hvmcontext.buffer) )
         {