WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] merge

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] merge
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Fri, 15 Jul 2011 06:11:10 +0100
Delivery-date: Thu, 14 Jul 2011 22:11:56 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1310632382 -3600
# Node ID becc550d3577ad75fc6c3f84fd2fc2997b0eb895
# Parent  8490523fe2a4f1df72c43f23922758ff0d62d9e1
# Parent  00d2c5ca26fd40f55f4255ac883ad882a5207cc8
merge
---


diff -r 8490523fe2a4 -r becc550d3577 tools/hotplug/Linux/block
--- a/tools/hotplug/Linux/block Thu Jul 14 09:31:53 2011 +0100
+++ b/tools/hotplug/Linux/block Thu Jul 14 09:33:02 2011 +0100
@@ -280,7 +280,7 @@
           fi
 
           shared_list=$(losetup -a |
-                sed -n -e 
"s@^\([^:]\+\)\(:[[:blank:]]\[${dev}\]:${inode}[[:blank:]](.*)\)@\1@p" )
+                sed -n -e 
"s@^\([^:]\+\)\(:[[:blank:]]\[0*${dev}\]:${inode}[[:blank:]](.*)\)@\1@p" )
           for dev in $shared_list
           do
             if [ -n "$dev" ]
diff -r 8490523fe2a4 -r becc550d3577 tools/hotplug/Linux/init.d/xen-watchdog
--- a/tools/hotplug/Linux/init.d/xen-watchdog   Thu Jul 14 09:31:53 2011 +0100
+++ b/tools/hotplug/Linux/init.d/xen-watchdog   Thu Jul 14 09:33:02 2011 +0100
@@ -6,10 +6,10 @@
 # description: Run domain watchdog daemon
 ### BEGIN INIT INFO
 # Provides:          xen-watchdog
-# Required-Start:    xend
-# Should-Start:      $syslog $remote_fs
-# Required-Stop:     xend
-# Should-Stop:       $syslog $remote_fs
+# Required-Start:    $syslog $remote_fs
+# Should-Start:      xend
+# Required-Stop:     $syslog $remote_fs
+# Should-Stop:       xend
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop xen-watchdog
diff -r 8490523fe2a4 -r becc550d3577 tools/hotplug/Linux/init.d/xend
--- a/tools/hotplug/Linux/init.d/xend   Thu Jul 14 09:31:53 2011 +0100
+++ b/tools/hotplug/Linux/init.d/xend   Thu Jul 14 09:33:02 2011 +0100
@@ -8,9 +8,9 @@
 # description: Starts and stops the Xen control daemon.
 ### BEGIN INIT INFO
 # Provides:          xend
-# Required-Start:    $syslog $remote_fs xenstored
+# Required-Start:    $syslog $remote_fs xenstored xenconsoled 
 # Should-Start:
-# Required-Stop:     $syslog $remote_fs xenstored
+# Required-Stop:     $syslog $remote_fs xenstored xenconsoled 
 # Should-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
diff -r 8490523fe2a4 -r becc550d3577 tools/hotplug/Linux/init.d/xendomains
--- a/tools/hotplug/Linux/init.d/xendomains     Thu Jul 14 09:31:53 2011 +0100
+++ b/tools/hotplug/Linux/init.d/xendomains     Thu Jul 14 09:33:02 2011 +0100
@@ -16,10 +16,10 @@
 #
 ### BEGIN INIT INFO
 # Provides:          xendomains
-# Required-Start:    $syslog $remote_fs xend
-# Should-Start:
-# Required-Stop:     $syslog $remote_fs xend
-# Should-Stop:
+# Required-Start:    $syslog $remote_fs xenstored xenconsoled
+# Should-Start:      xend
+# Required-Stop:     $syslog $remote_fs xenstored xenconsoled
+# Should-Stop:       xend
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start/stop secondary xen domains
diff -r 8490523fe2a4 -r becc550d3577 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c       Thu Jul 14 09:31:53 2011 +0100
+++ b/tools/libxl/libxl.c       Thu Jul 14 09:33:02 2011 +0100
@@ -1089,9 +1089,7 @@
                 break;
             case LIBXL_DISK_FORMAT_QCOW:
             case LIBXL_DISK_FORMAT_QCOW2:
-                LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot locally attach"
-                           " a qcow or qcow2 disk image");
-                break;
+                abort(); /* prevented by libxl__device_disk_set_backend */
             default:
                 LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
                            "unrecognized disk format: %d", disk->format);
diff -r 8490523fe2a4 -r becc550d3577 tools/libxl/libxl_device.c
--- a/tools/libxl/libxl_device.c        Thu Jul 14 09:31:53 2011 +0100
+++ b/tools/libxl/libxl_device.c        Thu Jul 14 09:33:02 2011 +0100
@@ -134,11 +134,7 @@
     case LIBXL_DISK_BACKEND_PHY:
         if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW ||
               a->disk->format == LIBXL_DISK_FORMAT_EMPTY)) {
-            LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend phy"
-                       " unsuitable due to format %s",
-                       a->disk->vdev,
-                       libxl_disk_format_to_string(a->disk->format));
-            return 0;
+            goto bad_format;
         }
         if (a->disk->format != LIBXL_DISK_FORMAT_EMPTY &&
             !S_ISBLK(a->stab.st_mode)) {
@@ -157,12 +153,9 @@
                        a->disk->vdev);
             return 0;
         }
-        if (a->disk->format == LIBXL_DISK_FORMAT_EMPTY ||
-            (S_ISREG(a->stab.st_mode) && !a->stab.st_size)) {
-            LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend tap"
-                       " unsuitable because empty devices not supported",
-                       a->disk->vdev);
-            return 0;
+        if (!(a->disk->format == LIBXL_DISK_FORMAT_RAW ||
+              a->disk->format == LIBXL_DISK_FORMAT_VHD)) {
+            goto bad_format;
         }
         return backend;
 
@@ -175,6 +168,15 @@
         return 0;
         
     }
+    abort(); /* notreached */
+
+ bad_format:
+    LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Disk vdev=%s, backend %s"
+               " unsuitable due to format %s",
+               a->disk->vdev,
+               libxl_disk_backend_to_string(backend),
+               libxl_disk_format_to_string(a->disk->format));
+    return 0;
 }            
 
 int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) {

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] merge, Xen patchbot-unstable <=