[RFC,4/7] kvm: Include kvm-stub.o only on CONFIG_SOFTMMU

Commit Message

Eduardo Habkost Dec. 20, 2016, 5:43 p.m. UTC

Now the stubs required by *-user are inside stubs/kvm.c, so
kvm-stub.c is needed only by CONFIG_SOFTMMU.

Cc: Paolo Bonzini <[e-mail]>
Cc: [e-mail]
Signed-off-by: Eduardo Habkost <[e-mail]>
---
 Makefile.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Huth Dec. 21, 2016, 7:27 a.m. UTC | #1

On 20.12.2016 18:43, Eduardo Habkost wrote:
> Now the stubs required by *-user are inside stubs/kvm.c, so
> kvm-stub.c is needed only by CONFIG_SOFTMMU.
> 
> Cc: Paolo Bonzini <[e-mail]>
> Cc: [e-mail]
> Signed-off-by: Eduardo Habkost <[e-mail]>
> ---
>  Makefile.target | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.target b/Makefile.target
> index 0b2ad86..5e78bb0 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -96,7 +96,6 @@ obj-y += target-$(TARGET_BASE_ARCH)/
>  obj-y += disas.o
>  obj-y += tcg-runtime.o
>  obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
> -obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
>  
>  obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o
>  obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o
> @@ -138,6 +137,7 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
>  obj-y += qtest.o bootdevice.o
>  obj-y += hw/
>  obj-$(CONFIG_KVM) += kvm-all.o
> +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
>  obj-y += memory.o cputlb.o
>  obj-y += memory_mapping.o
>  obj-y += dump.o

<bikeshedding>
IMHO you could also squash this change into the next patch (and just
mention it in the commit description).
</bikeshedding>

 Thomas

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

David Hildenbrand Dec. 21, 2016, 8:44 a.m. UTC | #2

>>  obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o
>>  obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o
>> @@ -138,6 +137,7 @@ obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
>>  obj-y += qtest.o bootdevice.o
>>  obj-y += hw/
>>  obj-$(CONFIG_KVM) += kvm-all.o
>> +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
>>  obj-y += memory.o cputlb.o
>>  obj-y += memory_mapping.o
>>  obj-y += dump.o
>
> <bikeshedding>
> IMHO you could also squash this change into the next patch (and just
> mention it in the commit description).
> </bikeshedding>

+1

Patch

diff --git a/Makefile.target b/Makefile.target
index 0b2ad86..5e78bb0 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -96,7 +96,6 @@  obj-y += target-$(TARGET_BASE_ARCH)/
 obj-y += disas.o
 obj-y += tcg-runtime.o
 obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
-obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 
 obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o
 obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decNumber.o
@@ -138,6 +137,7 @@  obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
 obj-y += qtest.o bootdevice.o
 obj-y += hw/
 obj-$(CONFIG_KVM) += kvm-all.o
+obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 obj-y += memory.o cputlb.o
 obj-y += memory_mapping.o
 obj-y += dump.o