[Qemu-devel] [PATCH for-1.6 0/5] qtest: Output cleanup

[Qemu-devel] [PATCH for-1.6 0/5] qtest: Output cleanup

[Andreas Färber]

Hello,

This mini-series cleans up noisy make check output from endian-test.

Regards,
Andreas

Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Paolo Bonzini <pbonzini@redhat.com>

Andreas Färber (5):
  target-ppc: Suppress TCG instruction emulation warnings for qtest
  mips_fulong2e: Silence BIOS loading warning for qtest
  mips_malta: Silence BIOS loading warning for qtest
  mips_jazz: Silence BIOS loading warning for qtest
  mips_r4k: Silence BIOS loading warning for qtest

 hw/mips/mips_fulong2e.c     | 4 +++-
 hw/mips/mips_jazz.c         | 3 ++-
 hw/mips/mips_malta.c        | 4 +++-
 hw/mips/mips_r4k.c          | 4 ++--
 target-ppc/translate_init.c | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

-- 
1.8.1.4

[Qemu-devel] [PATCH for-1.6 1/5] target-ppc: Suppress TCG instruction emulation warnings for qtest

[Andreas Färber]

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 target-ppc/translate_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 8215946..4fc022d 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -7825,7 +7825,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
             error_setg(errp, "Unable to virtualize selected CPU with KVM");
             return;
         }
-    } else {
+    } else if (tcg_enabled()) {
         if (ppc_fixup_cpu(cpu) != 0) {
             error_setg(errp, "Unable to emulate selected CPU with TCG");
             return;
-- 
1.8.1.4

[Qemu-devel] [PATCH for-1.6 2/5] mips_fulong2e: Silence BIOS loading warning for qtest

[Andreas Färber]

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/mips/mips_fulong2e.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 9901441..b13750d 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -43,6 +43,7 @@
 #include "hw/timer/i8254.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
 
 #define DEBUG_FULONG2E_INIT
 
@@ -332,7 +333,8 @@ static void mips_fulong2e_init(QEMUMachineInitArgs *args)
             bios_size = -1;
         }
 
-        if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) {
+        if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
+            !kernel_filename && !qtest_enabled()) {
             fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n", bios_name);
         }
     }
-- 
1.8.1.4

[Qemu-devel] [PATCH for-1.6 3/5] mips_malta: Silence BIOS loading warning for qtest

[Andreas Färber]

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/mips/mips_malta.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 1589b59..f56f34f 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -48,6 +48,7 @@
 #include "exec/address-spaces.h"
 #include "hw/sysbus.h"             /* SysBusDevice */
 #include "qemu/host-utils.h"
+#include "sysemu/qtest.h"
 
 //#define DEBUG_BOARD_INIT
 
@@ -1005,7 +1006,8 @@ void mips_malta_init(QEMUMachineInitArgs *args)
             } else {
                 bios_size = -1;
             }
-            if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) {
+            if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
+                !kernel_filename && !qtest_enabled()) {
                 fprintf(stderr,
                         "qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n",
                         bios_name);
-- 
1.8.1.4

[Qemu-devel] [PATCH for-1.6 4/5] mips_jazz: Silence BIOS loading warning for qtest

[Andreas Färber]

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/mips/mips_jazz.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index d6e0860..36677cc 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -42,6 +42,7 @@
 #include "sysemu/blockdev.h"
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
 
 enum jazz_model_e
 {
@@ -176,7 +177,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
     } else {
         bios_size = -1;
     }
-    if (bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) {
+    if ((bios_size < 0 || bios_size > MAGNUM_BIOS_SIZE) && !qtest_enabled()) {
         fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n",
                 bios_name);
     }
-- 
1.8.1.4

[Qemu-devel] [PATCH for-1.6 5/5] mips_r4k: Silence BIOS loading warning for qtest

[Andreas Färber]

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/mips/mips_r4k.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 7af08b8..044f232 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -26,6 +26,7 @@
 #include "hw/timer/i8254.h"
 #include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
 
 #define MAX_IDE_BUS 2
 
@@ -244,8 +245,7 @@ void mips_r4k_init(QEMUMachineInitArgs *args)
                                    4, 0, 0, 0, 0, be)) {
             fprintf(stderr, "qemu: Error registering flash memory.\n");
 	}
-    }
-    else {
+    } else if (!qtest_enabled()) {
 	/* not fatal */
         fprintf(stderr, "qemu: Warning, could not load MIPS bios '%s'\n",
 		bios_name);
-- 
1.8.1.4

Re: [Qemu-devel] [PATCH for-1.6 0/5] qtest: Output cleanup

[Anthony Liguori]

Andreas Färber <afaerber@suse.de> writes:

> Hello,
>
> This mini-series cleans up noisy make check output from endian-test.
>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Although this is pretty ugly to have to do.  It would be nicer to have
something as a machine property indicating that the machine type
requires -kernel to be useful.

Regards,

Anthony Liguori

> Regards,
> Andreas
>
> Cc: Anthony Liguori <anthony@codemonkey.ws>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
>
> Andreas Färber (5):
>   target-ppc: Suppress TCG instruction emulation warnings for qtest
>   mips_fulong2e: Silence BIOS loading warning for qtest
>   mips_malta: Silence BIOS loading warning for qtest
>   mips_jazz: Silence BIOS loading warning for qtest
>   mips_r4k: Silence BIOS loading warning for qtest
>
>  hw/mips/mips_fulong2e.c     | 4 +++-
>  hw/mips/mips_jazz.c         | 3 ++-
>  hw/mips/mips_malta.c        | 4 +++-
>  hw/mips/mips_r4k.c          | 4 ++--
>  target-ppc/translate_init.c | 2 +-
>  5 files changed, 11 insertions(+), 6 deletions(-)
>
> -- 
> 1.8.1.4

Re: [Qemu-devel] [PATCH for-1.6 0/5] qtest: Output cleanup

[Anthony Liguori]

Applied.  Thanks.

Regards,

Anthony Liguori