qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH 05/11] nbd: Remove unused functions
Date: Mon, 18 Mar 2013 18:23:55 +0100	[thread overview]
Message-ID: <1363627441-8297-6-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1363627441-8297-1-git-send-email-kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@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

  parent reply	other threads:[~2013-03-18 17:24 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-18 17:23 [Qemu-devel] [PATCH 00/11] block: Driver-specific options for protocols Kevin Wolf
2013-03-18 17:23 ` [Qemu-devel] [PATCH 01/11] block: Add options QDict to bdrv_file_open() prototypes Kevin Wolf
2013-03-19 15:40   ` Eric Blake
2013-03-18 17:23 ` [Qemu-devel] [PATCH 02/11] block: Pass bdrv_file_open() options to block drivers Kevin Wolf
2013-03-19 17:48   ` Eric Blake
2013-03-19 18:05     ` Kevin Wolf
2013-03-19 19:37       ` Eric Blake
2013-03-18 17:23 ` [Qemu-devel] [PATCH 03/11] qemu-socket: Make socket_optslist public Kevin Wolf
2013-03-19 19:51   ` Eric Blake
2013-03-18 17:23 ` [Qemu-devel] [PATCH 04/11] nbd: Keep hostname and port separate Kevin Wolf
2013-03-19 20:56   ` Eric Blake
2013-03-18 17:23 ` Kevin Wolf [this message]
2013-03-19 20:58   ` [Qemu-devel] [PATCH 05/11] nbd: Remove unused functions Eric Blake
2013-03-18 17:23 ` [Qemu-devel] [PATCH 06/11] nbd: Accept -drive options for the network connection Kevin Wolf
2013-03-19 21:44   ` Eric Blake
2013-03-18 17:23 ` [Qemu-devel] [PATCH 07/11] block: Introduce .bdrv_parse_filename callback Kevin Wolf
2013-03-19 22:04   ` Eric Blake
2013-03-18 17:23 ` [Qemu-devel] [PATCH 08/11] block: Rename variable to avoid shadowing Kevin Wolf
2013-03-20  2:07   ` Eric Blake
2013-03-20  8:51     ` Kevin Wolf
2013-03-18 17:23 ` [Qemu-devel] [PATCH 09/11] block: Make find_image_format safe with NULL filename Kevin Wolf
2013-03-20  2:14   ` Eric Blake
2013-03-20  8:48     ` Kevin Wolf
2013-03-18 17:24 ` [Qemu-devel] [PATCH 10/11] block: Allow omitting the file name when using driver-specific options Kevin Wolf
2013-03-20  2:27   ` Eric Blake
2013-03-20 18:37     ` Kevin Wolf
2013-03-18 17:24 ` [Qemu-devel] [PATCH 11/11] nbd: Use default port if only host is specified Kevin Wolf
2013-03-20  2:29   ` Eric Blake

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=1363627441-8297-6-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=pbonzini@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).