X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=qemu-nbd.c;h=0af97ca2c77f10e33ac3020036d917ff4efa7177;hb=e69917e29acc6a21a15c5c6b5569333ddf384a38;hp=c466ccecaac6e226e9fcda9e0e320eafb72dfe09;hpb=b1d8e52e636fd2c137e5abb2d59b331473e0930d;p=qemu

diff --git a/qemu-nbd.c b/qemu-nbd.c
index c466cce..0af97ca 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <qemu-common.h>
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
     char *device = NULL;
     char *socket = NULL;
     char sockpath[128];
-    const char *sopt = "hVbo:p:rsnP:c:dvk:e:t";
+    const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t";
     struct option lopt[] = {
         { "help", 0, 0, 'h' },
         { "version", 0, 0, 'V' },
@@ -409,8 +409,6 @@ int main(int argc, char **argv)
     }
 
     sharing_fds = qemu_malloc((shared + 1) * sizeof(int));
-    if (sharing_fds == NULL)
-        errx(ENOMEM, "Cannot allocate sharing fds");
 
     if (socket) {
         sharing_fds[0] = unix_socket_incoming(socket);