summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-03-09 12:21:49 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-03-22 22:20:16 +0100
commit8a98ecada310b14b4a2c133822674e070a7ba350 (patch)
tree7a3592ea127b284f3b55ba0bb1d4f5018a59b970
parente07e540aaa08718c9ff8213067a3dcef31b3e313 (diff)
downloadfocaccia-qemu-8a98ecada310b14b4a2c133822674e070a7ba350.tar.gz
focaccia-qemu-8a98ecada310b14b4a2c133822674e070a7ba350.zip
Move ParallelIOArg from qemu-common.h to sysemu/char.h
ParallelIOArg is shared between just qemu-char.c and
hw/char/parallel.c, and as such has no business in qemu-common.h.
Move it to sysemu/char.h.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--include/qemu-common.h5
-rw-r--r--include/sysemu/char.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h
index f2727523e0..e7bd1f852f 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -294,11 +294,6 @@ int qemu_openpty_raw(int *aslave, char *pty_name);
     sendto(sockfd, buf, len, flags, destaddr, addrlen)
 #endif
 
-struct ParallelIOArg {
-    void *buffer;
-    int count;
-};
-
 typedef int (*DMA_transfer_handler) (void *opaque, int nchan, int pos, int size);
 
 void tcg_exec_init(unsigned long tb_size);
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 4c2f777ad1..307fd8fde4 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -41,6 +41,11 @@ typedef struct {
 #define CHR_IOCTL_PP_EPP_WRITE       11
 #define CHR_IOCTL_PP_DATA_DIR        12
 
+struct ParallelIOArg {
+    void *buffer;
+    int count;
+};
+
 #define CHR_IOCTL_SERIAL_SET_TIOCM   13
 #define CHR_IOCTL_SERIAL_GET_TIOCM   14