Use QEMU_CAPS_MACHINE_OPT and QEMU_CAPS_MACHINE_VMPORT_OPT since it specifies <vmport state=off/>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvtest.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args index 96d2ae592..c7dd514fe 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-x86_64 \ -name virt-manager-basic \ -S \ --M pc-q35-2.7 \ +-machine pc-q35-2.7,accel=kvm,vmport=off \ -m 4096 \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 308d71f72..5cbe90a44 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2341,6 +2341,8 @@ mymain(void) DO_TEST("q35-virt-manager-basic", QEMU_CAPS_KVM, QEMU_CAPS_RTC, + QEMU_CAPS_MACHINE_OPT, + QEMU_CAPS_MACHINE_VMPORT_OPT, QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, -- 2.16.1

Remove the qmpOnly attribute of virQEMUCapsNewForBinaryInternal and instead always assume it's true. This effectively sets the minimum QEMU version to 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- cfg.mk | 2 +- src/qemu/qemu_capabilities.c | 866 +----------------------------- src/qemu/qemu_capspriv.h | 17 +- tests/Makefile.am | 8 +- tests/qemucapsprobe.c | 2 +- tests/qemuhelpdata/qemu-0.12.1 | 198 ------- tests/qemuhelpdata/qemu-0.12.1-device | 62 --- tests/qemuhelpdata/qemu-1.0 | 253 --------- tests/qemuhelpdata/qemu-1.0-device | 148 ----- tests/qemuhelpdata/qemu-1.1.0 | 269 ---------- tests/qemuhelpdata/qemu-1.1.0-device | 170 ------ tests/qemuhelpdata/qemu-1.2.0 | 272 ---------- tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 -------- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 --- tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 --------- tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 ---- tests/qemuhelpdata/qemu-kvm-1.2.0 | 277 ---------- tests/qemuhelptest.c | 437 --------------- 18 files changed, 8 insertions(+), 3583 deletions(-) delete mode 100644 tests/qemuhelpdata/qemu-0.12.1 delete mode 100644 tests/qemuhelpdata/qemu-0.12.1-device delete mode 100644 tests/qemuhelpdata/qemu-1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.2.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0 delete mode 100644 tests/qemuhelptest.c diff --git a/cfg.mk b/cfg.mk index 4aa26d434..980f34bb7 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1225,7 +1225,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \ ^(examples/|tools/virsh-edit\.c$$) exclude_file_name_regexp--sc_trailing_blank = \ - /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*diff$$ + /sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*diff$$ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test|docs/js/.*\.js)$$ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e54dde69a..031c1734e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -624,28 +624,6 @@ virQEMUCapsFindTarget(virArch hostarch, return guestarch; } -static virCommandPtr -virQEMUCapsProbeCommand(const char *qemu, - virQEMUCapsPtr qemuCaps, - uid_t runUid, gid_t runGid) -{ - virCommandPtr cmd = virCommandNew(qemu); - - if (qemuCaps) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG)) - virCommandAddArg(cmd, "-no-user-config"); - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NODEFCONFIG)) - virCommandAddArg(cmd, "-nodefconfig"); - } - - virCommandAddEnvPassCommon(cmd); - virCommandClearCaps(cmd); - virCommandSetGID(cmd, runGid); - virCommandSetUID(cmd, runUid); - - return cmd; -} - static void virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, @@ -660,282 +638,6 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, qemuCaps->machineTypes[0] = tmp; } -/* Format is: - * <machine> <desc> [(default)|(alias of <canonical>)] - */ -static int -virQEMUCapsParseMachineTypesStr(const char *output, - virQEMUCapsPtr qemuCaps) -{ - const char *p = output; - const char *next; - size_t defIdx = 0; - - do { - const char *t; - char *name; - char *canonical = NULL; - - if ((next = strchr(p, '\n'))) - ++next; - - if (STRPREFIX(p, "Supported machines are:")) - continue; - - if (!(t = strchr(p, ' ')) || (next && t >= next)) - continue; - - if (VIR_STRNDUP(name, p, t - p) < 0) - return -1; - - p = t; - if ((t = strstr(p, "(default)")) && (!next || t < next)) - defIdx = qemuCaps->nmachineTypes; - - if ((t = strstr(p, "(alias of ")) && (!next || t < next)) { - p = t + strlen("(alias of "); - if (!(t = strchr(p, ')')) || (next && t >= next)) { - VIR_FREE(name); - continue; - } - - if (VIR_STRNDUP(canonical, p, t - p) < 0) { - VIR_FREE(name); - return -1; - } - } - - if (VIR_REALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes + 1) < 0) { - VIR_FREE(name); - VIR_FREE(canonical); - return -1; - } - qemuCaps->nmachineTypes++; - if (canonical) { - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].name = canonical; - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].alias = name; - } else { - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].name = name; - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].alias = NULL; - } - /* When parsing from command line we don't have information about maxCpus */ - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].maxCpus = 0; - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].hotplugCpus = false; - } while ((p = next)); - - - if (defIdx) - virQEMUCapsSetDefaultMachine(qemuCaps, defIdx); - - return 0; -} - -static int -virQEMUCapsProbeMachineTypes(virQEMUCapsPtr qemuCaps, - uid_t runUid, gid_t runGid) -{ - char *output; - int ret = -1; - virCommandPtr cmd; - int status; - - /* Make sure the binary we are about to try exec'ing exists. - * Technically we could catch the exec() failure, but that's - * in a sub-process so it's hard to feed back a useful error. - */ - if (!virFileIsExecutable(qemuCaps->binary)) { - virReportSystemError(errno, _("Cannot find QEMU binary %s"), - qemuCaps->binary); - return -1; - } - - cmd = virQEMUCapsProbeCommand(qemuCaps->binary, qemuCaps, runUid, runGid); - virCommandAddArgList(cmd, "-M", "?", NULL); - virCommandSetOutputBuffer(cmd, &output); - - /* Ignore failure from older qemu that did not understand '-M ?'. */ - if (virCommandRun(cmd, &status) < 0) - goto cleanup; - - if (virQEMUCapsParseMachineTypesStr(output, qemuCaps) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - - return ret; -} - - -typedef int -(*virQEMUCapsParseCPUModels)(const char *output, - virQEMUCapsPtr qemuCaps); - -/* Format: - * <arch> <model> - * qemu-0.13 encloses some model names in []: - * <arch> [<model>] - */ -static int -virQEMUCapsParseX86Models(const char *output, - virQEMUCapsPtr qemuCaps) -{ - const char *p = output; - const char *next; - virDomainCapsCPUModelsPtr cpus; - - if (!(cpus = virDomainCapsCPUModelsNew(0))) - return -1; - - do { - const char *t; - size_t len; - - if ((next = strchr(p, '\n'))) - next++; - - if (!(t = strchr(p, ' ')) || (next && t >= next)) - continue; - - if (!STRPREFIX(p, "x86")) - continue; - - p = t; - while (*p == ' ') - p++; - - if (*p == '\0' || *p == '\n') - continue; - - if (next) - len = next - p - 1; - else - len = strlen(p); - - if (len > 2 && *p == '[' && p[len - 1] == ']') { - p++; - len -= 2; - } - - if (virDomainCapsCPUModelsAdd(cpus, p, len, - VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0) - goto error; - } while ((p = next)); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { - virDomainCapsCPUModelsPtr kvmCPUs; - - if (!(kvmCPUs = virDomainCapsCPUModelsCopy(cpus))) - goto error; - - qemuCaps->kvmCPUModels = kvmCPUs; - } - qemuCaps->tcgCPUModels = cpus; - - return 0; - - error: - virObjectUnref(cpus); - return -1; -} - -/* ppc64 parser. - * Format : PowerPC <machine> <description> - */ -static int -virQEMUCapsParsePPCModels(const char *output, - virQEMUCapsPtr qemuCaps) -{ - const char *p = output; - const char *next; - virDomainCapsCPUModelsPtr cpus; - - if (!(cpus = virDomainCapsCPUModelsNew(0))) - return -1; - - do { - const char *t; - - if ((next = strchr(p, '\n'))) - next++; - - if (!STRPREFIX(p, "PowerPC ")) - continue; - - /* Skip the preceding sub-string "PowerPC " */ - p += 8; - - /*Malformed string, does not obey the format 'PowerPC <model> <desc>'*/ - if (!(t = strchr(p, ' ')) || (next && t >= next)) - continue; - - if (*p == '\0') - break; - - if (*p == '\n') - continue; - - if (virDomainCapsCPUModelsAdd(cpus, p, t - p - 1, - VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL) < 0) - goto error; - } while ((p = next)); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { - virDomainCapsCPUModelsPtr kvmCPUs; - - if (!(kvmCPUs = virDomainCapsCPUModelsCopy(cpus))) - goto error; - - qemuCaps->kvmCPUModels = kvmCPUs; - } - qemuCaps->tcgCPUModels = cpus; - - return 0; - - error: - virObjectUnref(cpus); - return -1; -} - -static int -virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) -{ - char *output = NULL; - int ret = -1; - virQEMUCapsParseCPUModels parse; - virCommandPtr cmd; - - if (ARCH_IS_X86(qemuCaps->arch)) { - parse = virQEMUCapsParseX86Models; - } else if (ARCH_IS_PPC64(qemuCaps->arch)) { - parse = virQEMUCapsParsePPCModels; - } else { - VIR_DEBUG("don't know how to parse %s CPU models", - virArchToString(qemuCaps->arch)); - return 0; - } - - cmd = virQEMUCapsProbeCommand(qemuCaps->binary, qemuCaps, runUid, runGid); - virCommandAddArgList(cmd, "-cpu", "?", NULL); - virCommandSetOutputBuffer(cmd, &output); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - if (parse(output, qemuCaps) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - - return ret; -} static char * virQEMUCapsFindBinary(const char *format, @@ -1254,312 +956,6 @@ virQEMUCapsInit(virFileCachePtr cache) } -static int -virQEMUCapsComputeCmdFlags(const char *help, - unsigned int version, - virQEMUCapsPtr qemuCaps, - bool check_yajl ATTRIBUTE_UNUSED) -{ - const char *p; - const char *fsdev, *netdev; - const char *cache; - - if (strstr(help, "-no-kvm")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); - if (strstr(help, "-enable-kvm")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); - if (strstr(help, ",process=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); - - cache = strstr(help, "cache="); - if (cache && (p = strchr(cache, ']'))) { - if (memmem(cache, p - cache, "directsync", sizeof("directsync") - 1)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); - if (memmem(cache, p - cache, "unsafe", sizeof("unsafe") - 1)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); - } - if (strstr(help, "aio=threads|native")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO); - if (strstr(help, "copy-on-read=on|off")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); - if (strstr(help, "bps=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); - - if (strstr(help, "-display")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY); - if ((p = strstr(help, "-vga")) && !strstr(help, "-std-vga")) { - const char *nl = strstr(p, "\n"); - if ((p = strstr(p, "|none")) && p < nl) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE); - } - if (strstr(help, "-spice")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SPICE); - if (strstr(help, "-vnc")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC); - if (strstr(help, "seamless-migration=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION); - if (strstr(help, "boot=on")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_BOOT); - if (strstr(help, "serial=s")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); - if (strstr(help, "host=[seg:]bus")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); - if (strstr(help, "-mem-path")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH); - if (strstr(help, "-chardev spicevmc")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); - if (strstr(help, "-chardev spiceport")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT); - if (strstr(help, "-nodefconfig")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG); - if (strstr(help, "-no-user-config")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG); - /* The trailing ' ' is important to avoid a bogus match */ - if (strstr(help, "-rtc ")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); - /* to wit */ - if (strstr(help, "-rtc-td-hack")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC_TD_HACK); - if (strstr(help, "-no-hpet")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); - if (strstr(help, "-no-acpi")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); - if (strstr(help, "-no-kvm-pit-reinjection")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); - if (strstr(help, "-tdf")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_TDF); - if (strstr(help, "-enable-nesting")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NESTING); - if (strstr(help, ",menu=on")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU); - if (strstr(help, ",reboot-timeout=rb_time")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_REBOOT_TIMEOUT); - if (strstr(help, ",splash-time=sp_time")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SPLASH_TIMEOUT); - if ((fsdev = strstr(help, "-fsdev"))) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV); - if (strstr(fsdev, "readonly")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY); - if (strstr(fsdev, "writeout")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT); - } - if (strstr(help, "-smbios type")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE); - if (strstr(help, "-sandbox")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); - - if ((netdev = strstr(help, "-netdev"))) { - /* Disable -netdev on 0.12 since although it exists, - * the corresponding netdev_add/remove monitor commands - * do not, and we need them to be able to do hotplug. */ - if (version >= 13000) { - if (strstr(netdev, "bridge")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); - } - } - - if (strstr(help, "-sdl")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); - - if (strstr(help, ",vhost=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); - - /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling - * is most likely buggy when used with -no-shutdown (which applies for qemu - * 0.14.* and 0.15.0) - */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN); - - if (strstr(help, "dump-guest-core=on|off")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); - - if (strstr(help, "-dtb")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); - - if (strstr(help, "-machine")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); - - /* While JSON mode was available in 0.12.0, it was too - * incomplete to contemplate using. The 0.13.0 release - * is good enough to use, even though it lacks one or - * two features. */ -#if WITH_YAJL - if (version >= 13000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); -#else - /* Starting with qemu 0.15 and newer, upstream qemu no longer - * promises to keep the human interface stable, but requests that - * we use QMP (the JSON interface) for everything. If the user - * forgot to include YAJL libraries when building their own - * libvirt but is targeting a newer qemu, we are better off - * telling them to recompile (the spec file includes the - * dependency, so distros won't hit this). This check is - * also in m4/virt-yajl.m4 (see $with_yajl). */ - if (version >= 15000) { - if (check_yajl) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this qemu binary requires libvirt to be " - "compiled with yajl")); - return -1; - } - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); - } -#endif - - if (version >= 13000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION); - - if (version >= 1001000) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); - } - - return 0; -} - -/* We parse the output of 'qemu -help' to get the QEMU - * version number. The first bit is easy, just parse - * 'QEMU PC emulator version x.y.z' - * or - * 'QEMU emulator version x.y.z'. - * - * With qemu-kvm, however, that is followed by a string - * in parenthesis as follows: - * - qemu-kvm-x.y.z in stable releases - * - kvm-XX for kvm versions up to kvm-85 - * - qemu-kvm-devel-XX for kvm version kvm-86 and later - * - * For qemu-kvm versions before 0.10.z, we need to detect - * the KVM version number for some features. With 0.10.z - * and later, we just need the QEMU version number and - * whether it is KVM QEMU or mainline QEMU. - */ -#define QEMU_VERSION_STR_1 "QEMU emulator version" -#define QEMU_VERSION_STR_2 "QEMU PC emulator version" -#define QEMU_KVM_VER_PREFIX "(qemu-kvm-" -#define KVM_VER_PREFIX "(kvm-" - -#define SKIP_BLANKS(p) do { while ((*(p) == ' ') || (*(p) == '\t')) (p)++; } while (0) - -int virQEMUCapsParseHelpStr(const char *qemu, - const char *help, - virQEMUCapsPtr qemuCaps, - unsigned int *version, - bool *is_kvm, - unsigned int *kvm_version, - bool check_yajl, - const char *qmperr) -{ - unsigned major, minor, micro; - const char *p = help; - char *strflags; - - *version = *kvm_version = 0; - *is_kvm = false; - - if (STRPREFIX(p, QEMU_VERSION_STR_1)) - p += strlen(QEMU_VERSION_STR_1); - else if (STRPREFIX(p, QEMU_VERSION_STR_2)) - p += strlen(QEMU_VERSION_STR_2); - else - goto fail; - - SKIP_BLANKS(p); - - major = virParseNumber(&p); - if (major == -1 || *p != '.') - goto fail; - - ++p; - - minor = virParseNumber(&p); - if (minor == -1) - goto fail; - - if (*p != '.') { - micro = 0; - } else { - ++p; - micro = virParseNumber(&p); - if (micro == -1) - goto fail; - } - - SKIP_BLANKS(p); - - if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) { - *is_kvm = true; - p += strlen(QEMU_KVM_VER_PREFIX); - } else if (STRPREFIX(p, KVM_VER_PREFIX)) { - int ret; - - *is_kvm = true; - p += strlen(KVM_VER_PREFIX); - - ret = virParseNumber(&p); - if (ret == -1) - goto fail; - - *kvm_version = ret; - } - - *version = (major * 1000 * 1000) + (minor * 1000) + micro; - - if (*version < 12000) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("QEMU version >= 0.12.00 is required, but %d.%d.%d found"), - major, minor, micro); - goto cleanup; - } - - /* Refuse to parse -help output for QEMU releases >= 1.2.0 that should be - * using QMP probing. - */ - if (*version >= 1002000) { - if (qmperr && *qmperr) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("QEMU / QMP failed: %s"), - qmperr); - } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("QEMU %u.%u.%u is too new for help parsing"), - major, minor, micro); - } - goto cleanup; - } - - if (virQEMUCapsComputeCmdFlags(help, *version, - qemuCaps, check_yajl) < 0) - goto cleanup; - - strflags = virBitmapToString(qemuCaps->flags, true, false); - VIR_DEBUG("Version %u.%u.%u, cooked version %u, flags %s", - major, minor, micro, *version, NULLSTR(strflags)); - VIR_FREE(strflags); - - if (*kvm_version) - VIR_DEBUG("KVM version %d detected", *kvm_version); - else if (*is_kvm) - VIR_DEBUG("qemu-kvm version %u.%u.%u detected", major, minor, micro); - - return 0; - - fail: - p = strchr(help, '\n'); - if (!p) - p = strchr(help, '\0'); - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse %s version number in '%.*s'"), - qemu, (int) (p - help), help); - - cleanup: - return -1; -} - - struct virQEMUCapsStringFlags { const char *value; int flag; @@ -1986,184 +1382,6 @@ virQEMUCapsProcessStringFlags(virQEMUCapsPtr qemuCaps, } -#define OBJECT_TYPE_PREFIX "name \"" - -static int -virQEMUCapsParseDeviceStrObjectTypes(const char *str, - char ***types) -{ - const char *tmp = str; - int ret = -1; - size_t ntypelist = 0; - char **typelist = NULL; - - *types = NULL; - - while ((tmp = strstr(tmp, OBJECT_TYPE_PREFIX))) { - char *end; - tmp += strlen(OBJECT_TYPE_PREFIX); - end = strstr(tmp, "\""); - if (!end) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed QEMU device list string, missing quote")); - goto cleanup; - } - - if (VIR_EXPAND_N(typelist, ntypelist, 1) < 0) - goto cleanup; - if (VIR_STRNDUP(typelist[ntypelist - 1], tmp, end-tmp) < 0) - goto cleanup; - } - - *types = typelist; - ret = ntypelist; - - cleanup: - if (ret < 0) - virStringListFreeCount(typelist, ntypelist); - return ret; -} - - -static int -virQEMUCapsParseDeviceStrObjectProps(const char *str, - const char *type, - char ***props) -{ - const char *tmp = str; - int ret = -1; - size_t nproplist = 0; - char **proplist = NULL; - - VIR_DEBUG("Extract type %s", type); - *props = NULL; - - while ((tmp = strchr(tmp, '\n'))) { - char *end; - tmp += 1; - - if (*tmp == '\0') - break; - - if (STRPREFIX(tmp, OBJECT_TYPE_PREFIX)) - continue; - - if (!STRPREFIX(tmp, type)) - continue; - - tmp += strlen(type); - if (*tmp != '.') - continue; - tmp++; - - end = strstr(tmp, "="); - if (!end) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed QEMU device list string, missing '='")); - goto cleanup; - } - if (VIR_EXPAND_N(proplist, nproplist, 1) < 0) - goto cleanup; - if (VIR_STRNDUP(proplist[nproplist - 1], tmp, end-tmp) < 0) - goto cleanup; - } - - *props = proplist; - ret = nproplist; - - cleanup: - if (ret < 0) - virStringListFreeCount(proplist, nproplist); - return ret; -} - - -int -virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str) -{ - int nvalues; - char **values; - size_t i; - - if ((nvalues = virQEMUCapsParseDeviceStrObjectTypes(str, &values)) < 0) - return -1; - virQEMUCapsProcessStringFlags(qemuCaps, - ARRAY_CARDINALITY(virQEMUCapsObjectTypes), - virQEMUCapsObjectTypes, - nvalues, values); - virStringListFreeCount(values, nvalues); - - for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { - const char *type = virQEMUCapsObjectProps[i].type; - if ((nvalues = virQEMUCapsParseDeviceStrObjectProps(str, - type, - &values)) < 0) - return -1; - virQEMUCapsProcessStringFlags(qemuCaps, - virQEMUCapsObjectProps[i].nprops, - virQEMUCapsObjectProps[i].props, - nvalues, values); - virStringListFreeCount(values, nvalues); - } - - /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC)) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC); - - return 0; -} - - -static int -virQEMUCapsExtractDeviceStr(const char *qemu, - virQEMUCapsPtr qemuCaps, - uid_t runUid, gid_t runGid) -{ - char *output = NULL; - virCommandPtr cmd; - int ret = -1; - - /* Cram together all device-related queries into one invocation; - * the output format makes it possible to distinguish what we - * need. With qemu 0.13.0 and later, unrecognized '-device - * bogus,?' cause an error in isolation, but are silently ignored - * in combination with '-device ?'. Upstream qemu 0.12.x doesn't - * understand '-device name,?', and always exits with status 1 for - * the simpler '-device ?', so this function is really only useful - * if -help includes "device driver,?". */ - cmd = virQEMUCapsProbeCommand(qemu, qemuCaps, runUid, runGid); - virCommandAddArgList(cmd, - "-device", "?", - "-device", "pci-assign,?", - "-device", "virtio-blk-pci,?", - "-device", "virtio-net-pci,?", - "-device", "scsi-disk,?", - "-device", "PIIX4_PM,?", - "-device", "usb-redir,?", - "-device", "ide-drive,?", - "-device", "usb-host,?", - "-device", "scsi-generic,?", - "-device", "usb-storage,?", - "-device", "VGA,?", - "-device", "vmware-svga,?", - "-device", "qxl,?", - "-device", "qxl-vga,?", - NULL); - /* qemu -help goes to stdout, but qemu -device ? goes to stderr. */ - virCommandSetErrorBuffer(cmd, &output); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - ret = virQEMUCapsParseDeviceStr(qemuCaps, output); - - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - return ret; -} - - int virQEMUCapsGetDefaultVersion(virCapsPtr caps, virFileCachePtr capsCache, unsigned int *version) @@ -4398,76 +3616,6 @@ virQEMUCapsIsValid(void *data, } -#define QEMU_SYSTEM_PREFIX "qemu-system-" - -static int -virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const char *qmperr) -{ - virCommandPtr cmd = NULL; - bool is_kvm; - char *help = NULL; - int ret = -1; - const char *tmp; - - VIR_DEBUG("qemuCaps=%p", qemuCaps); - - tmp = strstr(qemuCaps->binary, QEMU_SYSTEM_PREFIX); - if (tmp) { - tmp += strlen(QEMU_SYSTEM_PREFIX); - - qemuCaps->arch = virQEMUCapsArchFromString(tmp); - } else { - qemuCaps->arch = virArchFromHost(); - } - - cmd = virQEMUCapsProbeCommand(qemuCaps->binary, NULL, runUid, runGid); - virCommandAddArgList(cmd, "-help", NULL); - virCommandSetOutputBuffer(cmd, &help); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - if (virQEMUCapsParseHelpStr(qemuCaps->binary, - help, qemuCaps, - &qemuCaps->version, - &is_kvm, - &qemuCaps->kvmVersion, - false, - qmperr) < 0) - goto cleanup; - - /* Older QEMU versions reported -no-acpi in the output of -help even - * though it was not supported by the architecture. The issue has since - * been fixed, but to maintain compatibility with all release we still - * need to filter out the capability for architectures that we know - * don't support the feature, eg. anything but x86 and aarch64 */ - if (!ARCH_IS_X86(qemuCaps->arch) && - qemuCaps->arch != VIR_ARCH_AARCH64) { - virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); - } - - /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu - * understands the 0.13.0+ notion of "-device driver,". */ - if (strstr(help, "-device driver,?") && - virQEMUCapsExtractDeviceStr(qemuCaps->binary, - qemuCaps, runUid, runGid) < 0) { - goto cleanup; - } - - if (virQEMUCapsProbeCPUModels(qemuCaps, runUid, runGid) < 0) - goto cleanup; - - if (virQEMUCapsProbeMachineTypes(qemuCaps, runUid, runGid) < 0) - goto cleanup; - - ret = 0; - cleanup: - virCommandFree(cmd); - VIR_FREE(help); - return ret; -} - - static void virQEMUCapsMonitorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) @@ -5075,8 +4223,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, uid_t runUid, gid_t runGid, unsigned int microcodeVersion, - const char *kernelVersion, - bool qmpOnly) + const char *kernelVersion) { virQEMUCapsPtr qemuCaps; struct stat sb; @@ -5112,7 +4259,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, goto error; } - if (qmpOnly && !qemuCaps->usedQMP) { + if (!qemuCaps->usedQMP) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to probe QEMU binary with QMP: %s"), qmperr ? qmperr : _("unknown error")); @@ -5120,12 +4267,6 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, goto error; } - if (!qemuCaps->usedQMP && - virQEMUCapsInitHelp(qemuCaps, runUid, runGid, qmperr) < 0) { - virQEMUCapsLogProbeFailure(binary); - goto error; - } - qemuCaps->libvirtCtime = virGetSelfLastChanged(); qemuCaps->libvirtVersion = LIBVIR_VERSION_NUMBER; @@ -5161,8 +4302,7 @@ virQEMUCapsNewData(const char *binary, priv->runUid, priv->runGid, priv->microcodeVersion, - priv->kernelVersion, - false); + priv->kernelVersion); } diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 222f3368e..0199501c9 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -37,8 +37,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, uid_t runUid, gid_t runGid, unsigned int microcodeVersion, - const char *kernelVersion, - bool qmpOnly); + const char *kernelVersion); int virQEMUCapsLoadCache(virArch hostArch, virQEMUCapsPtr qemuCaps, @@ -86,20 +85,6 @@ virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps, virGICCapability *capabilities, size_t ncapabilities); -int -virQEMUCapsParseHelpStr(const char *qemu, - const char *str, - virQEMUCapsPtr qemuCaps, - unsigned int *version, - bool *is_kvm, - unsigned int *kvm_version, - bool check_yajl, - const char *qmperr); - -int -virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, - const char *str); - int virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon, diff --git a/tests/Makefile.am b/tests/Makefile.am index 289ef35bd..0c535f90b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -121,7 +121,6 @@ EXTRA_DIST = \ qemuargv2xmldata \ qemucapabilitiesdata \ qemucaps2xmldata \ - qemuhelpdata \ qemuhotplugtestcpus \ qemuhotplugtestdevices \ qemuhotplugtestdomains \ @@ -283,7 +282,7 @@ endif WITH_LIBXL if WITH_QEMU test_programs += qemuxml2argvtest qemuxml2xmltest \ - qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ + qemuargv2xmltest domainsnapshotxml2xmltest \ qemumonitortest qemumonitorjsontest qemuhotplugtest \ qemuagenttest qemucapabilitiestest qemucaps2xmltest \ qemumemlocktest \ @@ -603,9 +602,6 @@ qemuargv2xmltest_SOURCES = \ testutils.c testutils.h qemuargv2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) -qemuhelptest_SOURCES = qemuhelptest.c testutils.c testutils.h -qemuhelptest_LDADD = $(qemu_LDADDS) $(LDADDS) - qemumonitortest_SOURCES = \ qemumonitortest.c \ testutils.c testutils.h \ @@ -693,7 +689,7 @@ qemumemlocktest_SOURCES = \ qemumemlocktest_LDADD = $(qemu_LDADDS) $(LDADDS) else ! WITH_QEMU EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ - qemuhelptest.c domainsnapshotxml2xmltest.c \ + domainsnapshotxml2xmltest.c \ qemumonitortest.c testutilsqemu.c testutilsqemu.h \ testutilsqemuschema.c testutilsqemuschema.h \ qemumonitorjsontest.c qemuhotplugtest.c \ diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 7d6024694..54084218b 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -72,7 +72,7 @@ main(int argc, char **argv) return EXIT_FAILURE; if (!(caps = virQEMUCapsNewForBinaryInternal(VIR_ARCH_NONE, argv[1], "/tmp", - -1, -1, 0, NULL, true))) + -1, -1, 0, NULL))) return EXIT_FAILURE; virObjectUnref(caps); diff --git a/tests/qemuhelpdata/qemu-0.12.1 b/tests/qemuhelpdata/qemu-0.12.1 deleted file mode 100644 index 0caa3b36a..000000000 --- a/tests/qemuhelpdata/qemu-0.12.1 +++ /dev/null @@ -1,198 +0,0 @@ -QEMU PC emulator version 0.12.1, Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug etc. - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none][,format=f][,serial=s] - [,addr=A][,id=name][,aio=threads|native] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,options] add device --name string1[,process=string2] set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description --smbios file=binary - Load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - Specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - Specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer; the - default of 'sndbuf=1048576' can be disabled using 'sndbuf=0' - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use - vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6] --chardev msmouse,id=id --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] --chardev file,id=id,path=path --chardev pipe,id=id,path=path --chardev pty,id=id --chardev stdio,id=id --chardev tty,id=id,path=path --chardev parport,id=id,path=path - -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode. --mon chardev=[name][,mode=readline|control][,default] --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices. --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. --readconfig <file> --writeconfig <file> - read/write config file -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-0.12.1-device b/tests/qemuhelpdata/qemu-0.12.1-device deleted file mode 100644 index 63c7bef4d..000000000 --- a/tests/qemuhelpdata/qemu-0.12.1-device +++ /dev/null @@ -1,62 +0,0 @@ -name "pci-bridge", bus PCI -name "virtio-balloon-pci", bus PCI -name "virtio-console-pci", bus PCI -name "virtio-net-pci", bus PCI -name "virtio-blk-pci", bus PCI -name "i82562", bus PCI -name "i82559er", bus PCI -name "i82559c", bus PCI -name "i82559b", bus PCI -name "i82559a", bus PCI -name "i82558b", bus PCI -name "i82558a", bus PCI -name "i82557c", bus PCI -name "i82557b", bus PCI -name "i82557a", bus PCI -name "i82551", bus PCI -name "i82550", bus PCI -name "pcnet", bus PCI -name "rtl8139", bus PCI -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ide-drive", bus IDE -name "isa-ide", bus ISA -name "piix4-ide", bus PCI, no-user -name "piix3-ide", bus PCI, no-user -name "i8042", bus ISA, no-user -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "VGA", bus PCI -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "isa-fdc", bus ISA, no-user -name "mc146818rtc", bus ISA, no-user -name "isa-serial", bus ISA -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "isa-parallel", bus ISA -name "PIIX3", bus PCI, desc "ISA bridge", no-user -name "i440FX", bus PCI, desc "Host bridge", no-user -name "i440FX-pcihost", bus System, no-user -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "vmware-svga", bus PCI -name "ib700", bus ISA -name "ne2k_isa", bus ISA -name "smbus-eeprom", bus I2C -name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom" -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "usb-hub", bus USB -name "usb-host", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-storage", bus USB -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-bt-dongle", bus USB -name "i6300esb", bus PCI -name "ne2k_pci", bus PCI -name "lsi53c895a", bus PCI, alias "lsi" -name "isabus-bridge", bus System, no-user diff --git a/tests/qemuhelpdata/qemu-1.0 b/tests/qemuhelpdata/qemu-1.0 deleted file mode 100644 index d6af0ec55..000000000 --- a/tests/qemuhelpdata/qemu-1.0 +++ /dev/null @@ -1,253 +0,0 @@ -QEMU emulator version 1.0, Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard disk image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --machine [type=]name[,prop[=value][,...]] - selects emulated machine (-machine ? for list) - property accel=accel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug, etc - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none|directsync|unsafe][,format=f] - [,serial=s][,addr=A][,id=name][,aio=threads|native] - [,readonly=on|off] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - [,splash=sp_name][,splash-time=sp_time] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) - 'sp_name': the file's name that would be passed to bios as logo picture, if menu=on - 'sp_time': the period that splash picture last if menu=on, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mem-path) --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,prop[=value][,...]] - add device (based on driver) - prop=value,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=id,path=path,[security_model={mapped|passthrough|none}] - [,writeout=immediate][,readonly] - -Virtual File system pass-through options: --virtfs local,path=path,mount_tag=tag,security_model=[mapped|passthrough|none] - [,writeout=immediate][,readonly] --virtfs_synth Create synthetic file system image - --name string1[,process=string2] - set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off] - [,window_close=on|off]|curses|none| - vnc=<display>[,<optargs>] - select display type --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --spice <args> enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate <deg> rotate graphical output some deg left (only PXA LCD) --vga [std|cirrus|vmware|qxl|xenfb|none] - select video card type --full-screen start in full screen --g WxH[xDEPTH] Set the initial graphical resolution and depth --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...] - ACPI table description --smbios file=binary - load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=on|off] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown) - use '[down]script=no' to disable script execution - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer (the - default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576') - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag - use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition - use vhost=on to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=on to force vhost on for non-MSIX virtio guests - use 'vhostfd=h' to connect to an already opened vhost net device --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port[,localaddr=addr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=addr' to specify the host address to send packets from --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices. If no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id[,mux=on|off] --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet][,mux=on|off] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6][,mux=on|off] --chardev msmouse,id=id[,mux=on|off] --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] - [,mux=on|off] --chardev file,id=id,path=path[,mux=on|off] --chardev pipe,id=id,path=path[,mux=on|off] --chardev pty,id=id[,mux=on|off] --chardev stdio,id=id[,mux=on|off][,signal=on|off] --chardev braille,id=id[,mux=on|off] --chardev tty,id=id,path=path[,mux=on|off] --chardev parport,id=id,path=path[,mux=on|off] --chardev spicevmc,id=id,name=name[,debug=debug] - -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode --mon chardev=[name][,mode=readline|control][,default] --debugcon dev redirect the debug console to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --D logfile output log to logfile (instead of the default /tmp/qemu.log) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --xen-domid id specify xen guest domain id --xen-create create domain using xen hypercalls, bypassing xend - warning: should not be used when xend is in use --xen-attach attach to existing xen domain - xend will use this when starting qemu --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices --chroot dir chroot to dir just before starting the VM --runas user change to user id user just before starting the VM --prom-env variable=value - set OpenBIOS nvram variables --semihosting semihosting mode --old-param old param mode --readconfig <file> --writeconfig <file> - read/write config file --nodefconfig - do not load default config files at startup --trace [events=<file>][,file=<file>] - specify tracing options - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-1.0-device b/tests/qemuhelpdata/qemu-1.0-device deleted file mode 100644 index a249dd2e9..000000000 --- a/tests/qemuhelpdata/qemu-1.0-device +++ /dev/null @@ -1,148 +0,0 @@ -name "ib700", bus ISA -name "sga", bus ISA, desc "Serial Graphics Adapter" -name "qxl", bus PCI, desc "Spice QXL GPU (secondary)" -name "qxl-vga", bus PCI, desc "Spice QXL GPU (primary, vga compatible)" -name "ivshmem", bus PCI -name "isa-debugcon", bus ISA -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "virtio-9p-pci", bus PCI -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-storage", bus USB -name "usb-host", bus USB -name "usb-hub", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-bt-dongle", bus USB -name "smbus-eeprom", bus I2C -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "scsi-disk", bus SCSI, desc "virtual SCSI disk or CD-ROM (legacy)" -name "scsi-block", bus SCSI, desc "SCSI block device passthrough" -name "scsi-cd", bus SCSI, desc "virtual SCSI CD-ROM" -name "scsi-hd", bus SCSI, desc "virtual SCSI disk" -name "x3130-upstream", bus PCI, desc "TI X3130 Upstream Port of PCI Express Switch" -name "xio3130-downstream", bus PCI, desc "TI X3130 Downstream Port of PCI Express Switch" -name "i6300esb", bus PCI -name "vmware-svga", bus PCI -name "virtio-balloon-pci", bus PCI, alias "virtio-balloon" -name "virtio-serial-pci", bus PCI, alias "virtio-serial" -name "virtio-net-pci", bus PCI, alias "virtio-net" -name "virtio-blk-pci", bus PCI, alias "virtio-blk" -name "virtserialport", bus virtio-serial-bus -name "virtconsole", bus virtio-serial-bus -name "VGA", bus PCI -name "isa-vga", bus ISA -name "ich9-usb-uhci3", bus PCI -name "ich9-usb-uhci2", bus PCI -name "ich9-usb-uhci1", bus PCI -name "vt82c686b-usb-uhci", bus PCI -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "sysbus-ohci", bus System, desc "OHCI USB Controller" -name "pci-ohci", bus PCI, desc "Apple USB Controller" -name "ich9-usb-ehci1", bus PCI -name "usb-ehci", bus PCI -name "usb-ccid", bus USB, desc "CCID Rev 1.1 smartcard reader" -name "isa-serial", bus ISA -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "rtl8139", bus PCI -name "pcnet", bus PCI -name "isa-parallel", bus ISA -name "ne2k_pci", bus PCI -name "ne2k_isa", bus ISA -name "lsi53c895a", bus PCI, alias "lsi" -name "ioh3420", bus PCI, desc "Intel IOH device id 3420 PCIE Root Port" -name "intel-hda", bus PCI, desc "Intel HD Audio Controller" -name "ide-drive", bus IDE, desc "virtual IDE disk or CD-ROM (legacy)" -name "ide-cd", bus IDE, desc "virtual IDE CD-ROM" -name "ide-hd", bus IDE, desc "virtual IDE disk" -name "isa-ide", bus ISA -name "ich9-ahci", bus PCI, alias "ahci" -name "hda-duplex", bus HDA, desc "HDA Audio Codec, duplex" -name "hda-output", bus HDA, desc "HDA Audio Codec, output-only" -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "i82801", bus PCI, desc "Intel i82801 Ethernet" -name "i82562", bus PCI, desc "Intel i82562 Ethernet" -name "i82559er", bus PCI, desc "Intel i82559ER Ethernet" -name "i82559c", bus PCI, desc "Intel i82559C Ethernet" -name "i82559b", bus PCI, desc "Intel i82559B Ethernet" -name "i82559a", bus PCI, desc "Intel i82559A Ethernet" -name "i82558b", bus PCI, desc "Intel i82558B Ethernet" -name "i82558a", bus PCI, desc "Intel i82558A Ethernet" -name "i82557c", bus PCI, desc "Intel i82557C Ethernet" -name "i82557b", bus PCI, desc "Intel i82557B Ethernet" -name "i82557a", bus PCI, desc "Intel i82557A Ethernet" -name "i82551", bus PCI, desc "Intel i82551 Ethernet" -name "i82550", bus PCI, desc "Intel i82550 Ethernet" -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ccid-card-passthru", bus ccid-bus, desc "passthrough smartcard" -name "ccid-card-emulated", bus ccid-bus, desc "emulated smartcard" -name "isa-applesmc", bus ISA -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -virtio-blk-pci.class=hex32 -virtio-blk-pci.drive=drive -virtio-blk-pci.logical_block_size=uint16 -virtio-blk-pci.physical_block_size=uint16 -virtio-blk-pci.min_io_size=uint16 -virtio-blk-pci.opt_io_size=uint32 -virtio-blk-pci.bootindex=int32 -virtio-blk-pci.discard_granularity=uint32 -virtio-blk-pci.serial=string -virtio-blk-pci.ioeventfd=on/off -virtio-blk-pci.vectors=uint32 -virtio-blk-pci.indirect_desc=on/off -virtio-blk-pci.event_idx=on/off -virtio-blk-pci.scsi=on/off -virtio-blk-pci.addr=pci-devfn -virtio-blk-pci.romfile=string -virtio-blk-pci.rombar=uint32 -virtio-blk-pci.multifunction=on/off -virtio-blk-pci.command_serr_enable=on/off -virtio-net-pci.ioeventfd=on/off -virtio-net-pci.vectors=uint32 -virtio-net-pci.indirect_desc=on/off -virtio-net-pci.event_idx=on/off -virtio-net-pci.csum=on/off -virtio-net-pci.guest_csum=on/off -virtio-net-pci.gso=on/off -virtio-net-pci.guest_tso4=on/off -virtio-net-pci.guest_tso6=on/off -virtio-net-pci.guest_ecn=on/off -virtio-net-pci.guest_ufo=on/off -virtio-net-pci.host_tso4=on/off -virtio-net-pci.host_tso6=on/off -virtio-net-pci.host_ecn=on/off -virtio-net-pci.host_ufo=on/off -virtio-net-pci.mrg_rxbuf=on/off -virtio-net-pci.status=on/off -virtio-net-pci.ctrl_vq=on/off -virtio-net-pci.ctrl_rx=on/off -virtio-net-pci.ctrl_vlan=on/off -virtio-net-pci.ctrl_rx_extra=on/off -virtio-net-pci.mac=macaddr -virtio-net-pci.vlan=vlan -virtio-net-pci.netdev=netdev -virtio-net-pci.bootindex=int32 -virtio-net-pci.x-txtimer=uint32 -virtio-net-pci.x-txburst=int32 -virtio-net-pci.tx=string -virtio-net-pci.addr=pci-devfn -virtio-net-pci.romfile=string -virtio-net-pci.rombar=uint32 -virtio-net-pci.multifunction=on/off -virtio-net-pci.command_serr_enable=on/off -scsi-generic.drive=drive -scsi-generic.logical_block_size=uint16 -scsi-generic.physical_block_size=uint16 -scsi-generic.min_io_size=uint16 -scsi-generic.opt_io_size=uint32 -scsi-generic.bootindex=int32 -scsi-generic.discard_granularity=uint32 -scsi-generic.channel=uint32 -scsi-generic.scsi-id=uint32 -scsi-generic.lun=uint32 diff --git a/tests/qemuhelpdata/qemu-1.1.0 b/tests/qemuhelpdata/qemu-1.1.0 deleted file mode 100644 index 43c189d2b..000000000 --- a/tests/qemuhelpdata/qemu-1.1.0 +++ /dev/null @@ -1,269 +0,0 @@ -QEMU emulator version 1.1.0, Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu-system-x86_64 [options] [disk_image] - -'disk_image' is a raw hard disk image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --machine [type=]name[,prop[=value][,...]] - selects emulated machine (-machine ? for list) - property accel=accel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) - kernel_irqchip=on|off controls accelerated irqchip support - kvm_shadow_mem=size of KVM shadow MMU --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug, etc - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none|directsync|unsafe][,format=f] - [,serial=s][,addr=A][,id=name][,aio=threads|native] - [,readonly=on|off][,copy-on-read=on|off] - [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.prop=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - [,splash=sp_name][,splash-time=sp_time] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) - 'sp_name': the file's name that would be passed to bios as logo picture, if menu=on - 'sp_time': the period that splash picture last if menu=on, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mem-path) --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,prop[=value][,...]] - add device (based on driver) - prop=value,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}] - [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd] - -Virtual File system pass-through options: --virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none] - [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd] --virtfs_synth Create synthetic file system image - --name string1[,process=string2] - set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off] - [,window_close=on|off]|curses|none| - vnc=<display>[,<optargs>] - select display type --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --spice <args> enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate <deg> rotate graphical output some deg left (only PXA LCD) --vga [std|cirrus|vmware|qxl|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...] - ACPI table description --smbios file=binary - load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=on|off] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off] - connect the host TAP network interface to VLAN 'n' - use network scripts 'file' (default=/etc/qemu-ifup) - to configure it and 'dfile' (default=/etc/qemu-ifdown) - to deconfigure it - use '[down]script=no' to disable script execution - use network helper 'helper' (default=/usr/libexec/qemu-bridge-helper) to - configure it - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer (the - default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576') - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag - use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition - use vhost=on to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=on to force vhost on for non-MSIX virtio guests - use 'vhostfd=h' to connect to an already opened vhost net device --net bridge[,vlan=n][,name=str][,br=bridge][,helper=helper] - connects a host TAP network interface to a host bridge device 'br' - (default=br0) using the program 'helper' - (default=/usr/libexec/qemu-bridge-helper) --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port[,localaddr=addr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=addr' to specify the host address to send packets from --net socket[,vlan=n][,name=str][,fd=h][,udp=host:port][,localaddr=host:port] - connect the vlan 'n' to another VLAN using an UDP tunnel --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices. If no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|bridge|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id[,mux=on|off] --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet][,mux=on|off] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6][,mux=on|off] --chardev msmouse,id=id[,mux=on|off] --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] - [,mux=on|off] --chardev file,id=id,path=path[,mux=on|off] --chardev pipe,id=id,path=path[,mux=on|off] --chardev pty,id=id[,mux=on|off] --chardev stdio,id=id[,mux=on|off][,signal=on|off] --chardev braille,id=id[,mux=on|off] --chardev tty,id=id,path=path[,mux=on|off] --chardev parport,id=id,path=path[,mux=on|off] --chardev spicevmc,id=id,name=name[,debug=debug] - --iscsi [user=user][,password=password] - [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE - [,initiator-name=iqn] - iSCSI session parameters -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk --dtb file use 'file' as device tree image - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode --mon chardev=[name][,mode=readline|control][,default] --debugcon dev redirect the debug console to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --D logfile output log to logfile (instead of the default /tmp/qemu.log) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually QEMU can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --xen-domid id specify xen guest domain id --xen-create create domain using xen hypercalls, bypassing xend - warning: should not be used when xend is in use --xen-attach attach to existing xen domain - xend will use this when starting QEMU --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|rt|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices --chroot dir chroot to dir just before starting the VM --runas user change to user id user just before starting the VM --readconfig <file> --writeconfig <file> - read/write config file --nodefconfig - do not load default config files at startup --no-user-config - do not load user-provided config files at startup --trace [events=<file>][,file=<file>] - specify tracing options --qtest CHR specify tracing options --qtest-log LOG specify tracing options - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-1.1.0-device b/tests/qemuhelpdata/qemu-1.1.0-device deleted file mode 100644 index 218690662..000000000 --- a/tests/qemuhelpdata/qemu-1.1.0-device +++ /dev/null @@ -1,170 +0,0 @@ -name "usb-storage", bus USB -name "VGA", bus PCI -name "scsi-hd", bus SCSI, desc "virtual SCSI disk" -name "i82559a", bus PCI, desc "Intel i82559A Ethernet" -name "i82559b", bus PCI, desc "Intel i82559B Ethernet" -name "i82559c", bus PCI, desc "Intel i82559C Ethernet" -name "sysbus-ohci", bus System, desc "OHCI USB Controller" -name "virtio-blk-pci", bus PCI, alias "virtio-blk" -name "qxl-vga", bus PCI, desc "Spice QXL GPU (primary, vga compatible)" -name "x3130-upstream", bus PCI, desc "TI X3130 Upstream Port of PCI Express Switch" -name "ide-drive", bus IDE, desc "virtual IDE disk or CD-ROM (legacy)" -name "virtio-9p-pci", bus PCI -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "ide-hd", bus IDE, desc "virtual IDE disk" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "ioh3420", bus PCI, desc "Intel IOH device id 3420 PCIE Root Port" -name "sga", bus ISA, desc "Serial Graphics Adapter" -name "scsi-block", bus SCSI, desc "SCSI block device passthrough" -name "usb-serial", bus USB -name "pc-sysfw", bus System, desc "PC System Firmware" -name "usb-mouse", bus USB -name "usb-hub", bus USB -name "usb-net", bus USB -name "ccid-card-emulated", bus ccid-bus, desc "emulated smartcard" -name "ne2k_isa", bus ISA -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "pcnet", bus PCI -name "lsi53c895a", bus PCI, alias "lsi" -name "scsi-disk", bus SCSI, desc "virtual SCSI disk or CD-ROM (legacy)" -name "hda-micro", bus HDA, desc "HDA Audio Codec, duplex (speaker, microphone)" -name "xio3130-downstream", bus PCI, desc "TI X3130 Downstream Port of PCI Express Switch" -name "virtserialport", bus virtio-serial-bus -name "nec-usb-xhci", bus PCI -name "pci-ohci", bus PCI, desc "Apple USB Controller" -name "usb-braille", bus USB -name "scsi-cd", bus SCSI, desc "virtual SCSI CD-ROM" -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "isa-serial", bus ISA -name "i82550", bus PCI, desc "Intel i82550 Ethernet" -name "i82551", bus PCI, desc "Intel i82551 Ethernet" -name "isa-debugcon", bus ISA -name "ide-cd", bus IDE, desc "virtual IDE CD-ROM" -name "SUNW,fdtwo", bus System -name "ich9-usb-uhci1", bus PCI -name "ich9-usb-uhci2", bus PCI -name "ich9-usb-uhci3", bus PCI -name "isa-parallel", bus ISA -name "virtconsole", bus virtio-serial-bus -name "ne2k_pci", bus PCI -name "virtio-serial-pci", bus PCI, alias "virtio-serial" -name "hda-duplex", bus HDA, desc "HDA Audio Codec, duplex (line-out, line-in)" -name "intel-hda", bus PCI, desc "Intel HD Audio Controller" -name "i82559er", bus PCI, desc "Intel i82559ER Ethernet" -name "hda-output", bus HDA, desc "HDA Audio Codec, output-only (line-out)" -name "i82562", bus PCI, desc "Intel i82562 Ethernet" -name "sysbus-ahci", bus System -name "usb-ccid", bus USB, desc "CCID Rev 1.1 smartcard reader" -name "ivshmem", bus PCI -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "sysbus-fdc", bus System -name "usb-bt-dongle", bus USB -name "usb-tablet", bus USB -name "isa-vga", bus ISA -name "usb-kbd", bus USB -name "isa-applesmc", bus ISA -name "rtl8139", bus PCI -name "qxl", bus PCI, desc "Spice QXL GPU (secondary)" -name "i82557a", bus PCI, desc "Intel i82557A Ethernet" -name "i82557b", bus PCI, desc "Intel i82557B Ethernet" -name "i82557c", bus PCI, desc "Intel i82557C Ethernet" -name "usb-audio", bus USB -name "piix3-usb-uhci", bus PCI -name "ccid-card-passthru", bus ccid-bus, desc "passthrough smartcard" -name "ib700", bus ISA -name "i82801", bus PCI, desc "Intel i82801 Ethernet" -name "smbus-eeprom", bus I2C -name "vmware-svga", bus PCI -name "isa-cirrus-vga", bus ISA -name "piix4-usb-uhci", bus PCI -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "pci-bridge", bus PCI, desc "Standard PCI Bridge" -name "usb-ehci", bus PCI -name "i82558a", bus PCI, desc "Intel i82558A Ethernet" -name "i82558b", bus PCI, desc "Intel i82558B Ethernet" -name "virtio-net-pci", bus PCI, alias "virtio-net" -name "virtio-balloon-pci", bus PCI, alias "virtio-balloon" -name "ich9-usb-ehci1", bus PCI -name "isa-ide", bus ISA -name "i6300esb", bus PCI -name "ich9-ahci", bus PCI, alias "ahci" -name "usb-host", bus USB -name "vt82c686b-usb-uhci", bus PCI -name "virtio-scsi-pci", bus PCI -virtio-blk-pci.class=hex32 -virtio-blk-pci.drive=drive -virtio-blk-pci.logical_block_size=blocksize -virtio-blk-pci.physical_block_size=blocksize -virtio-blk-pci.min_io_size=uint16 -virtio-blk-pci.opt_io_size=uint32 -virtio-blk-pci.bootindex=int32 -virtio-blk-pci.discard_granularity=uint32 -virtio-blk-pci.serial=string -virtio-blk-pci.scsi=on/off -virtio-blk-pci.ioeventfd=on/off -virtio-blk-pci.vectors=uint32 -virtio-blk-pci.indirect_desc=on/off -virtio-blk-pci.event_idx=on/off -virtio-blk-pci.addr=pci-devfn -virtio-blk-pci.romfile=string -virtio-blk-pci.rombar=uint32 -virtio-blk-pci.multifunction=on/off -virtio-blk-pci.command_serr_enable=on/off -virtio-net-pci.ioeventfd=on/off -virtio-net-pci.vectors=uint32 -virtio-net-pci.indirect_desc=on/off -virtio-net-pci.event_idx=on/off -virtio-net-pci.csum=on/off -virtio-net-pci.guest_csum=on/off -virtio-net-pci.gso=on/off -virtio-net-pci.guest_tso4=on/off -virtio-net-pci.guest_tso6=on/off -virtio-net-pci.guest_ecn=on/off -virtio-net-pci.guest_ufo=on/off -virtio-net-pci.host_tso4=on/off -virtio-net-pci.host_tso6=on/off -virtio-net-pci.host_ecn=on/off -virtio-net-pci.host_ufo=on/off -virtio-net-pci.mrg_rxbuf=on/off -virtio-net-pci.status=on/off -virtio-net-pci.ctrl_vq=on/off -virtio-net-pci.ctrl_rx=on/off -virtio-net-pci.ctrl_vlan=on/off -virtio-net-pci.ctrl_rx_extra=on/off -virtio-net-pci.mac=macaddr -virtio-net-pci.vlan=vlan -virtio-net-pci.netdev=netdev -virtio-net-pci.bootindex=int32 -virtio-net-pci.x-txtimer=uint32 -virtio-net-pci.x-txburst=int32 -virtio-net-pci.tx=string -virtio-net-pci.addr=pci-devfn -virtio-net-pci.romfile=string -virtio-net-pci.rombar=uint32 -virtio-net-pci.multifunction=on/off -virtio-net-pci.command_serr_enable=on/off -scsi-disk.drive=drive -scsi-disk.logical_block_size=blocksize -scsi-disk.physical_block_size=blocksize -scsi-disk.min_io_size=uint16 -scsi-disk.opt_io_size=uint32 -scsi-disk.bootindex=int32 -scsi-disk.discard_granularity=uint32 -scsi-disk.ver=string -scsi-disk.serial=string -scsi-disk.removable=on/off -scsi-disk.dpofua=on/off -scsi-disk.channel=uint32 -scsi-disk.scsi-id=uint32 -scsi-disk.lun=uint32 -scsi-generic.drive=drive -scsi-generic.logical_block_size=blocksize -scsi-generic.physical_block_size=blocksize -scsi-generic.min_io_size=uint16 -scsi-generic.opt_io_size=uint32 -scsi-generic.bootindex=int32 -scsi-generic.discard_granularity=uint32 -scsi-generic.channel=uint32 -scsi-generic.scsi-id=uint32 -scsi-generic.lun=uint32 diff --git a/tests/qemuhelpdata/qemu-1.2.0 b/tests/qemuhelpdata/qemu-1.2.0 deleted file mode 100644 index 32a243192..000000000 --- a/tests/qemuhelpdata/qemu-1.2.0 +++ /dev/null @@ -1,272 +0,0 @@ -QEMU emulator version 1.2.0, Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu-system-x86_64 [options] [disk_image] - -'disk_image' is a raw hard disk image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --machine [type=]name[,prop[=value][,...]] - selects emulated machine (-machine ? for list) - property accel=accel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) - kernel_irqchip=on|off controls accelerated irqchip support - kvm_shadow_mem=size of KVM shadow MMU - dump-guest-core=on|off include guest memory in a core dump (default=on) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug, etc - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none|directsync|unsafe][,format=f] - [,serial=s][,addr=A][,id=name][,aio=threads|native] - [,readonly=on|off][,copy-on-read=on|off] - [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.prop=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - [,splash=sp_name][,splash-time=sp_time] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) - 'sp_name': the file's name that would be passed to bios as logo picture, if menu=on - 'sp_time': the period that splash picture last if menu=on, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mem-path) --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,prop[=value][,...]] - add device (based on driver) - prop=value,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}] - [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd] - -Virtual File system pass-through options: --virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none] - [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd] --virtfs_synth Create synthetic file system image - --name string1[,process=string2] - set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off] - [,window_close=on|off]|curses|none| - vnc=<display>[,<optargs>] - select display type --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --spice <args> enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate <deg> rotate graphical output some deg left (only PXA LCD) --vga [std|cirrus|vmware|qxl|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...] - ACPI table description --smbios file=binary - load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=on|off] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off] - connect the host TAP network interface to VLAN 'n' - use network scripts 'file' (default=/etc/qemu-ifup) - to configure it and 'dfile' (default=/etc/qemu-ifdown) - to deconfigure it - use '[down]script=no' to disable script execution - use network helper 'helper' (default=/usr/local/libexec/qemu-bridge-helper) to - configure it - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer (the - default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576') - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag - use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition - use vhost=on to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=on to force vhost on for non-MSIX virtio guests - use 'vhostfd=h' to connect to an already opened vhost net device --net bridge[,vlan=n][,name=str][,br=bridge][,helper=helper] - connects a host TAP network interface to a host bridge device 'br' - (default=br0) using the program 'helper' - (default=/usr/local/libexec/qemu-bridge-helper) --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port[,localaddr=addr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=addr' to specify the host address to send packets from --net socket[,vlan=n][,name=str][,fd=h][,udp=host:port][,localaddr=host:port] - connect the vlan 'n' to another VLAN using an UDP tunnel --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices. If no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|bridge|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id[,mux=on|off] --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet][,mux=on|off] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6][,mux=on|off] --chardev msmouse,id=id[,mux=on|off] --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] - [,mux=on|off] --chardev file,id=id,path=path[,mux=on|off] --chardev pipe,id=id,path=path[,mux=on|off] --chardev pty,id=id[,mux=on|off] --chardev stdio,id=id[,mux=on|off][,signal=on|off] --chardev braille,id=id[,mux=on|off] --chardev tty,id=id,path=path[,mux=on|off] --chardev parport,id=id,path=path[,mux=on|off] --chardev spicevmc,id=id,name=name[,debug=debug] - --iscsi [user=user][,password=password] - [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE - [,initiator-name=iqn] - iSCSI session parameters -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk --dtb file use 'file' as device tree image - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode --mon chardev=[name][,mode=readline|control][,default] --debugcon dev redirect the debug console to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --D logfile output log to logfile (instead of the default /tmp/qemu.log) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually QEMU can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --xen-domid id specify xen guest domain id --xen-create create domain using xen hypercalls, bypassing xend - warning: should not be used when xend is in use --xen-attach attach to existing xen domain - xend will use this when starting QEMU --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|rt|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices --chroot dir chroot to dir just before starting the VM --runas user change to user id user just before starting the VM --sandbox <arg> Enable seccomp mode 2 system call filter (default 'off'). --readconfig <file> --writeconfig <file> - read/write config file --nodefconfig - do not load default config files at startup --no-user-config - do not load user-provided config files at startup --trace [events=<file>][,file=<file>] - specify tracing options --qtest CHR specify tracing options --qtest-log LOG specify tracing options --enable-fips enable FIPS 140-2 compliance - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.3 b/tests/qemuhelpdata/qemu-kvm-0.12.3 deleted file mode 100644 index 268d36fbe..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.12.3 +++ /dev/null @@ -1,215 +0,0 @@ -QEMU PC emulator version 0.12.3 (qemu-kvm-0.12.3), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard image image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug etc. - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none][,format=f][,serial=s] - [,addr=A][,id=name][,aio=threads|native] - [,boot=on|off] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,options] add device --name string1[,process=string2] set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description --smbios file=binary - Load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - Specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - Specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown); - use '[down]script=no' to disable script execution; - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer; the - default of 'sndbuf=1048576' can be disabled using 'sndbuf=0' - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use - vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices; if no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6] --chardev msmouse,id=id --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] --chardev file,id=id,path=path --chardev pipe,id=id,path=path --chardev pty,id=id --chardev stdio,id=id --chardev tty,id=id,path=path --chardev parport,id=id,path=path - -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode. --mon chardev=[name][,mode=readline|control][,default] --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices. --chroot dir Chroot to dir just before starting the VM. --runas user Change to user id user just before starting the VM. --readconfig <file> --writeconfig <file> - read/write config file --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection --pcidevice host=bus:dev.func[,dma=none][,name=string] - expose a PCI device to the guest OS. - dma=none: don't perform any dma translations (default is to use an iommu) - 'string' is used in log output. --enable-nesting enable support for running a VM inside the VM (AMD only) --nvram FILE provide ia64 nvram contents --tdf enable guest time drift compensation --kvm-shadow-memory MEGABYTES - allocate MEGABYTES for kvm mmu shadowing --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mempath) - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.3-device b/tests/qemuhelpdata/qemu-kvm-0.12.3-device deleted file mode 100644 index 814dcaf74..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.12.3-device +++ /dev/null @@ -1,63 +0,0 @@ -name "pci-bridge", bus PCI -name "virtio-balloon-pci", bus PCI -name "virtio-console-pci", bus PCI -name "virtio-net-pci", bus PCI -name "virtio-blk-pci", bus PCI -name "i82562", bus PCI -name "i82559er", bus PCI -name "i82559c", bus PCI -name "i82559b", bus PCI -name "i82559a", bus PCI -name "i82558b", bus PCI -name "i82558a", bus PCI -name "i82557c", bus PCI -name "i82557b", bus PCI -name "i82557a", bus PCI -name "i82551", bus PCI -name "i82550", bus PCI -name "pcnet", bus PCI -name "rtl8139", bus PCI -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ide-drive", bus IDE -name "isa-ide", bus ISA -name "piix4-ide", bus PCI, no-user -name "piix3-ide", bus PCI, no-user -name "i8042", bus ISA, no-user -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "VGA", bus PCI -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "isa-fdc", bus ISA, no-user -name "mc146818rtc", bus ISA, no-user -name "isa-serial", bus ISA -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "isa-parallel", bus ISA -name "PIIX3", bus PCI, desc "ISA bridge", no-user -name "i440FX", bus PCI, desc "Host bridge", no-user -name "i440FX-pcihost", bus System, no-user -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "vmware-svga", bus PCI -name "ib700", bus ISA -name "ne2k_isa", bus ISA -name "testdev", bus ISA -name "smbus-eeprom", bus I2C -name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom" -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "usb-hub", bus USB -name "usb-host", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-storage", bus USB -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-bt-dongle", bus USB -name "i6300esb", bus PCI -name "ne2k_pci", bus PCI -name "lsi53c895a", bus PCI, alias "lsi" -name "isabus-bridge", bus System, no-user diff --git a/tests/qemuhelpdata/qemu-kvm-0.13.0 b/tests/qemuhelpdata/qemu-kvm-0.13.0 deleted file mode 100644 index af29d11f7..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.13.0 +++ /dev/null @@ -1,242 +0,0 @@ -QEMU emulator version 0.13.0 (qemu-kvm-0.13.0), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu [options] [disk_image] - -'disk_image' is a raw hard disk image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --M machine select emulated machine (-M ? for list) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug, etc - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none|unsafe][,format=f] - [,serial=s][,addr=A][,id=name][,aio=threads|native] - [,readonly=on|off][,boot=on|off] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.property=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mem-path) --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,prop[=value][,...]] - add device (based on driver) - prop=value,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties -File system options: --fsdev local,id=id,path=path,security_model=[mapped|passthrough] -Virtual File system pass-through options: --virtfs local,path=path,mount_tag=tag,security_model=[mapped|passthrough] - --name string1[,process=string2] - set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --portrait rotate graphical output 90 deg left (only PXA LCD) --vga [std|cirrus|vmware|xenfb|none] - select video card type --full-screen start in full screen --g WxH[xDEPTH] Set the initial graphical resolution and depth --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] - ACPI table description --smbios file=binary - load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h] - connect the host TAP network interface to VLAN 'n' and use the - network scripts 'file' (default=/etc/qemu-ifup) - and 'dfile' (default=/etc/qemu-ifdown) - use '[down]script=no' to disable script execution - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer (the - default of 'sndbuf=1048576' can be disabled using 'sndbuf=0') - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag - use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition - use vhost=on to enable experimental in kernel accelerator - use 'vhostfd=h' to connect to an already opened vhost net device --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices. If no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id[,mux=on|off] --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet][,mux=on|off] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6][,mux=on|off] --chardev msmouse,id=id[,mux=on|off] --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] - [,mux=on|off] --chardev file,id=id,path=path[,mux=on|off] --chardev pipe,id=id,path=path[,mux=on|off] --chardev pty,id=id[,mux=on|off] --chardev stdio,id=id[,mux=on|off][,signal=on|off] --chardev tty,id=id,path=path[,mux=on|off] --chardev parport,id=id,path=path[,mux=on|off] - -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode --mon chardev=[name][,mode=readline|control][,default] --debugcon dev redirect the debug console to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually qemu can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --xen-domid id specify xen guest domain id --xen-create create domain using xen hypercalls, bypassing xend - warning: should not be used when xend is in use --xen-attach attach to existing xen domain - xend will use this when starting qemu --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices --chroot dir chroot to dir just before starting the VM --runas user change to user id user just before starting the VM --prom-env variable=value - set OpenBIOS nvram variables --semihosting semihosting mode --old-param old param mode --readconfig <file> --writeconfig <file> - read/write config file --nodefconfig - do not load default config files at startup --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection - disable KVM kernel mode PIT interrupt reinjection --pcidevice host=[seg:]bus:dev.func[,dma=none][,name=string] - expose a PCI device to the guest OS - dma=none: don't perform any dma translations (default is to use an iommu) - 'string' is used in log output --enable-nesting enable support for running a VM inside the VM (AMD only) --nvram FILE provide ia64 nvram contents --tdf enable guest time drift compensation --kvm-shadow-memory MEGABYTES - allocate MEGABYTES for kvm mmu shadowing - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelpdata/qemu-kvm-0.13.0-device b/tests/qemuhelpdata/qemu-kvm-0.13.0-device deleted file mode 100644 index 6dd2d09c5..000000000 --- a/tests/qemuhelpdata/qemu-kvm-0.13.0-device +++ /dev/null @@ -1,90 +0,0 @@ -name "pci-bridge", bus PCI -name "virtio-balloon-pci", bus PCI -name "virtio-serial-pci", bus PCI, alias "virtio-serial" -name "virtio-net-pci", bus PCI -name "virtio-blk-pci", bus PCI -name "sysbus-ohci", bus System, desc "OHCI USB Controller" -name "pci-ohci", bus PCI, desc "Apple USB Controller" -name "rtl8139", bus PCI -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "ivshmem", bus PCI -name "smbus-eeprom", bus I2C -name "scsi-disk", bus SCSI, desc "virtual scsi disk or cdrom" -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "usb-hub", bus USB -name "usb-host", bus USB -name "usb-kbd", bus USB -name "usb-mouse", bus USB -name "usb-tablet", bus USB -name "usb-storage", bus USB -name "usb-wacom-tablet", bus USB, desc "QEMU PenPartner Tablet" -name "usb-braille", bus USB -name "usb-serial", bus USB -name "usb-net", bus USB -name "usb-bt-dongle", bus USB -name "virtserialport", bus virtio-serial-bus -name "virtconsole", bus virtio-serial-bus -name "isa-serial", bus ISA -name "isa-parallel", bus ISA -name "vt82c686b-usb-uhci", bus PCI -name "piix4-usb-uhci", bus PCI -name "piix3-usb-uhci", bus PCI -name "SUNW,fdtwo", bus System -name "sysbus-fdc", bus System -name "i6300esb", bus PCI -name "ne2k_pci", bus PCI -name "i82801", bus PCI, desc "Intel i82801 Ethernet" -name "i82562", bus PCI, desc "Intel i82562 Ethernet" -name "i82559er", bus PCI, desc "Intel i82559ER Ethernet" -name "i82559c", bus PCI, desc "Intel i82559C Ethernet" -name "i82559b", bus PCI, desc "Intel i82559B Ethernet" -name "i82559a", bus PCI, desc "Intel i82559A Ethernet" -name "i82558b", bus PCI, desc "Intel i82558B Ethernet" -name "i82558a", bus PCI, desc "Intel i82558A Ethernet" -name "i82557c", bus PCI, desc "Intel i82557C Ethernet" -name "i82557b", bus PCI, desc "Intel i82557B Ethernet" -name "i82557a", bus PCI, desc "Intel i82557A Ethernet" -name "i82551", bus PCI, desc "Intel i82551 Ethernet" -name "i82550", bus PCI, desc "Intel i82550 Ethernet" -name "pcnet", bus PCI -name "ne2k_isa", bus ISA -name "ide-drive", bus IDE -name "isa-ide", bus ISA -name "lsi53c895a", bus PCI, alias "lsi" -name "VGA", bus PCI -name "vmware-svga", bus PCI -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "isa-applesmc", bus ISA -name "ib700", bus ISA -name "isa-debugcon", bus ISA -name "testdev", bus ISA -name "PIIX4_PM", bus PCI, desc "PM" -name "pci-assign", bus PCI, desc "pass through host pci devices to the guest" -pci-assign.host=pci-hostaddr -pci-assign.iommu=uint32 -pci-assign.configfd=string -virtio-net-pci.vectors=uint32 -virtio-net-pci.indirect_desc=on/off -virtio-net-pci.csum=on/off -virtio-net-pci.guest_csum=on/off -virtio-net-pci.gso=on/off -virtio-net-pci.guest_tso4=on/off -virtio-net-pci.guest_tso6=on/off -virtio-net-pci.guest_ecn=on/off -virtio-net-pci.guest_ufo=on/off -virtio-net-pci.host_tso4=on/off -virtio-net-pci.host_tso6=on/off -virtio-net-pci.host_ecn=on/off -virtio-net-pci.host_ufo=on/off -virtio-net-pci.mrg_rxbuf=on/off -virtio-net-pci.status=on/off -virtio-net-pci.ctrl_vq=on/off -virtio-net-pci.ctrl_rx=on/off -virtio-net-pci.ctrl_vlan=on/off -virtio-net-pci.ctrl_rx_extra=on/off -virtio-net-pci.mac=macaddr -virtio-net-pci.vlan=vlan -virtio-net-pci.netdev=netdev diff --git a/tests/qemuhelpdata/qemu-kvm-1.2.0 b/tests/qemuhelpdata/qemu-kvm-1.2.0 deleted file mode 100644 index 08c3f9362..000000000 --- a/tests/qemuhelpdata/qemu-kvm-1.2.0 +++ /dev/null @@ -1,277 +0,0 @@ -QEMU emulator version 1.2.0 (qemu-kvm-devel), Copyright (c) 2003-2008 Fabrice Bellard -usage: qemu-system-x86_64 [options] [disk_image] - -'disk_image' is a raw hard disk image for IDE hard disk 0 - -Standard options: --h or -help display this help and exit --version display version information and exit --machine [type=]name[,prop[=value][,...]] - selects emulated machine (-machine ? for list) - property accel=accel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) - kernel_irqchip=on|off controls accelerated irqchip support - kvm_shadow_mem=size of KVM shadow MMU - dump-guest-core=on|off include guest memory in a core dump (default=on) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] - set the number of CPUs to 'n' [default=1] - maxcpus= maximum number of total cpus, including - offline CPUs for hotplug, etc - cores= number of CPU cores on one socket - threads= number of threads on one CPU core - sockets= number of discrete sockets in the system --numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] --fda/-fdb file use 'file' as floppy disk 0/1 image --hda/-hdb file use 'file' as IDE hard disk 0/1 image --hdc/-hdd file use 'file' as IDE hard disk 2/3 image --cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) --drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] - [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] - [,cache=writethrough|writeback|none|directsync|unsafe][,format=f] - [,serial=s][,addr=A][,id=name][,aio=threads|native] - [,readonly=on|off][,copy-on-read=on|off] - [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]] - use 'file' as a drive image --set group.id.arg=value - set <arg> parameter for item <id> of type <group> - i.e. -set drive.$id.file=/path/to/image --global driver.prop=value - set a global default for a driver property --mtdblock file use 'file' as on-board Flash memory image --sd file use 'file' as SecureDigital card image --pflash file use 'file' as a parallel flash image --boot [order=drives][,once=drives][,menu=on|off] - [,splash=sp_name][,splash-time=sp_time] - 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) - 'sp_name': the file's name that would be passed to bios as logo picture, if menu=on - 'sp_time': the period that splash picture last if menu=on, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=128] --mem-path FILE provide backing storage for guest RAM --mem-prealloc preallocate guest memory (use with -mem-path) --k language use keyboard layout (for example 'fr' for French) --audio-help print list of audio drivers and their options --soundhw c1,... enable audio support - and only specified sound cards (comma separated list) - use -soundhw ? to get the list of supported cards - use -soundhw all to enable all of them --balloon none disable balloon device --balloon virtio[,addr=str] - enable virtio balloon device (default) --usb enable the USB driver (will be the default soon) --usbdevice name add the host or guest USB device 'name' --device driver[,prop[=value][,...]] - add device (based on driver) - prop=value,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}] - [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd] - -Virtual File system pass-through options: --virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none] - [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd] --virtfs_synth Create synthetic file system image - --name string1[,process=string2] - set the name of the guest - string1 sets the window title and string2 the process name (on Linux) --uuid %08x-%04x-%04x-%04x-%012x - specify machine UUID - -Display options: --display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off] - [,window_close=on|off]|curses|none| - vnc=<display>[,<optargs>] - select display type --nographic disable graphical output and redirect serial I/Os to console --curses use a curses/ncurses interface instead of SDL --no-frame open SDL window without a frame and window decorations --alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt) --ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt) --no-quit disable SDL window close capability --sdl enable SDL --spice <args> enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate <deg> rotate graphical output some deg left (only PXA LCD) --vga [std|cirrus|vmware|qxl|xenfb|none] - select video card type --full-screen start in full screen --vnc display start a VNC server on display - -i386 target only: --win2k-hack use it when installing Windows 2000 to avoid a disk full bug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...] - ACPI table description --smbios file=binary - load SMBIOS entry from binary file --smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] - specify SMBIOS type 0 fields --smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] - [,uuid=uuid][,sku=str][,family=str] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] - create a new Network Interface Card and connect it to VLAN 'n' --net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=on|off] - [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] - [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] - connect the user mode network stack to VLAN 'n', configure its - DHCP server and enabled optional services --net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off] - connect the host TAP network interface to VLAN 'n' - use network scripts 'file' (default=/etc/qemu-ifup) - to configure it and 'dfile' (default=/etc/qemu-ifdown) - to deconfigure it - use '[down]script=no' to disable script execution - use network helper 'helper' (default=/usr/local/libexec/qemu-bridge-helper) to - configure it - use 'fd=h' to connect to an already opened TAP interface - use 'sndbuf=nbytes' to limit the size of the send buffer (the - default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576') - use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag - use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition - use vhost=on to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=on to force vhost on for non-MSIX virtio guests - use 'vhostfd=h' to connect to an already opened vhost net device --net bridge[,vlan=n][,name=str][,br=bridge][,helper=helper] - connects a host TAP network interface to a host bridge device 'br' - (default=br0) using the program 'helper' - (default=/usr/local/libexec/qemu-bridge-helper) --net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] - connect the vlan 'n' to another VLAN using a socket connection --net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port[,localaddr=addr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=addr' to specify the host address to send packets from --net socket[,vlan=n][,name=str][,fd=h][,udp=host:port][,localaddr=host:port] - connect the vlan 'n' to another VLAN using an UDP tunnel --net dump[,vlan=n][,file=f][,len=n] - dump traffic on vlan 'n' to file 'f' (max n bytes per packet) --net none use it alone to have zero network devices. If no -net option - is provided, the default is '-net nic -net user' --netdev [user|tap|bridge|socket],id=str[,option][,option][,...] - -Character device options: --chardev null,id=id[,mux=on|off] --chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] - [,server][,nowait][,telnet][,mux=on|off] (tcp) --chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix) --chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] - [,localport=localport][,ipv4][,ipv6][,mux=on|off] --chardev msmouse,id=id[,mux=on|off] --chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] - [,mux=on|off] --chardev file,id=id,path=path[,mux=on|off] --chardev pipe,id=id,path=path[,mux=on|off] --chardev pty,id=id[,mux=on|off] --chardev stdio,id=id[,mux=on|off][,signal=on|off] --chardev braille,id=id[,mux=on|off] --chardev tty,id=id,path=path[,mux=on|off] --chardev parport,id=id,path=path[,mux=on|off] --chardev spicevmc,id=id,name=name[,debug=debug] - --iscsi [user=user][,password=password] - [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE - [,initiator-name=iqn] - iSCSI session parameters -Bluetooth(R) options: --bt hci,null dumb bluetooth HCI - doesn't respond to commands --bt hci,host[:id] - use host's HCI with the given name --bt hci[,vlan=n] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=n] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=n] - emulate a bluetooth device 'dev' in scatternet 'n' - -Linux/Multiboot boot specific: --kernel bzImage use 'bzImage' as kernel image --append cmdline use 'cmdline' as kernel command line --initrd file use 'file' as initial ram disk --dtb file use 'file' as device tree image - -Debug/Expert options: --serial dev redirect the serial port to char device 'dev' --parallel dev redirect the parallel port to char device 'dev' --monitor dev redirect the monitor to char device 'dev' --qmp dev like -monitor but opens in 'control' mode --mon chardev=[name][,mode=readline|control][,default] --debugcon dev redirect the debug console to char device 'dev' --pidfile file write PID to 'file' --singlestep always run in singlestep mode --S freeze CPU at startup (use 'c' to start execution) --gdb dev wait for gdb connection on 'dev' --s shorthand for -gdb tcp::1234 --d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) --D logfile output log to logfile (instead of the default /tmp/qemu.log) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=none or lba) (usually QEMU can guess them) --L path set the directory for the BIOS, VGA BIOS and keymaps --bios file set the filename for the BIOS --enable-kvm enable KVM full virtualization support --xen-domid id specify xen guest domain id --xen-create create domain using xen hypercalls, bypassing xend - warning: should not be used when xend is in use --xen-attach attach to existing xen domain - xend will use this when starting QEMU --no-reboot exit instead of rebooting --no-shutdown stop before shutdown --loadvm [tag|id] - start right away with a saved state (loadvm in monitor) --daemonize daemonize QEMU after initializing --option-rom rom load a file, rom, into the option ROM space --clock force the use of the given methods for timer alarm. - To see what timers are available use -clock ? --rtc [base=utc|localtime|date][,clock=host|rt|vm][,driftfix=none|slew] - set the RTC base and clock, enable drift fix for clock ticks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=none] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=reset] --echr chr set terminal escape character instead of ctrl-a --virtioconsole c - set virtio console --show-cursor show cursor --tb-size n set TB size --incoming p prepare for incoming migration, listen on port p --nodefaults don't create default devices --chroot dir chroot to dir just before starting the VM --runas user change to user id user just before starting the VM --sandbox <arg> Enable seccomp mode 2 system call filter (default 'off'). --readconfig <file> --writeconfig <file> - read/write config file --nodefconfig - do not load default config files at startup --no-user-config - do not load user-provided config files at startup --trace [events=<file>][,file=<file>] - specify tracing options --qtest CHR specify tracing options --qtest-log LOG specify tracing options --enable-fips enable FIPS 140-2 compliance --no-kvm disable KVM hardware virtualization --no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC --no-kvm-pit disable KVM kernel mode PIT --no-kvm-pit-reinjection - disable KVM kernel mode PIT interrupt reinjection - -During emulation, the following keys are useful: -ctrl-alt-f toggle full screen -ctrl-alt-n switch to virtual console 'n' -ctrl-alt toggle mouse and keyboard grab - -When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c deleted file mode 100644 index 1336eeef5..000000000 --- a/tests/qemuhelptest.c +++ /dev/null @@ -1,437 +0,0 @@ -#include <config.h> - -#include "testutils.h" - -#ifdef WITH_QEMU - -# include <stdio.h> -# include <stdlib.h> - -# include "qemu/qemu_capabilities.h" -# define __QEMU_CAPSPRIV_H_ALLOW__ -# include "qemu/qemu_capspriv.h" -# undef __QEMU_CAPSPRIV_H_ALLOW__ - -# include "viralloc.h" -# include "virstring.h" - -# define VIR_FROM_THIS VIR_FROM_NONE - -struct testInfo { - const char *name; - virQEMUCapsPtr flags; - unsigned int version; - bool is_kvm; - unsigned int kvm_version; - int error; -}; - -static void printMismatchedFlags(virQEMUCapsPtr got, - virQEMUCapsPtr expect) -{ - size_t i; - - for (i = 0; i < QEMU_CAPS_LAST; i++) { - bool gotFlag = virQEMUCapsGet(got, i); - bool expectFlag = virQEMUCapsGet(expect, i); - if (gotFlag && !expectFlag) - fprintf(stderr, "Extra flag %zu\n", i); - if (!gotFlag && expectFlag) - fprintf(stderr, "Missing flag %zu\n", i); - } -} - -static int testHelpStrParsing(const void *data) -{ - const struct testInfo *info = data; - char *help = NULL; - unsigned int version, kvm_version; - bool is_kvm; - virQEMUCapsPtr flags = NULL; - int ret = -1; - char *got = NULL; - char *expected = NULL; - - if (!(help = virTestLoadFilePath("qemuhelpdata/", info->name, NULL))) - goto cleanup; - - if (!(flags = virQEMUCapsNew())) - goto cleanup; - - if (virQEMUCapsParseHelpStr("QEMU", help, flags, - &version, &is_kvm, &kvm_version, false, NULL) == -1) { - virErrorPtr err = virGetLastError(); - - if (info->error && err && err->code == info->error) - ret = 0; - goto cleanup; - } - -# ifndef WITH_YAJL - if (virQEMUCapsGet(info->flags, QEMU_CAPS_MONITOR_JSON)) - virQEMUCapsSet(flags, QEMU_CAPS_MONITOR_JSON); -# endif - - VIR_FREE(help); - if (!(help = virTestLoadFilePath("qemuhelpdata/", info->name, "-device", NULL))) - goto cleanup; - - if (virQEMUCapsParseDeviceStr(flags, help) < 0) - goto cleanup; - - got = virQEMUCapsFlagsString(flags); - expected = virQEMUCapsFlagsString(info->flags); - if (!got || !expected) - goto cleanup; - - if (STRNEQ(got, expected)) { - VIR_TEST_DEBUG("%s: computed flags do not match: got %s, expected %s\n", - info->name, got, expected); - - if (virTestGetDebug()) - printMismatchedFlags(flags, info->flags); - - goto cleanup; - } - - if (version != info->version) { - fprintf(stderr, "%s: parsed versions do not match: got %u, expected %u\n", - info->name, version, info->version); - goto cleanup; - } - - if (is_kvm != info->is_kvm) { - fprintf(stderr, - "%s: parsed is_kvm flag does not match: got %u, expected %u\n", - info->name, is_kvm, info->is_kvm); - goto cleanup; - } - - if (kvm_version != info->kvm_version) { - fprintf(stderr, - "%s: parsed KVM versions do not match: got %u, expected %u\n", - info->name, kvm_version, info->kvm_version); - goto cleanup; - } - - ret = 0; - cleanup: - VIR_FREE(help); - virObjectUnref(flags); - VIR_FREE(got); - VIR_FREE(expected); - return ret; -} - -static int -mymain(void) -{ - int ret = 0; - -# define DO_TEST_FULL(name, version, is_kvm, kvm_version, error, ...) \ - do { \ - struct testInfo info = { \ - name, NULL, version, is_kvm, kvm_version, error \ - }; \ - if (!(info.flags = virQEMUCapsNew())) \ - return EXIT_FAILURE; \ - virQEMUCapsSetList(info.flags, __VA_ARGS__, QEMU_CAPS_LAST); \ - if (virTestRun("QEMU Help String Parsing " name, \ - testHelpStrParsing, &info) < 0) \ - ret = -1; \ - virObjectUnref(info.flags); \ - } while (0) - -# define DO_TEST(name, version, is_kvm, kvm_version, ...) \ - DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__) - - DO_TEST("qemu-0.12.1", 12001, 0, 0, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_SDL, - QEMU_CAPS_RTC, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_VIRTIO_NET); - DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_RTC, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_NESTING, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_VIRTIO_NET); - DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, - QEMU_CAPS_DRIVE_BOOT, - QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_NETDEV, - QEMU_CAPS_RTC, - QEMU_CAPS_VHOST_NET, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NO_KVM_PIT, - QEMU_CAPS_TDF, - QEMU_CAPS_PCI_CONFIGFD, - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_FSDEV, - QEMU_CAPS_NESTING, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_VT82C686B_USB_UHCI, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_HOST_PCI_MULTIDOMAIN, - QEMU_CAPS_DEVICE_IVSHMEM, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DEVICE_VIRTIO_NET); - DO_TEST("qemu-1.0", 1000000, 0, 0, - QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_NETDEV, - QEMU_CAPS_RTC, - QEMU_CAPS_VHOST_NET, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_FSDEV, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_SPICE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_HDA_DUPLEX, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_CCID_EMULATED, - QEMU_CAPS_CCID_PASSTHRU, - QEMU_CAPS_CHARDEV_SPICEVMC, - QEMU_CAPS_VIRTIO_TX_ALG, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_VIRTIO_IOEVENTFD, - QEMU_CAPS_SGA, - QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, - QEMU_CAPS_VIRTIO_NET_EVENT_IDX, - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_EHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_VT82C686B_USB_UHCI, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_FSDEV_READONLY, - QEMU_CAPS_VIRTIO_BLK_SCSI, - QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_SCSI_BLOCK, - QEMU_CAPS_SCSI_CD, - QEMU_CAPS_IDE_CD, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_BLOCKIO, - QEMU_CAPS_VNC, - QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_SPLASH_TIMEOUT, - QEMU_CAPS_DEVICE_IVSHMEM, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DISPLAY); - DO_TEST("qemu-1.1.0", 1001000, 0, 0, - QEMU_CAPS_DRIVE_CACHE_UNSAFE, - QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_MEM_PATH, - QEMU_CAPS_SDL, - QEMU_CAPS_ENABLE_KVM, - QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_NETDEV, - QEMU_CAPS_RTC, - QEMU_CAPS_VHOST_NET, - QEMU_CAPS_NO_HPET, - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_BOOT_MENU, - QEMU_CAPS_FSDEV, - QEMU_CAPS_NAME_PROCESS, - QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_SPICE, - QEMU_CAPS_VGA_NONE, - QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_HDA_DUPLEX, - QEMU_CAPS_DRIVE_AIO, - QEMU_CAPS_CCID_EMULATED, - QEMU_CAPS_CCID_PASSTHRU, - QEMU_CAPS_CHARDEV_SPICEVMC, - QEMU_CAPS_VIRTIO_TX_ALG, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_VIRTIO_IOEVENTFD, - QEMU_CAPS_SGA, - QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, - QEMU_CAPS_VIRTIO_NET_EVENT_IDX, - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PIIX4_USB_UHCI, - QEMU_CAPS_USB_EHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_VT82C686B_USB_UHCI, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_NO_ACPI, - QEMU_CAPS_FSDEV_READONLY, - QEMU_CAPS_VIRTIO_BLK_SCSI, - QEMU_CAPS_DRIVE_COPY_ON_READ, - QEMU_CAPS_FSDEV_WRITEOUT, - QEMU_CAPS_DRIVE_IOTUNE, - QEMU_CAPS_SCSI_DISK_CHANNEL, - QEMU_CAPS_SCSI_BLOCK, - QEMU_CAPS_SCSI_CD, - QEMU_CAPS_IDE_CD, - QEMU_CAPS_NO_USER_CONFIG, - QEMU_CAPS_HDA_MICRO, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_NETDEV_BRIDGE, - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_BLOCKIO, - QEMU_CAPS_VNC, - QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_DEVICE_VGA, - QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_DEVICE_VMWARE_SVGA, - QEMU_CAPS_DEVICE_USB_SERIAL, - QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB, - QEMU_CAPS_IPV6_MIGRATION, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, - QEMU_CAPS_VNC_SHARE_POLICY, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_OBJECT_USB_AUDIO, - QEMU_CAPS_SPLASH_TIMEOUT, - QEMU_CAPS_DEVICE_IVSHMEM, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_RTL8139, - QEMU_CAPS_DEVICE_E1000, - QEMU_CAPS_DEVICE_VIRTIO_NET, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_DISPLAY); - DO_TEST_FULL("qemu-1.2.0", 1002000, 0, 0, VIR_ERR_CONFIG_UNSUPPORTED, - QEMU_CAPS_LAST); - DO_TEST_FULL("qemu-kvm-1.2.0", 1002000, 1, 0, VIR_ERR_CONFIG_UNSUPPORTED, - QEMU_CAPS_LAST); - - return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -} - -VIR_TEST_MAIN(mymain) - -#else - -int main(void) -{ - return EXIT_AM_SKIP; -} - -#endif /* WITH_QEMU */ -- 2.16.1

Supported since QEMU 0.13, but we require QEMU 0.15. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 15 ------ tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 56 ++++------------------ tests/qemuxml2xmltest.c | 27 ++--------- 32 files changed, 14 insertions(+), 114 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 177e0a9be..50f656e26 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1111,7 +1111,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { - { "multifunction", QEMU_CAPS_PCI_MULTIFUNCTION }, { "bootindex", QEMU_CAPS_BOOTINDEX }, { "ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD }, { "event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3f3c29f8f..32527ce78 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -132,7 +132,7 @@ typedef enum { X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ /* 60 */ - QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */ + X_QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */ QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=on */ QEMU_CAPS_SGA, /* Serial Graphics Adapter */ QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 89fd08b64..3241b1cf5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -356,21 +356,6 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, goto cleanup; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION)) { - if (info->addr.pci.function != 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only PCI device addresses with function=0 " - "are supported with this QEMU binary")); - goto cleanup; - } - if (info->addr.pci.multi == VIR_TRISTATE_SWITCH_ON) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'multifunction=on' is not supported with " - "this QEMU binary")); - goto cleanup; - } - } - if (contIsPHB && contTargetIndex > 0) { /* The PCI bus created by a spapr-pci-host-bridge device with * alias 'x' will be called 'x.0' rather than 'x'; however, diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index d6db1ae22..48281548a 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 671ee9352..f6e8f588f 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 04c801649..109fa2ada 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index d977bdb64..6da349861 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 687d29251..9c1cc7b67 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index dd89b8300..73cd42409 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 17d388e81..88b3e9edb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 403b53862..846d8989e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 1096495f0..6110c227a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index dacb5c459..5689532c8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 70a35ef50..0ca9c7a82 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index ff4829365..c4f03d253 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index ee7fb9e05..c3051be2f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index b5b6b5b3b..015e97beb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 334296e21..90bea5d6b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 178f37f8a..0fec3cd0a 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 1e8ee4e59..d6bb7cecd 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 160ab1e9e..0172055e5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -24,7 +24,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 84df91880..3072c479c 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 24d9dccbc..e2b064a52 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index b58c3a1bd..cc01bf729 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 736e61aeb..61eedfb9e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 2b91337fd..b33d92f21 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index df6f7be34..f6cc85c57 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c83b5211f..75236851a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -22,7 +22,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index ac8d145d1..17fe8f215 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 13fc8c143..e26fe5db5 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d4f4be58f..2ba2b7021 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -808,7 +808,6 @@ mymain(void) QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC, @@ -837,7 +836,7 @@ mymain(void) DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_USB_REDIR, @@ -1148,7 +1147,6 @@ mymain(void) DO_TEST("graphics-spice-usb-redir", QEMU_CAPS_SPICE, QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1413,25 +1411,20 @@ mymain(void) QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-piix3-controller", QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-ich9-ehci-addr", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("input-usbmouse-addr", QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-ich9-companion", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST_PARSE_ERROR("usb-ich9-no-companion", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-ich9-autoassign", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB); DO_TEST("usb-hub", @@ -1466,7 +1459,6 @@ mymain(void) QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-redir", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1474,7 +1466,6 @@ mymain(void) QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("usb-redir-boot", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1484,7 +1475,6 @@ mymain(void) QEMU_CAPS_USB_REDIR_BOOTINDEX); DO_TEST("usb-redir-filter", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1499,7 +1489,6 @@ mymain(void) QEMU_CAPS_USB_REDIR_FILTER); DO_TEST("usb1-usb2", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1); @@ -1760,7 +1749,7 @@ mymain(void) DO_TEST("multifunction-pci-device", QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_SCSI_LSI); + QEMU_CAPS_SCSI_LSI); DO_TEST("monitor-json", QEMU_CAPS_MONITOR_JSON, @@ -1796,15 +1785,13 @@ mymain(void) QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_PCI_OHCI); DO_TEST("pseries-usb-multi", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_PCI_OHCI); DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY, @@ -1965,7 +1952,6 @@ mymain(void) DO_TEST("mach-virt-serial-pci", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -1973,7 +1959,6 @@ mymain(void) DO_TEST("mach-virt-serial-usb", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); @@ -2167,7 +2152,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -2195,7 +2179,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -2204,7 +2187,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -2213,7 +2195,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -2237,7 +2218,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -2263,7 +2243,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -2287,7 +2266,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -2310,7 +2288,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -2333,7 +2310,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -2362,7 +2338,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, @@ -2378,7 +2353,6 @@ mymain(void) DO_TEST("pcie-root-port", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -2387,11 +2361,9 @@ mymain(void) * any PCIe machine type (such as aarch64/virt) will behave the same */ DO_TEST("pcie-root-port-model-generic", QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_DEVICE_IOH3420); DO_TEST("pcie-root-port-model-ioh3420", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_DEVICE_IOH3420); DO_TEST("autoindex", QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -2400,7 +2372,6 @@ mymain(void) QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI); /* Make sure the user can always override libvirt's default device @@ -2414,7 +2385,7 @@ mymain(void) DO_TEST_PARSE_ERROR("q35-wrong-root", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE); @@ -2423,7 +2394,6 @@ mymain(void) DO_TEST_PARSE_ERROR("pcie-root-port-too-many", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -2431,7 +2401,6 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pcie-switch-downstream-port", @@ -2506,7 +2475,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); @@ -2562,7 +2530,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_PL011, @@ -2572,7 +2539,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_DEVICE_IOH3420); @@ -2583,19 +2549,18 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-video-default", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); DO_TEST("aarch64-aavmf-virtio-mmio", @@ -2927,7 +2892,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_INTEL_IOMMU, QEMU_CAPS_INTEL_IOMMU_INTREMAP, @@ -3001,7 +2965,7 @@ mymain(void) DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI); DO_TEST("user-aliases-usb", QEMU_CAPS_KVM, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, - QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_ICH9_USB_EHCI1); /* Test disks with format probing enabled for legacy reasons. * New tests should not go in this section. */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0f560290a..30bf68b02 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -667,7 +667,6 @@ mymain(void) DO_TEST("mach-virt-serial-pci", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -675,7 +674,6 @@ mymain(void) DO_TEST("mach-virt-serial-usb", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); @@ -725,7 +723,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -734,7 +731,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -743,7 +739,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -752,7 +747,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -775,7 +769,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -799,7 +792,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -823,7 +815,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -846,7 +837,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -869,7 +859,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); @@ -897,7 +886,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, @@ -917,7 +905,6 @@ mymain(void) DO_TEST("pcie-root-port", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); @@ -926,17 +913,14 @@ mymain(void) * any PCIe machine type (such as aarch64/virt) will behave the same */ DO_TEST("pcie-root-port-model-generic", QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_DEVICE_IOH3420); DO_TEST("pcie-root-port-model-ioh3420", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION); + QEMU_CAPS_DEVICE_IOH3420); DO_TEST("pcie-switch-upstream-port", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); DO_TEST("pcie-switch-downstream-port", @@ -960,7 +944,6 @@ mymain(void) QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI); /* Make sure the user can always override libvirt's default device @@ -981,7 +964,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); DO_TEST("hostdev-scsi-lsi", @@ -1091,7 +1073,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); @@ -1100,14 +1081,13 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-pci-serial", QEMU_CAPS_NODEFCONFIG, @@ -1122,7 +1102,6 @@ mymain(void) QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, -- 2.16.1

Now that we assume -netdev support, we no longer set the VLAN or need the hostPlugged bool. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_hotplug.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7f5c68e0c..a3e20c6e8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -825,7 +825,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, char *nicstr = NULL; char *netstr = NULL; int ret = -1; - int vlan; bool releaseaddr = false; bool iface_connected = false; virDomainNetType actualType; @@ -836,7 +835,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, char *charDevAlias = NULL; bool charDevPlugged = false; bool netdevPlugged = false; - bool hostPlugged = false; + char *netdev_name; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) @@ -1029,7 +1028,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, releaseaddr = true; - vlan = -1; if (VIR_ALLOC_N(tapfdName, tapfdSize) < 0 || VIR_ALLOC_N(vhostfdName, vhostfdSize) < 0) goto cleanup; @@ -1078,7 +1076,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, for (i = 0; i < vhostfdSize; i++) VIR_FORCE_CLOSE(vhostfd[i]); - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, + if (!(nicstr = qemuBuildNicDevStr(vm->def, net, -1, 0, queueSize, priv->qemuCaps))) goto try_remove; @@ -1169,31 +1167,17 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; virErrorPreserveLast(&originalError); - if (vlan < 0) { - char *netdev_name; - if (virAsprintf(&netdev_name, "host%s", net->info.alias) >= 0) { - qemuDomainObjEnterMonitor(driver, vm); - if (charDevPlugged && - qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) - VIR_WARN("Failed to remove associated chardev %s", charDevAlias); - if (netdevPlugged && - qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) - VIR_WARN("Failed to remove network backend for netdev %s", - netdev_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - VIR_FREE(netdev_name); - } - } else { - char *hostnet_name; - if (virAsprintf(&hostnet_name, "host%s", net->info.alias) >= 0) { - qemuDomainObjEnterMonitor(driver, vm); - if (hostPlugged && - qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) - VIR_WARN("Failed to remove network backend for vlan %d, net %s", - vlan, hostnet_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - VIR_FREE(hostnet_name); - } + if (virAsprintf(&netdev_name, "host%s", net->info.alias) >= 0) { + qemuDomainObjEnterMonitor(driver, vm); + if (charDevPlugged && + qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) + VIR_WARN("Failed to remove associated chardev %s", charDevAlias); + if (netdevPlugged && + qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) + VIR_WARN("Failed to remove network backend for netdev %s", + netdev_name); + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + VIR_FREE(netdev_name); } virErrorRestore(&originalError); goto cleanup; -- 2.16.1

Now that we assume QEMU_CAPS_NETDEV, the only thing left to check is whether we need to use the legacy -net syntax because of a non-conforming armchitecture. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_command.c | 20 +++++--------------- src/qemu/qemu_domain.c | 10 ---------- src/qemu/qemu_domain.h | 4 ---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_interface.c | 2 +- 5 files changed, 7 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3241b1cf5..3dda9156d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8222,7 +8222,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, unsigned int queues = net->driver.virtio.queues; char *nic = NULL; - if (!qemuDomainSupportsNetdev(def, qemuCaps, net)) { + if (!qemuDomainSupportsNicdev(def, net)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Netdev support unavailable")); goto error; @@ -8557,23 +8557,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, goto cleanup; } - /* Possible combinations: - * - * 1. Old way: -net nic,model=e1000,vlan=1 -net tap,vlan=1 - * 2. Semi-new: -device e1000,vlan=1 -net tap,vlan=1 - * 3. Best way: -netdev type=tap,id=netdev1 -device e1000,id=netdev1 - * - * NB, no support for -netdev without use of -device - */ - if (qemuDomainSupportsNetdev(def, qemuCaps, net)) { + if (qemuDomainSupportsNicdev(def, net)) { if (!(host = qemuBuildHostNetStr(net, driver, ',', vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; virCommandAddArgList(cmd, "-netdev", host, NULL); - } - if (qemuDomainSupportsNicdev(def, net)) { + if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, vhostfdSize, qemuCaps))) goto cleanup; @@ -8582,8 +8573,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (!(nic = qemuBuildNicStr(net, "nic,", vlan))) goto cleanup; virCommandAddArgList(cmd, "-net", nic, NULL); - } - if (!qemuDomainSupportsNetdev(def, qemuCaps, net)) { + if (!(host = qemuBuildHostNetStr(net, driver, ',', vlan, tapfdName, tapfdSize, @@ -8663,7 +8653,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver, int vlan; /* VLANs are not used with -netdev, so don't record them */ - if (qemuDomainSupportsNetdev(def, qemuCaps, net)) + if (qemuDomainSupportsNicdev(def, net)) vlan = -1; else vlan = i; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e4a8c45cf..b4ce6c145 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9109,16 +9109,6 @@ qemuDomainSupportsNicdev(virDomainDefPtr def, return true; } -bool -qemuDomainSupportsNetdev(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, - virDomainNetDefPtr net) -{ - if (!qemuDomainSupportsNicdev(def, net)) - return false; - return true; -} - bool qemuDomainNetSupportsMTU(virDomainNetType type) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 43352412c..c01cc85e0 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -799,10 +799,6 @@ int qemuDomainRefreshVcpuHalted(virQEMUDriverPtr driver, bool qemuDomainSupportsNicdev(virDomainDefPtr def, virDomainNetDefPtr net); -bool qemuDomainSupportsNetdev(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, - virDomainNetDefPtr net); - bool qemuDomainNetSupportsMTU(virDomainNetType type); int qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a3e20c6e8..a70ec5b6e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -956,7 +956,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, queueSize = net->driver.virtio.queues; if (!queueSize) queueSize = 1; - if (!qemuDomainSupportsNetdev(vm->def, priv->qemuCaps, net)) { + if (!qemuDomainSupportsNicdev(vm->def, net)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Netdev support unavailable")); goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index cebb49022..24c0174bf 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -646,7 +646,7 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def, * option), don't try to open the device. */ if (!(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_NET) && - qemuDomainSupportsNetdev(def, qemuCaps, net))) { + qemuDomainSupportsNicdev(def, net))) { if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_VHOST) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("vhost-net is not supported with " -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 20 ++++++++------------ tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - .../disk-drive-network-tlsx509-vxhs.args | 6 +++--- tests/qemuxml2argvdata/disk-drive-network-vxhs.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 2 +- tests/qemuxml2argvtest.c | 8 +++----- 34 files changed, 17 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bb2fd0544..6b16662fe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3d7239085..3073446ee 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -73,7 +73,7 @@ typedef enum { X_QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ X_QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */ X_QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ - QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ + X_QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ /* 20 */ X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7fd05ec76..2ab3dcb10 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1340,14 +1340,12 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, if (qemuCaps) { if (disk->serial && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { - if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && - disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("scsi-block 'lun' devices do not support the " - "serial property")); - return -1; - } + disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && + disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("scsi-block 'lun' devices do not support the " + "serial property")); + return -1; } if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_DIRECTSYNC && @@ -1677,7 +1675,6 @@ qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk, static void qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps, virBufferPtr buf) { /* generate geometry command string */ @@ -1694,8 +1691,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virDomainDiskGeometryTransTypeToString(disk->geometry.trans)); } - if (disk->serial && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { + if (disk->serial) { virBufferAddLit(buf, ",serial="); virBufferEscape(buf, '\\', " ", "%s", disk->serial); } @@ -1742,7 +1738,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, /* Format attributes for the drive itself (not the storage backing it) which * we've formatted historically with -drive */ - qemuBuildDiskFrontendAttributes(disk, qemuCaps, &opt); + qemuBuildDiskFrontendAttributes(disk, &opt); /* While this is a frontend attribute, it only makes sense to be used when * legacy -drive is used. In modern qemu the 'ide-cd' or 'scsi-cd' are used. diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 898badc59..be0412bd2 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 5f7415eb9..2dbc1b913 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 891cb25e8..1b09d4108 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 2d9b18c72..96f6a3c2e 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index dbe56d746..ff7f5e139 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 4f4399c7d..ca98ee14d 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 29bb8846f..146f0f0b8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index c9fbdc897..5df71879f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index a3c5c6084..5bc204e14 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 218700913..3d59e0e3b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 895752990..2fbd794ec 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 02d4c47d5..6aa99fac9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 323148c5f..744a95481 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 45676a091..5e2ac1d96 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -3,7 +3,6 @@ <selfctime>0</selfctime> <selfvers>0</selfvers> <usedQMP/> - <flag name='drive-serial'/> <flag name='enable-kvm'/> <flag name='sdl'/> <flag name='rtc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 3ac161a76..cc05d2dd9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 1ad8ce62c..a94a47ee5 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index fdc6b4b73..7576e0b1d 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index a3a640014..34bc3919e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index c8e31f336..9ae59448b 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 3c4452f7e..748b5ebc5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 96ec062cf..c35cade3d 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 0ed1ab5c5..b9e5b3110 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index ac01f3d5a..82d7dd791 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index a78a6c35c..2cdd49231 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 15516df5f..7c8973ae0 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index ee820d252..d99924f99 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index d9ba0e19c..5bd53f71f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='drive-serial'/> <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args index b4298b11a..601bcfd83 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509-vxhs.args @@ -26,7 +26,7 @@ endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,cache=none \ +id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs,\ @@ -34,11 +34,11 @@ endpoint=client,verify-peer=yes \ -drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\ file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\ file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk1,cache=none \ +id=drive-virtio-disk1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,\ id=virtio-disk1 \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc253,\ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk2,cache=none \ +id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ id=virtio-disk2 diff --git a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args index 638769601..e8d6344c1 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-drive-network-vxhs.args @@ -23,6 +23,6 @@ server,nowait \ -usb \ -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\ file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\ -id=drive-virtio-disk0,cache=none \ +id=drive-virtio-disk0,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 41f025571..3fb9168f7 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -23,7 +23,7 @@ server,nowait \ -device lsi,id=scsi1,bus=pci.0,addr=0x4 \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-1-0,\ -readonly=on \ +serial=WD-WMAP9A966149,readonly=on \ -device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ id=scsi0-0-1-0,wwn=0x5000c50015ea71ac \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-0-0 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 076b1a137..346382c8f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -910,8 +910,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-drive-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-shared", - QEMU_CAPS_DRIVE_SERIAL); + DO_TEST("disk-drive-shared", NONE); DO_TEST_PARSE_ERROR("disk-drive-shared-qcow", NONE); DO_TEST("disk-drive-shared-locking", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW); @@ -1059,8 +1058,7 @@ mymain(void) QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-serial", - QEMU_CAPS_KVM, - QEMU_CAPS_DRIVE_SERIAL); + QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address", NONE); DO_TEST_PARSE_ERROR("disk-ide-incompatible-address", @@ -1966,7 +1964,7 @@ mymain(void) QEMU_CAPS_IDE_CD); DO_TEST("disk-ide-wwn", QEMU_CAPS_IDE_CD, - QEMU_CAPS_DRIVE_SERIAL, QEMU_CAPS_IDE_DRIVE_WWN); + QEMU_CAPS_IDE_DRIVE_WWN); DO_TEST("disk-geometry", NONE); DO_TEST("disk-blockio", -- 2.16.1

Implied by QEMU >= 0.12.0. Deprecated by QEMU commit 1ed2fc1 included in 0.12.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3a18370eb..41342ab4b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -92,7 +92,7 @@ typedef enum { /* 30 */ X_QEMU_CAPS_RTC, /* The -rtc flag for clock options */ QEMU_CAPS_VHOST_NET, /* vhost-net support available */ - QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */ + X_QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */ QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7ed179a3c..2b7a871b2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6185,26 +6185,7 @@ qemuBuildClockCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_TIMER_NAME_RTC: - /* This has already been taken care of (in qemuBuildClockArgStr) - if QEMU_CAPS_RTC is set (mutually exclusive with - QEMUD_FLAG_RTC_TD_HACK) */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC_TD_HACK)) { - switch (def->clock.timers[i]->tickpolicy) { - case -1: - case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: - /* the default - do nothing */ - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: - virCommandAddArg(cmd, "-rtc-td-hack"); - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: - case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported rtc tickpolicy '%s'"), - virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy)); - return -1; - } - } + /* Already handled in qemuBuildClockArgStr */ break; case VIR_DOMAIN_TIMER_NAME_PIT: -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 366 +++++++-------------- tests/qemuxml2xmltest.c | 63 ++-- 31 files changed, 134 insertions(+), 325 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 25b90282f..90b1c0b2c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 19b01cbd3..4e1558b52 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -99,7 +99,7 @@ typedef enum { /* 35 */ QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ - QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ + X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */ X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */ diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index f51e1fc37..1dea27ed5 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 11becc4d6..af1d8beb8 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 3cc8c22c2..9c95914dc 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 617759bf8..c1d813594 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index a02826bb0..f65dfdffd 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 49458e743..7d4a1cc0f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index ba46cc164..28cd0f92d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 0a787b65c..b20500a53 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index ebd8a5817..9a0b66cd4 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index f79b5f5bc..c84b419d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index e8d4c6bf8..99e8bbcd3 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 6f32f834e..9cdcf8d17 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 6b4f5ba8a..5623559dd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index fb647cbd7..78bdd16c3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='enable-kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index ba3fcd215..1a3ae5ae5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='no-hpet'/> <flag name='no-kvm-pit'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index f2cfab0a7..d7adef1cb 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index fa3140ffd..a364ea2f8 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 4217dc9c3..f22d8cdce 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index eaab5d467..b8d1b53da 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index d519a93a9..7d6cfe7f2 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 80bb743f3..e931d62ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index a20a76222..4062b4caf 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 6f66983e7..3b95db75f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index b8b4a5f22..be68a33ab 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index f45a5023d..3c4714b66 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 5031a9450..911d80d5d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 2078c4533..09683ec56 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='nodefconfig'/> <flag name='boot-menu'/> <flag name='fsdev'/> <flag name='name-process'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f99361227..e696af7a3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -788,7 +788,7 @@ mymain(void) DO_TEST("q35-noacpi-nouefi", NONE); DO_TEST("q35-acpi-nouefi", NONE); - DO_TEST("clock-utc", QEMU_CAPS_NODEFCONFIG); + DO_TEST("clock-utc", NONE); DO_TEST("clock-localtime", NONE); DO_TEST("clock-localtime-basis-localtime", NONE); DO_TEST("clock-variable", NONE); @@ -904,10 +904,8 @@ mymain(void) QEMU_CAPS_DRIVE_BOOT); DO_TEST("floppy-drive-fat", QEMU_CAPS_DRIVE_BOOT); - DO_TEST("disk-drive-readonly-disk", - QEMU_CAPS_NODEFCONFIG); - DO_TEST("disk-drive-readonly-no-device", - QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-drive-readonly-disk", NONE); + DO_TEST("disk-drive-readonly-no-device", NONE); DO_TEST("disk-drive-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-drive-shared", NONE); @@ -937,7 +935,7 @@ mymain(void) DO_TEST_PARSE_ERROR("disk-drive-network-iscsi-auth-wrong-secrettype", NONE); DO_TEST_PARSE_ERROR("disk-drive-network-source-auth-both", NONE); DO_TEST("disk-drive-network-iscsi-lun", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-drive-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); @@ -963,66 +961,49 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI); DO_TEST_FAILURE("disk-usb-nosupport", NONE); DO_TEST("disk-usb-device", - QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST("disk-usb-device-removable", QEMU_CAPS_DEVICE_USB_STORAGE, - QEMU_CAPS_USB_STORAGE_REMOVABLE, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_USB_STORAGE_REMOVABLE); DO_TEST_FAILURE("disk-usb-pci", - QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST("disk-scsi-device", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-device-auto", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-disk-split", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-disk-wwn", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-disk-vpd", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); - DO_TEST("disk-scsi-vscsi", - QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-scsi-virtio-scsi", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-num_queues", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-cmd_per_lun", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-scsi-mptsas1068", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-sata-device", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); + QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", QEMU_CAPS_DRIVE_AIO); - DO_TEST("disk-source-pool", - QEMU_CAPS_NODEFCONFIG); - DO_TEST("disk-source-pool-mode", - QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-source-pool", NONE); + DO_TEST("disk-source-pool-mode", NONE); DO_TEST("disk-ioeventfd", QEMU_CAPS_VIRTIO_IOEVENTFD, QEMU_CAPS_VIRTIO_TX_ALG, @@ -1039,7 +1020,7 @@ mymain(void) DO_TEST("disk-snapshot", NONE); DO_TEST_PARSE_ERROR("disk-same-targets", QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST_PARSE_ERROR("disk-drive-address-conflict", QEMU_CAPS_ICH9_AHCI); DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", @@ -1125,7 +1106,6 @@ mymain(void) QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-spice-compression", QEMU_CAPS_SPICE, @@ -1140,7 +1120,6 @@ mymain(void) QEMU_CAPS_DEVICE_QXL); DO_TEST("graphics-spice-usb-redir", QEMU_CAPS_SPICE, - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1184,11 +1163,9 @@ mymain(void) DO_TEST("net-user-addr", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG); - DO_TEST("net-virtio-disable-offloads", - QEMU_CAPS_NODEFCONFIG); - DO_TEST("net-virtio-netdev", - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_VIRTIO_TX_ALG); + DO_TEST("net-virtio-disable-offloads", NONE); + DO_TEST("net-virtio-netdev", NONE); DO_TEST("net-virtio-s390", QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", @@ -1205,23 +1182,17 @@ mymain(void) DO_TEST("net-server", NONE); DO_TEST("net-mcast", NONE); DO_TEST("net-udp", NONE); - DO_TEST("net-hostdev", - QEMU_CAPS_NODEFCONFIG); + DO_TEST("net-hostdev", NONE); DO_TEST("net-hostdev-multidomain", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); - DO_TEST_FAILURE("net-hostdev-multidomain", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_FAILURE("net-hostdev-multidomain", NONE); DO_TEST("net-hostdev-vfio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-hostdev-vfio-multidomain", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); DO_TEST_FAILURE("net-hostdev-vfio-multidomain", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_FAILURE("net-hostdev-fail", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); @@ -1230,7 +1201,6 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_CHARDEV_LOGFILE); DO_TEST("serial-spiceport", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, @@ -1244,46 +1214,34 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-vc-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-pty-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-dev-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-dev-chardev-iobase", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-file-chardev", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_CHARDEV_FILE_APPEND); DO_TEST("serial-unix-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-tcp-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-udp-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-tcp-telnet-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); driver.config->chardevTLS = 1; DO_TEST("serial-tcp-tlsx509-chardev", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_OBJECT_TLS_CREDS_X509); driver.config->chardevTLSx509verify = 1; DO_TEST("serial-tcp-tlsx509-chardev-verify", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_OBJECT_TLS_CREDS_X509); driver.config->chardevTLSx509verify = 0; DO_TEST("serial-tcp-tlsx509-chardev-notls", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_OBJECT_TLS_CREDS_X509); VIR_FREE(driver.config->chardevTLSx509certdir); @@ -1294,13 +1252,11 @@ mymain(void) return EXIT_FAILURE; # ifdef HAVE_GNUTLS_CIPHER_ENCRYPT DO_TEST("serial-tcp-tlsx509-secret-chardev", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_OBJECT_TLS_CREDS_X509); # else DO_TEST_FAILURE("serial-tcp-tlsx509-secret-chardev", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_OBJECT_TLS_CREDS_X509); @@ -1308,156 +1264,133 @@ mymain(void) driver.config->chardevTLS = 0; VIR_FREE(driver.config->chardevTLSx509certdir); DO_TEST("serial-many-chardev", - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); - DO_TEST("parallel-tcp-chardev", - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_ISA_SERIAL); + DO_TEST("parallel-tcp-chardev", NONE); DO_TEST("parallel-parport-chardev", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("console-compat-chardev", QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("pci-serial-dev-chardev", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("channel-guestfwd", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("channel-virtio", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("channel-virtio-state", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("channel-virtio-auto", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("channel-virtio-autoassign", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("channel-virtio-autoadd", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("console-virtio", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("console-virtio-s390", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390); DO_TEST("console-virtio-ccw", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("console-sclp", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("channel-spicevmc", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("channel-spicevmc-old", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_SPICEVMC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("channel-virtio-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("channel-virtio-unix", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("smartcard-host", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-host-certificates", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-passthrough-tcp", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU); DO_TEST("smartcard-passthrough-spicevmc", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("smartcard-controller", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CCID_EMULATED); DO_TEST("chardev-reconnect", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV_RECONNECT, QEMU_CAPS_USB_REDIR, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_CCID_PASSTHRU); DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV_RECONNECT); DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV_RECONNECT); DO_TEST("usb-controller", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-piix3-controller", QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-ich9-ehci-addr", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("input-usbmouse-addr", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-ich9-companion", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST_PARSE_ERROR("usb-ich9-no-companion", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-ich9-autoassign", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB); DO_TEST("usb-hub", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-hub-autoadd", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-hub-autoadd-deluxe", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST_PARSE_ERROR("usb-hub-conflict", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST_PARSE_ERROR("usb-hub-nonexistent", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST_FAILURE("usb-bus-missing", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-ports", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST_PARSE_ERROR("usb-ports-out-of-range", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-port-autoassign", QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-redir", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); DO_TEST("usb-redir-boot", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1466,7 +1399,6 @@ mymain(void) QEMU_CAPS_BOOTINDEX, QEMU_CAPS_USB_REDIR_BOOTINDEX); DO_TEST("usb-redir-filter", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, @@ -1474,25 +1406,22 @@ mymain(void) QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_USB_REDIR_FILTER); DO_TEST("usb-redir-filter-version", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_REDIR, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_USB_REDIR_FILTER); DO_TEST("usb1-usb2", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-none", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST_PARSE_ERROR("usb-none-other", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST_PARSE_ERROR("usb-none-hub", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-none-usbtablet", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("usb-controller-default-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, @@ -1512,18 +1441,15 @@ mymain(void) QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI); DO_TEST("usb-controller-xhci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS); DO_TEST("usb-xhci-autoassign", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS, QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS); @@ -1537,67 +1463,56 @@ mymain(void) DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE); DO_TEST("watchdog", NONE); - DO_TEST("watchdog-device", QEMU_CAPS_NODEFCONFIG); + DO_TEST("watchdog-device", NONE); DO_TEST("watchdog-dump", NONE); DO_TEST("watchdog-injectnmi", NONE); DO_TEST("watchdog-diag288", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390); - DO_TEST("balloon-device", QEMU_CAPS_NODEFCONFIG); - DO_TEST("balloon-device-deflate", QEMU_CAPS_NODEFCONFIG, + DO_TEST("balloon-device", NONE); + DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST("balloon-ccw-deflate", QEMU_CAPS_NODEFCONFIG, + DO_TEST("balloon-ccw-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST("balloon-mmio-deflate", QEMU_CAPS_NODEFCONFIG, + DO_TEST("balloon-mmio-deflate", QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST("balloon-device-deflate-off", QEMU_CAPS_NODEFCONFIG, + DO_TEST("balloon-device-deflate-off", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST("balloon-device-auto", - QEMU_CAPS_NODEFCONFIG); - DO_TEST("balloon-device-period", QEMU_CAPS_NODEFCONFIG); + DO_TEST("balloon-device-auto", NONE); + DO_TEST("balloon-device-period", NONE); DO_TEST("sound", NONE); DO_TEST("sound-device", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV, + QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT); DO_TEST("fs9p-ccw", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_FSDEV, + QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("hostdev-usb-address", NONE); - DO_TEST("hostdev-usb-address-device", - QEMU_CAPS_NODEFCONFIG); + DO_TEST("hostdev-usb-address-device", NONE); DO_TEST("hostdev-usb-address-device-boot", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, + QEMU_CAPS_BOOTINDEX, QEMU_CAPS_USB_HOST_BOOTINDEX); DO_TEST("hostdev-pci-address", NONE); - DO_TEST("hostdev-pci-address-device", - QEMU_CAPS_NODEFCONFIG); + DO_TEST("hostdev-pci-address-device", NONE); DO_TEST("hostdev-vfio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio-multidomain", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); DO_TEST("hostdev-mdev-precreated", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_FAILURE("hostdev-vfio-multidomain", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("pci-rom", - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST("pci-rom", NONE); DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, NONE); DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, GIC_NONE, NONE); @@ -1740,14 +1655,10 @@ mymain(void) QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH); DO_TEST("multifunction-pci-device", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI); - DO_TEST("monitor-json", - QEMU_CAPS_NODEFCONFIG); - DO_TEST("no-shutdown", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_NO_SHUTDOWN); + DO_TEST("monitor-json", NONE); + DO_TEST("no-shutdown", QEMU_CAPS_NO_SHUTDOWN); DO_TEST("seclabel-dynamic", NONE); DO_TEST("seclabel-dynamic-baselabel", NONE); @@ -1764,60 +1675,48 @@ mymain(void) DO_TEST("pseries-basic", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-vio", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-usb-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI); DO_TEST("pseries-usb-multi", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI); DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("pseries-vio-address-clash", - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); + DO_TEST_PARSE_ERROR("pseries-vio-address-clash", NONE); DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_NVRAM); DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-cpu-exact", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("pseries-no-parallel", - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); + DO_TEST_PARSE_ERROR("pseries-no-parallel", NONE); qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64); DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-machine-max-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST_FAILURE("pseries-cpu-compat-power9", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_KVM); @@ -1826,29 +1725,23 @@ mymain(void) DO_TEST("pseries-cpu-compat-power9", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); qemuTestSetHostCPU(driver.caps, NULL); qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE); DO_TEST("pseries-panic-missing", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-panic-no-address", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST_FAILURE("pseries-panic-address", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-phb-simple", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-phb-default-missing", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-phb-numa-node", QEMU_CAPS_NUMA, @@ -1861,31 +1754,25 @@ mymain(void) DO_TEST_PARSE_ERROR("pseries-phb-invalid-target-index-3", NONE); DO_TEST("pseries-many-devices", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("pseries-many-buses-1", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("pseries-many-buses-2", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("pseries-hostdevs-1", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("pseries-hostdevs-2", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("pseries-hostdevs-3", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_VIRTIO_SCSI, @@ -1901,66 +1788,51 @@ mymain(void) DO_TEST_PARSE_ERROR("pseries-features-invalid-machine", NONE); DO_TEST("pseries-serial-native", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-serial+console-native", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-serial-compat", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-serial-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("pseries-serial-usb", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); DO_TEST("pseries-console-native", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-console-virtio", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST_PARSE_ERROR("pseries-serial-invalid-machine", NONE); DO_TEST("mach-virt-serial-native", - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_PL011); DO_TEST("mach-virt-serial+console-native", - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_PL011); DO_TEST("mach-virt-serial-compat", - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_PL011); DO_TEST("mach-virt-serial-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("mach-virt-serial-usb", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); DO_TEST("mach-virt-console-native", - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_NODEFCONFIG); - DO_TEST("mach-virt-console-virtio", - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_PL011); + DO_TEST("mach-virt-console-virtio", NONE); DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE); DO_TEST("disk-ide-drive-split", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD); DO_TEST("disk-ide-wwn", QEMU_CAPS_IDE_CD, @@ -1968,7 +1840,6 @@ mymain(void) DO_TEST("disk-geometry", NONE); DO_TEST("disk-blockio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD, QEMU_CAPS_BLOCKIO); DO_TEST("video-device-pciaddr-default", @@ -2047,7 +1918,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST("virtio-rng-ccw", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, @@ -2055,47 +1925,38 @@ mymain(void) QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("s390-allow-bogus-usb-none", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("s390-allow-bogus-usb-controller", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("s390-panic-no-address", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST_FAILURE("s390-panic-address", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("s390-panic-missing", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST_PARSE_ERROR("s390-no-parallel", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("s390-serial", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("s390-serial-2", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE, QEMU_CAPS_DEVICE_SCLPLMCONSOLE); DO_TEST("s390-serial-console", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE); @@ -2484,21 +2345,21 @@ mymain(void) QEMU_CAPS_Q35_PCI_HOLE64_SIZE); DO_TEST("arm-vexpressa9-nodevs", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB); + QEMU_CAPS_DTB); DO_TEST("arm-vexpressa9-basic", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB); + QEMU_CAPS_DTB); DO_TEST("arm-vexpressa9-virtio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("arm-virt-virtio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("aarch64-virt-virtio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); @@ -2508,7 +2369,7 @@ mymain(void) but virtio-mmio is always used unless PCI addresses are manually specified. */ DO_TEST("aarch64-virtio-pci-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, @@ -2518,7 +2379,7 @@ mymain(void) QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-virt-2.6-virtio-pci-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -2528,7 +2389,7 @@ mymain(void) /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ DO_TEST("aarch64-virtio-pci-manual-addresses", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -2536,26 +2397,25 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-video-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); DO_TEST("aarch64-aavmf-virtio-mmio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("aarch64-virt-default-nic", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO); qemuTestSetHostArch(driver.caps, VIR_ARCH_AARCH64); DO_TEST("aarch64-cpu-passthrough", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-none", GIC_NONE, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); @@ -2640,14 +2500,13 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); DO_TEST("aarch64-kvm-32-on-64", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_KVM, QEMU_CAPS_CPU_AARCH64_OFF); DO_TEST_FAILURE("aarch64-kvm-32-on-64", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); DO_TEST("aarch64-pci-serial", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_PCI_SERIAL, QEMU_CAPS_CHARDEV_LOGFILE, QEMU_CAPS_OBJECT_GPEX, @@ -2667,13 +2526,10 @@ mymain(void) DO_TEST("kvm-pit-discard", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("no-kvm-pit-device", NONE); - DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC, - QEMU_CAPS_NODEFCONFIG); - DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC, - QEMU_CAPS_NODEFCONFIG); + DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC); + DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC); - DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC, - QEMU_CAPS_NODEFCONFIG); + DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC); DO_TEST("fips-enabled", QEMU_CAPS_ENABLE_FIPS); @@ -2856,10 +2712,10 @@ mymain(void) DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS); DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET); - DO_TEST("usb-long-port-path", QEMU_CAPS_NODEFCONFIG, + DO_TEST("usb-long-port-path", QEMU_CAPS_USB_HUB); DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); + QEMU_CAPS_USB_HUB); DO_TEST("acpi-table", NONE); DO_TEST("intel-iommu", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 8004fc427..182134567 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -381,22 +381,22 @@ mymain(void) DO_TEST("disk-drive-network-vxhs", NONE); DO_TEST("disk-drive-network-tlsx509-vxhs", NONE); DO_TEST("disk-scsi-device", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI); + QEMU_CAPS_SCSI_LSI); DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-scsi-virtio-scsi", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-num_queues", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-cmd_per_lun", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-max_sectors", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-scsi-ioeventfd", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + QEMU_CAPS_SCSI_MEGASAS); DO_TEST("disk-scsi-mptsas1068", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old", NONE); DO_TEST("disk-mirror", NONE); @@ -504,7 +504,7 @@ mymain(void) DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("iothreads-virtio-scsi-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("iothreads-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); @@ -559,10 +559,10 @@ mymain(void) DO_TEST("numad-static-vcpu-no-numatune", NONE); DO_TEST("disk-scsi-lun-passthrough-sgio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-disk-vpd", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); @@ -583,10 +583,8 @@ mymain(void) QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-phb-simple", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-phb-default-missing", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-phb-numa-node", QEMU_CAPS_NUMA, @@ -594,31 +592,25 @@ mymain(void) QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE); DO_TEST("pseries-many-devices", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("pseries-many-buses-1", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("pseries-many-buses-2", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("pseries-hostdevs-1", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("pseries-hostdevs-2", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("pseries-hostdevs-3", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_HOST_PCI_MULTIDOMAIN, QEMU_CAPS_VIRTIO_SCSI, @@ -630,64 +622,55 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); DO_TEST("pseries-serial-native", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-serial+console-native", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-serial-compat", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-serial-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("pseries-serial-usb", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); DO_TEST("pseries-console-native", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); DO_TEST("pseries-console-virtio", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("mach-virt-serial-native", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("mach-virt-serial+console-native", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("mach-virt-serial-compat", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("mach-virt-serial-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_SERIAL); DO_TEST("mach-virt-serial-usb", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_DEVICE_USB_SERIAL); DO_TEST("mach-virt-console-native", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("mach-virt-console-virtio", - QEMU_CAPS_NODEFCONFIG); + NONE); DO_TEST("balloon-device-auto", NONE); DO_TEST("balloon-device-period", NONE); DO_TEST("channel-virtio-auto", NONE); DO_TEST("console-compat-auto", NONE); DO_TEST("disk-scsi-device-auto", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI); + QEMU_CAPS_SCSI_LSI); DO_TEST("console-virtio", NONE); DO_TEST("serial-target-port-auto", NONE); DO_TEST("graphics-listen-network2", NONE); @@ -1057,11 +1040,11 @@ mymain(void) DO_TEST("smbios-multiple-type2", NONE); DO_TEST("aarch64-aavmf-virtio-mmio", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("aarch64-virtio-pci-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, @@ -1070,7 +1053,7 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-virtio-pci-manual-addresses", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -1078,12 +1061,11 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); DO_TEST("aarch64-pci-serial", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_PCI_SERIAL, QEMU_CAPS_CHARDEV_LOGFILE, QEMU_CAPS_OBJECT_GPEX, @@ -1091,7 +1073,6 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT); DO_TEST("aarch64-video-default", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 6 ------ tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 10 +--------- tests/qemuxml2xmltest.c | 6 ------ 32 files changed, 2 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index da4403c3a..d83ed23d9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ed6043f97..f44be29bb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -104,7 +104,7 @@ typedef enum { X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */ /* 40 */ - QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ + X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae2c4fcf1..fceb5d2ce 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2466,12 +2466,6 @@ qemuBuildFSDevCommandLine(virCommandPtr cmd, { size_t i; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV) && def->nfss) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("filesystem passthrough not supported by this QEMU")); - return -1; - } - for (i = 0; i < def->nfss; i++) { char *optstr; virDomainFSDefPtr fs = def->fss[i]; diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 2d5e87878..ec8718a7c 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index ced532236..1af6561b8 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 7fe822cbf..770d0df19 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 711ad04f0..cd093fd75 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 4a6749a37..bfae3e804 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index f7f687c85..81044e9e7 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 9cfb13c15..743f1f4e3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 482a6777f..933be1000 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 4b42badae..b16ac28b9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 0847df131..975ff5c0e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 64e467c9b..9fdfad497 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 89ceab5be..ab14d5964 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index ecf50e74d..d88bb2c32 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 3c85651fe..1d998f9cd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='enable-kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 697c1409c..da20a577c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='no-hpet'/> <flag name='no-kvm-pit'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 1d0059711..1de06103d 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index bd52e6eee..662113f8d 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 7d8b21cda..ae3d680d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index cf6994147..6b3dd1251 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 0b7d39712..189e987c9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 4a1f633db..21399ee9d 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 14750ee6b..74dd4d4e2 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 18a81a2ab..77dd0c33a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 55f6066b2..ac2563200 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index da19644d8..88e2a8c52 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 544b4ae56..ab67ea316 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='vga-none'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 5bbf174ca..08227444a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='fsdev'/> <flag name='name-process'/> <flag name='smbios-type'/> <flag name='spice'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d6fb2b5be..943513cca 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1482,10 +1482,8 @@ mymain(void) QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT); DO_TEST("fs9p-ccw", - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); @@ -2058,7 +2056,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -2082,7 +2079,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -2104,7 +2100,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -2125,7 +2120,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -2146,7 +2140,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -2172,7 +2165,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -2753,7 +2745,7 @@ mymain(void) DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_KEYBOARD, QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, + QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, QEMU_CAPS_DEVICE_VIRTIO_RNG, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6f6c31faa..236338b6c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -745,7 +745,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -767,7 +766,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -789,7 +787,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -810,7 +807,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -831,7 +827,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -856,7 +851,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TABLET, QEMU_CAPS_VIRTIO_INPUT_HOST, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_FSDEV, QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 12 ++---------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 6 +++--- 31 files changed, 6 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5d5b8ed64..6fd6d06e7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 55b95f4e5..6e756c661 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -108,7 +108,7 @@ typedef enum { QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ + X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ /* 45 */ X_QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2487965d8..da95625b2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5910,8 +5910,7 @@ qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) static int qemuBuildSmbiosCommandLine(virCommandPtr cmd, virQEMUDriverPtr driver, - const virDomainDef *def, - virQEMUCapsPtr qemuCaps) + const virDomainDef *def) { size_t i; virSysinfoDefPtr source = NULL; @@ -5921,13 +5920,6 @@ qemuBuildSmbiosCommandLine(virCommandPtr cmd, def->os.smbios_mode == VIR_DOMAIN_SMBIOS_EMULATE) return 0; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMBIOS_TYPE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("the QEMU binary %s does not support smbios settings"), - def->emulator); - return -1; - } - /* should we really error out or just warn in those cases ? */ if (def->os.smbios_mode == VIR_DOMAIN_SMBIOS_HOST) { if (driver->hostsysinfo == NULL) { @@ -9950,7 +9942,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, virUUIDFormat(def->uuid, uuid); virCommandAddArgList(cmd, "-uuid", uuid, NULL); - if (qemuBuildSmbiosCommandLine(cmd, driver, def, qemuCaps) < 0) + if (qemuBuildSmbiosCommandLine(cmd, driver, def) < 0) goto error; /* diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index dc3f4d0d8..86af6e828 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 42a361564..9012430cf 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index b03e0db34..edfd53315 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index cc80ca13d..bd2d90954 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 5799f1ae3..57d416807 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index a8197113c..585433312 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 2439ac31a..ccafbbd8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 4abc07a35..e197f1887 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 3b0945f99..85a3c28e1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index f0f9b59b4..638b9d882 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 2cfe87954..9ccd01ae2 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index e0b2af57a..10f6d0b9e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index cdb69c9bb..6449f8577 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 1d12e27e8..375eb3891 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='enable-kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 9a51c42dd..98c961fdd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='no-hpet'/> <flag name='no-kvm-pit'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index cbf4b358e..f1627ab7b 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 9e9c3ddb9..89fef00c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 0fe16efcf..ba050f4bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index e5db343d0..7db11051e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 21a4f5192..2d841414e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index adfc6cb44..e5c51082e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index f6355a5c4..3a973588b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index ecec216da..eb10d11f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7f5454d68..18eebf10f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c51dc12a3..4d61a7768 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='hda-duplex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index d493a8f50..6ab4e980a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='smbios-type'/> <flag name='vga-none'/> <flag name='boot-index'/> <flag name='drive-aio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index a9b127967..fb2ad3e07 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -7,7 +7,6 @@ <flag name='no-hpet'/> <flag name='no-kvm-pit'/> <flag name='pci-configfd'/> - <flag name='smbios-type'/> <flag name='spice'/> <flag name='vga-none'/> <flag name='boot-index'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 943513cca..b678d6353 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1454,9 +1454,9 @@ mymain(void) DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", QEMU_CAPS_DEVICE_QEMU_XHCI); - DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE); + DO_TEST("smbios", NONE); + DO_TEST_PARSE_ERROR("smbios-date", NONE); + DO_TEST_PARSE_ERROR("smbios-uuid-match", NONE); DO_TEST("watchdog", NONE); DO_TEST("watchdog-device", NONE); -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7 ------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 +-- 31 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 92abec25a..4c4c8b9ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO); virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 08e709099..180814e2e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -119,7 +119,7 @@ typedef enum { /* 50 */ QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ - QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */ + X_QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */ X_QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */ QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index da95625b2..64de5ab4d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1382,13 +1382,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, _("detect_zeroes is not supported by this QEMU binary")); return -1; } - - if (disk->iomode && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_AIO)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk aio mode not supported with this QEMU binary")); - return -1; - } } if (disk->serial && diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 0203c86ee..057005cf3 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index d808800b2..2d0748ce6 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index c32bc60a4..e62d01b59 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index aa4fab4cb..1b5342087 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index a5dcc49a7..58ba9f7ff 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 19bc333a4..407a28da8 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index c947515cb..be4230437 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 09c8ebacf..90d73f60d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index c94161abb..b734e24b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='boot-index'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index a603dee17..5cd0e6bf5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index cb993c44e..660e4e0bc 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='boot-index'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index ec1145192..1f274046f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 618d16532..6bae5eab3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 61f2f6236..25a064812 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='enable-kvm'/> <flag name='boot-index'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index e0f0df55e..f65a85a82 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -9,7 +9,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index a352805ec..a7b1bb59e 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 0027ecebf..f00916432 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 570fe9178..154e723c0 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index ce35dacd2..5b15b5a1a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 415275ceb..72b74c66e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index c51f30d2a..c644b539f 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='boot-index'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index a0db647f6..9d3b8e10c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index e3d8ff673..6896469a4 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='boot-index'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index c18d19e4c..324382851 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index beda90f0e..07adc73fb 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -6,7 +6,6 @@ <flag name='kvm'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 7e3a3fe3c..0c585d998 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='boot-index'/> - <flag name='drive-aio'/> <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> <flag name='virtio-blk-pci.ioeventfd'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 82679b611..d827a7963 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -10,7 +10,6 @@ <flag name='spice'/> <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4f32c7115..880822be6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -803,7 +803,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_CCID_PASSTHRU, QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_SPICE, @@ -997,7 +996,7 @@ mymain(void) DO_TEST("disk-sata-device", QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", - QEMU_CAPS_DRIVE_AIO); + NONE); DO_TEST("disk-source-pool", NONE); DO_TEST("disk-source-pool-mode", NONE); DO_TEST("disk-ioeventfd", -- 2.16.1

The (now assumed) QEMU_CAPS_CHARDEV_SPICEVMC is preferred. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 4 -- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 71 ++++++++---------------- tests/qemuxml2argvdata/channel-spicevmc-old.args | 30 ---------- tests/qemuxml2argvdata/channel-spicevmc-old.xml | 35 ------------ tests/qemuxml2argvtest.c | 4 -- 6 files changed, 25 insertions(+), 121 deletions(-) delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 97c8e0052..867088fcb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1024,7 +1024,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI }, { "megasas", QEMU_CAPS_SCSI_MEGASAS }, - { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl", QEMU_CAPS_DEVICE_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, @@ -2098,9 +2097,6 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, virStringListFreeCount(values, nvalues); } - /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ - virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC); - return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5068679a5..23db9796a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -127,7 +127,7 @@ typedef enum { /* 55 */ QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */ X_QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ + X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */ X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 019843036..4f3420e19 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5364,8 +5364,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager, static char * qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, - virDomainChrDefPtr dev, - virQEMUCapsPtr qemuCaps) + virDomainChrDefPtr dev) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *contAlias; @@ -5375,13 +5374,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, virBufferAddLit(&buf, "virtconsole"); break; case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - /* Legacy syntax '-device spicevmc' */ - if (dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC)) { - virBufferAddLit(&buf, "spicevmc"); - } else { - virBufferAddLit(&buf, "virtserialport"); - } + virBufferAddLit(&buf, "virtserialport"); break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -5419,19 +5412,13 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, goto error; } - if (!(dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC))) { - virBufferAsprintf(&buf, ",chardev=char%s,id=%s", - dev->info.alias, dev->info.alias); - if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - (dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC || - dev->target.name)) { - virBufferAsprintf(&buf, ",name=%s", dev->target.name - ? dev->target.name : "com.redhat.spice.0"); - } - } else { - virBufferAsprintf(&buf, ",id=%s", dev->info.alias); + virBufferAsprintf(&buf, ",chardev=char%s,id=%s", + dev->info.alias, dev->info.alias); + if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + (dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC || + dev->target.name)) { + virBufferAsprintf(&buf, ",name=%s", dev->target.name + ? dev->target.name : "com.redhat.spice.0"); } if (virBufferCheckError(&buf) < 0) goto error; @@ -9152,23 +9139,15 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC) && - channel->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { - /* spicevmc was originally introduced via a -device - * with a backend internal to qemu; although we prefer - * the newer -chardev interface. */ - ; - } else { - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - channel->source, - channel->info.alias, - qemuCaps, true, - chardevStdioLogd))) - return -1; - virCommandAddArg(cmd, "-chardev"); - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); - } + if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + channel->source, + channel->info.alias, + qemuCaps, true, + chardevStdioLogd))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); if (qemuBuildChrDeviceCommandLine(cmd, def, channel, qemuCaps) < 0) return -1; @@ -10188,8 +10167,7 @@ qemuBuildParallelChrDeviceStr(char **deviceStr, static int qemuBuildChannelChrDeviceStr(char **deviceStr, const virDomainDef *def, - virDomainChrDefPtr chr, - virQEMUCapsPtr qemuCaps) + virDomainChrDefPtr chr) { int ret = -1; char *addr = NULL; @@ -10210,7 +10188,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: - if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(def, chr, qemuCaps))) + if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(def, chr))) goto cleanup; break; @@ -10229,8 +10207,7 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, static int qemuBuildConsoleChrDeviceStr(char **deviceStr, const virDomainDef *def, - virDomainChrDefPtr chr, - virQEMUCapsPtr qemuCaps) + virDomainChrDefPtr chr) { int ret = -1; @@ -10242,7 +10219,7 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: - if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(def, chr, qemuCaps))) + if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(def, chr))) goto cleanup; break; @@ -10284,11 +10261,11 @@ qemuBuildChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - ret = qemuBuildChannelChrDeviceStr(deviceStr, vmdef, chr, qemuCaps); + ret = qemuBuildChannelChrDeviceStr(deviceStr, vmdef, chr); break; case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: - ret = qemuBuildConsoleChrDeviceStr(deviceStr, vmdef, chr, qemuCaps); + ret = qemuBuildConsoleChrDeviceStr(deviceStr, vmdef, chr); break; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: diff --git a/tests/qemuxml2argvdata/channel-spicevmc-old.args b/tests/qemuxml2argvdata/channel-spicevmc-old.args deleted file mode 100644 index 852c8699e..000000000 --- a/tests/qemuxml2argvdata/channel-spicevmc-old.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=spice \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-acpi \ --boot c \ --device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --device spicevmc,bus=virtio-serial1.0,nr=3,id=channel0 \ --spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,\ -tls-channel=main \ --vga cirrus \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/channel-spicevmc-old.xml b/tests/qemuxml2argvdata/channel-spicevmc-old.xml deleted file mode 100644 index 95d0c2064..000000000 --- a/tests/qemuxml2argvdata/channel-spicevmc-old.xml +++ /dev/null @@ -1,35 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='virtio-serial' index='1'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> - </controller> - <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> - <channel name='main' mode='secure'/> - </graphics> - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0'/> - <address type='virtio-serial' controller='1' bus='0' port='3'/> - </channel> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c96e91a3f..246ae669f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1295,10 +1295,6 @@ mymain(void) DO_TEST("channel-spicevmc", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("channel-spicevmc-old", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_SPICEVMC, - QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("channel-virtio-default", QEMU_CAPS_SPICE, NONE); -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7 ------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 +-- 31 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8d43fedfe..ab6e617aa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3628,7 +3628,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index eed4a3b50..14fbd45c8 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -153,7 +153,7 @@ typedef enum { X_QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ /* 75 */ - QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */ + X_QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */ X_QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */ QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI, /* -no-acpi */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 519efe7a5..3edab457b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1348,13 +1348,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, return -1; } - if (disk->cachemode == VIR_DOMAIN_DISK_CACHE_UNSAFE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disk cache mode 'unsafe' is not supported by this QEMU")); - return -1; - } - if (disk->copy_on_read && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 275c69b20..c6ebd0023 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 51bb63e2a..037c65216 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index fedb71b09..58208d3f3 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 85834e713..d6183e400 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index fe17eef72..4af8078a5 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 3a4c5e5b2..6bd1dcfb9 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 7352cd866..fd65fee6e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 8e465a9cf..c57b95379 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 97f43c76e..f37c20df2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> <flag name='drive-copy-on-read'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index abed3a7f6..99726360f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index a6f55e73f..ed779b3ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> <flag name='drive-copy-on-read'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 3302d5524..3e133e7ef 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index c69a8421e..d5d2e43e1 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 9d848e4bb..74e0b2ed7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> <flag name='drive-copy-on-read'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index cfaed5f29..838bc48de 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index d61ca6687..8e7c2a5da 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 4c8a97d19..223d0a7a3 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 8a6cbb75b..46c006b80 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -19,7 +19,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index c20d5cfe5..6c7799924 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 49f90ff1d..720e84b47 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index c3c10799e..8e2e796b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> <flag name='drive-copy-on-read'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index ce10968e4..c900360c0 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index ec497f50e..44957621b 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> <flag name='drive-copy-on-read'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index aaafb6350..a32a10cfb 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 957e34178..db61974e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index a40122a50..da8b39dc2 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> <flag name='drive-copy-on-read'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 66d5a2584..5697923c3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fe2d6bf79..9ab5e880a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -913,8 +913,7 @@ mymain(void) DO_TEST("disk-drive-cache-v2-wb", NONE); DO_TEST("disk-drive-cache-v2-none", NONE); DO_TEST("disk-drive-cache-directsync", NONE); - DO_TEST("disk-drive-cache-unsafe", - QEMU_CAPS_DRIVE_CACHE_UNSAFE); + DO_TEST("disk-drive-cache-unsafe", NONE); DO_TEST("disk-drive-copy-on-read", QEMU_CAPS_DRIVE_COPY_ON_READ); DO_TEST("disk-drive-network-nbd", NONE); -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7 ------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 4 +--- 31 files changed, 2 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fc68e354e..a7899ad1e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3628,7 +3628,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 9df4be849..9c7ac5f51 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -162,7 +162,7 @@ typedef enum { /* 80 */ QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ X_QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands */ - QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ + X_QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ X_QEMU_CAPS_CPU_HOST, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 607e44ef0..dcb6876f6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1348,13 +1348,6 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, return -1; } - if (disk->copy_on_read && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("copy_on_read is not supported by this QEMU binary")); - return -1; - } - if (disk->discard && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index fa507f3b9..61bb5855b 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 825ac8635..0e8ebd2a6 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index f9d7babc9..9ffe77a89 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index da4cf265d..81fa3e598 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index cbf81f0f0..7f06a8329 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 306fc3089..aa09231fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 2ce66aff4..666da9e6d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 72897ab8a..55a90c0fe 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 0cab64717..ab0388e64 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 491f3128b..567a2ef34 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 1af994e7b..94ac5c7df 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 07d03c09b..82ddbc9c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index eefb63602..7527cda32 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 07bf390eb..70858eb1b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4a7b984a5..303d1fddc 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 294a110e9..3db0b3476 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index fd95ccf56..f73c13b36 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index dc9741e76..07d3b3a19 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 71d3ab282..bf2064d85 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index cd1bb4d70..f8a7940cc 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index b0be73ce5..766ba36a9 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 6c135ab27..a2cbf61ba 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 85b57d9c3..93031654d 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index f362433d0..93a0522a9 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index d78567689..8ea49029e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index e585940ed..5de333680 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 9e9799075..bc9480c2c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> <flag name='fsdev-writeout'/> <flag name='drive-iotune'/> <flag name='system_wakeup'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9ab5e880a..ace73c534 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -914,8 +914,7 @@ mymain(void) DO_TEST("disk-drive-cache-v2-none", NONE); DO_TEST("disk-drive-cache-directsync", NONE); DO_TEST("disk-drive-cache-unsafe", NONE); - DO_TEST("disk-drive-copy-on-read", - QEMU_CAPS_DRIVE_COPY_ON_READ); + DO_TEST("disk-drive-copy-on-read", NONE); DO_TEST("disk-drive-network-nbd", NONE); DO_TEST("disk-drive-network-nbd-export", NONE); DO_TEST("disk-drive-network-nbd-ipv6", NONE); @@ -1001,7 +1000,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-copy_on_read", - QEMU_CAPS_DRIVE_COPY_ON_READ, QEMU_CAPS_VIRTIO_TX_ALG, QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-drive-discard", -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 9 --------- src/qemu/qemu_driver.c | 14 -------------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 6 +----- 32 files changed, 2 insertions(+), 57 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8ff0a0e92..631d8a1bf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3628,7 +3628,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0f7561dba..25fb83860 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -167,7 +167,7 @@ typedef enum { X_QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ /* 85 */ - QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */ + X_QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */ QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */ QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index aa2f58634..33ba1fe8f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1132,15 +1132,6 @@ qemuCheckDiskConfigBlkdeviotune(virDomainDiskDefPtr disk, } if (qemuCaps) { - /* block I/O throttling */ - if (qemuDiskConfigBlkdeviotuneHasBasic(disk) && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("block I/O throttling not supported with this " - "QEMU binary")); - return -1; - } - /* block I/O throttling 1.7 */ if (qemuDiskConfigBlkdeviotuneHasMax(disk) && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE_MAX)) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e8a89d650..d6b207a1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18210,13 +18210,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, supportMaxLengthOptions = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH); - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("block I/O throttling not supported with this " - "QEMU binary")); - goto endjob; - } - if (!supportMaxOptions && (set_fields & (QEMU_BLOCK_IOTUNE_SET_BYTES_MAX | QEMU_BLOCK_IOTUNE_SET_IOPS_MAX | @@ -18395,13 +18388,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, if (def) { /* If the VM is running, we can check if the current VM can use * optional parameters or not. */ - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("block I/O throttling not supported with this " - "QEMU binary")); - goto endjob; - } - maxparams = QEMU_NB_BLOCK_IO_TUNE_BASE_PARAMS; if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE_MAX)) maxparams += QEMU_NB_BLOCK_IO_TUNE_MAX_PARAMS; diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 4711416da..fb448c963 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index c9700f000..177946844 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 8a5e3f87e..9fdb4cede 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 8306c9a6e..2a1eb0b65 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index a9ae8d176..970ee004b 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index f26fbf863..cc85cfdde 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 6bcdc9525..6e312d79c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index aedb0394c..0a6835173 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 01b9991b8..6b306ff3e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 5f2817390..56b86484a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index cb9fc2e13..118811409 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 35be4a2c3..516f9328c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -20,7 +20,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index b749e9255..8e865163f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index c55d7a68d..a6744d04b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 958dba037..3081debbb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 9a46343d0..dbba0876c 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index dbb2f3882..770a99bd8 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 946fef766..26a87eae5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index c0511233a..b665696e7 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4b8f08c45..ec3f5410f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index e0026e0b6..288c5c456 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index b89bc46db..151c46dfd 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index d6f200a67..570bf43e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index ea4891978..fe5b89c64 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 5d4ce975b..ac1c56951 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -19,7 +19,6 @@ <flag name='usb-hub'/> <flag name='ich9-ahci'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index dd25fbca4..974320fb4 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 10f111127..0c120fb70 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -29,7 +29,6 @@ <flag name='ich9-ahci'/> <flag name='no-acpi'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-iotune'/> <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index eb9a368cc..ba1434dc3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1616,17 +1616,13 @@ mymain(void) DO_TEST("numad-auto-memory-vcpu-cpuset", NONE); DO_TEST("numad-auto-memory-vcpu-no-cpuset-and-placement", NONE); DO_TEST("numad-static-memory-auto-vcpu", NONE); - DO_TEST("blkdeviotune", - QEMU_CAPS_DRIVE_IOTUNE); + DO_TEST("blkdeviotune", NONE); DO_TEST("blkdeviotune-max", - QEMU_CAPS_DRIVE_IOTUNE, QEMU_CAPS_DRIVE_IOTUNE_MAX); DO_TEST("blkdeviotune-group-num", - QEMU_CAPS_DRIVE_IOTUNE, QEMU_CAPS_DRIVE_IOTUNE_MAX, QEMU_CAPS_DRIVE_IOTUNE_GROUP); DO_TEST("blkdeviotune-max-length", - QEMU_CAPS_DRIVE_IOTUNE, QEMU_CAPS_DRIVE_IOTUNE_MAX, QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH); -- 2.16.1

Unused since commit <2d80fbb1>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - 29 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7112d6f03..756d54f38 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3627,7 +3627,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a6cfc43cb..af79eebaa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -188,7 +188,7 @@ typedef enum { QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ /* 100 */ - QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ + X_QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ QEMU_CAPS_SCSI_LSI, /* -device lsi */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 054c4de1f..cf350156d 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index a36fed8d1..3cb7835e0 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index bcc623e02..dad34c688 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 0d65b9360..b571fd5d8 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index e58ede242..181d6f893 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 18b061357..b9a6f7251 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index e7323ab83..c2a78ff74 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -30,7 +30,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 282e4ba32..2fa93acc8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -29,7 +29,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 1f712ee94..147c62611 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 496289b8f..3fe9dbc0e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 1c2d13974..b65b7ab34 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 641e03ec7..c11a76e65 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -30,7 +30,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index ec0297e91..8168f6806 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -29,7 +29,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index f78463517..94014dabb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 578df7648..fae87609b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -37,7 +37,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 1709f5777..867142bfc 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index ff1c073de..9cd8f4655 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 0ebb86ec8..9445d48aa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -32,7 +32,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index d196dd28f..0de4f8524 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -29,7 +29,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 0b96bdd17..fcbfccc63 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index b7d398066..f15c4a035 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 2ed18713d..734d791ff 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 1afe2da3b..65f62eb49 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 51a918219..c4ff3470d 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 158fa4976..3bd1c9d46 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -29,7 +29,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index ada4b403e..0c1c610f8 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -17,7 +17,6 @@ <flag name='scsi-cd'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 6a824ecf9..65546aca6 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -39,7 +39,6 @@ <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 11 ++--------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 16 ++++------------ tests/qemuxml2xmltest.c | 3 --- 32 files changed, 7 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 44fc038e4..2db7d9c48 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3627,7 +3627,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5b7f83580..854227bd2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -233,7 +233,7 @@ typedef enum { QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */ QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */ QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */ - QEMU_CAPS_DTB, /* -dtb file */ + X_QEMU_CAPS_DTB, /* -dtb file */ QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ /* 135 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 114af9119..ed04a2a35 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6352,15 +6352,8 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-initrd", def->os.initrd, NULL); if (def->os.cmdline) virCommandAddArgList(cmd, "-append", def->os.cmdline, NULL); - if (def->os.dtb) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DTB)) { - virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL); - } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("dtb is not supported with this QEMU binary")); - goto error; - } - } + if (def->os.dtb) + virCommandAddArgList(cmd, "-dtb", def->os.dtb, NULL); if (def->os.slic_table) { virBuffer buf = VIR_BUFFER_INITIALIZER; virCommandAddArg(cmd, "-acpitable"); diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 3e76a2073..aebc7a157 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -66,7 +66,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 7895ccce7..b5a94ba4b 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -66,7 +66,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 69ee300ce..21f0d7ded 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -67,7 +67,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 21c4ad973..a903d80e2 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index f3ee50041..197f43846 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index f794d7f10..c8d2daa77 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 3b6b16920..79b06ef5c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -52,7 +52,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 1116d192d..398b7b09b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 05c6858a2..e7a724844 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='dtb'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 0ab17a241..46066f1d8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index c1eedd42d..5872a6254 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='dtb'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 7dc83c54f..5e2ad4dba 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -52,7 +52,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 8b7ef6d7a..568f0f710 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 1c81a887b..67919f1b8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='dtb'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 8a1c0feef..2252636ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -66,7 +66,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 9c86bf079..ff5f820eb 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 8062bcf75..e9aef8e36 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 663bb01bf..815ad2e7f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -54,7 +54,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index dfe686c5c..da7de1d7f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 6b0f54489..77cc540d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 0069f639e..cfdee30b3 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='dtb'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 489b82d4b..ba7a5ebb5 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index b1413fe34..c547abef7 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='dtb'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 4d5706853..4d4e66160 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index c4647a6d7..c37d90fac 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 4c88f62df..665122e72 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='dtb'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> <flag name='machine-usb-opt'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 896813522..5c0e8cddf 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> <flag name='ipv6-migration'/> <flag name='machine-opt'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ba1434dc3..f0a4fa141 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1453,7 +1453,7 @@ mymain(void) DO_TEST("balloon-ccw-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST("balloon-mmio-deflate", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST("balloon-device-deflate-off", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); @@ -1934,8 +1934,7 @@ mymain(void) QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("ppc-dtb", - QEMU_CAPS_KVM, - QEMU_CAPS_DTB); + QEMU_CAPS_KVM); DO_TEST("ppce500-serial", QEMU_CAPS_KVM); @@ -2304,21 +2303,18 @@ mymain(void) QEMU_CAPS_Q35_PCI_HOLE64_SIZE); DO_TEST("arm-vexpressa9-nodevs", - QEMU_CAPS_DTB); + NONE); DO_TEST("arm-vexpressa9-basic", - QEMU_CAPS_DTB); + NONE); DO_TEST("arm-vexpressa9-virtio", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("arm-virt-virtio", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("aarch64-virt-virtio", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); @@ -2328,7 +2324,6 @@ mymain(void) but virtio-mmio is always used unless PCI addresses are manually specified. */ DO_TEST("aarch64-virtio-pci-default", - QEMU_CAPS_DTB, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, @@ -2338,7 +2333,6 @@ mymain(void) QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-virt-2.6-virtio-pci-default", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -2348,7 +2342,6 @@ mymain(void) /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ DO_TEST("aarch64-virtio-pci-manual-addresses", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -2367,7 +2360,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); DO_TEST("aarch64-aavmf-virtio-mmio", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("aarch64-virt-default-nic", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 32309a0e9..20b07f32c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1027,11 +1027,9 @@ mymain(void) DO_TEST("smbios-multiple-type2", NONE); DO_TEST("aarch64-aavmf-virtio-mmio", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("aarch64-virtio-pci-default", - QEMU_CAPS_DTB, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, @@ -1040,7 +1038,6 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-virtio-pci-manual-addresses", - QEMU_CAPS_DTB, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 7 ------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 2 +- 31 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 182d0549e..0221c7e7e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3627,7 +3627,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a55ed2e68..5207c41cd 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -258,7 +258,7 @@ typedef enum { QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */ /* 150 */ - QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ + X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */ QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */ QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9f1764e40..9c304338b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7634,13 +7634,6 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, } if (graphics->data.vnc.sharePolicy) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vnc display sharing policy is not " - "supported with this QEMU")); - goto error; - } - virBufferAsprintf(&opt, ",share=%s", virDomainGraphicsVNCSharePolicyTypeToString( graphics->data.vnc.sharePolicy)); diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index b2f1d07d2..7abef25a1 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -72,7 +72,6 @@ <flag name='scsi-generic'/> <flag name='scsi-generic.bootindex'/> <flag name='vnc-websocket'/> - <flag name='vnc-share-policy'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index b0d5111b0..dd74fb4d0 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -72,7 +72,6 @@ <flag name='scsi-generic'/> <flag name='scsi-generic.bootindex'/> <flag name='vnc-websocket'/> - <flag name='vnc-share-policy'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 779f5032b..cc1687237 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -77,7 +77,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index a2076c7a5..70de6f5d6 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -77,7 +77,6 @@ <flag name='mem-merge'/> <flag name='vnc-websocket'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index f57088701..e2528f10d 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -78,7 +78,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 8d8636655..91824d737 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index ca44ad2a1..49d0ae032 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -62,7 +62,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 308e2e9e2..8c0aef946 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -62,7 +62,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index aa48542c2..87818944a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 25672db06..511c806f5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 7351ed5a7..eb68541c0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index b6fa4d798..7b4ae1575 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -62,7 +62,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 63ce8f7e3..e71d1d10a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -62,7 +62,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index fddfd6ecb..a75a87c41 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 8467efac4..f7d8137bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -78,7 +78,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index ee1bdfaa0..74b831442 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 28689bb76..2248546c6 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 89022c240..a23ecdf24 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -64,7 +64,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index e07951b12..dc70b02a3 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -62,7 +62,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index b83cff919..fb8734fce 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index b03ef2709..cb525a064 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index e9944e63c..fdc46175d 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index c2e12ce32..9538b5449 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 07b8c7b9f..22c0ad12e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 5873af49d..c8b14b40b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index c5560a62a..d06bd702e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index f0525971f..cb6014459 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cfc4a305f..cb5f0a201 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1036,7 +1036,7 @@ mymain(void) DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_VNC_SHARE_POLICY, + DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-no-listen-attr", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); -- 2.16.1

Implied by QEMU >= 1.2.0. Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used when QEMU_CAPS_NO_USER_CONFIG is unsupported. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 5 +---- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + [...] tests/qemuxml2argvdata/watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/watchdog.args | 1 + tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + 636 files changed, 608 insertions(+), 204 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 334c3c135..18d0e0739 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3654,7 +3654,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_WRITEOUT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index df8c197cd..5393f6eeb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -178,7 +178,7 @@ typedef enum { QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ QEMU_CAPS_IDE_CD, /* -device ide-cd */ - QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ + X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ /* 95 */ QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8b883b208..29383a6c2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10057,10 +10057,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, } /* Disable global config files and default devices */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG)) - virCommandAddArg(cmd, "-no-user-config"); - else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NODEFCONFIG)) - virCommandAddArg(cmd, "-nodefconfig"); + virCommandAddArg(cmd, "-no-user-config"); virCommandAddArg(cmd, "-nodefaults"); if (qemuBuildSgaCommandLine(cmd, def, qemuCaps) < 0) diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index ccd76cf8f..5a080e9ad 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 7691d01ca..37b287b2f 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 46b88f218..8ded41708 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 47ac2eaf2..6fcc7f1c5 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 7b5ac5c4e..58227aca1 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 69c7e2258..3a06c7642 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 900f5fbbc..545eb2b51 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -47,7 +47,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 8408a3476..44f08ad06 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -46,7 +46,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index d0a07be5a..cef0a6a38 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='scsi-cd'/> - <flag name='no-user-config'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 59900c4a4..7b179059e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 3aaf8abfc..ef02bac5b 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='scsi-cd'/> - <flag name='no-user-config'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index d765aa08f..585f1daa0 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -47,7 +47,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 195566568..ea6791e69 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -46,7 +46,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 7a5f4bb2f..17659c37f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='scsi-cd'/> - <flag name='no-user-config'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index c32effb6c..130a604f7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -54,7 +54,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index b9f3b65e5..8c9afec91 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index c524588d7..e1245953b 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 59aed9b1f..136385b86 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -49,7 +49,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index fb1333fec..76c6ab2a6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -46,7 +46,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 89d032467..2d16d4133 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 0ce1780f9..efe2d4ac4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='scsi-cd'/> - <flag name='no-user-config'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index da1b370c1..7445253c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index c532e5cee..4d8d24682 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='scsi-cd'/> - <flag name='no-user-config'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 9fd8684bb..584ec7870 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 9fa07c8e7..cee011d5f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -46,7 +46,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index d534e4714..e4060518b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='transaction'/> <flag name='block-job-async'/> <flag name='scsi-cd'/> - <flag name='no-user-config'/> <flag name='dump-guest-memory'/> <flag name='balloon-event'/> <flag name='bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index fa7c4fd65..6ad3e2b17 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='block-job-async'/> <flag name='scsi-cd'/> <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 21a3f591d..92da7122a 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -13,7 +13,7 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ --nodefconfig \ +-no-user-config \ -nodefaults \ -chardev socket,id=charmonitor,\ path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args index 0d3b47768..e7af5a6d6 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -17,6 +17,7 @@ unit=1 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ +-no-user-config \ -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ server,nowait \ [...] diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index 73854f9e3..c2a505e1e 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ +-no-user-config \ -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ server,nowait \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args index fe89e1fc3..3360fda13 100644 --- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args @@ -13,6 +13,7 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ +-no-user-config \ -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\ nowait \ -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 4 +--- src/qemu/qemu_driver.c | 8 +------- src/qemu/qemu_process.c | 15 ++++----------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 1 + tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + [...] tests/qemuxml2argvdata/watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/watchdog.args | 1 + tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + tests/qemuxml2argvtest.c | 2 +- 636 files changed, 611 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index dd3476aa8..8d43fedfe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3628,7 +3628,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c24f08daa..eed4a3b50 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -150,7 +150,7 @@ typedef enum { QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR, /* -device usb-redir */ QEMU_CAPS_USB_HUB, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ + X_QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ /* 75 */ QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9178b16e8..519efe7a5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6228,10 +6228,8 @@ qemuBuildPMCommandLine(virCommandPtr cmd, * when QEMU stops. If we use no-shutdown, then we can * watch for this event and do a soft/warm reboot. */ - if (priv->monJSON && priv->allowReboot == VIR_TRISTATE_BOOL_YES && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { + if (priv->monJSON && priv->allowReboot == VIR_TRISTATE_BOOL_YES) virCommandAddArg(cmd, "-no-shutdown"); - } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI)) { if (def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5a07da087..e8a89d650 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2122,13 +2122,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) */ if ((!useAgent) || (ret < 0 && (acpiRequested || !flags))) { -#if WITH_YAJL - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("ACPI reboot is not supported with this QEMU binary")); - goto endjob; - } -#else +#if !WITH_YAJL virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("ACPI reboot is not supported without the JSON monitor")); goto endjob; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 61e3be4e1..5e481f0ef 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7485,17 +7485,10 @@ qemuProcessReconnect(void *opaque) /* We can't get the monitor back, so must kill the VM * to remove danger of it ending up running twice if * user tries to start it again later - */ - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { - /* If we couldn't get the monitor and qemu supports - * no-shutdown, we can safely say that the domain - * crashed ... */ - state = VIR_DOMAIN_SHUTOFF_CRASHED; - } else { - /* ... but if it doesn't we can't say what the state - * really is and FAILED means "failed to start" */ - state = VIR_DOMAIN_SHUTOFF_UNKNOWN; - } + * If we couldn't get the monitor and qemu supports + * no-shutdown, we can safely say that the domain + * crashed ... */ + state = VIR_DOMAIN_SHUTOFF_CRASHED; /* If BeginJob failed, we jumped here without a job, let's hope another * thread didn't have a chance to start playing with the domain yet * (it's all we can do anyway). diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 358f914d2..275c69b20 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index c46761d8e..51bb63e2a 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 3ace4ee1d..fedb71b09 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 4203337c2..85834e713 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 95c6b154f..fe17eef72 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index df9b61017..3a4c5e5b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index fa4ffefe6..7352cd866 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 5268ba646..8e465a9cf 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 552f7441f..97f43c76e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 73d75ccf9..abed3a7f6 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 882bee816..a6f55e73f 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 781cf5a27..3302d5524 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 290f1db26..c69a8421e 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 281135789..9d848e4bb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4e0b08fa0..cfaed5f29 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 6b999c093..d61ca6687 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 7e6599c7f..4c8a97d19 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index f2ac19fb5..8a6cbb75b 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -19,7 +19,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 688912711..c20d5cfe5 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4e0fa0d04..49f90ff1d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index be75c82a6..c3c10799e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 50f40e773..ce10968e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index e0c7cce09..ec497f50e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 22936542e..aaafb6350 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index ad4215401..957e34178 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 2877774ba..a40122a50 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index b47dc22eb..66d5a2584 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 4d2dbf872..6f332941c 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -19,6 +19,7 @@ QEMU_AUDIO_DRV=none \ path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ +-no-shutdown \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args index 14d43868b..8c8dbbe9e 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -23,4 +23,5 @@ unit=1 \ server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ +-no-shutdown \ -boot c diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args index a1d65b5e5..8f6193a4f 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args @@ -19,6 +19,7 @@ QEMU_AUDIO_DRV=none \ path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ +-no-shutdown \ -no-acpi \ -boot c \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ [...] diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index 7744baa46..218470702 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -18,6 +18,7 @@ QEMU_AUDIO_DRV=none \ server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ +-no-shutdown \ -no-acpi \ -boot c \ -usb \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args index 9359472c1..63c5a4270 100644 --- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args @@ -19,5 +19,6 @@ QEMU_AUDIO_DRV=none \ nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ +-no-shutdown \ -no-acpi \ -boot c diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 93e2325c6..fe2d6bf79 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1638,7 +1638,7 @@ mymain(void) QEMU_CAPS_SCSI_LSI); DO_TEST("monitor-json", NONE); - DO_TEST("no-shutdown", QEMU_CAPS_NO_SHUTDOWN); + DO_TEST("no-shutdown", NONE); DO_TEST("seclabel-dynamic", NONE); DO_TEST("seclabel-dynamic-baselabel", NONE); -- 2.16.1

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 19 +++++-------------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +- [...] tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/watchdog.args | 2 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +- tests/qemuxml2argvtest.c | 11 +++-------- 633 files changed, 611 insertions(+), 653 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 245f81986..182d0549e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3627,7 +3627,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 74f02ff3f..a55ed2e68 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -203,7 +203,7 @@ typedef enum { /* 110 */ QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ - QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ + X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ QEMU_CAPS_VNC, /* Is -vnc available? */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b85bad8da..9f1764e40 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7055,21 +7055,12 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virTristateSwitchTypeToString(smm)); } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { - if (def->mem.dump_core) { - virBufferAsprintf(&buf, ",dump-guest-core=%s", - virTristateSwitchTypeToString(def->mem.dump_core)); - } else { - virBufferAsprintf(&buf, ",dump-guest-core=%s", - cfg->dumpGuestCore ? "on" : "off"); - } + if (def->mem.dump_core) { + virBufferAsprintf(&buf, ",dump-guest-core=%s", + virTristateSwitchTypeToString(def->mem.dump_core)); } else { - if (def->mem.dump_core) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("dump-guest-core is not available " - "with this QEMU binary")); - goto cleanup; - } + virBufferAsprintf(&buf, ",dump-guest-core=%s", + cfg->dumpGuestCore ? "on" : "off"); } if (def->mem.nosharepages) { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 911e24eb9..b2f1d07d2 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -47,7 +47,6 @@ <flag name='usb-redir.filter'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 013cc78eb..b0d5111b0 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -47,7 +47,6 @@ <flag name='usb-redir.filter'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index efe137cb1..779f5032b 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index a32e1adfd..a2076c7a5 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index ff7caea2a..f57088701 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 6d3623bbd..8d8636655 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 11c183ce4..ca44ad2a1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -36,7 +36,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 34c69fa4d..308e2e9e2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -35,7 +35,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index cbff80591..aa48542c2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='blockio'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index d2b68a5b6..25672db06 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index d61ba1453..7351ed5a7 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='blockio'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 646e7440a..b6fa4d798 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -36,7 +36,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index c5a6418f3..63ce8f7e3 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -35,7 +35,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 3cdf9daa1..fddfd6ecb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='blockio'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 9873f5ee6..8467efac4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -46,7 +46,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 0a7346721..ee1bdfaa0 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 5484a3995..28689bb76 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 88f6087f3..89022c240 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -38,7 +38,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index a87fa6b92..e07951b12 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -35,7 +35,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 9a50253bb..b83cff919 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 86af6a52d..b03ef2709 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='blockio'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 42532805a..e9944e63c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 4eacbfe16..c2e12ce32 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='blockio'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 89e0d453a..07b8c7b9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 40b0b4b6a..5873af49d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -35,7 +35,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index a9a739f95..c5560a62a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -21,7 +21,6 @@ <flag name='blockio'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 3a5c611c0..f0525971f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -48,7 +48,6 @@ <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 6a25e5317..ba4cadbac 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg \ +-machine virt,accel=tcg,dump-guest-core=off \ -cpu cortex-a53 \ -m 1024 \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args index 0b6156a97..c7b192d38 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg \ +-machine virt,accel=tcg,dump-guest-core=off \ -cpu cortex-a57 \ -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\ readonly=on \ diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args index 29da75e06..42618cf80 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=kvm \ +-machine virt,accel=kvm,dump-guest-core=off \ -cpu host \ -m 1024 \ -smp 1,sockets=1,cores=1,threads=1 \ [...] diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args index c49f5e846..8c4d0ed7c 100644 --- a/tests/qemuxml2argvdata/watchdog-device.args +++ b/tests/qemuxml2argvdata/watchdog-device.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg \ +-machine pc,accel=tcg,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args index c3380c89b..2717844c6 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.args +++ b/tests/qemuxml2argvdata/watchdog-diag288.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-virtio,accel=tcg \ +-machine s390-virtio,accel=tcg,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args index 128710c71..f0d57baa7 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.args +++ b/tests/qemuxml2argvdata/watchdog-dump.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg \ +-machine pc,accel=tcg,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args index ed05601fc..e7409d519 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg \ +-machine pc,accel=tcg,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index 21b763e6b..c8048c2e9 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg \ +-machine pc,accel=tcg,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args index 63c5a4270..d7674e6b4 100644 --- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name kvm \ -S \ --machine pc,accel=kvm \ +-machine pc,accel=kvm,dump-guest-core=off \ -cpu qemu32 \ -m 4096 \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cb1ee9acf..cfc4a305f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -694,16 +694,11 @@ mymain(void) DO_TEST("minimal-msg-timestamp", QEMU_CAPS_MSG_TIMESTAMP); DO_TEST("machine-aliases1", NONE); DO_TEST("machine-aliases2", QEMU_CAPS_KVM); - DO_TEST("machine-core-on", - QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST("machine-core-on", NONE); driver.config->dumpGuestCore = true; - DO_TEST("machine-core-off", - QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST("machine-core-off", NONE); driver.config->dumpGuestCore = false; - DO_TEST("machine-core-cfg-off", - QEMU_CAPS_DUMP_GUEST_CORE); - DO_TEST_FAILURE("machine-core-on", NONE); - DO_TEST_FAILURE("machine-core-on", NONE); + DO_TEST("machine-core-cfg-off", NONE); DO_TEST("machine-smm-opt", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_PCI_BRIDGE, -- 2.16.1

Implied by QEMU >= 1.3.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 3 +-- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +- [...] tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/watchdog.args | 2 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +- tests/qemuxml2argvtest.c | 3 +-- 635 files changed, 612 insertions(+), 640 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ac29057cb..085a33589 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3750,10 +3750,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasicArch(qemuCaps); - /* USB option is supported v1.3.0 onwards */ - if (qemuCaps->version >= 1003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); - /* WebSockets were introduced between 1.3.0 and 1.3.1 */ if (qemuCaps->version >= 1003001) virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ba9db074a..ea0911723 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -239,7 +239,7 @@ typedef enum { /* 135 */ X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/ - QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */ + X_QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */ QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */ QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cab69e023..4620b34f0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7021,8 +7021,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, /* To avoid the collision of creating USB controllers when calling * machine->init in QEMU, it needs to set usb=off */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT)) - virBufferAddLit(&buf, ",usb=off"); + virBufferAddLit(&buf, ",usb=off"); if (vmport) { if (!virQEMUCapsSupportsVmport(qemuCaps, def)) { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 879859fa5..09df77fad 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -66,7 +66,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='scsi-generic'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 0e969d50c..a4dda3040 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -66,7 +66,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='scsi-generic'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index f49df8586..25ad2dff2 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -67,7 +67,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index f9e2959b9..97b74749e 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index e8eaa7939..75fcf8ff5 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 7892381f3..e97d4b920 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index ba7f299b3..2d8e0c365 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -52,7 +52,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 508b0efe0..4777a7cf8 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='nvram'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 8830ae4fd..522148ec9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 5b9fedb54..9ea616924 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index e8fa60f1e..43de4f5dd 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 272b4bcb4..addaffd34 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -52,7 +52,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 7bb13ed5d..0a3710cd8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='nvram'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 11b818061..307475774 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 72942f374..9b85adbe2 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -66,7 +66,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 794ea38af..f6556ee3d 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 8962aec41..fc3d9d757 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 687b5b984..b1bb3e7bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -54,7 +54,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 2bfb0ae49..f3611e192 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -51,7 +51,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='nvram'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index ac97bb5c3..0e4818027 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 97bc0bc25..a585af453 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index b66da6c78..55c121c59 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 7f574e7f8..1ac60bb40 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7fb3e9a81..831a76897 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 791019e3d..4998edf7a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -50,7 +50,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='nvram'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 66eb5f9ce..d29994bbf 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='virtio-ccw'/> - <flag name='machine-usb-opt'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='vfio-pci.bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 2397a1998..d813a96a1 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='megasas'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 4ef4490f3..d7a891c83 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,dump-guest-core=off \ +-machine virt,accel=tcg,usb=off,dump-guest-core=off \ -cpu cortex-a53 \ -m 1024 \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args index 2ad4c2e76..8aefc7d44 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,dump-guest-core=off \ +-machine virt,accel=tcg,usb=off,dump-guest-core=off \ -cpu cortex-a57 \ -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\ readonly=on \ diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args index 13887f2b6..ff0c8c90b 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=kvm,dump-guest-core=off \ +-machine virt,accel=kvm,usb=off,dump-guest-core=off \ -cpu host \ -m 1024 \ -smp 1,sockets=1,cores=1,threads=1 \ [...] diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args index 2dd6c21f9..414e81f0f 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.args +++ b/tests/qemuxml2argvdata/watchdog-dump.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args index cc6d36d49..a320440f3 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index 5fd89bd6d..3e0bd5988 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args index 3cf06f370..7f9ad338f 100644 --- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name kvm \ -S \ --machine pc,accel=kvm,dump-guest-core=off \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off \ -cpu qemu32 \ -m 4096 \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 045ac3f90..84c075a2a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -706,8 +706,7 @@ mymain(void) QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_MACHINE_SMM_OPT, QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("machine-usb-opt", - QEMU_CAPS_MACHINE_USB_OPT); + DO_TEST("machine-usb-opt", NONE); DO_TEST("machine-vmport-opt", QEMU_CAPS_MACHINE_VMPORT_OPT); DO_TEST("kvm", NONE); -- 2.16.1