On Wed, Apr 20, 2022 at 05:25:49PM +0400, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
Could use a commit message explaining why this is a good
idea.
I see it contains QEMU_COPYRIGHT macro, but it also then
contains QEMU_HELP_BOTTOM which is about bug reporting
not copyright.
IMHO something like 'qemu-cli.h' could be a better match
That was Peter's suggestion:
I don't mind qemu-cli.h or elsewhere
Peter?
>
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/{qemu-common.h => qemu/copyright.h} | 0
> bsd-user/main.c | 2 +-
> linux-user/main.c | 2 +-
> qemu-img.c | 2 +-
> qemu-io.c | 2 +-
> qemu-nbd.c | 2 +-
> qga/main.c | 2 +-
> scsi/qemu-pr-helper.c | 2 +-
> softmmu/vl.c | 2 +-
> storage-daemon/qemu-storage-daemon.c | 2 +-
> tools/virtiofsd/passthrough_ll.c | 2 +-
> ui/cocoa.m | 2 +-
> 12 files changed, 11 insertions(+), 11 deletions(-)
> rename include/{qemu-common.h => qemu/copyright.h} (100%)
>
> diff --git a/include/qemu-common.h b/include/qemu/copyright.h
> similarity index 100%
> rename from include/qemu-common.h
> rename to include/qemu/copyright.h
> diff --git a/bsd-user/main.c b/bsd-user/main.c
> index 88d347d05ebf..aaab3f278534 100644
> --- a/bsd-user/main.c
> +++ b/bsd-user/main.c
> @@ -24,7 +24,7 @@
> #include <sys/sysctl.h>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qemu/units.h"
> #include "qemu/accel.h"
> #include "sysemu/tcg.h"
> diff --git a/linux-user/main.c b/linux-user/main.c
> index fbc9bcfd5f5f..744d216b1e8e 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -18,7 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qemu/units.h"
> #include "qemu/accel.h"
> #include "sysemu/tcg.h"
> diff --git a/qemu-img.c b/qemu-img.c
> index 116e05867558..a2b1d3653a1e 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
> #include <getopt.h>
>
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qemu/qemu-progress.h"
> #include "qemu-version.h"
> #include "qapi/error.h"
> diff --git a/qemu-io.c b/qemu-io.c
> index eb8afc8b413b..952a36643b0c 100644
> --- a/qemu-io.c
> +++ b/qemu-io.c
> @@ -15,7 +15,7 @@
> #include <termios.h>
> #endif
>
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qapi/error.h"
> #include "qemu-io.h"
> #include "qemu/error-report.h"
> diff --git a/qemu-nbd.c b/qemu-nbd.c
> index 713e7557a9eb..f4d121c0c40e 100644
> --- a/qemu-nbd.c
> +++ b/qemu-nbd.c
> @@ -21,7 +21,7 @@
> #include <libgen.h>
> #include <pthread.h>
>
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> #include "sysemu/block-backend.h"
> diff --git a/qga/main.c b/qga/main.c
> index ac63d8e47802..8994f73e4735 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -18,7 +18,7 @@
> #include <syslog.h>
> #include <sys/wait.h>
> #endif
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qapi/qmp/json-parser.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qjson.h"
> diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
> index f281daeced8d..e7549ffb3bc9 100644
> --- a/scsi/qemu-pr-helper.c
> +++ b/scsi/qemu-pr-helper.c
> @@ -36,7 +36,7 @@
> #include <mpath_persist.h>
> #endif
>
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> #include "qemu/main-loop.h"
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index 46aba6a039c4..b0bf16e16aaa 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -23,7 +23,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "exec/cpu-common.h"
> diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
> index eb724072579a..a4415e8c995b 100644
> --- a/storage-daemon/qemu-storage-daemon.c
> +++ b/storage-daemon/qemu-storage-daemon.c
> @@ -42,7 +42,7 @@
> #include "qapi/qmp/qstring.h"
> #include "qapi/qobject-input-visitor.h"
>
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qemu-version.h"
> #include "qemu/config-file.h"
> #include "qemu/error-report.h"
> diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
> index 028dacdd8f5a..8af28f5fb823 100644
> --- a/tools/virtiofsd/passthrough_ll.c
> +++ b/tools/virtiofsd/passthrough_ll.c
> @@ -38,7 +38,7 @@
> #include "qemu/osdep.h"
> #include "qemu/timer.h"
> #include "qemu-version.h"
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "fuse_virtio.h"
> #include "fuse_log.h"
> #include "fuse_lowlevel.h"
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index 839ae4f58a69..a2a74656fabf 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -27,7 +27,7 @@
> #import <Cocoa/Cocoa.h>
> #include <crt_externs.h>
>
> -#include "qemu-common.h"
> +#include "qemu/copyright.h"
> #include "qemu-main.h"
> #include "ui/clipboard.h"
> #include "ui/console.h"
> --
> 2.35.1.693.g805e0a68082a
>
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|