Re: [Qemu-devel] [PATCH for-1.6? 04/14] gumstix: Don't enforce use of -pflash for qtest

[Anthony Liguori <anthony@codemonkey.ws>]

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

> Signed-off-by: Andreas Färber <afaerber@suse.de>

I'm not sure this is heading in the right direction.

What's the bigger picture here?  Are we saying that all machines must be
launchable without any special parameters?  If so, can we document that
somewhere?

Is that reasonable in practice or are there cases where we must specify
parameters for a machine?

If the above is true, then I don't think there should be if
(qtest_enabled())s guarding this stuff.

Regards,

Anthony Liguori

> ---
>  hw/arm/gumstix.c | 31 +++++++++++++++++++------------
>  1 file changed, 19 insertions(+), 12 deletions(-)
>
> diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
> index b8cab10..27117fa 100644
> --- a/hw/arm/gumstix.c
> +++ b/hw/arm/gumstix.c
> @@ -42,6 +42,7 @@
>  #include "hw/boards.h"
>  #include "sysemu/blockdev.h"
>  #include "exec/address-spaces.h"
> +#include "sysemu/qtest.h"
>  
>  static const int sector_len = 128 * 1024;
>  
> @@ -58,7 +59,7 @@ static void connex_init(QEMUMachineInitArgs *args)
>      cpu = pxa255_init(address_space_mem, connex_ram);
>  
>      dinfo = drive_get(IF_PFLASH, 0, 0);
> -    if (!dinfo) {
> +    if (!dinfo && !qtest_enabled()) {
>          fprintf(stderr, "A flash image must be given with the "
>                  "'pflash' parameter\n");
>          exit(1);
> @@ -69,11 +70,14 @@ static void connex_init(QEMUMachineInitArgs *args)
>  #else
>      be = 0;
>  #endif
> -    if (!pflash_cfi01_register(0x00000000, NULL, "connext.rom", connex_rom,
> -                               dinfo->bdrv, sector_len, connex_rom / sector_len,
> -                               2, 0, 0, 0, 0, be)) {
> -        fprintf(stderr, "qemu: Error registering flash memory.\n");
> -        exit(1);
> +    if (dinfo) {
> +        if (!pflash_cfi01_register(0x00000000, NULL, "connext.rom", connex_rom,
> +                                   dinfo->bdrv, sector_len,
> +                                   connex_rom / sector_len,
> +                                   2, 0, 0, 0, 0, be)) {
> +            fprintf(stderr, "qemu: Error registering flash memory.\n");
> +            exit(1);
> +        }
>      }
>  
>      /* Interrupt line of NIC is connected to GPIO line 36 */
> @@ -95,7 +99,7 @@ static void verdex_init(QEMUMachineInitArgs *args)
>      cpu = pxa270_init(address_space_mem, verdex_ram, cpu_model ?: "pxa270-c0");
>  
>      dinfo = drive_get(IF_PFLASH, 0, 0);
> -    if (!dinfo) {
> +    if (!dinfo && !qtest_enabled()) {
>          fprintf(stderr, "A flash image must be given with the "
>                  "'pflash' parameter\n");
>          exit(1);
> @@ -106,11 +110,14 @@ static void verdex_init(QEMUMachineInitArgs *args)
>  #else
>      be = 0;
>  #endif
> -    if (!pflash_cfi01_register(0x00000000, NULL, "verdex.rom", verdex_rom,
> -                               dinfo->bdrv, sector_len, verdex_rom / sector_len,
> -                               2, 0, 0, 0, 0, be)) {
> -        fprintf(stderr, "qemu: Error registering flash memory.\n");
> -        exit(1);
> +    if (dinfo) {
> +        if (!pflash_cfi01_register(0x00000000, NULL, "verdex.rom", verdex_rom,
> +                                   dinfo->bdrv, sector_len,
> +                                   verdex_rom / sector_len,
> +                                   2, 0, 0, 0, 0, be)) {
> +            fprintf(stderr, "qemu: Error registering flash memory.\n");
> +            exit(1);
> +        }
>      }
>  
>      /* Interrupt line of NIC is connected to GPIO line 99 */
> -- 
> 1.8.1.4