Re: [Qemu-devel] [PATCH v1 1/6] target/s390x: fix pgm irq ilen for stsi

2017-07-25 Thread Cornelia Huck 
On Fri, 21 Jul 2017 14:56:04 +0200
David Hildenbrand  wrote:

> The instruction is 4 bytes long.
> 
> Signed-off-by: David Hildenbrand 
> ---
>  target/s390x/misc_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
> index b508101..2ec49c9 100644
> --- a/target/s390x/misc_helper.c
> +++ b/target/s390x/misc_helper.c
> @@ -385,7 +385,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
>  if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 &&
>  ((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) {
>  /* valid function code, invalid reserved bits */
> -program_interrupt(env, PGM_SPECIFICATION, 2);
> +program_interrupt(env, PGM_SPECIFICATION, 4);
>  }
>  
>  sel1 = r0 & STSI_R0_SEL1_MASK;

Thanks, applied.

Re: [Qemu-devel] [PATCH v1 1/6] target/s390x: fix pgm irq ilen for stsi

2017-07-24 Thread Thomas Huth 
On 21.07.2017 14:56, David Hildenbrand wrote:
> The instruction is 4 bytes long.
> 
> Signed-off-by: David Hildenbrand 
> ---
>  target/s390x/misc_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
> index b508101..2ec49c9 100644
> --- a/target/s390x/misc_helper.c
> +++ b/target/s390x/misc_helper.c
> @@ -385,7 +385,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
>  if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 &&
>  ((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) {
>  /* valid function code, invalid reserved bits */
> -program_interrupt(env, PGM_SPECIFICATION, 2);
> +program_interrupt(env, PGM_SPECIFICATION, 4);
>  }
>  
>  sel1 = r0 & STSI_R0_SEL1_MASK;
> 

Reviewed-by: Thomas Huth