Re: [Qemu-devel] [PATCH v2 04/19] s390x: rename s390-virtio.h to s390-virtio-hcall.h

[Christian Borntraeger]

On 09/04/2017 05:43 PM, David Hildenbrand wrote:
> The only interface left, so let's properly rename it.
> 
> Reviewed-by: Thomas Huth <address@hidden>
> Signed-off-by: David Hildenbrand <address@hidden>

Acked-by: Christian Borntraeger <address@hidden>

> ---
>  hw/s390x/s390-virtio-ccw.c                      | 2 +-
>  hw/s390x/s390-virtio-hcall.c                    | 2 +-
>  hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} | 8 ++++----
>  3 files changed, 6 insertions(+), 6 deletions(-)
>  rename hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} (77%)
> 
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 4c3a3e177b..f67b4b5d58 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -16,7 +16,7 @@
>  #include "cpu.h"
>  #include "hw/boards.h"
>  #include "exec/address-spaces.h"
> -#include "s390-virtio.h"
> +#include "hw/s390x/s390-virtio-hcall.h"
>  #include "hw/s390x/sclp.h"
>  #include "hw/s390x/s390_flic.h"
>  #include "hw/s390x/ioinst.h"
> diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c
> index 23d67d6170..ec7cf8beb3 100644
> --- a/hw/s390x/s390-virtio-hcall.c
> +++ b/hw/s390x/s390-virtio-hcall.c
> @@ -11,7 +11,7 @@
> 
>  #include "qemu/osdep.h"
>  #include "cpu.h"
> -#include "hw/s390x/s390-virtio.h"
> +#include "hw/s390x/s390-virtio-hcall.h"
> 
>  #define MAX_DIAG_SUBCODES 255
> 
> diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio-hcall.h
> similarity index 77%
> rename from hw/s390x/s390-virtio.h
> rename to hw/s390x/s390-virtio-hcall.h
> index d984cd4115..59fcba3a06 100644
> --- a/hw/s390x/s390-virtio.h
> +++ b/hw/s390x/s390-virtio-hcall.h
> @@ -1,5 +1,5 @@
>  /*
> - * Virtio interfaces for s390
> + * Support for virtio hypercalls on s390x
>   *
>   * Copyright 2012 IBM Corp.
>   * Author(s): Cornelia Huck <address@hidden>
> @@ -9,12 +9,12 @@
>   * directory.
>   */
> 
> -#ifndef HW_S390_VIRTIO_H
> -#define HW_S390_VIRTIO_H
> +#ifndef HW_S390_VIRTIO_HCALL_H
> +#define HW_S390_VIRTIO_HCALL_H
> 
>  #include "standard-headers/asm-s390/kvm_virtio.h"
>  #include "standard-headers/asm-s390/virtio-ccw.h"
> 
>  typedef int (*s390_virtio_fn)(const uint64_t *args);
>  void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);
> -#endif
> +#endif /* HW_S390_VIRTIO_HCALL_H */
>