From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yosuke Iwamatsu Subject: [PATCH 1/4] mini-os: Make utility function get_self_id() public Date: Tue, 16 Dec 2008 18:23:01 +0900 Message-ID: <49477375.6070802@ab.jp.nec.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040309050002000102080807" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: samuel.thibault@ens-lyon.org, Keir Fraser List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------040309050002000102080807 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Signed-off-by: Yosuke Iwamatsu Thanks, ----------------------- Yosuke Iwamatsu NEC Corporation --------------040309050002000102080807 Content-Type: all/allfiles; name="minios_get_self_id.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="minios_get_self_id.patch" mini-os: Make utility function get_self_id() in fs-front.c public. Signed-off-by: Yosuke Iwamatsu diff -r 6595393a3d28 extras/mini-os/fs-front.c --- a/extras/mini-os/fs-front.c Tue Dec 09 16:28:02 2008 +0000 +++ b/extras/mini-os/fs-front.c Tue Dec 16 14:38:33 2008 +0900 @@ -867,18 +867,6 @@ moretodo: if(more) goto moretodo; in_irq = 0; -} - -/* Small utility function to figure out our domain id */ -static domid_t get_self_id(void) -{ - char *dom_id; - domid_t ret; - - BUG_ON(xenbus_read(XBT_NIL, "domid", &dom_id)); - sscanf(dom_id, "%d", &ret); - - return ret; } static void alloc_request_table(struct fs_import *import) @@ -1066,7 +1054,7 @@ static int init_fs_import(struct fs_impo unmask_evtchn(import->local_port); - self_id = get_self_id(); + self_id = xenbus_get_self_id(); /* Write the frontend info to a node in our Xenbus */ sprintf(nodename, "/local/domain/%d/device/vfs/%d", self_id, import->import_id); diff -r 6595393a3d28 extras/mini-os/include/xenbus.h --- a/extras/mini-os/include/xenbus.h Tue Dec 09 16:28:02 2008 +0000 +++ b/extras/mini-os/include/xenbus.h Tue Dec 16 14:38:33 2008 +0900 @@ -91,6 +91,9 @@ char* xenbus_printf(xenbus_transaction_t const char* fmt, ...) __attribute__((__format__(printf, 4, 5))); +/* Utility function to figure out our domain id */ +domid_t xenbus_get_self_id(void); + /* Reset the XenBus system. */ void fini_xenbus(void); diff -r 6595393a3d28 extras/mini-os/xenbus/xenbus.c --- a/extras/mini-os/xenbus/xenbus.c Tue Dec 09 16:28:02 2008 +0000 +++ b/extras/mini-os/xenbus/xenbus.c Tue Dec 16 14:38:33 2008 +0900 @@ -666,6 +666,17 @@ char* xenbus_printf(xenbus_transaction_t return xenbus_write(xbt,fullpath,val); } +domid_t xenbus_get_self_id(void) +{ + char *dom_id; + domid_t ret; + + BUG_ON(xenbus_read(XBT_NIL, "domid", &dom_id)); + sscanf(dom_id, "%d", &ret); + + return ret; +} + static void do_ls_test(const char *pre) { char **dirs, *msg; --------------040309050002000102080807 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------040309050002000102080807--