[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/20] nbd: inline tcp_socket_incoming_spec into
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 03/20] nbd: inline tcp_socket_incoming_spec into sole caller |
Date: |
Mon, 17 Feb 2014 14:43:50 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/block/nbd.h | 1 -
nbd.c | 8 ++------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/block/nbd.h b/include/block/nbd.h
index e10ab82..1b39c06 100644
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -63,7 +63,6 @@ enum {
ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read);
int tcp_socket_incoming(const char *address, uint16_t port);
-int tcp_socket_incoming_spec(const char *address_and_port);
int unix_socket_outgoing(const char *path);
int unix_socket_incoming(const char *path);
diff --git a/nbd.c b/nbd.c
index 17ca95b..2fc1f1f 100644
--- a/nbd.c
+++ b/nbd.c
@@ -202,13 +202,9 @@ static void combine_addr(char *buf, size_t len, const
char* address,
int tcp_socket_incoming(const char *address, uint16_t port)
{
char address_and_port[128];
- combine_addr(address_and_port, 128, address, port);
- return tcp_socket_incoming_spec(address_and_port);
-}
-
-int tcp_socket_incoming_spec(const char *address_and_port)
-{
Error *local_err = NULL;
+
+ combine_addr(address_and_port, 128, address, port);
int fd = inet_listen(address_and_port, NULL, 0, SOCK_STREAM, 0,
&local_err);
if (local_err != NULL) {
--
1.8.5.3
- [Qemu-devel] [PATCH v3 00/20] Improve bdrv_open error messages, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 01/20] nbd: produce a better error if neither host nor port is passed, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 02/20] nbd: correctly propagate errors, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 03/20] nbd: inline tcp_socket_incoming_spec into sole caller,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 04/20] nbd: move socket wrappers to qemu-nbd, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 05/20] iscsi: fix indentation, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 06/20] iscsi: correctly propagate errors in iscsi_open, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 07/20] gluster: default scheme to gluster:// and host to localhost., Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 09/20] cow: correctly propagate errors, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 08/20] gluster: correctly propagate errors, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 10/20] curl: correctly propagate errors, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 11/20] qcow: correctly propagate errors, Paolo Bonzini, 2014/02/17
- [Qemu-devel] [PATCH v3 15/20] vmdk: extract vmdk_read_desc, Paolo Bonzini, 2014/02/17