Get rid of some annoying debug messages.

Signed-off-by: Steven Smith, sos22@cam.ac.uk

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index 521460bcc294dcab8ae45455ac2d028ccba5579d..d5fe6cc2f3f1213b50903eb400992adea004c597 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -168,8 +168,6 @@ static int xenbus_dev_probe(struct device *_dev)
        struct xenbus_driver *drv = to_xenbus_driver(_dev->driver);
        const struct xenbus_device_id *id;
 
-       BUG_ON(!dev->driver);
-
        if (!drv->probe)
                return -ENODEV;
 

diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 21e11a69e4ce26543cd8e19a53b0ff9683581d50..007c0f279b80628ed909ddbb28b0629d80dde139 100644 (file)
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -588,7 +588,6 @@ static long evtchn_bind_vcpu(evtchn_bind_vcpu_t *bind)
     long           rc = 0;
 
     if ( (vcpu >= MAX_VIRT_CPUS) || (d->vcpu[vcpu] == NULL) ) {
-        printf("vcpu %d bad.\n", vcpu);
         return -EINVAL;
     }
 
@@ -596,7 +595,6 @@ static long evtchn_bind_vcpu(evtchn_bind_vcpu_t *bind)
 
     if ( !port_is_valid(d, port) )
     {
-        printf("port %d bad.\n", port);
         rc = -EINVAL;
         goto out;
     }
@@ -610,7 +608,6 @@ static long evtchn_bind_vcpu(evtchn_bind_vcpu_t *bind)
         chn->notify_vcpu_id = vcpu;
         break;
     default:
-        printf("evtchn type %d can't be rebound.\n", chn->state);
         rc = -EINVAL;
         break;
     }

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index d3d222b35b4d92d391688e8d31411564a45e93a1..1a8eb12aa03cb834c222407bd5d0be1c98cde437 100644 (file)
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -311,7 +311,6 @@ static long do_vcpu_pickle(int vcpu, unsigned long arg)
         return -ESRCH;
     /* Don't pickle vcpus which are currently running */
     if (!test_bit(_VCPUF_down, &v->vcpu_flags)) {
-        printf("Pickling a live vcpu?\n");
         return -EBUSY;
     }
     c = xmalloc(vcpu_guest_context_t);
@@ -367,7 +366,6 @@ long do_sched_op(unsigned long op, unsigned long arg)
     case SCHEDOP_vcpu_pickle:
     {
         ret = do_vcpu_pickle((int)(op >> SCHEDOP_vcpushift), arg);
-        printf("Pickle result %ld.\n", ret);
         break;
     }