From 72945e5a5b96c970fa08557eeed1e2e031c46413 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 22 Mar 2023 20:15:11 -0300 Subject: [PATCH] package/qemu: allow building only the guest agent Most of the tools are useful only on virtualization hosts. After the upgrade to QEMU 7.2.0, it is possible to build only quemu-ga, which makes more sense when we build guest VM images. Also do not build the other tools by default if none of the emulators is selected, since the user does not necessarily wants them. Ideally, it should not be possible to select qemu without selecting at least one of the subcomponents but it is hard to guess what the user wants. Signed-off-by: Carlos Santos Signed-off-by: Yann E. MORIN --- package/qemu/Config.in | 8 +++++++- package/qemu/qemu.mk | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 235fdb9ce6..91a1b288c6 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -26,7 +26,6 @@ menuconfig BR2_PACKAGE_QEMU depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_QEMU_TOOLS if !BR2_PACKAGE_QEMU_SYSTEM && !BR2_PACKAGE_QEMU_LINUX_USER help QEMU is a generic and open source machine emulator and virtualizer. @@ -358,4 +357,11 @@ config BR2_PACKAGE_QEMU_TOOLS Say 'y' here to include tools packaged with QEMU (e.g. qemu-img). +config BR2_PACKAGE_QEMU_GUEST_AGENT + bool "Enable guest agent" + help + Say 'y' here to include an agent to run on guests, which + communicates with the host over a virtio-serial channel + named "org.qemu.guest_agent.0". + endif # BR2_PACKAGE_QEMU diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index e8a5388596..6a6905d75f 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -165,6 +165,12 @@ else QEMU_OPTS += --disable-tools endif +ifeq ($(BR2_PACKAGE_QEMU_GUEST_AGENT),y) +QEMU_OPTS += --enable-guest-agent +else +QEMU_OPTS += --disable-guest-agent +endif + ifeq ($(BR2_PACKAGE_LIBFUSE3),y) QEMU_OPTS += --enable-fuse --enable-fuse-lseek QEMU_DEPENDENCIES += libfuse3