| Message ID | 1453138500-8410-1-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18/01/16 17:35, Peter Maydell wrote: > 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> > --- > disas/mips.c | 1 + > hw/mips/addr.c | 1 + > hw/mips/cputimer.c | 1 + > hw/mips/gt64xxx_pci.c | 1 + > hw/mips/mips_fulong2e.c | 1 + > hw/mips/mips_int.c | 1 + > hw/mips/mips_jazz.c | 1 + > hw/mips/mips_malta.c | 1 + > hw/mips/mips_mipssim.c | 1 + > hw/mips/mips_r4k.c | 1 + > target-mips/cpu.c | 1 + > target-mips/dsp_helper.c | 1 + > target-mips/gdbstub.c | 2 +- > target-mips/helper.c | 6 +----- > target-mips/kvm.c | 2 +- > target-mips/lmi_helper.c | 1 + > target-mips/machine.c | 1 + > target-mips/mips-semi.c | 2 +- > target-mips/msa_helper.c | 1 + > target-mips/op_helper.c | 2 +- > target-mips/translate.c | 1 + > 21 files changed, 21 insertions(+), 9 deletions(-) Applied to target-mips tree, thanks. Regards, Leon
diff --git a/disas/mips.c b/disas/mips.c index bf0bbaf..0e488d8 100644 --- a/disas/mips.c +++ b/disas/mips.c @@ -19,6 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "disas/bfd.h" /* mips.h. Mips opcode list for GDB, the GNU debugger. diff --git a/hw/mips/addr.c b/hw/mips/addr.c index ff3b952..e4e86b4 100644 --- a/hw/mips/addr.c +++ b/hw/mips/addr.c @@ -20,6 +20,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/cpudevs.h" diff --git a/hw/mips/cputimer.c b/hw/mips/cputimer.c index f046588..efb227d 100644 --- a/hw/mips/cputimer.c +++ b/hw/mips/cputimer.c @@ -20,6 +20,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/cpudevs.h" #include "qemu/timer.h" diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index c1f3c9c..3f4523d 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/pci/pci.h" diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 5988a88..6748d89 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -18,6 +18,7 @@ * http://www.loongsondeveloper.com/doc/Loongson2EUserGuide.pdf */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/char/serial.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index d740046..59081f9 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -20,6 +20,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/cpudevs.h" #include "cpu.h" diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1cfbaa6..62527fd 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 91c36ba..c5da83f 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/char/serial.h" diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 23b35be..8951ae9 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -24,6 +24,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/mips/mips.h" #include "hw/mips/cpudevs.h" diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 2d4e038..b6625ae 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -7,6 +7,7 @@ * All peripherial devices are attached to this "bus" with * the standard PC ISA addresses. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" diff --git a/target-mips/cpu.c b/target-mips/cpu.c index 639a24b..0b3f130 100644 --- a/target-mips/cpu.c +++ b/target-mips/cpu.c @@ -18,6 +18,7 @@ * <http://www.gnu.org/licenses/lgpl-2.1.html> */ +#include "qemu/osdep.h" #include "cpu.h" #include "kvm_mips.h" #include "qemu-common.h" diff --git a/target-mips/dsp_helper.c b/target-mips/dsp_helper.c index 46528de..df7d220 100644 --- a/target-mips/dsp_helper.c +++ b/target-mips/dsp_helper.c @@ -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" #include "qemu/bitops.h" diff --git a/target-mips/gdbstub.c b/target-mips/gdbstub.c index 9845d88..b0b4a32 100644 --- a/target-mips/gdbstub.c +++ b/target-mips/gdbstub.c @@ -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" diff --git a/target-mips/helper.c b/target-mips/helper.c index 118072a..f9c4c11 100644 --- a/target-mips/helper.c +++ b/target-mips/helper.c @@ -16,11 +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 <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> +#include "qemu/osdep.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-mips/kvm.c b/target-mips/kvm.c index 12d7db3..fb5ce1f 100644 --- a/target-mips/kvm.c +++ b/target-mips/kvm.c @@ -9,7 +9,7 @@ * Authors: Sanjay Lal <sanjayl@kymasys.com> */ -#include <sys/types.h> +#include "qemu/osdep.h" #include <sys/ioctl.h> #include <sys/mman.h> diff --git a/target-mips/lmi_helper.c b/target-mips/lmi_helper.c index bbfcd59..fb1245b 100644 --- a/target-mips/lmi_helper.c +++ b/target-mips/lmi_helper.c @@ -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" diff --git a/target-mips/machine.c b/target-mips/machine.c index b15c43a..737f3c2 100644 --- a/target-mips/machine.c +++ b/target-mips/machine.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/hw.h" #include "cpu.h" diff --git a/target-mips/mips-semi.c b/target-mips/mips-semi.c index 5050940..ed235de 100644 --- a/target-mips/mips-semi.c +++ b/target-mips/mips-semi.c @@ -17,7 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/stat.h> +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/softmmu-semi.h" diff --git a/target-mips/msa_helper.c b/target-mips/msa_helper.c index 5dd3da6..49a9ed5 100644 --- a/target-mips/msa_helper.c +++ b/target-mips/msa_helper.c @@ -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" diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index d2c98c9..217d669 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -16,7 +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 <stdlib.h> +#include "qemu/osdep.h" #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target-mips/translate.c b/target-mips/translate.c index 5626647..d403c89 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -21,6 +21,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "cpu.h" #include "disas/disas.h" #include "tcg-op.h"
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> --- disas/mips.c | 1 + hw/mips/addr.c | 1 + hw/mips/cputimer.c | 1 + hw/mips/gt64xxx_pci.c | 1 + hw/mips/mips_fulong2e.c | 1 + hw/mips/mips_int.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 1 + hw/mips/mips_mipssim.c | 1 + hw/mips/mips_r4k.c | 1 + target-mips/cpu.c | 1 + target-mips/dsp_helper.c | 1 + target-mips/gdbstub.c | 2 +- target-mips/helper.c | 6 +----- target-mips/kvm.c | 2 +- target-mips/lmi_helper.c | 1 + target-mips/machine.c | 1 + target-mips/mips-semi.c | 2 +- target-mips/msa_helper.c | 1 + target-mips/op_helper.c | 2 +- target-mips/translate.c | 1 + 21 files changed, 21 insertions(+), 9 deletions(-)