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
Subject: [Qemu-devel] [PULL 17/22] iotests: Send the correct fd in socket_scm_helper
Date: Fri, 12 Sep 2014 17:57:01 +0200	[thread overview]
Message-ID: <1410537426-9917-18-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1410537426-9917-1-git-send-email-kwolf@redhat.com>

From: Stratos Psomadakis <psomas@grnet.gr>

Make sure to pass the correct fd via SCM_RIGHTS in socket_scm_helper.c
(i.e. fd_to_send, not socket-fd).

Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/socket_scm_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c
index 0e2b285..8195983 100644
--- a/tests/qemu-iotests/socket_scm_helper.c
+++ b/tests/qemu-iotests/socket_scm_helper.c
@@ -52,7 +52,7 @@ static int send_fd(int fd, int fd_to_send)
     cmsg->cmsg_len = CMSG_LEN(sizeof(int));
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;
-    memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
+    memcpy(CMSG_DATA(cmsg), &fd_to_send, sizeof(int));
 
     do {
         ret = sendmsg(fd, &msg, 0);
-- 
1.8.3.1

  parent reply	other threads:[~2014-09-12 15:57 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12 15:56 [Qemu-devel] [PULL 00/22] Block patches Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 01/22] block: extend BLOCK_IO_ERROR event with nospace indicator Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 02/22] Fix improper usage of cpu_to_be32 in vpc Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 03/22] qemu-io: Clean up openfile() after commit 2e40134 Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 04/22] xen_disk: Plug memory leak on error path Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 05/22] xen: Drop redundant bdrv_close() from pci_piix3_xen_ide_unplug() Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 06/22] thread-pool: Drop unnecessary includes Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 07/22] IDE: MMIO IDE device control should be little endian Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 08/22] block: Extract the BlockAcctStats structure Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 09/22] block: Extract the block accounting code Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 10/22] block: rename BlockAcctType members to start with BLOCK_ instead of BDRV_ Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 11/22] block: Make the block accounting functions operate on BlockAcctStats Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 12/22] block/archipelago: Implement bdrv_truncate() Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 13/22] qemu-iotests: Run 025 for Archipelago block driver Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 14/22] dataplane: fix virtio_blk_data_plane_create() op blocker error path Kevin Wolf
2014-09-12 15:56 ` [Qemu-devel] [PULL 15/22] block: extend BLOCK_IO_ERROR with reason string Kevin Wolf
2014-09-12 15:57 ` [Qemu-devel] [PULL 16/22] blockdev: Refuse to drive_del something added with blockdev-add Kevin Wolf
2014-09-12 15:57 ` Kevin Wolf [this message]
2014-09-12 15:57 ` [Qemu-devel] [PULL 18/22] block: round up file size to nearest sector Kevin Wolf
2014-09-12 15:57 ` [Qemu-devel] [PULL 19/22] block: don't convert file size to sector size Kevin Wolf
2014-09-12 15:57 ` [Qemu-devel] [PULL 20/22] qapi: introduce PreallocMode and new PreallocModes full and falloc Kevin Wolf
2014-09-12 15:57 ` [Qemu-devel] [PULL 21/22] raw-posix: Add falloc and full preallocation option Kevin Wolf
2014-09-12 15:57 ` [Qemu-devel] [PULL 22/22] qcow2: " Kevin Wolf
2014-09-15 18:44 ` [Qemu-devel] [PULL 00/22] Block patches Peter Maydell

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=1410537426-9917-18-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).