next round of s390x cleanups

[Qemu-devel] [PATCH v1 05/11] s390x: rename s390-virtio.h to s390-virtio-hcall.h

Posted by David Hildenbrand 8 years, 5 months ago

The only interface left, so let's properly rename it.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 hw/s390x/s390-virtio-ccw.c                      | 2 +-
 hw/s390x/s390-virtio-hcall.c                    | 2 +-
 hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} (92%)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 41a9e976dc..03c88a524b 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 92%
rename from hw/s390x/s390-virtio.h
rename to hw/s390x/s390-virtio-hcall.h
index d984cd4115..64c5bbd827 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 <cornelia.huck@de.ibm.com>
-- 
2.13.5

Re: [Qemu-devel] [PATCH v1 05/11] s390x: rename s390-virtio.h to s390-virtio-hcall.h

Posted by Thomas Huth 8 years, 5 months ago

On 30.08.2017 19:05, David Hildenbrand wrote:
> The only interface left, so let's properly rename it.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  hw/s390x/s390-virtio-ccw.c                      | 2 +-
>  hw/s390x/s390-virtio-hcall.c                    | 2 +-
>  hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>  rename hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} (92%)
[...]
> diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio-hcall.h
> similarity index 92%
> rename from hw/s390x/s390-virtio.h
> rename to hw/s390x/s390-virtio-hcall.h
> index d984cd4115..64c5bbd827 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 <cornelia.huck@de.ibm.com>
> 

Maybe also rename the HW_S390_VIRTIO_H header guard? Anyway:

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [Qemu-devel] [PATCH v1 05/11] s390x: rename s390-virtio.h to s390-virtio-hcall.h

Posted by David Hildenbrand 8 years, 5 months ago

On 31.08.2017 11:29, Thomas Huth wrote:
> On 30.08.2017 19:05, David Hildenbrand wrote:
>> The only interface left, so let's properly rename it.
>>
>> Signed-off-by: David Hildenbrand <david@redhat.com>
>> ---
>>  hw/s390x/s390-virtio-ccw.c                      | 2 +-
>>  hw/s390x/s390-virtio-hcall.c                    | 2 +-
>>  hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>  rename hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} (92%)
> [...]
>> diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio-hcall.h
>> similarity index 92%
>> rename from hw/s390x/s390-virtio.h
>> rename to hw/s390x/s390-virtio-hcall.h
>> index d984cd4115..64c5bbd827 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 <cornelia.huck@de.ibm.com>
>>
> 
> Maybe also rename the HW_S390_VIRTIO_H header guard? Anyway:
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 

Sure, will do. Is HW_S390_VIRTIO_HCALL_H okay?

(HW_S390X_S390_VIRTIO_HCALL_H doesn't sound necessary)

-- 

Thanks,

David

Re: [Qemu-devel] [PATCH v1 05/11] s390x: rename s390-virtio.h to s390-virtio-hcall.h

Posted by Thomas Huth 8 years, 5 months ago

On 31.08.2017 15:18, David Hildenbrand wrote:
> On 31.08.2017 11:29, Thomas Huth wrote:
>> On 30.08.2017 19:05, David Hildenbrand wrote:
>>> The only interface left, so let's properly rename it.
>>>
>>> Signed-off-by: David Hildenbrand <david@redhat.com>
>>> ---
>>>  hw/s390x/s390-virtio-ccw.c                      | 2 +-
>>>  hw/s390x/s390-virtio-hcall.c                    | 2 +-
>>>  hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} | 2 +-
>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>  rename hw/s390x/{s390-virtio.h => s390-virtio-hcall.h} (92%)
>> [...]
>>> diff --git a/hw/s390x/s390-virtio.h b/hw/s390x/s390-virtio-hcall.h
>>> similarity index 92%
>>> rename from hw/s390x/s390-virtio.h
>>> rename to hw/s390x/s390-virtio-hcall.h
>>> index d984cd4115..64c5bbd827 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 <cornelia.huck@de.ibm.com>
>>>
>>
>> Maybe also rename the HW_S390_VIRTIO_H header guard? Anyway:
>>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>>
> 
> Sure, will do. Is HW_S390_VIRTIO_HCALL_H okay?

Sounds fine.

 Thomas