Re: [Xen-devel] [PATCH 4/5 TAKE 2] xenoprof: make linux xenoprof codearch-generic

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

On Mon, Nov 20, 2006 at 12:38:51PM -0600, Santos, Jose Renato G wrote:

>    Why perfmon needs to access Oprofile? It should be the other way
> around ...
>    It seems that the only change was to create a new file named
> xenoprof_is_primary.c to hold the definition of xenoprof_is_primary
>    I don't like this. And I don't understand why you need this. You
> should deal with IA64 specifics in arch specific code as much as
> possible. Could you please find an IA64 specific solution or explain why
> this is needed in the generic part? 

I found the way without referencing it so that I made it static.


>   Also, if sending another patch please send me only the changes from
> the initial 5 patches you sent me. I would like to see only the changes
> ...
>   (do not use this last patch as reference, I am ignoring it)

Here is the patch to follow
http://lists.xensource.com/archives/html/xen-devel/2006-11/msg00842.html.

To make sure, I also attached the patch for PATCH 4/5 TAKE2
http://lists.xensource.com/archives/html/xen-devel/2006-11/msg00689.html

thanks,


# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1164087772 -32400
# Node ID ab6c1b607484d3b273d091a11334a3458d36349c
# Parent  e8fba03edf517b88a91aee47afbc15ab89e5d434
update xenoprof linux side patch following Renato's comment.
- compilation fix when CONFIG_OPROFILE=m with minor clean up
- don't export xenoprof_is_primary.
PATCHNAME: xenoprof_linux_side_update

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r e8fba03edf51 -r ab6c1b607484 
linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c   Tue Nov 14 
15:34:22 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c   Tue Nov 21 
14:42:52 2006 +0900
@@ -48,7 +48,7 @@ static void xenoprof_stop(void);
 static void xenoprof_stop(void);
 
 static int xenoprof_enabled = 0;
-int xenoprof_is_primary = 0;
+static int xenoprof_is_primary = 0;
 static int active_defined;
 
 /* Number of buffers in shared area (one per VCPU) */
diff -r e8fba03edf51 -r ab6c1b607484 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h     Tue Nov 
14 15:34:22 2006 +0900
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h     Tue Nov 
21 14:42:52 2006 +0900
@@ -21,7 +21,7 @@
  */
 #ifndef __ASM_XENOPROF_H__
 #define __ASM_XENOPROF_H__
-#ifdef CONFIG_OPROFILE
+#ifdef CONFIG_XEN
 
 struct super_block;
 struct dentry;
@@ -44,5 +44,5 @@ struct xenoprof_passive;
 struct xenoprof_passive;
 int xenoprof_arch_set_passive(struct xenoprof_passive* pdomain, struct 
xenoprof_shared_buffer* sbuf);
 
-#endif /* CONFIG_OPROFILE */
+#endif /* CONFIG_XEN */
 #endif /* __ASM_XENOPROF_H__ */
diff -r e8fba03edf51 -r ab6c1b607484 linux-2.6-xen-sparse/include/xen/xenoprof.h
--- a/linux-2.6-xen-sparse/include/xen/xenoprof.h       Tue Nov 14 15:34:22 
2006 +0900
+++ b/linux-2.6-xen-sparse/include/xen/xenoprof.h       Tue Nov 21 14:42:52 
2006 +0900
@@ -22,24 +22,21 @@
 
 #ifndef __XEN_XENOPROF_H__
 #define __XEN_XENOPROF_H__
+#ifdef CONFIG_XEN
 
-#ifdef CONFIG_OPROFILE
 #include <asm/xenoprof.h>
 
 struct oprofile_operations;
 int xenoprofile_init(struct oprofile_operations * ops);
 void xenoprofile_exit(void);
 
-extern int xenoprof_is_primary;
-#define is_xenoprof_primary()  (xenoprof_is_primary)
 struct xenoprof_shared_buffer {
        char                                    *buffer;
        struct xenoprof_arch_shared_buffer      arch;
 };
 #else
-#define xenoprofile_init(ops)  do { } while (0)
+#define xenoprofile_init(ops)  (-ENOSYS)
 #define xenoprofile_exit()     do { } while (0)
-#define is_xenoprof_primary()  (0)
-#endif /* CONFIG_OPROFILE */
 
+#endif /* CONFIG_XEN */
 #endif /* __XEN_XENOPROF_H__ */


-- 
yamahata

Attachment: 12499_ab6c1b607484_xenoprof_linux_side_update.patch
Description: Text document

Attachment: 12499_7e4eac672ace_xenoprof_linux_side_update.patch
Description: Text document

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