From: David Gibson <david@gibson.dropbear.id.au>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, hpoussin@reactos.org,
Gerd Hoffmann <kraxel@redhat.com>,
agraf@suse.de
Subject: Re: [Qemu-devel] [PATCH v3 3/3] audio: Rename hw/audio/audio.h to hw/audio/soundhw.h
Date: Tue, 9 May 2017 12:43:43 +1000 [thread overview]
Message-ID: <20170509024343.GL25748@umbus.fritz.box> (raw)
In-Reply-To: <20170508205735.23444-4-ehabkost@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 6244 bytes --]
On Mon, May 08, 2017 at 05:57:35PM -0300, Eduardo Habkost wrote:
> All the functions in hw/audio/audio.h are called "soundhw_*()"
> and live in hw/audio/audiohw.c. Rename the header file for
> consistency.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> Changes v2 -> v3:
> * Update header name at hw/ppc/prep.c too
>
> Changes v1 -> v2:
> * Rebase to latest qemu.git master
> ---
> include/hw/audio/{audio.h => soundhw.h} | 0
> arch_init.c | 2 +-
> hw/audio/ac97.c | 2 +-
> hw/audio/adlib.c | 2 +-
> hw/audio/cs4231a.c | 2 +-
> hw/audio/es1370.c | 2 +-
> hw/audio/gus.c | 2 +-
> hw/audio/intel-hda.c | 2 +-
> hw/audio/pcspk.c | 2 +-
> hw/audio/sb16.c | 2 +-
> hw/audio/soundhw.c | 2 +-
> hw/ppc/prep.c | 2 +-
> vl.c | 2 +-
> 13 files changed, 12 insertions(+), 12 deletions(-)
> rename include/hw/audio/{audio.h => soundhw.h} (100%)
>
> diff --git a/include/hw/audio/audio.h b/include/hw/audio/soundhw.h
> similarity index 100%
> rename from include/hw/audio/audio.h
> rename to include/hw/audio/soundhw.h
> diff --git a/arch_init.c b/arch_init.c
> index 74ca62f508..a0b8ed6167 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -27,7 +27,7 @@
> #include "sysemu/sysemu.h"
> #include "sysemu/arch_init.h"
> #include "hw/pci/pci.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "qemu/config-file.h"
> #include "qemu/error-report.h"
> #include "qmp-commands.h"
> diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
> index c30657501c..959c786261 100644
> --- a/hw/audio/ac97.c
> +++ b/hw/audio/ac97.c
> @@ -19,7 +19,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "hw/pci/pci.h"
> #include "sysemu/dma.h"
> diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
> index 09b8248cda..c6e0f10c16 100644
> --- a/hw/audio/adlib.c
> +++ b/hw/audio/adlib.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "hw/isa/isa.h"
>
> diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
> index 3ecd0582bf..096e8e98d7 100644
> --- a/hw/audio/cs4231a.c
> +++ b/hw/audio/cs4231a.c
> @@ -23,7 +23,7 @@
> */
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "hw/isa/isa.h"
> #include "hw/qdev.h"
> diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
> index fe64c1ac37..dd7c23d185 100644
> --- a/hw/audio/es1370.c
> +++ b/hw/audio/es1370.c
> @@ -28,7 +28,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "hw/pci/pci.h"
> #include "sysemu/dma.h"
> diff --git a/hw/audio/gus.c b/hw/audio/gus.c
> index ec103a4db9..3e864cd36d 100644
> --- a/hw/audio/gus.c
> +++ b/hw/audio/gus.c
> @@ -24,7 +24,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "hw/isa/isa.h"
> #include "gusemu.h"
> diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
> index 2c497eb174..06acc98f7b 100644
> --- a/hw/audio/intel-hda.c
> +++ b/hw/audio/intel-hda.c
> @@ -22,7 +22,7 @@
> #include "hw/pci/pci.h"
> #include "hw/pci/msi.h"
> #include "qemu/timer.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "intel-hda.h"
> #include "intel-hda-defs.h"
> #include "sysemu/dma.h"
> diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
> index 798002277b..c815a2b9ca 100644
> --- a/hw/audio/pcspk.c
> +++ b/hw/audio/pcspk.c
> @@ -26,7 +26,7 @@
> #include "hw/hw.h"
> #include "hw/i386/pc.h"
> #include "hw/isa/isa.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "qemu/timer.h"
> #include "hw/timer/i8254.h"
> diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
> index 6b4427f242..6ab2f6f89a 100644
> --- a/hw/audio/sb16.c
> +++ b/hw/audio/sb16.c
> @@ -23,7 +23,7 @@
> */
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "hw/isa/isa.h"
> #include "hw/qdev.h"
> diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
> index 29565da93d..e698909d34 100644
> --- a/hw/audio/soundhw.c
> +++ b/hw/audio/soundhw.c
> @@ -28,7 +28,7 @@
> #include "qom/object.h"
> #include "hw/isa/isa.h"
> #include "hw/pci/pci.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
>
> struct soundhw {
> const char *name;
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index 4a7d2cfbe0..d16646c95d 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -36,7 +36,7 @@
> #include "hw/pci/pci_host.h"
> #include "hw/ppc/ppc.h"
> #include "hw/boards.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "hw/ide.h"
> diff --git a/vl.c b/vl.c
> index 42fd66ac0d..54b44937e6 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -89,7 +89,7 @@ int main(int argc, char **argv)
> #include "migration/block.h"
> #include "sysemu/tpm.h"
> #include "sysemu/dma.h"
> -#include "hw/audio/audio.h"
> +#include "hw/audio/soundhw.h"
> #include "audio/audio.h"
> #include "migration/migration.h"
> #include "sysemu/cpus.h"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2017-05-09 3:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-08 20:57 [Qemu-devel] [PATCH v3 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c Eduardo Habkost
2017-05-08 20:57 ` [Qemu-devel] [PATCH v3 1/3] audio: Move arch_init audio " Eduardo Habkost
2017-05-09 2:42 ` David Gibson
2017-05-09 5:49 ` [Qemu-devel] [Qemu-ppc] " Thomas Huth
2017-05-10 10:49 ` [Qemu-devel] " Philippe Mathieu-Daudé
2017-05-08 20:57 ` [Qemu-devel] [PATCH v3 2/3] audio: Rename audio_init() to soundhw_init() Eduardo Habkost
2017-05-09 2:43 ` David Gibson
2017-05-09 4:43 ` Hervé Poussineau
2017-05-08 20:57 ` [Qemu-devel] [PATCH v3 3/3] audio: Rename hw/audio/audio.h to hw/audio/soundhw.h Eduardo Habkost
2017-05-09 2:43 ` David Gibson [this message]
2017-05-09 4:40 ` Hervé Poussineau
2017-05-08 22:54 ` [Qemu-devel] [PATCH v3 0/3] arch_init: Move soundhw code to hw/audio/soundhw.c no-reply
2017-05-09 3:13 ` Eduardo Habkost
2017-05-16 18:54 ` Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170509024343.GL25748@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).