[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/7] hw/xen: Relax dependency on FSDEV_9P
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 2/7] hw/xen: Relax dependency on FSDEV_9P |
Date: |
Mon, 1 Feb 2021 12:29:00 +0100 |
Relax the dependency on 9pfs by using the 'imply' Kconfig rule.
This fixes when XEN_PV without XEN_FV:
/usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function
`xen_be_register_common':
hw/xen/xen-legacy-backend.c:754: undefined reference to `xen_9pfs_ops'
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/xen/xen-legacy-backend.c | 3 ++-
accel/Kconfig | 2 +-
hw/xen/meson.build | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index b61a4855b7b..338d443a5c0 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -33,6 +33,7 @@
#include "hw/xen/xen-legacy-backend.h"
#include "hw/xen/xen_pvdev.h"
#include "monitor/qdev.h"
+#include CONFIG_DEVICES
DeviceState *xen_sysdev;
BusState *xen_sysbus;
@@ -750,7 +751,7 @@ void xen_be_register_common(void)
xen_be_register("console", &xen_console_ops);
xen_be_register("vkbd", &xen_kbdmouse_ops);
-#ifdef CONFIG_VIRTFS
+#ifdef CONFIG_FSDEV_9P
xen_be_register("9pfs", &xen_9pfs_ops);
#endif
#ifdef CONFIG_USB_LIBUSB
diff --git a/accel/Kconfig b/accel/Kconfig
index 461104c7715..7565ccf69e6 100644
--- a/accel/Kconfig
+++ b/accel/Kconfig
@@ -15,4 +15,4 @@ config KVM
config XEN
bool
- select FSDEV_9P if VIRTFS
+ imply FSDEV_9P
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index 076954b89ca..3c2062b9b3e 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -2,12 +2,12 @@
'xen-backend.c',
'xen-bus-helper.c',
'xen-bus.c',
- 'xen-legacy-backend.c',
'xen_devconfig.c',
'xen_pvdev.c',
))
xen_specific_ss = ss.source_set()
+xen_specific_ss.add(files('xen-legacy-backend.c'))
xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files(
'xen-host-pci-device.c',
'xen_pt.c',
--
2.26.2
- [PATCH v3 0/7] hw/xen: Introduce XEN_FV/XEN_PV Kconfig, Philippe Mathieu-Daudé, 2021/02/01
- [PATCH v3 1/7] meson: Do not build Xen x86_64-softmmu on Aarch64, Philippe Mathieu-Daudé, 2021/02/01
- [PATCH v3 2/7] hw/xen: Relax dependency on FSDEV_9P,
Philippe Mathieu-Daudé <=
- [PATCH v3 3/7] accel/xen: Incorporate xen-mapcache.c, Philippe Mathieu-Daudé, 2021/02/01
- [PATCH v3 4/7] hw/i386/xen: Introduce XEN_FV Kconfig, Philippe Mathieu-Daudé, 2021/02/01
- [PATCH v3 5/7] hw/xen: Make xen_shutdown_fatal_error() available out of X86 HVM, Philippe Mathieu-Daudé, 2021/02/01
- [PATCH v3 6/7] hw/xen: Make qmp_xen_set_global_dirty_log() available out of X86 HVM, Philippe Mathieu-Daudé, 2021/02/01
- [PATCH v3 7/7] NOTFORMERGE hw/xen/Kconfig: Introduce XEN_PV config, Philippe Mathieu-Daudé, 2021/02/01