[Qemu-devel] [PATCH 0/2] microblaze: clean includes

[Qemu-devel] [PATCH 0/2] microblaze: clean includes

[Peter Maydell]

I'm sending this small series separately because cleaning
the microblaze files' use of includes requires a manual
code fix to disas/microblaze.c. That file manually defines
TRUE and FALSE, which clash with the standard defines
that osdep.h will pull in. Patch 1 fixes this, and then
patch 2 is the usual automated cleanup of the remaining
files.

thanks
-- PMM


Peter Maydell (2):
  disas/microblaze.c: Don't define TRUE or FALSE
  microblaze: Clean up includes

 disas/microblaze.c                       | 5 +----
 hw/microblaze/boot.c                     | 1 +
 hw/microblaze/petalogix_ml605_mmu.c      | 1 +
 hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 +
 target-microblaze/cpu.c                  | 1 +
 target-microblaze/gdbstub.c              | 2 +-
 target-microblaze/helper.c               | 1 +
 target-microblaze/mmu.c                  | 1 +
 target-microblaze/op_helper.c            | 1 +
 target-microblaze/translate.c            | 1 +
 10 files changed, 10 insertions(+), 5 deletions(-)

-- 
1.9.1

[Qemu-devel] [PATCH 1/2] disas/microblaze.c: Don't define TRUE or FALSE

[Peter Maydell]

Don't define TRUE and FALSE locally or manually include stdio.h;
instead use osdep.h which provides them.

This is a necessary prerequisite for moving to "everywhere includes
osdep.h", because otherwise there is a compile error due to the
redefinition of TRUE and FALSE.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 disas/microblaze.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/disas/microblaze.c b/disas/microblaze.c
index 5d15907..91b30ac 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -33,13 +33,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/>. */
  */
 
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #define STATIC_TABLE
 #define DEFINE_TABLE
 
-#define TRUE   1
-#define FALSE  0
-
 #ifndef MICROBLAZE_OPC
 #define MICROBLAZE_OPC
 /* Assembler instructions for Xilinx's microblaze processor
-- 
1.9.1

[Qemu-devel] [PATCH 2/2] microblaze: Clean up includes

[Peter Maydell]

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>
---
 hw/microblaze/boot.c                     | 1 +
 hw/microblaze/petalogix_ml605_mmu.c      | 1 +
 hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 +
 target-microblaze/cpu.c                  | 1 +
 target-microblaze/gdbstub.c              | 2 +-
 target-microblaze/helper.c               | 1 +
 target-microblaze/mmu.c                  | 1 +
 target-microblaze/op_helper.c            | 1 +
 target-microblaze/translate.c            | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index d7eaa1f..26cc378 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 3f9fa5f..85e974b 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "net/net.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 1c84b75..606ba1f 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "net/net.h"
diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
index 52959e1..7a42897 100644
--- a/target-microblaze/cpu.c
+++ b/target-microblaze/cpu.c
@@ -21,6 +21,7 @@
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "hw/qdev-properties.h"
diff --git a/target-microblaze/gdbstub.c b/target-microblaze/gdbstub.c
index a70e2ee..89d3898 100644
--- a/target-microblaze/gdbstub.c
+++ b/target-microblaze/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-microblaze/helper.c b/target-microblaze/helper.c
index a482e47..3b0fae8 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -18,6 +18,7 @@
  * 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"
 
diff --git a/target-microblaze/mmu.c b/target-microblaze/mmu.c
index ee95a04..4ac3040 100644
--- a/target-microblaze/mmu.c
+++ b/target-microblaze/mmu.c
@@ -18,6 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 
 #define D(x)
diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
index 5637462..9733388 100644
--- a/target-microblaze/op_helper.c
+++ b/target-microblaze/op_helper.c
@@ -18,6 +18,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/host-utils.h"
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 9e52011..2e1293d 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -18,6 +18,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"
-- 
1.9.1

Re: [Qemu-devel] [PATCH 1/2] disas/microblaze.c: Don't define TRUE or FALSE

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

On 01/26/2016 11:05 AM, Peter Maydell wrote:
> Don't define TRUE and FALSE locally or manually include stdio.h;
> instead use osdep.h which provides them.
> 
> This is a necessary prerequisite for moving to "everywhere includes
> osdep.h", because otherwise there is a compile error due to the
> redefinition of TRUE and FALSE.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  disas/microblaze.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 0/2] microblaze: clean includes

[Edgar E. Iglesias]

On Tue, Jan 26, 2016 at 06:05:29PM +0000, Peter Maydell wrote:
> I'm sending this small series separately because cleaning
> the microblaze files' use of includes requires a manual
> code fix to disas/microblaze.c. That file manually defines
> TRUE and FALSE, which clash with the standard defines
> that osdep.h will pull in. Patch 1 fixes this, and then
> patch 2 is the usual automated cleanup of the remaining
> files.


Ack on both patches, thanks

Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


> 
> thanks
> -- PMM
> 
> 
> Peter Maydell (2):
>   disas/microblaze.c: Don't define TRUE or FALSE
>   microblaze: Clean up includes
> 
>  disas/microblaze.c                       | 5 +----
>  hw/microblaze/boot.c                     | 1 +
>  hw/microblaze/petalogix_ml605_mmu.c      | 1 +
>  hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 +
>  target-microblaze/cpu.c                  | 1 +
>  target-microblaze/gdbstub.c              | 2 +-
>  target-microblaze/helper.c               | 1 +
>  target-microblaze/mmu.c                  | 1 +
>  target-microblaze/op_helper.c            | 1 +
>  target-microblaze/translate.c            | 1 +
>  10 files changed, 10 insertions(+), 5 deletions(-)
> 
> -- 
> 1.9.1
> 

Re: [Qemu-devel] [PATCH 0/2] microblaze: clean includes

[Peter Maydell]

On 27 January 2016 at 20:04, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote:
> On Tue, Jan 26, 2016 at 06:05:29PM +0000, Peter Maydell wrote:
>> I'm sending this small series separately because cleaning
>> the microblaze files' use of includes requires a manual
>> code fix to disas/microblaze.c. That file manually defines
>> TRUE and FALSE, which clash with the standard defines
>> that osdep.h will pull in. Patch 1 fixes this, and then
>> patch 2 is the usual automated cleanup of the remaining
>> files.
>
>
> Ack on both patches, thanks
>
> Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>

thanks; applied to master.

-- PMM