From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PATCH v2 05/12] nbd: Remove unused functions
Date: Wed, 20 Mar 2013 19:39:41 +0100 [thread overview]
Message-ID: <1363804788-18535-6-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1363804788-18535-1-git-send-email-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
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
next prev parent reply other threads:[~2013-03-20 18:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 18:39 [Qemu-devel] [PATCH v2 00/12] block: Driver-specific options for protocols Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 01/12] block: Add options QDict to bdrv_file_open() prototypes Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 02/12] block: Pass bdrv_file_open() options to block drivers Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 03/12] qemu-socket: Make socket_optslist public Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 04/12] nbd: Keep hostname and port separate Kevin Wolf
2013-03-20 18:39 ` Kevin Wolf [this message]
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 06/12] nbd: Accept -drive options for the network connection Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 07/12] block: Introduce .bdrv_parse_filename callback Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 08/12] block: Rename variable to avoid shadowing Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 09/12] block: Make find_image_format safe with NULL filename Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 10/12] block: Allow omitting the file name when using driver-specific options Kevin Wolf
2013-03-20 21:31 ` Eric Blake
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 11/12] nbd: Use default port if only host is specified Kevin Wolf
2013-03-20 18:39 ` [Qemu-devel] [PATCH v2 12/12] nbd: Check against invalid option combinations Kevin Wolf
2013-03-20 21:34 ` Eric Blake
2013-03-21 10:29 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363804788-18535-6-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).