From patchwork Tue Mar 22 14:16:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8642951 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C73369F294 for ; Tue, 22 Mar 2016 14:22:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DE212037F for ; Tue, 22 Mar 2016 14:22:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 928E12034B for ; Tue, 22 Mar 2016 14:22:16 +0000 (UTC) Received: from localhost ([::1]:37268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiNCJ-00036Y-GF for patchwork-qemu-devel@patchwork.kernel.org; Tue, 22 Mar 2016 10:22:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiN7o-0004aC-Bz for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiN7i-0006cA-Ph for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiN7i-0006bd-JT for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:30 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 52C90804EF for ; Tue, 22 Mar 2016 14:17:30 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-37.ams2.redhat.com [10.36.112.37]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2MEH9Q0004983; Tue, 22 Mar 2016 10:17:29 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 22 Mar 2016 15:16:50 +0100 Message-Id: <1458656229-32043-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1458656229-32043-1-git-send-email-pbonzini@redhat.com> References: <1458656229-32043-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Markus Armbruster Subject: [Qemu-devel] [PULL 10/29] Move ParallelIOArg from qemu-common.h to sysemu/char.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Armbruster 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 Signed-off-by: Paolo Bonzini --- include/qemu-common.h | 5 ----- include/sysemu/char.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index f272752..e7bd1f8 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 4c2f777..307fd8f 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