| Message ID | 1437583451-9677-2-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 38e20cac669083e2e10a2a9a9602cb99ec19299e |
| Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBB4UQX6WQKGQECGKS5GQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id CC747228EF for <linaro@patches.linaro.org>; Wed, 22 Jul 2015 16:44:34 +0000 (UTC) Received: by wicmm11 with SMTP id mm11sf18349151wic.3 for <linaro@patches.linaro.org>; Wed, 22 Jul 2015 09:44:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=obN9E66ODYqUZtAID+K8MUsTouSj0myH+wAQ1dzZ3hk=; b=MX/3obWkH49Js/ybE03I/l/t4J0sKKPpobzBQuEPc0tzofwzcJAZlX/ks+T+W7o7HX dwOPur/or2ICtM+Xjxmj3qI+i0mfV3jHpKz4F1hvjtxx/v79BWXOF13f3y3VOyQnkikE Dv3mclpOVvoIhQDPo7Vqbha/I5t5U3Ph4ibc+Xf+d0WEw2PDqUlhn6lkED8u9z+UVR66 hazzLcelfgr/X/0WKFr3cFR9JvLpeMKvrJhI4DcvffcSM0xASJEmB5HgwQRLcO6eg0tF sIEywxKMgtaaF8Gdg/NERiPpEQD9bKqhnMqOt7Q64kWcWNkmJ5dG7Kh5Og8imPZlqTqW 5BKQ== X-Gm-Message-State: ALoCoQnxXaLC6bVFkeT0wfBykTcKD40j+KRZLtAXCddfctR0zFyeky4GSYzXWUG7SB46pGrOV9Ei X-Received: by 10.152.237.36 with SMTP id uz4mr1593141lac.1.1437583474169; Wed, 22 Jul 2015 09:44:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.102 with SMTP id s6ls109897lag.102.gmail; Wed, 22 Jul 2015 09:44:34 -0700 (PDT) X-Received: by 10.152.25.169 with SMTP id d9mr3307314lag.80.1437583474030; Wed, 22 Jul 2015 09:44:34 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id de7si1651465lbd.58.2015.07.22.09.44.34 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 09:44:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lahh5 with SMTP id h5so141638474lah.2 for <patchwork-forward@linaro.org>; Wed, 22 Jul 2015 09:44:33 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr3259586lbb.36.1437583473942; Wed, 22 Jul 2015 09:44:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp46340lba; Wed, 22 Jul 2015 09:44:32 -0700 (PDT) X-Received: by 10.70.44.13 with SMTP id a13mr7743172pdm.96.1437583459398; Wed, 22 Jul 2015 09:44:19 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id c7si5024465pdn.193.2015.07.22.09.44.17 for <patches@linaro.org> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 22 Jul 2015 09:44:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1ZHx7r-0002Wb-GD; Wed, 22 Jul 2015 17:44:11 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 01/12] qapi/qmp-event.c: Don't manually include os-win32.h/os-posix.h Date: Wed, 22 Jul 2015 17:44:00 +0100 Message-Id: <1437583451-9677-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> References: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c index 0d1ce0b..c0e435f 100644 --- a/qapi/qmp-event.c +++ b/qapi/qmp-event.c @@ -18,14 +18,6 @@ #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" -#ifdef _WIN32 -#include "sysemu/os-win32.h" -#endif - -#ifdef CONFIG_POSIX -#include "sysemu/os-posix.h" -#endif - static QMPEventFuncEmit qmp_emit; void qmp_event_set_func_emit(QMPEventFuncEmit emit)
qmp-event.c already includes qemu-common.h, so manually including os-win32.h/os-posix.h is unnecessary (and potentially fragile, since it's duplicating the #ifdef logic that chooses which of the two we need). Remove the unnecessary include logic. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- qapi/qmp-event.c | 8 -------- 1 file changed, 8 deletions(-)