Re: [Xen-devel] /sys/hypervisor missing with pv_ops dom0?

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2009-03-11 at 04:12 -0400, Pasi KÃrkkÃinen wrote:
> On Tue, Mar 10, 2009 at 06:10:39PM -0700, Jeremy Fitzhardinge wrote:
> > Pasi KÃrkkÃinen wrote:
> > >I searched for it myself, and found this commit:
> > >
> > >http://git.et.redhat.com/?p=linux-2.6-dom0-pvops.git;a=commit;h=7aa79a5603bb604e8bf4fe7c31cc9c8b3d3b7ea2
> > >
> > >Which looks to be the correct thing.. 
> > >
> > >Could you commit that to current pv_ops dom0 tree? 
> > >  
> > 
> > OK, check out what's there now.
> > 
> 
> 
> Thanks, will try later today!
> 

I needed this to compile since there is no kexec yet in pvops kernel
  CC      drivers/xen/sys-hypervisor.o
drivers/xen/sys-hypervisor.c: In function 'hyper_sysfs_init':
drivers/xen/sys-hypervisor.c:405: error: 'vmcoreinfo_size_xen' undeclared 
(first use in this function)
drivers/xen/sys-hypervisor.c:405: error: (Each undeclared identifier is 
reported only once
drivers/xen/sys-hypervisor.c:405: error: for each function it appears in.)
drivers/xen/sys-hypervisor.c:406: error: implicit declaration of function 
'xen_sysfs_vmcoreinfo_init'
drivers/xen/sys-hypervisor.c: In function 'hyper_sysfs_exit':
drivers/xen/sys-hypervisor.c:433: error: 'vmcoreinfo_size_xen' undeclared 
(first use in this function)
drivers/xen/sys-hypervisor.c:434: error: implicit declaration of function 
'xen_sysfs_vmcoreinfo_destroy'

>From 10b22abd8f978fceaf9829253c6f883c5439c1f0 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
Date: Wed, 11 Mar 2009 10:18:42 +0000
Subject: [PATCH] xen: drop kexec bits from /sys/hypervisor since kexec
isn't implemented yet

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 drivers/xen/sys-hypervisor.c |   41
-----------------------------------------
 1 files changed, 0 insertions(+), 41 deletions(-)

diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
index 1267d6f..88a60e0 100644
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@ -353,32 +353,6 @@ static void xen_properties_destroy(void)
        sysfs_remove_group(hypervisor_kobj, &xen_properties_group);
 }
 
-#ifdef CONFIG_KEXEC
-
-extern size_t vmcoreinfo_size_xen;
-extern unsigned long paddr_vmcoreinfo_xen;
-
-static ssize_t vmcoreinfo_show(struct hyp_sysfs_attr *attr, char *page)
-{
-       return sprintf(page, "%lx %zx\n",
-               paddr_vmcoreinfo_xen, vmcoreinfo_size_xen);
-}
-
-HYPERVISOR_ATTR_RO(vmcoreinfo);
-
-static int __init xen_sysfs_vmcoreinfo_init(void)
-{
-       return sysfs_create_file(hypervisor_kobj,
-                                &vmcoreinfo_attr.attr);
-}
-
-static void xen_sysfs_vmcoreinfo_destroy(void)
-{
-       sysfs_remove_file(hypervisor_kobj, &vmcoreinfo_attr.attr);
-}
-
-#endif
-
 static int __init hyper_sysfs_init(void)
 {
        int ret;
@@ -401,20 +375,9 @@ static int __init hyper_sysfs_init(void)
        ret = xen_properties_init();
        if (ret)
                goto prop_out;
-#ifdef CONFIG_KEXEC
-       if (vmcoreinfo_size_xen != 0) {
-               ret = xen_sysfs_vmcoreinfo_init();
-               if (ret)
-                       goto vmcoreinfo_out;
-       }
-#endif
 
        goto out;
 
-#ifdef CONFIG_KEXEC
-vmcoreinfo_out:
-#endif
-       xen_properties_destroy();
 prop_out:
        xen_sysfs_uuid_destroy();
 uuid_out:
@@ -429,10 +392,6 @@ out:
 
 static void __exit hyper_sysfs_exit(void)
 {
-#ifdef CONFIG_KEXEC
-       if (vmcoreinfo_size_xen != 0)
-               xen_sysfs_vmcoreinfo_destroy();
-#endif
        xen_properties_destroy();
        xen_compilation_destroy();
        xen_sysfs_uuid_destroy();
-- 
1.5.6.5




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel