From: Jes.Sorensen@redhat.com
To: qemu-devel@nongnu.org
Cc: blauwirbel@gmail.com, Jes.Sorensen@redhat.com
Subject: [Qemu-devel] [PATCH 1/6] Remove unused argument for nbd_client()
Date: Tue, 31 Aug 2010 09:30:33 +0200 [thread overview]
Message-ID: <1283239838-20349-2-git-send-email-Jes.Sorensen@redhat.com> (raw)
In-Reply-To: <1283239838-20349-1-git-send-email-Jes.Sorensen@redhat.com>
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
nbd.c | 4 ++--
nbd.h | 2 +-
qemu-nbd.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nbd.c b/nbd.c
index a9f295f..7049998 100644
--- a/nbd.c
+++ b/nbd.c
@@ -393,7 +393,7 @@ int nbd_disconnect(int fd)
return 0;
}
-int nbd_client(int fd, int csock)
+int nbd_client(int fd)
{
int ret;
int serrno;
@@ -427,7 +427,7 @@ int nbd_disconnect(int fd)
return -1;
}
-int nbd_client(int fd, int csock)
+int nbd_client(int fd)
{
errno = ENOTSUP;
return -1;
diff --git a/nbd.h b/nbd.h
index 5a1fbdf..f103c3c 100644
--- a/nbd.h
+++ b/nbd.h
@@ -55,7 +55,7 @@ int nbd_send_request(int csock, struct nbd_request *request);
int nbd_receive_reply(int csock, struct nbd_reply *reply);
int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
off_t *offset, bool readonly, uint8_t *data, int data_size);
-int nbd_client(int fd, int csock);
+int nbd_client(int fd);
int nbd_disconnect(int fd);
#endif
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 4e607cf..9cc8f47 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -417,7 +417,7 @@ int main(int argc, char **argv)
show_parts(device);
- nbd_client(fd, sock);
+ nbd_client(fd);
close(fd);
out:
kill(pid, SIGTERM);
--
1.7.2.2
next prev parent reply other threads:[~2010-08-31 7:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-31 7:30 [Qemu-devel] [PATCH 0/6] bugs from gcc warning fixes v3 Jes.Sorensen
2010-08-31 7:30 ` Jes.Sorensen [this message]
2010-08-31 7:30 ` [Qemu-devel] [PATCH 2/6] Respect return value from nbd_client() Jes.Sorensen
2010-08-31 7:30 ` [Qemu-devel] [PATCH 3/6] Fix repeated typo: was "end if list" instead of "end of list" Jes.Sorensen
2010-08-31 7:30 ` [Qemu-devel] [PATCH 4/6] size_t is unsigned, change to ssize_t to handle errors from tight_compress_data() Jes.Sorensen
2010-08-31 7:30 ` [Qemu-devel] [PATCH 5/6] Change DPRINTF() to do{}while(0) to avoid compiler warning Jes.Sorensen
2010-08-31 7:30 ` [Qemu-devel] [PATCH 6/6] load_multiboot(): get_image_size() returns int Jes.Sorensen
2010-09-04 10:05 ` [Qemu-devel] Re: [PATCH 0/6] bugs from gcc warning fixes v3 Blue Swirl
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=1283239838-20349-2-git-send-email-Jes.Sorensen@redhat.com \
--to=jes.sorensen@redhat.com \
--cc=blauwirbel@gmail.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).