[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/12] nbd: Remove unused functions
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 05/12] nbd: Remove unused functions |
Date: |
Wed, 20 Mar 2013 19:39:41 +0100 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/block/nbd.h | 2 --
nbd.c | 19 -------------------
2 files changed, 21 deletions(-)
diff --git a/include/block/nbd.h b/include/block/nbd.h
index 9b52d50..0903d7a 100644
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -61,9 +61,7 @@ enum {
#define NBD_BUFFER_SIZE (1024*1024)
ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read);
-int tcp_socket_outgoing(const char *address, uint16_t port);
int tcp_socket_incoming(const char *address, uint16_t port);
-int tcp_socket_outgoing_spec(const char *address_and_port);
int tcp_socket_incoming_spec(const char *address_and_port);
int tcp_socket_outgoing_opts(QemuOpts *opts);
int unix_socket_outgoing(const char *path);
diff --git a/nbd.c b/nbd.c
index 97879ca..d1a67ee 100644
--- a/nbd.c
+++ b/nbd.c
@@ -199,25 +199,6 @@ static void combine_addr(char *buf, size_t len, const
char* address,
}
}
-int tcp_socket_outgoing(const char *address, uint16_t port)
-{
- char address_and_port[128];
- combine_addr(address_and_port, 128, address, port);
- return tcp_socket_outgoing_spec(address_and_port);
-}
-
-int tcp_socket_outgoing_spec(const char *address_and_port)
-{
- Error *local_err = NULL;
- int fd = inet_connect(address_and_port, &local_err);
-
- if (local_err != NULL) {
- qerror_report_err(local_err);
- error_free(local_err);
- }
- return fd;
-}
-
int tcp_socket_outgoing_opts(QemuOpts *opts)
{
Error *local_err = NULL;
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/12] block: Driver-specific options for protocols, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 02/12] block: Pass bdrv_file_open() options to block drivers, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 03/12] qemu-socket: Make socket_optslist public, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 01/12] block: Add options QDict to bdrv_file_open() prototypes, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 05/12] nbd: Remove unused functions,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 04/12] nbd: Keep hostname and port separate, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 08/12] block: Rename variable to avoid shadowing, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 09/12] block: Make find_image_format safe with NULL filename, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 06/12] nbd: Accept -drive options for the network connection, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 10/12] block: Allow omitting the file name when using driver-specific options, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 11/12] nbd: Use default port if only host is specified, Kevin Wolf, 2013/03/20
- [Qemu-devel] [PATCH v2 12/12] nbd: Check against invalid option combinations, Kevin Wolf, 2013/03/20