From 05e0fabb75d3ca1c02a55cfa8ab85b988125c954 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 12 Jun 2011 09:21:13 -0700
Subject: [PATCH] --- yaml --- r: 255265 b: refs/heads/master c:
 08b8bfc1c649cf82edf43f686cbb9a4bac809679 h: refs/heads/master i:   255263:
 2f28d8e984f7c54866eed0d92e30b2c5f2a8e649 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/block/xen-blkback/xenbus.c | 2 +-
 trunk/include/xen/hvc-console.h          | 4 +++-
 trunk/include/xen/xenbus.h               | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fe85e7a98be1..430e6234b6f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7fdd84e04c8fdc9196abe3bfd27535bccb52ee5
+refs/heads/master: 08b8bfc1c649cf82edf43f686cbb9a4bac809679
diff --git a/trunk/drivers/block/xen-blkback/xenbus.c b/trunk/drivers/block/xen-blkback/xenbus.c
index 6cc0db1bf522..3f129b45451a 100644
--- a/trunk/drivers/block/xen-blkback/xenbus.c
+++ b/trunk/drivers/block/xen-blkback/xenbus.c
@@ -684,7 +684,7 @@ static void connect(struct backend_info *be)
 
 	err = xenbus_switch_state(dev, XenbusStateConnected);
 	if (err)
-		xenbus_dev_fatal(dev, err, "switching to Connected state",
+		xenbus_dev_fatal(dev, err, "%s: switching to Connected state",
 				 dev->nodename);
 
 	return;
diff --git a/trunk/include/xen/hvc-console.h b/trunk/include/xen/hvc-console.h
index c3adde32669b..901724dc528d 100644
--- a/trunk/include/xen/hvc-console.h
+++ b/trunk/include/xen/hvc-console.h
@@ -6,11 +6,13 @@ extern struct console xenboot_console;
 #ifdef CONFIG_HVC_XEN
 void xen_console_resume(void);
 void xen_raw_console_write(const char *str);
+__attribute__((format(printf, 1, 2)))
 void xen_raw_printk(const char *fmt, ...);
 #else
 static inline void xen_console_resume(void) { }
 static inline void xen_raw_console_write(const char *str) { }
-static inline void xen_raw_printk(const char *fmt, ...) { }
+static inline __attribute__((format(printf, 1, 2)))
+void xen_raw_printk(const char *fmt, ...) { }
 #endif
 
 #endif	/* XEN_HVC_CONSOLE_H */
diff --git a/trunk/include/xen/xenbus.h b/trunk/include/xen/xenbus.h
index 5467369e0889..aceeca799fd7 100644
--- a/trunk/include/xen/xenbus.h
+++ b/trunk/include/xen/xenbus.h
@@ -223,7 +223,9 @@ int xenbus_free_evtchn(struct xenbus_device *dev, int port);
 
 enum xenbus_state xenbus_read_driver_state(const char *path);
 
+__attribute__((format(printf, 3, 4)))
 void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt, ...);
+__attribute__((format(printf, 3, 4)))
 void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt, ...);
 
 const char *xenbus_strstate(enum xenbus_state state);