mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

softmmu: Use accel_find("xen") instead of xen_available()

Browse Source 
The xen_available() function is used only to produce an error
for some Xen-specific command line options in QEMU binaries where
Xen support was not compiled in: it just returns the value of
the CONFIG_XEN define.

Now that accelerators are QOM classes, we can check for
"does this binary have Xen compiled in" with accel_find("xen"),
and drop the xen_available() function.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210730105947.28215-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-07-30 11:59:40 +01:00
parent fcc6f73369
commit 6773fbf8c0
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sysemu/arch_init.h
View File

@ -30,7 +30,6 @@ enum {
extern const uint32_t arch_type;
int kvm_available(void);
int xen_available(void);
/* default virtio transport per architecture */
#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \

9
softmmu/arch_init.c
View File

@ -96,12 +96,3 @@ int kvm_available(void)
return 0;
#endif
}
int xen_available(void)
{
#ifdef CONFIG_XEN
return 1;
#else
return 0;
#endif
}

6
softmmu/vl.c
View File

@ -3448,21 +3448,21 @@ void qemu_init(int argc, char **argv, char **envp)
has_defaults = 0;
break;
case QEMU_OPTION_xen_domid:
if (!(xen_available())) {
if (!(accel_find("xen"))) {
error_report("Option not supported for this target");
exit(1);
}
xen_domid = atoi(optarg);
break;
case QEMU_OPTION_xen_attach:
if (!(xen_available())) {
if (!(accel_find("xen"))) {
error_report("Option not supported for this target");
exit(1);
}
xen_mode = XEN_ATTACH;
break;
case QEMU_OPTION_xen_domid_restrict:
if (!(xen_available())) {
if (!(accel_find("xen"))) {
error_report("Option not supported for this target");
exit(1);
}