qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: erik.rull@rdsoftware.de
Subject: [Qemu-devel] [PATCH 1.0 1/2] 9p: allow compiling the dummy virtio-9p-handle.c code on Linux
Date: Fri, 18 Nov 2011 17:35:37 +0100	[thread overview]
Message-ID: <1321634138-24687-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1321634138-24687-1-git-send-email-pbonzini@redhat.com>

Avoid a conflict on the definition of struct file_handle by
using a replacement name.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/9pfs/virtio-9p-handle.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index 0a778b4..27889d8 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -58,11 +58,12 @@ static inline int open_by_handle(int mountfd, const char *fh, int flags)
 }
 #else
 
-struct file_handle {
+struct rpl_file_handle {
     unsigned int handle_bytes;
     int handle_type;
     unsigned char handle[0];
 };
+#define file_handle rpl_file_handle
 
 #ifndef AT_EMPTY_PATH
 #define AT_EMPTY_PATH   0x1000  /* Allow empty relative pathname */
-- 
1.7.7.1

  reply	other threads:[~2011-11-18 16:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-18 16:35 [Qemu-devel] [PATCH 1.0 0/2] Fix compilation of 9pfs on old systems Paolo Bonzini
2011-11-18 16:35 ` Paolo Bonzini [this message]
2011-11-18 16:35 ` [Qemu-devel] [PATCH 1.0 2/2] 9p: pass dotl flags to the unlinkat method Paolo Bonzini
2011-11-22  0:21 ` [Qemu-devel] [PATCH 1.0 0/2] Fix compilation of 9pfs on old systems Anthony Liguori

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=1321634138-24687-2-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=erik.rull@rdsoftware.de \
    --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).