From patchwork Tue May 8 15:10:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 910258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jydgBHc3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gNHy5Lhvz9s0W for ; Wed, 9 May 2018 01:11:58 +1000 (AEST) Received: from localhost ([::1]:51747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG4HU-00030i-A8 for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:11:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG4GS-0002ic-JR for qemu-devel@nongnu.org; Tue, 08 May 2018 11:10:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG4GM-000524-Hu for qemu-devel@nongnu.org; Tue, 08 May 2018 11:10:52 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:37593) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fG4GM-00051g-Dm; Tue, 08 May 2018 11:10:46 -0400 Received: by mail-qk0-x244.google.com with SMTP id d74so24913628qkg.4; Tue, 08 May 2018 08:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=akadkz0FoT2MUqQjNWwO0MkNCnELMn0hozv2oTUgTNs=; b=jydgBHc33h38CTrGGds8UI/gNHGRot6oNWkoR60Cc8Z3ZwdazHzl7I5fGpGk6xXTHa 6fJD9eLszWV1FDjLkSlJUwyI+7H0KEgFZi0kL8mG806DyEF+tomDIB8UWOdpaMA8Ic2j muA857sfpYzmqerGa9mayWkXT9rJMt3Mf0YYsCV09VtwMZre7WWkrzOf9aRgg3POyzpb Wb1SO7Dg4I8sCs7o+V10cjFNsfNoJFL3JwIiNe80gt1NVKazudApqOvuQTUN+d3bbaYL n+bIZ1r8rkxT1peCbVeNR71LQZoBlGGfDNBL/35M8Cp4Fg3VipLtWiiCNoA2efugLGRZ jXNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=akadkz0FoT2MUqQjNWwO0MkNCnELMn0hozv2oTUgTNs=; b=hRUtc9XePSZmb/V/fheTCK29k7byv6RcePNc9PZNqTcWIEqygnHvnjsydzVD9Kd+v/ 1mNZEI7x6LmGD1pmdO5xTnJprgYfb5GcqW4jiarXZvnDn7EE+r3LyISX0wL8qeNqZQBi zRaV0uG3jkgiU2M/LURX5Xy89TKkylYOzVsyoOpAvgULiiY4nn7dBKAqotyCyr97Z1BN CbuSIgghnvorjAaz0f5HfNzmm+sDdfkhttr/4hmeHKCU6Lw9mNwj38yjdupL5lxfZZwL 9lFXFMo3GbWI29+eg9KzgqjEGpC6ebW0kl25vaVdxQKhx1JLOkghDGCK7fO9iLnBp+nd i4Zg== X-Gm-Message-State: ALKqPweRaMABGS7oI3g02pNukeYOjXqc1VoPW/FUJxHMh3VwhcowUEuB LGsQwTA+17tqQYGDl0fcnw8= X-Google-Smtp-Source: AB8JxZoAIa9dIim+6pBgK9ZixJcWQF2IXyjQ1IjrZUOEE3O5wgILpGkqlbasekCvpMV7NpGnoqgRsg== X-Received: by 10.55.159.194 with SMTP id i185mr2851461qke.107.1525792245969; Tue, 08 May 2018 08:10:45 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id w12-v6sm13305015qtb.80.2018.05.08.08.10.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 08:10:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , "Michael S . Tsirkin" , Paolo Bonzini Date: Tue, 8 May 2018 12:10:33 -0300 Message-Id: <20180508151035.16774-3-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508151035.16774-1-f4bug@amsat.org> References: <20180508151035.16774-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [RFC PATCH 2/4] hw/pcmcia: Remove PCMCIACardState from qemu/typedefs.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" There is only one file requiring this typedef (hw/arm/pxa.h), let it include "hw/pcmcia.h" directly to simplify qemu/typedefs.h. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/arm/pxa.h | 1 + include/hw/pcmcia.h | 4 ++-- include/qemu/typedefs.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 0df1199caa..f6dfb5c0cf 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -12,6 +12,7 @@ #include "exec/memory.h" #include "target/arm/cpu-qom.h" +#include "hw/pcmcia.h" /* Interrupt numbers */ # define PXA2XX_PIC_SSP3 0 diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h index 79cac9c761..1b4080764f 100644 --- a/include/hw/pcmcia.h +++ b/include/hw/pcmcia.h @@ -18,13 +18,13 @@ typedef struct PCMCIASocket { #define PCMCIA_CARD_CLASS(cls) \ OBJECT_CLASS_CHECK(PCMCIACardClass, cls, TYPE_PCMCIA_CARD) -struct PCMCIACardState { +typedef struct PCMCIACardState { /*< private >*/ DeviceState parent_obj; /*< public >*/ PCMCIASocket *slot; -}; +} PCMCIACardState; typedef struct PCMCIACardClass { /*< private >*/ diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 325c72de33..c7a0159bd2 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -76,7 +76,6 @@ typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; typedef struct PCMachineClass PCMachineClass; typedef struct PCMachineState PCMachineState; -typedef struct PCMCIACardState PCMCIACardState; typedef struct PixelFormat PixelFormat; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property;