Skip to content

Commit

Permalink
ppc: Clean up includes
Browse files Browse the repository at this point in the history
Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1453832250-766-6-git-send-email-peter.maydell@linaro.org
  • Loading branch information
pm215 committed Jan 29, 2016
1 parent ea99dde commit 0d75590
Show file tree
Hide file tree
Showing 63 changed files with 63 additions and 11 deletions.
1 change: 1 addition & 0 deletions disas/ppc.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this file; see the file COPYING. If not,
see <http://www.gnu.org/licenses/>. */
#include "qemu/osdep.h"
#include "disas/bfd.h"
#define BFD_DEFAULT_TARGET_SIZE 64

Expand Down
1 change: 1 addition & 0 deletions hw/char/spapr_vty.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "qemu/osdep.h"
#include "hw/qdev.h"
#include "sysemu/char.h"
#include "hw/ppc/spapr.h"
Expand Down
1 change: 1 addition & 0 deletions hw/intc/xics.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*
*/

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "trace.h"
#include "qemu/timer.h"
Expand Down
1 change: 1 addition & 0 deletions hw/intc/xics_kvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*
*/

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "trace.h"
#include "hw/ppc/spapr.h"
Expand Down
1 change: 1 addition & 0 deletions hw/isa/pc87312.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* THE SOFTWARE.
*/

#include "qemu/osdep.h"
#include "hw/isa/pc87312.h"
#include "qemu/error-report.h"
#include "sysemu/block-backend.h"
Expand Down
1 change: 1 addition & 0 deletions hw/misc/macio/cuda.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/input/adb.h"
Expand Down
1 change: 1 addition & 0 deletions hw/misc/macio/mac_dbdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "hw/ppc/mac_dbdma.h"
Expand Down
1 change: 1 addition & 0 deletions hw/misc/macio/macio.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
Expand Down
1 change: 1 addition & 0 deletions hw/net/spapr_llan.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "net/net.h"
#include "hw/qdev.h"
Expand Down
1 change: 1 addition & 0 deletions hw/nvram/spapr_nvram.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* THE SOFTWARE.
*/

#include "qemu/osdep.h"
#include <libfdt.h>

#include "sysemu/block-backend.h"
Expand Down
1 change: 1 addition & 0 deletions hw/pci-bridge/dec.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* THE SOFTWARE.
*/

#include "qemu/osdep.h"
#include "dec.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
Expand Down
1 change: 1 addition & 0 deletions hw/pci-host/grackle.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* THE SOFTWARE.
*/

#include "qemu/osdep.h"
#include "hw/pci/pci_host.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
Expand Down
1 change: 1 addition & 0 deletions hw/pci-host/prep.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* THE SOFTWARE.
*/

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
Expand Down
1 change: 1 addition & 0 deletions hw/pci-host/uninorth.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/ppc/e500.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* (at your option) any later version.
*/

#include "config.h"
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "e500.h"
#include "e500-ccsr.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/ppc/e500plat.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* (at your option) any later version.
*/

#include "config.h"
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "e500.h"
#include "hw/boards.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/mac_newworld.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
* 0001:05:0c.0 IDE interface [0101]: Broadcom K2 SATA [1166:0240]
*
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/mac.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/mac_oldworld.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "mac.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/mpc8544_guts.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*
*/

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/ppc/mpc8544ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* (at your option) any later version.
*/

#include "config.h"
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "e500.h"
#include "hw/boards.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc_e500.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc405_boards.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc405_uc.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/boards.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/ppc/ppc440_bamboo.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/

#include "config.h"
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "net/net.h"
#include "hw/hw.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc4xx_devs.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc4xx_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
/* This file implements emulation of the 32-bit PCI controller found in some
* 4xx SoCs, such as the 440EP. */

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc_booke.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/ppc/ppc.h"
#include "qemu/timer.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppce500_spin.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*
*/

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/prep.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/timer/m48t59.h"
#include "hw/i386/pc.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "sysemu/numa.h"
#include "hw/hw.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_drc.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* See the COPYING file in the top-level directory.
*/

#include "qemu/osdep.h"
#include "hw/ppc/spapr_drc.h"
#include "qom/object.h"
#include "hw/qdev.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
#include "sysemu/char.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_hcall.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "helper_regs.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/kvm.h"
#include "hw/qdev.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/pci/pci.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_pci_vfio.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/

#include "qemu/osdep.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
#include "hw/pci/msix.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_rng.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_rtas.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* THE SOFTWARE.
*
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
#include "sysemu/char.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* THE SOFTWARE.
*
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/spapr_vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ppc/virtex_ml507.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* THE SOFTWARE.
*/

#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/char/serial.h"
Expand Down
1 change: 1 addition & 0 deletions hw/scsi/spapr_vscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* - Add indirect descriptors support
* - Maybe do autosense (PAPR seems to mandate it, linux doesn't care)
*/
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/scsi/scsi.h"
#include "block/scsi.h"
Expand Down
1 change: 1 addition & 0 deletions target-ppc/arch_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*
*/

#include "qemu/osdep.h"
#include "cpu.h"
#include "elf.h"
#include "exec/cpu-all.h"
Expand Down
1 change: 1 addition & 0 deletions target-ppc/cpu-models.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* inside "#if defined(TODO) ... #endif" statements to make tests easier.
*/

#include "qemu/osdep.h"
#include "cpu.h"
#include "cpu-models.h"

Expand Down
1 change: 1 addition & 0 deletions target-ppc/dfp_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/

#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"

Expand Down
1 change: 1 addition & 0 deletions target-ppc/excp_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
Expand Down
1 change: 1 addition & 0 deletions target-ppc/fpu_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"

Expand Down
2 changes: 1 addition & 1 deletion target-ppc/gdbstub.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "exec/gdbstub.h"

Expand Down
1 change: 1 addition & 0 deletions target-ppc/int_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/host-utils.h"
#include "exec/helper-proto.h"
Expand Down
1 change: 1 addition & 0 deletions target-ppc/kvm-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* See the COPYING file in the top-level directory.
*
*/
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/ppc/openpic.h"

Expand Down
Loading

0 comments on commit 0d75590

Please sign in to comment.