Patchwork [2/3] Compile vl.c once

login
register
mail settings
Submitter Blue Swirl
Date April 15, 2010, 7:08 p.m.
Message ID <s2vf43fc5581004151208wa574fd65v288aa0beb9c90ad5@mail.gmail.com>
Download mbox | patch
Permalink /patch/50283/
State New
Headers show

Comments

Blue Swirl - April 15, 2010, 7:08 p.m.
Since kvm.h can be used in files compiled once,
we can partially revert
b33612d03540fda7fa67485f1c20395beb7a2bf0.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 Makefile.objs   |    2 +-
 Makefile.target |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
TeLeMan - May 4, 2010, 6:31 a.m.
This patch breaks cpu list("-cpu ?").

--
SUN OF A BEACH



On Fri, Apr 16, 2010 at 03:08, Blue Swirl <blauwirbel@gmail.com> wrote:
> Since kvm.h can be used in files compiled once,
> we can partially revert
> b33612d03540fda7fa67485f1c20395beb7a2bf0.
>
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
> ---
>  Makefile.objs   |    2 +-
>  Makefile.target |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index ab1af88..c0fe5e2 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -128,7 +128,7 @@ user-obj-y += cutils.o cache-utils.o
>  # libhw
>
>  hw-obj-y =
> -hw-obj-y += loader.o
> +hw-obj-y += vl.o loader.o
>  hw-obj-y += virtio.o virtio-console.o
>  hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
>  hw-obj-y += watchdog.o
> diff --git a/Makefile.target b/Makefile.target
> index 34ceed6..3bd4b86 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -162,7 +162,7 @@ endif #CONFIG_BSD_USER
>  # System emulator target
>  ifdef CONFIG_SOFTMMU
>
> -obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o
> +obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o
>  # virtio has to be here due to weird dependency between PCI and virtio-net.
>  # need to fix this properly
>  obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
> --
> 1.6.2.4
>
>
>
Blue Swirl - May 4, 2010, 7:57 p.m.
On 5/4/10, TeLeMan <geleman@gmail.com> wrote:
> This patch breaks cpu list("-cpu ?").

Thanks for reporting. Fixed in HEAD.

Patch

diff --git a/Makefile.objs b/Makefile.objs
index ab1af88..c0fe5e2 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -128,7 +128,7 @@  user-obj-y += cutils.o cache-utils.o
 # libhw

 hw-obj-y =
-hw-obj-y += loader.o
+hw-obj-y += vl.o loader.o
 hw-obj-y += virtio.o virtio-console.o
 hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
 hw-obj-y += watchdog.o
diff --git a/Makefile.target b/Makefile.target
index 34ceed6..3bd4b86 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -162,7 +162,7 @@  endif #CONFIG_BSD_USER
 # System emulator target
 ifdef CONFIG_SOFTMMU

-obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o
+obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o