* [PATCH-for-5.2] stubs/cmos: Use correct include
@ 2020-07-24 8:43 Philippe Mathieu-Daudé
2020-08-03 21:17 ` John Snow
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-07-24 8:43 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Philippe Mathieu-Daudé,
qemu-block
cmos_get_fd_drive_type() is declared in "hw/block/fdc.h".
This currently works because "hw/i386/pc.h" happens to
include it. Simplify including the correct header.
Fixes: 2055dbc1c9 ("acpi: move aml builder code for floppy device")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
stubs/cmos.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stubs/cmos.c b/stubs/cmos.c
index 416cbe4055..3fdbae2c69 100644
--- a/stubs/cmos.c
+++ b/stubs/cmos.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "hw/i386/pc.h"
+#include "hw/block/fdc.h"
int cmos_get_fd_drive_type(FloppyDriveType fd0)
{
--
2.21.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH-for-5.2] stubs/cmos: Use correct include
2020-07-24 8:43 [PATCH-for-5.2] stubs/cmos: Use correct include Philippe Mathieu-Daudé
@ 2020-08-03 21:17 ` John Snow
2020-08-22 19:58 ` Philippe Mathieu-Daudé
2020-09-01 7:11 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: John Snow @ 2020-08-03 21:17 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Paolo Bonzini, qemu-block
On 7/24/20 4:43 AM, Philippe Mathieu-Daudé wrote:
> cmos_get_fd_drive_type() is declared in "hw/block/fdc.h".
> This currently works because "hw/i386/pc.h" happens to
> include it. Simplify including the correct header.
>
> Fixes: 2055dbc1c9 ("acpi: move aml builder code for floppy device")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: John Snow <jsnow@redhat.com>
> ---
> stubs/cmos.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/stubs/cmos.c b/stubs/cmos.c
> index 416cbe4055..3fdbae2c69 100644
> --- a/stubs/cmos.c
> +++ b/stubs/cmos.c
> @@ -1,5 +1,5 @@
> #include "qemu/osdep.h"
> -#include "hw/i386/pc.h"
> +#include "hw/block/fdc.h"
>
> int cmos_get_fd_drive_type(FloppyDriveType fd0)
> {
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH-for-5.2] stubs/cmos: Use correct include
2020-07-24 8:43 [PATCH-for-5.2] stubs/cmos: Use correct include Philippe Mathieu-Daudé
2020-08-03 21:17 ` John Snow
@ 2020-08-22 19:58 ` Philippe Mathieu-Daudé
2020-09-01 7:11 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-22 19:58 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, qemu-block
ping?
On 7/24/20 10:43 AM, Philippe Mathieu-Daudé wrote:
> cmos_get_fd_drive_type() is declared in "hw/block/fdc.h".
> This currently works because "hw/i386/pc.h" happens to
> include it. Simplify including the correct header.
>
> Fixes: 2055dbc1c9 ("acpi: move aml builder code for floppy device")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> stubs/cmos.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/stubs/cmos.c b/stubs/cmos.c
> index 416cbe4055..3fdbae2c69 100644
> --- a/stubs/cmos.c
> +++ b/stubs/cmos.c
> @@ -1,5 +1,5 @@
> #include "qemu/osdep.h"
> -#include "hw/i386/pc.h"
> +#include "hw/block/fdc.h"
>
> int cmos_get_fd_drive_type(FloppyDriveType fd0)
> {
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH-for-5.2] stubs/cmos: Use correct include
2020-07-24 8:43 [PATCH-for-5.2] stubs/cmos: Use correct include Philippe Mathieu-Daudé
2020-08-03 21:17 ` John Snow
2020-08-22 19:58 ` Philippe Mathieu-Daudé
@ 2020-09-01 7:11 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2020-09-01 7:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Paolo Bonzini, qemu-block
Le 24/07/2020 à 10:43, Philippe Mathieu-Daudé a écrit :
> cmos_get_fd_drive_type() is declared in "hw/block/fdc.h".
> This currently works because "hw/i386/pc.h" happens to
> include it. Simplify including the correct header.
>
> Fixes: 2055dbc1c9 ("acpi: move aml builder code for floppy device")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> stubs/cmos.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/stubs/cmos.c b/stubs/cmos.c
> index 416cbe4055..3fdbae2c69 100644
> --- a/stubs/cmos.c
> +++ b/stubs/cmos.c
> @@ -1,5 +1,5 @@
> #include "qemu/osdep.h"
> -#include "hw/i386/pc.h"
> +#include "hw/block/fdc.h"
>
> int cmos_get_fd_drive_type(FloppyDriveType fd0)
> {
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-01 7:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-24 8:43 [PATCH-for-5.2] stubs/cmos: Use correct include Philippe Mathieu-Daudé
2020-08-03 21:17 ` John Snow
2020-08-22 19:58 ` Philippe Mathieu-Daudé
2020-09-01 7:11 ` Laurent Vivier
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).