Re: [Qemu-devel] [PULL 04/62] Revert "spapr: support memory unplug for qtest"

[Greg Kurz]

On Tue, 12 Mar 2019 19:54:04 +1100
David Gibson <address@hidden> wrote:

> From: Greg Kurz <address@hidden>
> 
> Commit b8165118f52c broke CPU hotplug tests for old machine types:
> 
> $ QTEST_QEMU_BINARY=ppc64-softmmu/qemu-system-ppc64 ./tests/cpu-plug-test 
> -m=slow
> /ppc64/cpu-plug/pseries-3.1/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-2.12-sxxm/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-3.0/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-2.10/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-2.11/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-2.12/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-2.9/device-add/2x3x1&maxcpus=6: OK
> /ppc64/cpu-plug/pseries-2.7/device-add/2x3x1&maxcpus=6: **
> ERROR:/home/thuth/devel/qemu/hw/ppc/spapr_events.c:313:rtas_event_log_to_source:
>  assertion failed: (source->enabled)
> Broken pipe
> /home/thuth/devel/qemu/tests/libqtest.c:143: kill_qemu() detected QEMU death 
> from signal 6 (Aborted) (core dumped)
> Aborted (core dumped)
> 
> The approach of faking the availability of OV5_HP_EVT causes the
> code to assume the hotplug event source is enabled, which is wrong
> for older machines.
> 
> We've now fixed CAS under qtest with a different approach.  Therefore,
> this reverts commit b8165118f52ce5ee88565d3cec83d30374efdc96.
> 

Cool.

> A subsequent patch will address the problem of CAS under qtest from
> a different angle.
> 

This sentence should have been removed... no big deal I guess.


> Reported-by: Thomas Huth <address@hidden>
> Signed-off-by: Greg Kurz <address@hidden>
> Message-Id: <address@hidden>
> Tested-by: Michael Roth <address@hidden>
> Reviewed-by: Michael Roth <address@hidden>
> Signed-off-by: David Gibson <address@hidden>
> ---
>  hw/ppc/spapr_ovec.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c
> index 12510b236a..318bf33de4 100644
> --- a/hw/ppc/spapr_ovec.c
> +++ b/hw/ppc/spapr_ovec.c
> @@ -16,7 +16,6 @@
>  #include "qemu/bitmap.h"
>  #include "exec/address-spaces.h"
>  #include "qemu/error-report.h"
> -#include "sysemu/qtest.h"
>  #include "trace.h"
>  #include <libfdt.h>
>  
> @@ -132,11 +131,6 @@ bool spapr_ovec_test(sPAPROptionVector *ov, long bitnr)
>      g_assert(ov);
>      g_assert(bitnr < OV_MAXBITS);
>  
> -    /* support memory unplug for qtest */
> -    if (qtest_enabled() && bitnr == OV5_HP_EVT) {
> -        return true;
> -    }
> -
>      return test_bit(bitnr, ov->bitmap) ? true : false;
>  }
>