diff mbox

[1/3] fixup! libqemustub: add more stubs for qemu-char

Message ID 1abfc782c70f4daa242128480cf6a594e081a61c.1403243169.git.hutao@cn.fujitsu.com
State New
Headers show

Commit Message

Hu Tao June 20, 2014, 5:55 a.m. UTC
build stub/qemu-chr-open-spice.o only with CONFIG_SPICE, this
suppresses the warning when building without CONFIG_SPICE.

Cc: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
 stubs/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nikolay Nikolaev June 20, 2014, 6:03 a.m. UTC | #1
On Fri, Jun 20, 2014 at 8:55 AM, Hu Tao <hutao@cn.fujitsu.com> wrote:

> build stub/qemu-chr-open-spice.o only with CONFIG_SPICE, this
> suppresses the warning when building without CONFIG_SPICE.
>
> Cc: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
> Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
> ---
>  stubs/Makefile.objs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
> index 2312076..03210ad 100644
> --- a/stubs/Makefile.objs
> +++ b/stubs/Makefile.objs
> @@ -25,7 +25,7 @@ stub-obj-y += mon-set-error.o
>  stub-obj-y += monitor-init.o
>  stub-obj-y += notify-event.o
>  stub-obj-y += pci-drive-hot-add.o
> -stub-obj-y += qemu-chr-open-spice.o
> +stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o
>  stub-obj-y += qtest.o
>  stub-obj-y += reset.o
>  stub-obj-y += runstate-check.o
> --
> 1.9.3
>
>
I've already send one, based on Andrew Jones proposal:
http://patchwork.ozlabs.org/patch/361926/

But probably this one is better. I'm OK with it.

regards,
Nikolay Nikolaev
Hu Tao June 20, 2014, 6:17 a.m. UTC | #2
On Fri, Jun 20, 2014 at 09:03:59AM +0300, Nikolay Nikolaev wrote:
> 
> 
> 
> On Fri, Jun 20, 2014 at 8:55 AM, Hu Tao <hutao@cn.fujitsu.com> wrote:
> 
>     build stub/qemu-chr-open-spice.o only with CONFIG_SPICE, this
>     suppresses the warning when building without CONFIG_SPICE.
> 
>     Cc: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
>     Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
>     ---
>      stubs/Makefile.objs | 2 +-
>      1 file changed, 1 insertion(+), 1 deletion(-)
> 
>     diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
>     index 2312076..03210ad 100644
>     --- a/stubs/Makefile.objs
>     +++ b/stubs/Makefile.objs
>     @@ -25,7 +25,7 @@ stub-obj-y += mon-set-error.o
>      stub-obj-y += monitor-init.o
>      stub-obj-y += notify-event.o
>      stub-obj-y += pci-drive-hot-add.o
>     -stub-obj-y += qemu-chr-open-spice.o
>     +stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o
>      stub-obj-y += qtest.o
>      stub-obj-y += reset.o
>      stub-obj-y += runstate-check.o
>     --
>     1.9.3
> 
> 
> 
> I've already send one, based on Andrew Jones proposal:
> http://patchwork.ozlabs.org/patch/361926/
> 
> But probably this one is better. I'm OK with it.

Didn't see that one. But we need the version check in the stub also,
because in include/ui/qemu-spice.h function qemu_chr_open_spice_port()
is defined if version < 0x000c02, or we can remove the one in
qemu-spice.h.

Regards,
Hu
Peter Maydell June 20, 2014, 8:26 a.m. UTC | #3
On 20 June 2014 06:55, Hu Tao <hutao@cn.fujitsu.com> wrote:
> build stub/qemu-chr-open-spice.o only with CONFIG_SPICE, this
> suppresses the warning when building without CONFIG_SPICE.

I notice there's been a bunch of these "!fixup" patches on
list recently. Do you think you could add something in the
subject that says which patch queue/maintainer tree they
are fixup patches for, so that I know whether I can ignore them
or not?

thanks
-- PMM
Hu Tao June 20, 2014, 8:29 a.m. UTC | #4
On Fri, Jun 20, 2014 at 09:26:32AM +0100, Peter Maydell wrote:
> On 20 June 2014 06:55, Hu Tao <hutao@cn.fujitsu.com> wrote:
> > build stub/qemu-chr-open-spice.o only with CONFIG_SPICE, this
> > suppresses the warning when building without CONFIG_SPICE.
> 
> I notice there's been a bunch of these "!fixup" patches on
> list recently. Do you think you could add something in the
> subject that says which patch queue/maintainer tree they
> are fixup patches for, so that I know whether I can ignore them
> or not?
> 
> thanks
> -- PMM

Sorry if this brings any nosices. the fixups are for MST's pci tree, see
coverletter.

Regards,
Hu Tao
diff mbox

Patch

diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 2312076..03210ad 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -25,7 +25,7 @@  stub-obj-y += mon-set-error.o
 stub-obj-y += monitor-init.o
 stub-obj-y += notify-event.o
 stub-obj-y += pci-drive-hot-add.o
-stub-obj-y += qemu-chr-open-spice.o
+stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o
 stub-obj-y += qtest.o
 stub-obj-y += reset.o
 stub-obj-y += runstate-check.o