From nobody Mon Apr 29 13:13:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522931003610675.6936259831053; Thu, 5 Apr 2018 05:23:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DC61C03E013; Thu, 5 Apr 2018 12:23:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F6837D676; Thu, 5 Apr 2018 12:23:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0260F4CA9E; Thu, 5 Apr 2018 12:23:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35CNKNU026256 for ; Thu, 5 Apr 2018 08:23:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 81F85AB3EC; Thu, 5 Apr 2018 12:23:20 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29791AB3EE for ; Thu, 5 Apr 2018 12:23:20 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:52 +0200 Message-Id: <67fe6d8722e993f9fa7ba1babfbc97095eb6e803.1522930120.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt PATCH v2 01/44] qemuxml2argvtest: Fix q35-virt-manager capabilities X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 05 Apr 2018 12:23:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Use QEMU_CAPS_MACHINE_OPT and QEMU_CAPS_MACHINE_VMPORT_OPT since it specifies . Signed-off-by: J=C3=A1n Tomko --- 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/qem= uxml2argvdata/q35-virt-manager-basic.args index 96d2ae5924..c7dd514fec 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dspice \ /usr/bin/qemu-system-x86_64 \ -name virt-manager-basic \ -S \ --M pc-q35-2.7 \ +-machine pc-q35-2.7,accel=3Dkvm,vmport=3Doff \ -m 4096 \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ -uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d79913dd0a..5ccbb3cff9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2384,6 +2384,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, --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 13:13:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522931007232659.4229276011419; Thu, 5 Apr 2018 05:23:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5A6B12E371; Thu, 5 Apr 2018 12:23:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A61FE6C339; Thu, 5 Apr 2018 12:23:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2CD1F4CAA6; Thu, 5 Apr 2018 12:23:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35CNLuX026261 for ; Thu, 5 Apr 2018 08:23:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F05BAB3EF; Thu, 5 Apr 2018 12:23:21 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAA07AB3EE for ; Thu, 5 Apr 2018 12:23:20 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:53 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt PATCH v2 02/44] Delete bogus cpu-host-passthrough test X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 05 Apr 2018 12:23:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 We test the same XML for a type=3D'kvm' domain twice, once with QEMU_CAPS_KVM (expecting success), once without (expecting failure). The failure case relies on QEMU_CAPS_MACHINE_OPT not being set, failing in qemuBuildObsoleteAccelArg. Checking a domain-type error message in a cpu test is strange. Delete the negative test to allow assuming QEMU_CAPS_MACHINE_OPT by default. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- tests/qemuxml2argvtest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5ccbb3cff9..24eb8cbc5b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1715,7 +1715,6 @@ mymain(void) DO_TEST_FAILURE("cpu-host-model-nofallback", NONE); skipLegacyCPUs =3D false; DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); - DO_TEST_FAILURE("cpu-host-passthrough", NONE); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); =20 qemuTestSetHostArch(driver.caps, VIR_ARCH_S390X); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 13:13:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522931006216643.7109036190093; Thu, 5 Apr 2018 05:23:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A9E6FC03D46E; Thu, 5 Apr 2018 12:23:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7BE1460C4E; Thu, 5 Apr 2018 12:23:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2345F180BAEA; Thu, 5 Apr 2018 12:23:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35CNMR5026276 for ; Thu, 5 Apr 2018 08:23:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 309D4AB3EC; Thu, 5 Apr 2018 12:23:22 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58017AB3EE for ; Thu, 5 Apr 2018 12:23:21 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:54 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt PATCH v2 03/44] Force QMP capability probing X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 05 Apr 2018 12:23:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Remove the qmpOnly attribute of virQEMUCapsNewForBinaryInternal and instead always assume it's true. This effectively sets the minimum QEMU version to 1.2.0, breaking support for QEMU in RHEL6. Signed-off-by: J=C3=A1n Tomko --- 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 4aa26d434a..980f34bb7d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1225,7 +1225,7 @@ exclude_file_name_regexp--sc_require_config_h_first = =3D \ ^(examples/|tools/virsh-edit\.c$$) =20 exclude_file_name_regexp--sc_trailing_blank =3D \ - /qemuhelpdata/|/sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib= /local/.*/.*diff$$ + /sysinfodata/.*\.data|/virhostcpudata/.*\.cpuinfo|^gnulib/local/.*/.*dif= f$$ =20 exclude_file_name_regexp--sc_unmarked_diagnostics =3D \ ^(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 959c27f3bf..0be39b76dd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -625,28 +625,6 @@ virQEMUCapsFindTarget(virArch hostarch, return guestarch; } =20 -static virCommandPtr -virQEMUCapsProbeCommand(const char *qemu, - virQEMUCapsPtr qemuCaps, - uid_t runUid, gid_t runGid) -{ - virCommandPtr cmd =3D 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; -} - =20 static void virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, @@ -661,282 +639,6 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, qemuCaps->machineTypes[0] =3D tmp; } =20 -/* Format is: - * [(default)|(alias of )] - */ -static int -virQEMUCapsParseMachineTypesStr(const char *output, - virQEMUCapsPtr qemuCaps) -{ - const char *p =3D output; - const char *next; - size_t defIdx =3D 0; - - do { - const char *t; - char *name; - char *canonical =3D NULL; - - if ((next =3D strchr(p, '\n'))) - ++next; - - if (STRPREFIX(p, "Supported machines are:")) - continue; - - if (!(t =3D strchr(p, ' ')) || (next && t >=3D next)) - continue; - - if (VIR_STRNDUP(name, p, t - p) < 0) - return -1; - - p =3D t; - if ((t =3D strstr(p, "(default)")) && (!next || t < next)) - defIdx =3D qemuCaps->nmachineTypes; - - if ((t =3D strstr(p, "(alias of ")) && (!next || t < next)) { - p =3D t + strlen("(alias of "); - if (!(t =3D strchr(p, ')')) || (next && t >=3D 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 =3D can= onical; - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].alias =3D na= me; - } else { - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].name =3D nam= e; - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].alias =3D NU= LL; - } - /* When parsing from command line we don't have information about = maxCpus */ - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].maxCpus =3D 0; - qemuCaps->machineTypes[qemuCaps->nmachineTypes-1].hotplugCpus =3D = false; - } while ((p =3D next)); - - - if (defIdx) - virQEMUCapsSetDefaultMachine(qemuCaps, defIdx); - - return 0; -} - -static int -virQEMUCapsProbeMachineTypes(virQEMUCapsPtr qemuCaps, - uid_t runUid, gid_t runGid) -{ - char *output; - int ret =3D -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 =3D virQEMUCapsProbeCommand(qemuCaps->binary, qemuCaps, runUid, ru= nGid); - 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 =3D 0; - - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - - return ret; -} - - -typedef int -(*virQEMUCapsParseCPUModels)(const char *output, - virQEMUCapsPtr qemuCaps); - -/* Format: - * - * qemu-0.13 encloses some model names in []: - * [] - */ -static int -virQEMUCapsParseX86Models(const char *output, - virQEMUCapsPtr qemuCaps) -{ - const char *p =3D output; - const char *next; - virDomainCapsCPUModelsPtr cpus; - - if (!(cpus =3D virDomainCapsCPUModelsNew(0))) - return -1; - - do { - const char *t; - size_t len; - - if ((next =3D strchr(p, '\n'))) - next++; - - if (!(t =3D strchr(p, ' ')) || (next && t >=3D next)) - continue; - - if (!STRPREFIX(p, "x86")) - continue; - - p =3D t; - while (*p =3D=3D ' ') - p++; - - if (*p =3D=3D '\0' || *p =3D=3D '\n') - continue; - - if (next) - len =3D next - p - 1; - else - len =3D strlen(p); - - if (len > 2 && *p =3D=3D '[' && p[len - 1] =3D=3D ']') { - p++; - len -=3D 2; - } - - if (virDomainCapsCPUModelsAdd(cpus, p, len, - VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL= ) < 0) - goto error; - } while ((p =3D next)); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { - virDomainCapsCPUModelsPtr kvmCPUs; - - if (!(kvmCPUs =3D virDomainCapsCPUModelsCopy(cpus))) - goto error; - - qemuCaps->kvmCPUModels =3D kvmCPUs; - } - qemuCaps->tcgCPUModels =3D cpus; - - return 0; - - error: - virObjectUnref(cpus); - return -1; -} - -/* ppc64 parser. - * Format : PowerPC - */ -static int -virQEMUCapsParsePPCModels(const char *output, - virQEMUCapsPtr qemuCaps) -{ - const char *p =3D output; - const char *next; - virDomainCapsCPUModelsPtr cpus; - - if (!(cpus =3D virDomainCapsCPUModelsNew(0))) - return -1; - - do { - const char *t; - - if ((next =3D strchr(p, '\n'))) - next++; - - if (!STRPREFIX(p, "PowerPC ")) - continue; - - /* Skip the preceding sub-string "PowerPC " */ - p +=3D 8; - - /*Malformed string, does not obey the format 'PowerPC '*/ - if (!(t =3D strchr(p, ' ')) || (next && t >=3D next)) - continue; - - if (*p =3D=3D '\0') - break; - - if (*p =3D=3D '\n') - continue; - - if (virDomainCapsCPUModelsAdd(cpus, p, t - p - 1, - VIR_DOMCAPS_CPU_USABLE_UNKNOWN, NULL= ) < 0) - goto error; - } while ((p =3D next)); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { - virDomainCapsCPUModelsPtr kvmCPUs; - - if (!(kvmCPUs =3D virDomainCapsCPUModelsCopy(cpus))) - goto error; - - qemuCaps->kvmCPUModels =3D kvmCPUs; - } - qemuCaps->tcgCPUModels =3D cpus; - - return 0; - - error: - virObjectUnref(cpus); - return -1; -} - -static int -virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t run= Gid) -{ - char *output =3D NULL; - int ret =3D -1; - virQEMUCapsParseCPUModels parse; - virCommandPtr cmd; - - if (ARCH_IS_X86(qemuCaps->arch)) { - parse =3D virQEMUCapsParseX86Models; - } else if (ARCH_IS_PPC64(qemuCaps->arch)) { - parse =3D virQEMUCapsParsePPCModels; - } else { - VIR_DEBUG("don't know how to parse %s CPU models", - virArchToString(qemuCaps->arch)); - return 0; - } - - cmd =3D virQEMUCapsProbeCommand(qemuCaps->binary, qemuCaps, runUid, ru= nGid); - virCommandAddArgList(cmd, "-cpu", "?", NULL); - virCommandSetOutputBuffer(cmd, &output); - - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - if (parse(output, qemuCaps) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - - return ret; -} =20 static char * virQEMUCapsFindBinary(const char *format, @@ -1255,312 +957,6 @@ virQEMUCapsInit(virFileCachePtr cache) } =20 =20 -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=3D")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); - - cache =3D strstr(help, "cache=3D"); - if (cache && (p =3D 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=3Dthreads|native")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO); - if (strstr(help, "copy-on-read=3Don|off")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); - if (strstr(help, "bps=3D")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_IOTUNE); - - if (strstr(help, "-display")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY); - if ((p =3D strstr(help, "-vga")) && !strstr(help, "-std-vga")) { - const char *nl =3D strstr(p, "\n"); - if ((p =3D 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=3D")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION); - if (strstr(help, "boot=3Don")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_BOOT); - if (strstr(help, "serial=3Ds")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); - if (strstr(help, "host=3D[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=3Don")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU); - if (strstr(help, ",reboot-timeout=3Drb_time")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_REBOOT_TIMEOUT); - if (strstr(help, ",splash-time=3Dsp_time")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SPLASH_TIMEOUT); - if ((fsdev =3D 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 =3D 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 >=3D 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=3D")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); - - /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handl= ing - * 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 > 1500= 0)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN); - - if (strstr(help, "dump-guest-core=3Don|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 >=3D 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 >=3D 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 >=3D 13000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION); - - if (version >=3D 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) =3D=3D ' ') || (*(p) =3D=3D '\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 =3D help; - char *strflags; - - *version =3D *kvm_version =3D 0; - *is_kvm =3D false; - - if (STRPREFIX(p, QEMU_VERSION_STR_1)) - p +=3D strlen(QEMU_VERSION_STR_1); - else if (STRPREFIX(p, QEMU_VERSION_STR_2)) - p +=3D strlen(QEMU_VERSION_STR_2); - else - goto fail; - - SKIP_BLANKS(p); - - major =3D virParseNumber(&p); - if (major =3D=3D -1 || *p !=3D '.') - goto fail; - - ++p; - - minor =3D virParseNumber(&p); - if (minor =3D=3D -1) - goto fail; - - if (*p !=3D '.') { - micro =3D 0; - } else { - ++p; - micro =3D virParseNumber(&p); - if (micro =3D=3D -1) - goto fail; - } - - SKIP_BLANKS(p); - - if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) { - *is_kvm =3D true; - p +=3D strlen(QEMU_KVM_VER_PREFIX); - } else if (STRPREFIX(p, KVM_VER_PREFIX)) { - int ret; - - *is_kvm =3D true; - p +=3D strlen(KVM_VER_PREFIX); - - ret =3D virParseNumber(&p); - if (ret =3D=3D -1) - goto fail; - - *kvm_version =3D ret; - } - - *version =3D (major * 1000 * 1000) + (minor * 1000) + micro; - - if (*version < 12000) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("QEMU version >=3D 0.12.00 is required, but %d.%d= .%d found"), - major, minor, micro); - goto cleanup; - } - - /* Refuse to parse -help output for QEMU releases >=3D 1.2.0 that shou= ld be - * using QMP probing. - */ - if (*version >=3D 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 =3D 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, micr= o); - - return 0; - - fail: - p =3D strchr(help, '\n'); - if (!p) - p =3D 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; @@ -1988,184 +1384,6 @@ virQEMUCapsProcessStringFlags(virQEMUCapsPtr qemuCa= ps, } =20 =20 -#define OBJECT_TYPE_PREFIX "name \"" - -static int -virQEMUCapsParseDeviceStrObjectTypes(const char *str, - char ***types) -{ - const char *tmp =3D str; - int ret =3D -1; - size_t ntypelist =3D 0; - char **typelist =3D NULL; - - *types =3D NULL; - - while ((tmp =3D strstr(tmp, OBJECT_TYPE_PREFIX))) { - char *end; - tmp +=3D strlen(OBJECT_TYPE_PREFIX); - end =3D strstr(tmp, "\""); - if (!end) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed QEMU device list string, missing q= uote")); - 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 =3D typelist; - ret =3D ntypelist; - - cleanup: - if (ret < 0) - virStringListFreeCount(typelist, ntypelist); - return ret; -} - - -static int -virQEMUCapsParseDeviceStrObjectProps(const char *str, - const char *type, - char ***props) -{ - const char *tmp =3D str; - int ret =3D -1; - size_t nproplist =3D 0; - char **proplist =3D NULL; - - VIR_DEBUG("Extract type %s", type); - *props =3D NULL; - - while ((tmp =3D strchr(tmp, '\n'))) { - char *end; - tmp +=3D 1; - - if (*tmp =3D=3D '\0') - break; - - if (STRPREFIX(tmp, OBJECT_TYPE_PREFIX)) - continue; - - if (!STRPREFIX(tmp, type)) - continue; - - tmp +=3D strlen(type); - if (*tmp !=3D '.') - continue; - tmp++; - - end =3D strstr(tmp, "=3D"); - if (!end) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed QEMU device list string, missing '= =3D'")); - 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 =3D proplist; - ret =3D 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 =3D virQEMUCapsParseDeviceStrObjectTypes(str, &values)) <= 0) - return -1; - virQEMUCapsProcessStringFlags(qemuCaps, - ARRAY_CARDINALITY(virQEMUCapsObjectTypes= ), - virQEMUCapsObjectTypes, - nvalues, values); - virStringListFreeCount(values, nvalues); - - for (i =3D 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { - const char *type =3D virQEMUCapsObjectProps[i].type; - if ((nvalues =3D 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 =3D NULL; - virCommandPtr cmd; - int ret =3D -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 =3D 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 =3D virQEMUCapsParseDeviceStr(qemuCaps, output); - - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - return ret; -} - - int virQEMUCapsGetDefaultVersion(virCapsPtr caps, virFileCachePtr capsCache, unsigned int *version) @@ -4400,76 +3618,6 @@ virQEMUCapsIsValid(void *data, } =20 =20 -#define QEMU_SYSTEM_PREFIX "qemu-system-" - -static int -virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, c= onst char *qmperr) -{ - virCommandPtr cmd =3D NULL; - bool is_kvm; - char *help =3D NULL; - int ret =3D -1; - const char *tmp; - - VIR_DEBUG("qemuCaps=3D%p", qemuCaps); - - tmp =3D strstr(qemuCaps->binary, QEMU_SYSTEM_PREFIX); - if (tmp) { - tmp +=3D strlen(QEMU_SYSTEM_PREFIX); - - qemuCaps->arch =3D virQEMUCapsArchFromString(tmp); - } else { - qemuCaps->arch =3D virArchFromHost(); - } - - cmd =3D 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 !=3D 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 =3D 0; - cleanup: - virCommandFree(cmd); - VIR_FREE(help); - return ret; -} - - static void virQEMUCapsMonitorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) @@ -5077,8 +4225,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; @@ -5114,7 +4261,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, goto error; } =20 - if (qmpOnly && !qemuCaps->usedQMP) { + if (!qemuCaps->usedQMP) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to probe QEMU binary with QMP: %s"), qmperr ? qmperr : _("unknown error")); @@ -5122,12 +4269,6 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, goto error; } =20 - if (!qemuCaps->usedQMP && - virQEMUCapsInitHelp(qemuCaps, runUid, runGid, qmperr) < 0) { - virQEMUCapsLogProbeFailure(binary); - goto error; - } - qemuCaps->libvirtCtime =3D virGetSelfLastChanged(); qemuCaps->libvirtVersion =3D LIBVIR_VERSION_NUMBER; =20 @@ -5163,8 +4304,7 @@ virQEMUCapsNewData(const char *binary, priv->runUid, priv->runGid, priv->microcodeVersion, - priv->kernelVersion, - false); + priv->kernelVersion); } =20 =20 diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 222f3368e3..0199501c93 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); =20 int virQEMUCapsLoadCache(virArch hostArch, virQEMUCapsPtr qemuCaps, @@ -86,20 +85,6 @@ virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps, virGICCapability *capabilities, size_t ncapabilities); =20 -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 f2f5caed4f..53857df201 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -121,7 +121,6 @@ EXTRA_DIST =3D \ qemuargv2xmldata \ qemucapabilitiesdata \ qemucaps2xmldata \ - qemuhelpdata \ qemuhotplugtestcpus \ qemuhotplugtestdevices \ qemuhotplugtestdomains \ @@ -284,7 +283,7 @@ endif WITH_LIBXL =20 if WITH_QEMU test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ - qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ + qemuargv2xmltest domainsnapshotxml2xmltest \ qemumonitortest qemumonitorjsontest qemuhotplugtest \ qemuagenttest qemucapabilitiestest qemucaps2xmltest \ qemumemlocktest \ @@ -604,9 +603,6 @@ qemuargv2xmltest_SOURCES =3D \ testutils.c testutils.h qemuargv2xmltest_LDADD =3D $(qemu_LDADDS) $(LDADDS) =20 -qemuhelptest_SOURCES =3D qemuhelptest.c testutils.c testutils.h -qemuhelptest_LDADD =3D $(qemu_LDADDS) $(LDADDS) - qemumonitortest_SOURCES =3D \ qemumonitortest.c \ testutils.c testutils.h \ @@ -694,7 +690,7 @@ qemumemlocktest_SOURCES =3D \ qemumemlocktest_LDADD =3D $(qemu_LDADDS) $(LDADDS) else ! WITH_QEMU EXTRA_DIST +=3D 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 7d60246949..54084218b7 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -72,7 +72,7 @@ main(int argc, char **argv) return EXIT_FAILURE; =20 if (!(caps =3D virQEMUCapsNewForBinaryInternal(VIR_ARCH_NONE, argv[1],= "/tmp", - -1, -1, 0, NULL, true))) + -1, -1, 0, NULL))) return EXIT_FAILURE; =20 virObjectUnref(caps); diff --git a/tests/qemuhelpdata/qemu-0.12.1 b/tests/qemuhelpdata/qemu-0.12.1 deleted file mode 100644 index 0caa3b36a2..0000000000 --- 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=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug etc. - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none][,format=3Df][,serial=3Ds] - [,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.property=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|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=3D128] --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=3Dstring2] 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 conso= le --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 b= ug --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=3Dstr] - enable virtio balloon device (default) --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,data=3Dfile1[:file= 2]...] - ACPI table description --smbios file=3Dbinary - Load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - Specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - Specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Dy|n] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off] - connect the host TAP network interface to VLAN 'n' and use= the - network scripts 'file' (default=3D/etc/qemu-ifup) - and 'dfile' (default=3D/etc/qemu-ifdown); - use '[down]script=3Dno' to disable script execution; - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= ; the - default of 'sndbuf=3D1048576' can be disabled using 'sndbu= f=3D0' - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag; use - vnet_hdr=3Don to make the lack of IFF_VNET_HDR support an = error condition --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices; if no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6] --chardev msmouse,id=3Did --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] --chardev file,id=3Did,path=3Dpath --chardev pipe,id=3Did,path=3Dpath --chardev pty,id=3Did --chardev stdio,id=3Did --chardev tty,id=3Did,path=3Dpath --chardev parport,id=3Did,path=3Dpath - -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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|vm][,driftfix=3Dnone|slew] - set the RTC base and clock, enable drift fix for clock tic= ks --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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 --writeconfig - 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/qem= u-0.12.1-device deleted file mode 100644 index 63c7bef4d6..0000000000 --- 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 (/de= v/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 d6af0ec552..0000000000 --- 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=3D]name[,prop[=3Dvalue][,...]] - selects emulated machine (-machine ? for list) - property accel=3Daccel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug, etc - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none|directsync|unsafe][,format=3D= f] - [,serial=3Ds][,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - [,readonly=3Don|off] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.property=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|off] - [,splash=3Dsp_name][,splash-time=3Dsp_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=3Don - 'sp_time': the period that splash picture last if menu=3Do= n, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=3D128] --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[=3Dvalue][,...]] - add device (based on driver) - prop=3Dvalue,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=3Did,path=3Dpath,[security_model=3D{mapped|passthrough|= none}] - [,writeout=3Dimmediate][,readonly] - -Virtual File system pass-through options: --virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped|passthr= ough|none] - [,writeout=3Dimmediate][,readonly] --virtfs_synth Create synthetic file system image - --name string1[,process=3Dstring2] - 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=3Don|off][,alt_grab=3Don|off][,ctrl_grab=3Don|off] - [,window_close=3Don|off]|curses|none| - vnc=3D[,] - select display type --nographic disable graphical output and redirect serial I/Os to conso= le --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 enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate 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 b= ug --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=3Dstr] - enable virtio balloon device (default) --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,{data|file}=3Dfile= 1[:file2]...] - ACPI table description --smbios file=3Dbinary - load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Don|off] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off][,vhost=3Don|off]= [,vhostfd=3Dh][,vhostforce=3Don|off] - connect the host TAP network interface to VLAN 'n' and use= the - network scripts 'file' (default=3D/etc/qemu-ifup) - and 'dfile' (default=3D/etc/qemu-ifdown) - use '[down]script=3Dno' to disable script execution - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= (the - default is disabled 'sndbuf=3D0' to enable flow control se= t 'sndbuf=3D1048576') - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag - use vnet_hdr=3Don to make the lack of IFF_VNET_HDR support= an error condition - use vhost=3Don to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=3Don to force vhost on for non-MSIX virtio = guests - use 'vhostfd=3Dh' to connect to an already opened vhost ne= t device --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port[,localadd= r=3Daddr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=3Daddr' to specify the host address to send= packets from --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices. If no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did[,mux=3Don|off] --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet][,mux=3Don|off] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet],[mux=3Don|o= ff] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off] --chardev msmouse,id=3Did[,mux=3Don|off] --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] - [,mux=3Don|off] --chardev file,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pipe,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pty,id=3Did[,mux=3Don|off] --chardev stdio,id=3Did[,mux=3Don|off][,signal=3Don|off] --chardev braille,id=3Did[,mux=3Don|off] --chardev tty,id=3Did,path=3Dpath[,mux=3Don|off] --chardev parport,id=3Did,path=3Dpath[,mux=3Don|off] --chardev spicevmc,id=3Did,name=3Dname[,debug=3Ddebug] - -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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --D logfile output log to logfile (instead of the default /tmp/qemu.lo= g) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|vm][,driftfix=3Dnone|slew] - set the RTC base and clock, enable drift fix for clock tic= ks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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=3Dvalue - set OpenBIOS nvram variables --semihosting semihosting mode --old-param old param mode --readconfig --writeconfig - read/write config file --nodefconfig - do not load default config files at startup --trace [events=3D][,file=3D] - 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 a249dd2e9f..0000000000 --- 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 (/de= v/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 Expres= s 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=3Dhex32 -virtio-blk-pci.drive=3Ddrive -virtio-blk-pci.logical_block_size=3Duint16 -virtio-blk-pci.physical_block_size=3Duint16 -virtio-blk-pci.min_io_size=3Duint16 -virtio-blk-pci.opt_io_size=3Duint32 -virtio-blk-pci.bootindex=3Dint32 -virtio-blk-pci.discard_granularity=3Duint32 -virtio-blk-pci.serial=3Dstring -virtio-blk-pci.ioeventfd=3Don/off -virtio-blk-pci.vectors=3Duint32 -virtio-blk-pci.indirect_desc=3Don/off -virtio-blk-pci.event_idx=3Don/off -virtio-blk-pci.scsi=3Don/off -virtio-blk-pci.addr=3Dpci-devfn -virtio-blk-pci.romfile=3Dstring -virtio-blk-pci.rombar=3Duint32 -virtio-blk-pci.multifunction=3Don/off -virtio-blk-pci.command_serr_enable=3Don/off -virtio-net-pci.ioeventfd=3Don/off -virtio-net-pci.vectors=3Duint32 -virtio-net-pci.indirect_desc=3Don/off -virtio-net-pci.event_idx=3Don/off -virtio-net-pci.csum=3Don/off -virtio-net-pci.guest_csum=3Don/off -virtio-net-pci.gso=3Don/off -virtio-net-pci.guest_tso4=3Don/off -virtio-net-pci.guest_tso6=3Don/off -virtio-net-pci.guest_ecn=3Don/off -virtio-net-pci.guest_ufo=3Don/off -virtio-net-pci.host_tso4=3Don/off -virtio-net-pci.host_tso6=3Don/off -virtio-net-pci.host_ecn=3Don/off -virtio-net-pci.host_ufo=3Don/off -virtio-net-pci.mrg_rxbuf=3Don/off -virtio-net-pci.status=3Don/off -virtio-net-pci.ctrl_vq=3Don/off -virtio-net-pci.ctrl_rx=3Don/off -virtio-net-pci.ctrl_vlan=3Don/off -virtio-net-pci.ctrl_rx_extra=3Don/off -virtio-net-pci.mac=3Dmacaddr -virtio-net-pci.vlan=3Dvlan -virtio-net-pci.netdev=3Dnetdev -virtio-net-pci.bootindex=3Dint32 -virtio-net-pci.x-txtimer=3Duint32 -virtio-net-pci.x-txburst=3Dint32 -virtio-net-pci.tx=3Dstring -virtio-net-pci.addr=3Dpci-devfn -virtio-net-pci.romfile=3Dstring -virtio-net-pci.rombar=3Duint32 -virtio-net-pci.multifunction=3Don/off -virtio-net-pci.command_serr_enable=3Don/off -scsi-generic.drive=3Ddrive -scsi-generic.logical_block_size=3Duint16 -scsi-generic.physical_block_size=3Duint16 -scsi-generic.min_io_size=3Duint16 -scsi-generic.opt_io_size=3Duint32 -scsi-generic.bootindex=3Dint32 -scsi-generic.discard_granularity=3Duint32 -scsi-generic.channel=3Duint32 -scsi-generic.scsi-id=3Duint32 -scsi-generic.lun=3Duint32 diff --git a/tests/qemuhelpdata/qemu-1.1.0 b/tests/qemuhelpdata/qemu-1.1.0 deleted file mode 100644 index 43c189d2b8..0000000000 --- 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=3D]name[,prop[=3Dvalue][,...]] - selects emulated machine (-machine ? for list) - property accel=3Daccel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) - kernel_irqchip=3Don|off controls accelerated irqchip suppo= rt - kvm_shadow_mem=3Dsize of KVM shadow MMU --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug, etc - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none|directsync|unsafe][,format=3D= f] - [,serial=3Ds][,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - [,readonly=3Don|off][,copy-on-read=3Don|off] - [[,bps=3Db]|[[,bps_rd=3Dr][,bps_wr=3Dw]]][[,iops=3Di]|[[,iops_rd=3D= r][,iops_wr=3Dw]] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.prop=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|off] - [,splash=3Dsp_name][,splash-time=3Dsp_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=3Don - 'sp_time': the period that splash picture last if menu=3Do= n, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=3D128] --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=3Dstr] - 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[=3Dvalue][,...]] - add device (based on driver) - prop=3Dvalue,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=3Did[,path=3Dpath,][security_model=3D{mapped-xattr|mapp= ed-file|passthrough|none}] - [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock_fd] - -Virtual File system pass-through options: --virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped-xattr|m= apped-file|passthrough|none] - [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock= _fd] --virtfs_synth Create synthetic file system image - --name string1[,process=3Dstring2] - 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=3Don|off][,alt_grab=3Don|off][,ctrl_grab=3Don|off] - [,window_close=3Don|off]|curses|none| - vnc=3D[,] - select display type --nographic disable graphical output and redirect serial I/Os to conso= le --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 enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate 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 b= ug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,{data|file}=3Dfile= 1[:file2]...] - ACPI table description --smbios file=3Dbinary - load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Don|off] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,helper=3Dhelper][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off= ][,vhost=3Don|off][,vhostfd=3Dh][,vhostforce=3Don|off] - connect the host TAP network interface to VLAN 'n'=20 - use network scripts 'file' (default=3D/etc/qemu-ifup) - to configure it and 'dfile' (default=3D/etc/qemu-ifdown) - to deconfigure it - use '[down]script=3Dno' to disable script execution - use network helper 'helper' (default=3D/usr/libexec/qemu-b= ridge-helper) to - configure it - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= (the - default is disabled 'sndbuf=3D0' to enable flow control se= t 'sndbuf=3D1048576') - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag - use vnet_hdr=3Don to make the lack of IFF_VNET_HDR support= an error condition - use vhost=3Don to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=3Don to force vhost on for non-MSIX virtio = guests - use 'vhostfd=3Dh' to connect to an already opened vhost ne= t device --net bridge[,vlan=3Dn][,name=3Dstr][,br=3Dbridge][,helper=3Dhelper] - connects a host TAP network interface to a host bridge dev= ice 'br' - (default=3Dbr0) using the program 'helper' - (default=3D/usr/libexec/qemu-bridge-helper) --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port[,localadd= r=3Daddr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=3Daddr' to specify the host address to send= packets from --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,udp=3Dhost:port][,localaddr= =3Dhost:port] - connect the vlan 'n' to another VLAN using an UDP tunnel --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices. If no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|bridge|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did[,mux=3Don|off] --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet][,mux=3Don|off] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet],[mux=3Don|o= ff] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off] --chardev msmouse,id=3Did[,mux=3Don|off] --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] - [,mux=3Don|off] --chardev file,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pipe,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pty,id=3Did[,mux=3Don|off] --chardev stdio,id=3Did[,mux=3Don|off][,signal=3Don|off] --chardev braille,id=3Did[,mux=3Don|off] --chardev tty,id=3Did,path=3Dpath[,mux=3Don|off] --chardev parport,id=3Did,path=3Dpath[,mux=3Don|off] --chardev spicevmc,id=3Did,name=3Dname[,debug=3Ddebug] - --iscsi [user=3Duser][,password=3Dpassword] - [,header-digest=3DCRC32C|CR32C-NONE|NONE-CRC32C|NONE - [,initiator-name=3Diqn] - 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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --D logfile output log to logfile (instead of the default /tmp/qemu.lo= g) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|rt|vm][,driftfix=3Dnone|sle= w] - set the RTC base and clock, enable drift fix for clock tic= ks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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 --writeconfig - 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=3D][,file=3D] - 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 218690662a..0000000000 --- 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 Expres= s 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 (/de= v/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, microph= one)" -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=3Dhex32 -virtio-blk-pci.drive=3Ddrive -virtio-blk-pci.logical_block_size=3Dblocksize -virtio-blk-pci.physical_block_size=3Dblocksize -virtio-blk-pci.min_io_size=3Duint16 -virtio-blk-pci.opt_io_size=3Duint32 -virtio-blk-pci.bootindex=3Dint32 -virtio-blk-pci.discard_granularity=3Duint32 -virtio-blk-pci.serial=3Dstring -virtio-blk-pci.scsi=3Don/off -virtio-blk-pci.ioeventfd=3Don/off -virtio-blk-pci.vectors=3Duint32 -virtio-blk-pci.indirect_desc=3Don/off -virtio-blk-pci.event_idx=3Don/off -virtio-blk-pci.addr=3Dpci-devfn -virtio-blk-pci.romfile=3Dstring -virtio-blk-pci.rombar=3Duint32 -virtio-blk-pci.multifunction=3Don/off -virtio-blk-pci.command_serr_enable=3Don/off -virtio-net-pci.ioeventfd=3Don/off -virtio-net-pci.vectors=3Duint32 -virtio-net-pci.indirect_desc=3Don/off -virtio-net-pci.event_idx=3Don/off -virtio-net-pci.csum=3Don/off -virtio-net-pci.guest_csum=3Don/off -virtio-net-pci.gso=3Don/off -virtio-net-pci.guest_tso4=3Don/off -virtio-net-pci.guest_tso6=3Don/off -virtio-net-pci.guest_ecn=3Don/off -virtio-net-pci.guest_ufo=3Don/off -virtio-net-pci.host_tso4=3Don/off -virtio-net-pci.host_tso6=3Don/off -virtio-net-pci.host_ecn=3Don/off -virtio-net-pci.host_ufo=3Don/off -virtio-net-pci.mrg_rxbuf=3Don/off -virtio-net-pci.status=3Don/off -virtio-net-pci.ctrl_vq=3Don/off -virtio-net-pci.ctrl_rx=3Don/off -virtio-net-pci.ctrl_vlan=3Don/off -virtio-net-pci.ctrl_rx_extra=3Don/off -virtio-net-pci.mac=3Dmacaddr -virtio-net-pci.vlan=3Dvlan -virtio-net-pci.netdev=3Dnetdev -virtio-net-pci.bootindex=3Dint32 -virtio-net-pci.x-txtimer=3Duint32 -virtio-net-pci.x-txburst=3Dint32 -virtio-net-pci.tx=3Dstring -virtio-net-pci.addr=3Dpci-devfn -virtio-net-pci.romfile=3Dstring -virtio-net-pci.rombar=3Duint32 -virtio-net-pci.multifunction=3Don/off -virtio-net-pci.command_serr_enable=3Don/off -scsi-disk.drive=3Ddrive -scsi-disk.logical_block_size=3Dblocksize -scsi-disk.physical_block_size=3Dblocksize -scsi-disk.min_io_size=3Duint16 -scsi-disk.opt_io_size=3Duint32 -scsi-disk.bootindex=3Dint32 -scsi-disk.discard_granularity=3Duint32 -scsi-disk.ver=3Dstring -scsi-disk.serial=3Dstring -scsi-disk.removable=3Don/off -scsi-disk.dpofua=3Don/off -scsi-disk.channel=3Duint32 -scsi-disk.scsi-id=3Duint32 -scsi-disk.lun=3Duint32 -scsi-generic.drive=3Ddrive -scsi-generic.logical_block_size=3Dblocksize -scsi-generic.physical_block_size=3Dblocksize -scsi-generic.min_io_size=3Duint16 -scsi-generic.opt_io_size=3Duint32 -scsi-generic.bootindex=3Dint32 -scsi-generic.discard_granularity=3Duint32 -scsi-generic.channel=3Duint32 -scsi-generic.scsi-id=3Duint32 -scsi-generic.lun=3Duint32 diff --git a/tests/qemuhelpdata/qemu-1.2.0 b/tests/qemuhelpdata/qemu-1.2.0 deleted file mode 100644 index 32a243192b..0000000000 --- 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=3D]name[,prop[=3Dvalue][,...]] - selects emulated machine (-machine ? for list) - property accel=3Daccel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) - kernel_irqchip=3Don|off controls accelerated irqchip suppo= rt - kvm_shadow_mem=3Dsize of KVM shadow MMU - dump-guest-core=3Don|off include guest memory in a core du= mp (default=3Don) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug, etc - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none|directsync|unsafe][,format=3D= f] - [,serial=3Ds][,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - [,readonly=3Don|off][,copy-on-read=3Don|off] - [[,bps=3Db]|[[,bps_rd=3Dr][,bps_wr=3Dw]]][[,iops=3Di]|[[,iops_rd=3D= r][,iops_wr=3Dw]] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.prop=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|off] - [,splash=3Dsp_name][,splash-time=3Dsp_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=3Don - 'sp_time': the period that splash picture last if menu=3Do= n, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=3D128] --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=3Dstr] - 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[=3Dvalue][,...]] - add device (based on driver) - prop=3Dvalue,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=3Did[,path=3Dpath,][security_model=3D{mapped-xattr|mapp= ed-file|passthrough|none}] - [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock_fd] - -Virtual File system pass-through options: --virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped-xattr|m= apped-file|passthrough|none] - [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock= _fd] --virtfs_synth Create synthetic file system image - --name string1[,process=3Dstring2] - 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=3Don|off][,alt_grab=3Don|off][,ctrl_grab=3Don|off] - [,window_close=3Don|off]|curses|none| - vnc=3D[,] - select display type --nographic disable graphical output and redirect serial I/Os to conso= le --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 enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate 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 b= ug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,{data|file}=3Dfile= 1[:file2]...] - ACPI table description --smbios file=3Dbinary - load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Don|off] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,helper=3Dhelper][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off= ][,vhost=3Don|off][,vhostfd=3Dh][,vhostforce=3Don|off] - connect the host TAP network interface to VLAN 'n'=20 - use network scripts 'file' (default=3D/etc/qemu-ifup) - to configure it and 'dfile' (default=3D/etc/qemu-ifdown) - to deconfigure it - use '[down]script=3Dno' to disable script execution - use network helper 'helper' (default=3D/usr/local/libexec/= qemu-bridge-helper) to - configure it - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= (the - default is disabled 'sndbuf=3D0' to enable flow control se= t 'sndbuf=3D1048576') - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag - use vnet_hdr=3Don to make the lack of IFF_VNET_HDR support= an error condition - use vhost=3Don to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=3Don to force vhost on for non-MSIX virtio = guests - use 'vhostfd=3Dh' to connect to an already opened vhost ne= t device --net bridge[,vlan=3Dn][,name=3Dstr][,br=3Dbridge][,helper=3Dhelper] - connects a host TAP network interface to a host bridge dev= ice 'br' - (default=3Dbr0) using the program 'helper' - (default=3D/usr/local/libexec/qemu-bridge-helper) --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port[,localadd= r=3Daddr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=3Daddr' to specify the host address to send= packets from --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,udp=3Dhost:port][,localaddr= =3Dhost:port] - connect the vlan 'n' to another VLAN using an UDP tunnel --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices. If no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|bridge|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did[,mux=3Don|off] --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet][,mux=3Don|off] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet],[mux=3Don|o= ff] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off] --chardev msmouse,id=3Did[,mux=3Don|off] --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] - [,mux=3Don|off] --chardev file,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pipe,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pty,id=3Did[,mux=3Don|off] --chardev stdio,id=3Did[,mux=3Don|off][,signal=3Don|off] --chardev braille,id=3Did[,mux=3Don|off] --chardev tty,id=3Did,path=3Dpath[,mux=3Don|off] --chardev parport,id=3Did,path=3Dpath[,mux=3Don|off] --chardev spicevmc,id=3Did,name=3Dname[,debug=3Ddebug] - --iscsi [user=3Duser][,password=3Dpassword] - [,header-digest=3DCRC32C|CR32C-NONE|NONE-CRC32C|NONE - [,initiator-name=3Diqn] - 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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --D logfile output log to logfile (instead of the default /tmp/qemu.lo= g) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|rt|vm][,driftfix=3Dnone|sle= w] - set the RTC base and clock, enable drift fix for clock tic= ks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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 Enable seccomp mode 2 system call filter (default 'off'). --readconfig --writeconfig - 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=3D][,file=3D] - 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-k= vm-0.12.3 deleted file mode 100644 index 268d36fbe1..0000000000 --- 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=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug etc. - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none][,format=3Df][,serial=3Ds] - [,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - [,boot=3Don|off] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.property=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|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=3D128] --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=3Dstring2] 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 conso= le --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 b= ug --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=3Dstr] - enable virtio balloon device (default) --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,data=3Dfile1[:file= 2]...] - ACPI table description --smbios file=3Dbinary - Load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - Specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - Specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Dy|n] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off] - connect the host TAP network interface to VLAN 'n' and use= the - network scripts 'file' (default=3D/etc/qemu-ifup) - and 'dfile' (default=3D/etc/qemu-ifdown); - use '[down]script=3Dno' to disable script execution; - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= ; the - default of 'sndbuf=3D1048576' can be disabled using 'sndbu= f=3D0' - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag; use - vnet_hdr=3Don to make the lack of IFF_VNET_HDR support an = error condition --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices; if no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6] --chardev msmouse,id=3Did --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] --chardev file,id=3Did,path=3Dpath --chardev pipe,id=3Did,path=3Dpath --chardev pty,id=3Did --chardev stdio,id=3Did --chardev tty,id=3Did,path=3Dpath --chardev parport,id=3Did,path=3Dpath - -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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|vm][,driftfix=3Dnone|slew] - set the RTC base and clock, enable drift fix for clock tic= ks --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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 --writeconfig - 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=3Dbus:dev.func[,dma=3Dnone][,name=3Dstring] - expose a PCI device to the guest OS. - dma=3Dnone: 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 814dcaf74d..0000000000 --- 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 (/de= v/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-k= vm-0.13.0 deleted file mode 100644 index af29d11f7d..0000000000 --- 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 Fa= brice 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=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug, etc - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none|unsafe][,format=3Df] - [,serial=3Ds][,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - [,readonly=3Don|off][,boot=3Don|off] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.property=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|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=3D128] --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[=3Dvalue][,...]] - add device (based on driver) - prop=3Dvalue,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties -File system options: --fsdev local,id=3Did,path=3Dpath,security_model=3D[mapped|passthrough] -Virtual File system pass-through options: --virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped|passthr= ough] - --name string1[,process=3Dstring2] - 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 conso= le --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 b= ug --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=3Dstr] - enable virtio balloon device (default) --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,data=3Dfile1[:file= 2]...] - ACPI table description --smbios file=3Dbinary - load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Dy|n] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off][,vhost=3Don|off]= [,vhostfd=3Dh] - connect the host TAP network interface to VLAN 'n' and use= the - network scripts 'file' (default=3D/etc/qemu-ifup) - and 'dfile' (default=3D/etc/qemu-ifdown) - use '[down]script=3Dno' to disable script execution - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= (the - default of 'sndbuf=3D1048576' can be disabled using 'sndbu= f=3D0') - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag - use vnet_hdr=3Don to make the lack of IFF_VNET_HDR support= an error condition - use vhost=3Don to enable experimental in kernel accelerator - use 'vhostfd=3Dh' to connect to an already opened vhost ne= t device --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port] - connect the vlan 'n' to multicast maddr and port --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices. If no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did[,mux=3Don|off] --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet][,mux=3Don|off] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet],[mux=3Don|o= ff] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off] --chardev msmouse,id=3Did[,mux=3Don|off] --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] - [,mux=3Don|off] --chardev file,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pipe,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pty,id=3Did[,mux=3Don|off] --chardev stdio,id=3Did[,mux=3Don|off][,signal=3Don|off] --chardev tty,id=3Did,path=3Dpath[,mux=3Don|off] --chardev parport,id=3Did,path=3Dpath[,mux=3Don|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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|vm][,driftfix=3Dnone|slew] - set the RTC base and clock, enable drift fix for clock tic= ks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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=3Dvalue - set OpenBIOS nvram variables --semihosting semihosting mode --old-param old param mode --readconfig --writeconfig - 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=3D[seg:]bus:dev.func[,dma=3Dnone][,name=3Dstring] - expose a PCI device to the guest OS - dma=3Dnone: 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 6dd2d09c56..0000000000 --- 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 (/de= v/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 gue= st" -pci-assign.host=3Dpci-hostaddr -pci-assign.iommu=3Duint32 -pci-assign.configfd=3Dstring -virtio-net-pci.vectors=3Duint32 -virtio-net-pci.indirect_desc=3Don/off -virtio-net-pci.csum=3Don/off -virtio-net-pci.guest_csum=3Don/off -virtio-net-pci.gso=3Don/off -virtio-net-pci.guest_tso4=3Don/off -virtio-net-pci.guest_tso6=3Don/off -virtio-net-pci.guest_ecn=3Don/off -virtio-net-pci.guest_ufo=3Don/off -virtio-net-pci.host_tso4=3Don/off -virtio-net-pci.host_tso6=3Don/off -virtio-net-pci.host_ecn=3Don/off -virtio-net-pci.host_ufo=3Don/off -virtio-net-pci.mrg_rxbuf=3Don/off -virtio-net-pci.status=3Don/off -virtio-net-pci.ctrl_vq=3Don/off -virtio-net-pci.ctrl_rx=3Don/off -virtio-net-pci.ctrl_vlan=3Don/off -virtio-net-pci.ctrl_rx_extra=3Don/off -virtio-net-pci.mac=3Dmacaddr -virtio-net-pci.vlan=3Dvlan -virtio-net-pci.netdev=3Dnetdev diff --git a/tests/qemuhelpdata/qemu-kvm-1.2.0 b/tests/qemuhelpdata/qemu-kv= m-1.2.0 deleted file mode 100644 index 08c3f9362f..0000000000 --- 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 Fabr= ice 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=3D]name[,prop[=3Dvalue][,...]] - selects emulated machine (-machine ? for list) - property accel=3Daccel1[:accel2[:...]] selects accelerator - supported accelerators are kvm, xen, tcg (default: tcg) - kernel_irqchip=3Don|off controls accelerated irqchip suppo= rt - kvm_shadow_mem=3Dsize of KVM shadow MMU - dump-guest-core=3Don|off include guest memory in a core du= mp (default=3Don) --cpu cpu select CPU (-cpu ? for list) --smp n[,maxcpus=3Dcpus][,cores=3Dcores][,threads=3Dthreads][,sockets=3Dsoc= kets] - set the number of CPUs to 'n' [default=3D1] - maxcpus=3D maximum number of total cpus, including - offline CPUs for hotplug, etc - cores=3D number of CPU cores on one socket - threads=3D number of threads on one CPU core - sockets=3D number of discrete sockets in the system --numa node[,mem=3Dsize][,cpus=3Dcpu[-cpu]][,nodeid=3Dnode] --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=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,index= =3Di] - [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|off] - [,cache=3Dwritethrough|writeback|none|directsync|unsafe][,format=3D= f] - [,serial=3Ds][,addr=3DA][,id=3Dname][,aio=3Dthreads|native] - [,readonly=3Don|off][,copy-on-read=3Don|off] - [[,bps=3Db]|[[,bps_rd=3Dr][,bps_wr=3Dw]]][[,iops=3Di]|[[,iops_rd=3D= r][,iops_wr=3Dw]] - use 'file' as a drive image --set group.id.arg=3Dvalue - set parameter for item of type - i.e. -set drive.$id.file=3D/path/to/image --global driver.prop=3Dvalue - 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=3Ddrives][,once=3Ddrives][,menu=3Don|off] - [,splash=3Dsp_name][,splash-time=3Dsp_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=3Don - 'sp_time': the period that splash picture last if menu=3Do= n, unit is ms --snapshot write to temporary files instead of disk image files --m megs set virtual RAM size to megs MB [default=3D128] --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=3Dstr] - 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[=3Dvalue][,...]] - add device (based on driver) - prop=3Dvalue,... sets driver properties - use -device ? to print all possible drivers - use -device driver,? to print all possible properties - -File system options: --fsdev fsdriver,id=3Did[,path=3Dpath,][security_model=3D{mapped-xattr|mapp= ed-file|passthrough|none}] - [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock_fd] - -Virtual File system pass-through options: --virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped-xattr|m= apped-file|passthrough|none] - [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock= _fd] --virtfs_synth Create synthetic file system image - --name string1[,process=3Dstring2] - 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=3Don|off][,alt_grab=3Don|off][,ctrl_grab=3Don|off] - [,window_close=3Don|off]|curses|none| - vnc=3D[,] - select display type --nographic disable graphical output and redirect serial I/Os to conso= le --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 enable spice --portrait rotate graphical output 90 deg left (only PXA LCD) --rotate 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 b= ug --no-fd-bootchk disable boot signature checking for floppy disks --no-acpi disable ACPI --no-hpet disable HPET --acpitable [sig=3Dstr][,rev=3Dn][,oem_id=3Dstr][,oem_table_id=3Dstr][,oem_= rev=3Dn][,asl_compiler_id=3Dstr][,asl_compiler_rev=3Dn][,{data|file}=3Dfile= 1[:file2]...] - ACPI table description --smbios file=3Dbinary - load SMBIOS entry from binary file --smbios type=3D0[,vendor=3Dstr][,version=3Dstr][,date=3Dstr][,release=3D%d= .%d] - specify SMBIOS type 0 fields --smbios type=3D1[,manufacturer=3Dstr][,product=3Dstr][,version=3Dstr][,ser= ial=3Dstr] - [,uuid=3Duuid][,sku=3Dstr][,family=3Dstr] - specify SMBIOS type 1 fields - -Network options: --net nic[,vlan=3Dn][,macaddr=3Dmac][,model=3Dtype][,name=3Dstr][,addr=3Dst= r][,vectors=3Dv] - create a new Network Interface Card and connect it to VLAN= 'n' --net user[,vlan=3Dn][,name=3Dstr][,net=3Daddr[/mask]][,host=3Daddr][,restr= ict=3Don|off] - [,hostname=3Dhost][,dhcpstart=3Daddr][,dns=3Daddr][,tftp=3Ddir][,= bootfile=3Df] - [,hostfwd=3Drule][,guestfwd=3Drule][,smb=3Ddir[,smbserver=3Daddr]] - connect the user mode network stack to VLAN 'n', configure= its - DHCP server and enabled optional services --net tap[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,ifname=3Dname][,script=3Dfile][= ,downscript=3Ddfile][,helper=3Dhelper][,sndbuf=3Dnbytes][,vnet_hdr=3Don|off= ][,vhost=3Don|off][,vhostfd=3Dh][,vhostforce=3Don|off] - connect the host TAP network interface to VLAN 'n'=20 - use network scripts 'file' (default=3D/etc/qemu-ifup) - to configure it and 'dfile' (default=3D/etc/qemu-ifdown) - to deconfigure it - use '[down]script=3Dno' to disable script execution - use network helper 'helper' (default=3D/usr/local/libexec/= qemu-bridge-helper) to - configure it - use 'fd=3Dh' to connect to an already opened TAP interface - use 'sndbuf=3Dnbytes' to limit the size of the send buffer= (the - default is disabled 'sndbuf=3D0' to enable flow control se= t 'sndbuf=3D1048576') - use vnet_hdr=3Doff to avoid enabling the IFF_VNET_HDR tap = flag - use vnet_hdr=3Don to make the lack of IFF_VNET_HDR support= an error condition - use vhost=3Don to enable experimental in kernel accelerator - (only has effect for virtio guests which use MSIX) - use vhostforce=3Don to force vhost on for non-MSIX virtio = guests - use 'vhostfd=3Dh' to connect to an already opened vhost ne= t device --net bridge[,vlan=3Dn][,name=3Dstr][,br=3Dbridge][,helper=3Dhelper] - connects a host TAP network interface to a host bridge dev= ice 'br' - (default=3Dbr0) using the program 'helper' - (default=3D/usr/local/libexec/qemu-bridge-helper) --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,listen=3D[host]:port][,conne= ct=3Dhost:port] - connect the vlan 'n' to another VLAN using a socket connec= tion --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,mcast=3Dmaddr:port[,localadd= r=3Daddr]] - connect the vlan 'n' to multicast maddr and port - use 'localaddr=3Daddr' to specify the host address to send= packets from --net socket[,vlan=3Dn][,name=3Dstr][,fd=3Dh][,udp=3Dhost:port][,localaddr= =3Dhost:port] - connect the vlan 'n' to another VLAN using an UDP tunnel --net dump[,vlan=3Dn][,file=3Df][,len=3Dn] - dump traffic on vlan 'n' to file 'f' (max n bytes per pack= et) --net none use it alone to have zero network devices. If no -net opti= on - is provided, the default is '-net nic -net user' --netdev [user|tap|bridge|socket],id=3Dstr[,option][,option][,...] - -Character device options: --chardev null,id=3Did[,mux=3Don|off] --chardev socket,id=3Did[,host=3Dhost],port=3Dhost[,to=3Dto][,ipv4][,ipv6][= ,nodelay] - [,server][,nowait][,telnet][,mux=3Don|off] (tcp) --chardev socket,id=3Did,path=3Dpath[,server][,nowait][,telnet],[mux=3Don|o= ff] (unix) --chardev udp,id=3Did[,host=3Dhost],port=3Dport[,localaddr=3Dlocaladdr] - [,localport=3Dlocalport][,ipv4][,ipv6][,mux=3Don|off] --chardev msmouse,id=3Did[,mux=3Don|off] --chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols][,ro= ws=3Drows]] - [,mux=3Don|off] --chardev file,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pipe,id=3Did,path=3Dpath[,mux=3Don|off] --chardev pty,id=3Did[,mux=3Don|off] --chardev stdio,id=3Did[,mux=3Don|off][,signal=3Don|off] --chardev braille,id=3Did[,mux=3Don|off] --chardev tty,id=3Did,path=3Dpath[,mux=3Don|off] --chardev parport,id=3Did,path=3Dpath[,mux=3Don|off] --chardev spicevmc,id=3Did,name=3Dname[,debug=3Ddebug] - --iscsi [user=3Duser][,password=3Dpassword] - [,header-digest=3DCRC32C|CR32C-NONE|NONE-CRC32C|NONE - [,initiator-name=3Diqn] - 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=3Dn] - emulate a standard HCI in virtual scatternet 'n' --bt vhci[,vlan=3Dn] - add host computer to virtual scatternet 'n' using VHCI --bt device:dev[,vlan=3Dn] - 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=3D[name][,mode=3Dreadline|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 it= ems) --D logfile output log to logfile (instead of the default /tmp/qemu.lo= g) --hdachs c,h,s[,t] - force hard disk 0 physical geometry and the optional BIOS - translation (t=3Dnone 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=3Dutc|localtime|date][,clock=3Dhost|rt|vm][,driftfix=3Dnone|sle= w] - set the RTC base and clock, enable drift fix for clock tic= ks (x86 only) --icount [N|auto] - enable virtual instruction counter with 2^N clock ticks per - instruction --watchdog i6300esb|ib700 - enable virtual hardware watchdog [default=3Dnone] --watchdog-action reset|shutdown|poweroff|pause|debug|none - action when watchdog fires [default=3Dreset] --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 Enable seccomp mode 2 system call filter (default 'off'). --readconfig --writeconfig - 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=3D][,file=3D] - 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 1336eeef5e..0000000000 --- a/tests/qemuhelptest.c +++ /dev/null @@ -1,437 +0,0 @@ -#include - -#include "testutils.h" - -#ifdef WITH_QEMU - -# include -# include - -# 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 =3D 0; i < QEMU_CAPS_LAST; i++) { - bool gotFlag =3D virQEMUCapsGet(got, i); - bool expectFlag =3D 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 =3D data; - char *help =3D NULL; - unsigned int version, kvm_version; - bool is_kvm; - virQEMUCapsPtr flags =3D NULL; - int ret =3D -1; - char *got =3D NULL; - char *expected =3D NULL; - - if (!(help =3D virTestLoadFilePath("qemuhelpdata/", info->name, NULL))) - goto cleanup; - - if (!(flags =3D virQEMUCapsNew())) - goto cleanup; - - if (virQEMUCapsParseHelpStr("QEMU", help, flags, - &version, &is_kvm, &kvm_version, false, NU= LL) =3D=3D -1) { - virErrorPtr err =3D virGetLastError(); - - if (info->error && err && err->code =3D=3D info->error) - ret =3D 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 =3D virTestLoadFilePath("qemuhelpdata/", info->name, "-devi= ce", NULL))) - goto cleanup; - - if (virQEMUCapsParseDeviceStr(flags, help) < 0) - goto cleanup; - - got =3D virQEMUCapsFlagsString(flags); - expected =3D 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 !=3D info->version) { - fprintf(stderr, "%s: parsed versions do not match: got %u, expecte= d %u\n", - info->name, version, info->version); - goto cleanup; - } - - if (is_kvm !=3D 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 !=3D 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 =3D 0; - cleanup: - VIR_FREE(help); - virObjectUnref(flags); - VIR_FREE(got); - VIR_FREE(expected); - return ret; -} - -static int -mymain(void) -{ - int ret =3D 0; - -# define DO_TEST_FULL(name, version, is_kvm, kvm_version, error, ...) \ - do { \ - struct testInfo info =3D { \ - name, NULL, version, is_kvm, kvm_version, error \ - }; \ - if (!(info.flags =3D virQEMUCapsNew())) \ - return EXIT_FAILURE; \ - virQEMUCapsSetList(info.flags, __VA_ARGS__, QEMU_CAPS_LAST); \ - if (virTestRun("QEMU Help String Parsing " name, \ - testHelpStrParsing, &info) < 0) \ - ret =3D -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_UNSUPPORT= ED, - QEMU_CAPS_LAST); - - return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; -} - -VIR_TEST_MAIN(mymain) - -#else - -int main(void) -{ - return EXIT_AM_SKIP; -} - -#endif /* WITH_QEMU */ --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 13:13:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522931011032364.64853674916174; Thu, 5 Apr 2018 05:23:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF6D681240; Thu, 5 Apr 2018 12:23:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82C8E7A4CF; Thu, 5 Apr 2018 12:23:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 30EA618033EB; Thu, 5 Apr 2018 12:23:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35CNNub026291 for ; Thu, 5 Apr 2018 08:23:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id E229CAB3EE; Thu, 5 Apr 2018 12:23:22 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69A1FAB3F2 for ; Thu, 5 Apr 2018 12:23:22 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 14:22:55 +0200 Message-Id: <189fd72214273b39bde954691b831ebd7a73cef9.1522930120.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt PATCH v2 04/44] Require QEMU 1.5.0 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 05 Apr 2018 12:23:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 According to the policy described on https://libvirt.org/platforms.html the QEMU versions in the oldest relevant releses are: SLES 12: 2.0.0 RHEL 7: 1.5.3 Ubuntu 14.04: 2.0.0 Set the minimum to 1.5.0 and drop support for RHEL 6. This lets us drop the -help parsing code and assume lots of capabilities. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 12 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 1886 ----------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 172 -- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 2141 ----------------= --- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 196 -- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 2191 ----------------= ---- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 198 -- tests/qemucapabilitiestest.c | 3 - 8 files changed, 9 insertions(+), 6790 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0be39b76dd..f427cfdeaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3755,6 +3755,9 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCapsPtr = qemuCaps, return 0; } =20 +#define QEMU_MIN_MAJOR 1 +#define QEMU_MIN_MINOR 5 +#define QEMU_MIN_MICRO 0 =20 int virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, @@ -3785,9 +3788,12 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, VIR_DEBUG("Got version %d.%d.%d (%s)", major, minor, micro, NULLSTR(package)); =20 - if (major < 1 || (major =3D=3D 1 && minor < 2)) { - VIR_DEBUG("Not new enough for QMP capabilities detection"); - ret =3D 0; + if (major < QEMU_MIN_MAJOR || + (major =3D=3D QEMU_MIN_MAJOR && minor < QEMU_MIN_MINOR)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("QEMU version >=3D %d.%d.%d is required, but %d.%= d.%d found"), + QEMU_MIN_MAJOR, QEMU_MIN_MINOR, QEMU_MIN_MICRO, + major, minor, micro); goto cleanup; } =20 diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.2.2.x86_64.replies deleted file mode 100644 index a3a9510511..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies +++ /dev/null @@ -1,1886 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 2, - "minor": 2, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": { - "qemu": { - "micro": 2, - "minor": 2, - "major": 1 - }, - "package": "" - }, - "id": "libvirt-2" -} - -{ - "return": { - "arch": "x86_64" - }, - "id": "libvirt-3" -} - -{ - "return": [ - { - "name": "query-target" - }, - { - "name": "query-cpu-definitions" - }, - { - "name": "query-machines" - }, - { - "name": "device-list-properties" - }, - { - "name": "qom-list-types" - }, - { - "name": "change-vnc-password" - }, - { - "name": "qom-get" - }, - { - "name": "qom-set" - }, - { - "name": "qom-list" - }, - { - "name": "query-block-jobs" - }, - { - "name": "query-balloon" - }, - { - "name": "query-migrate-capabilities" - }, - { - "name": "migrate-set-capabilities" - }, - { - "name": "query-migrate" - }, - { - "name": "query-uuid" - }, - { - "name": "query-name" - }, - { - "name": "query-spice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-mice" - }, - { - "name": "query-status" - }, - { - "name": "query-kvm" - }, - { - "name": "query-pci" - }, - { - "name": "query-cpus" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-block" - }, - { - "name": "query-chardev" - }, - { - "name": "query-events" - }, - { - "name": "query-commands" - }, - { - "name": "query-version" - }, - { - "name": "human-monitor-command" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "add_client" - }, - { - "name": "expire_password" - }, - { - "name": "set_password" - }, - { - "name": "block_set_io_throttle" - }, - { - "name": "block_passwd" - }, - { - "name": "query-fdsets" - }, - { - "name": "remove-fd" - }, - { - "name": "add-fd" - }, - { - "name": "closefd" - }, - { - "name": "getfd" - }, - { - "name": "set_link" - }, - { - "name": "balloon" - }, - { - "name": "blockdev-snapshot-sync" - }, - { - "name": "transaction" - }, - { - "name": "block-job-cancel" - }, - { - "name": "block-job-set-speed" - }, - { - "name": "block-stream" - }, - { - "name": "block_resize" - }, - { - "name": "netdev_del" - }, - { - "name": "netdev_add" - }, - { - "name": "dump-guest-memory" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate" - }, - { - "name": "xen-save-devices-state" - }, - { - "name": "inject-nmi" - }, - { - "name": "pmemsave" - }, - { - "name": "memsave" - }, - { - "name": "cpu" - }, - { - "name": "device_del" - }, - { - "name": "device_add" - }, - { - "name": "system_powerdown" - }, - { - "name": "system_reset" - }, - { - "name": "system_wakeup" - }, - { - "name": "cont" - }, - { - "name": "stop" - }, - { - "name": "screendump" - }, - { - "name": "change" - }, - { - "name": "eject" - }, - { - "name": "quit" - } - ], - "id": "libvirt-4" -} - -{ - "id": "libvirt-5", - "error": { - "class": "GenericError", - "desc": "Parameter 'fdset-id' expects an existing fdset-id" - } -} - -{ - "return": { - "enabled": true, - "present": true - }, - "id": "libvirt-6" -} - -{ - "return": [ - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "POWERDOWN" - }, - { - "name": "RESET" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-7" -} - -{ - "return": [ - { - "name": "port92" - }, - { - "name": "apic" - }, - { - "name": "virtio-scsi-pci" - }, - { - "name": "i6300esb" - }, - { - "name": "usb-ehci" - }, - { - "name": "vt82c686b-usb-uhci" - }, - { - "name": "ich9-ahci" - }, - { - "name": "usb-host" - }, - { - "name": "isa-ide" - }, - { - "name": "ich9-usb-ehci1" - }, - { - "name": "virtio-balloon-pci" - }, - { - "name": "virtio-net-pci" - }, - { - "name": "i82558b" - }, - { - "name": "i82558a" - }, - { - "name": "isa-fdc" - }, - { - "name": "isabus-bridge" - }, - { - "name": "i2c-bus" - }, - { - "name": "piix3-ide" - }, - { - "name": "ioapic" - }, - { - "name": "pci-bridge" - }, - { - "name": "HDA" - }, - { - "name": "am53c974" - }, - { - "name": "vmmouse" - }, - { - "name": "sb16" - }, - { - "name": "x86_64-cpu" - }, - { - "name": "isa-cirrus-vga" - }, - { - "name": "dc390" - }, - { - "name": "vmware-svga" - }, - { - "name": "smbus-eeprom" - }, - { - "name": "i82801" - }, - { - "name": "ccid-card-passthru" - }, - { - "name": "fw_cfg" - }, - { - "name": "piix4-usb-uhci" - }, - { - "name": "i82557b" - }, - { - "name": "piix3-usb-uhci" - }, - { - "name": "ib700" - }, - { - "name": "usb-audio" - }, - { - "name": "i82557c" - }, - { - "name": "i82557a" - }, - { - "name": "qxl" - }, - { - "name": "rtl8139" - }, - { - "name": "hpet" - }, - { - "name": "isa-applesmc" - }, - { - "name": "container" - }, - { - "name": "usb-kbd" - }, - { - "name": "isa-vga" - }, - { - "name": "usb-tablet" - }, - { - "name": "kvmvapic" - }, - { - "name": "usb-bt-dongle" - }, - { - "name": "sysbus-fdc" - }, - { - "name": "piix4-ide" - }, - { - "name": "e1000" - }, - { - "name": "AC97" - }, - { - "name": "ivshmem" - }, - { - "name": "usb-ccid" - }, - { - "name": "sysbus-ahci" - }, - { - "name": "kvmclock" - }, - { - "name": "i82562" - }, - { - "name": "hda-output" - }, - { - "name": "ccid-bus" - }, - { - "name": "i82559er" - }, - { - "name": "megasas" - }, - { - "name": "i8042" - }, - { - "name": "intel-hda" - }, - { - "name": "vmport" - }, - { - "name": "hda-duplex" - }, - { - "name": "virtio-serial-pci" - }, - { - "name": "ne2k_pci" - }, - { - "name": "mc146818rtc" - }, - { - "name": "virtconsole" - }, - { - "name": "isa-parallel" - }, - { - "name": "ich9-usb-uhci1" - }, - { - "name": "ich9-usb-uhci3" - }, - { - "name": "ich9-usb-uhci2" - }, - { - "name": "PCI" - }, - { - "name": "SUNW,fdtwo" - }, - { - "name": "ide-cd" - }, - { - "name": "isa-debugcon" - }, - { - "name": "i82551" - }, - { - "name": "i82550" - }, - { - "name": "isa-serial" - }, - { - "name": "kvm-ioapic" - }, - { - "name": "System" - }, - { - "name": "kvm-apic" - }, - { - "name": "usb-wacom-tablet" - }, - { - "name": "PIIX4_PM" - }, - { - "name": "kvm-i8259" - }, - { - "name": "scsi-cd" - }, - { - "name": "i440FX" - }, - { - "name": "usb-braille" - }, - { - "name": "virtserialport" - }, - { - "name": "xio3130-downstream" - }, - { - "name": "nec-usb-xhci" - }, - { - "name": "pci-ohci" - }, - { - "name": "hda-micro" - }, - { - "name": "scsi-disk" - }, - { - "name": "lsi53c895a" - }, - { - "name": "SCSI" - }, - { - "name": "pcnet" - }, - { - "name": "scsi-generic" - }, - { - "name": "virtio-serial-bus" - }, - { - "name": "usb-bus" - }, - { - "name": "ne2k_isa" - }, - { - "name": "IDE" - }, - { - "name": "ccid-card-emulated" - }, - { - "name": "i440FX-pcihost" - }, - { - "name": "usb-hub" - }, - { - "name": "usb-net" - }, - { - "name": "usb-mouse" - }, - { - "name": "ISA" - }, - { - "name": "pc-sysfw" - }, - { - "name": "usb-serial" - }, - { - "name": "scsi-block" - }, - { - "name": "sga" - }, - { - "name": "ioh3420" - }, - { - "name": "ES1370" - }, - { - "name": "isa-i8259" - }, - { - "name": "isa-pcspk" - }, - { - "name": "ide-hd" - }, - { - "name": "PIIX3" - }, - { - "name": "cirrus-vga" - }, - { - "name": "virtio-9p-pci" - }, - { - "name": "x3130-upstream" - }, - { - "name": "ide-drive" - }, - { - "name": "qxl-vga" - }, - { - "name": "usb-uas" - }, - { - "name": "kvm-pit" - }, - { - "name": "virtio-blk-pci" - }, - { - "name": "sysbus-ohci" - }, - { - "name": "esp" - }, - { - "name": "piix3-ide-xen" - }, - { - "name": "i82559c" - }, - { - "name": "i82559b" - }, - { - "name": "i82559a" - }, - { - "name": "scsi-hd" - }, - { - "name": "PIIX3-xen" - }, - { - "name": "isa-pit" - }, - { - "name": "usb-storage" - }, - { - "name": "VGA" - } - ], - "id": "libvirt-8" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "scsi", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "heads", - "type": "uint32" - }, - { - "name": "cyls", - "type": "uint32" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - }, - { - "name": "class", - "type": "hex32" - } - ], - "id": "libvirt-9" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "tx", - "type": "string" - }, - { - "name": "x-txburst", - "type": "int32" - }, - { - "name": "x-txtimer", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "netdev", - "type": "netdev" - }, - { - "name": "vlan", - "type": "vlan" - }, - { - "name": "mac", - "type": "macaddr" - }, - { - "name": "ctrl_rx_extra", - "type": "on/off" - }, - { - "name": "ctrl_vlan", - "type": "on/off" - }, - { - "name": "ctrl_rx", - "type": "on/off" - }, - { - "name": "ctrl_vq", - "type": "on/off" - }, - { - "name": "status", - "type": "on/off" - }, - { - "name": "mrg_rxbuf", - "type": "on/off" - }, - { - "name": "host_ufo", - "type": "on/off" - }, - { - "name": "host_ecn", - "type": "on/off" - }, - { - "name": "host_tso6", - "type": "on/off" - }, - { - "name": "host_tso4", - "type": "on/off" - }, - { - "name": "guest_ufo", - "type": "on/off" - }, - { - "name": "guest_ecn", - "type": "on/off" - }, - { - "name": "guest_tso6", - "type": "on/off" - }, - { - "name": "guest_tso4", - "type": "on/off" - }, - { - "name": "gso", - "type": "on/off" - }, - { - "name": "guest_csum", - "type": "on/off" - }, - { - "name": "csum", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-10" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "param_change", - "type": "on/off" - }, - { - "name": "hotplug", - "type": "on/off" - }, - { - "name": "cmd_per_lun", - "type": "uint32" - }, - { - "name": "max_sectors", - "type": "uint32" - }, - { - "name": "num_queues", - "type": "uint32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-11" -} - -{ - "id": "libvirt-12", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" - } -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'kvm-pci-assign' not found" - } -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "dpofua", - "type": "on/off" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "product", - "type": "string" - }, - { - "name": "vendor", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "unit", - "type": "uint32" - }, - { - "name": "model", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "s4_val", - "type": "uint8" - }, - { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "disable_s3", - "type": "uint8" - }, - { - "name": "smb_io_base", - "type": "uint32" - } - ], - "id": "libvirt-19" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "pipeline", - "type": "on/off" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "isobufs", - "type": "uint32" - }, - { - "name": "productid", - "type": "hex32" - }, - { - "name": "vendorid", - "type": "hex32" - }, - { - "name": "hostport", - "type": "string" - }, - { - "name": "hostaddr", - "type": "uint32" - }, - { - "name": "hostbus", - "type": "uint32" - } - ], - "id": "libvirt-20" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-21" -} - -{ - "return": [ - ], - "id": "libvirt-22" -} - -{ - "id": "libvirt-23", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'q35-pcihost' not found" - } -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-24" -} - -{ - "return": [ - { - "name": "lost_tick_policy", - "type": "LostTickPolicy" - }, - { - "name": "iobase", - "type": "hex32" - } - ], - "id": "libvirt-25" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-26" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-28" -} - -{ - "id": "libvirt-29", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'ICH9-LPC' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "class", - "type": "hex32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - } - ], - "id": "libvirt-30" -} - -{ - "id": "libvirt-31", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-ccw' not found" - } -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-device' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "msi", - "type": "uint32" - } - ], - "id": "libvirt-33" -} - -{ - "return": [ - { - "name": "isapc" - }, - { - "name": "pc-0.10" - }, - { - "name": "pc-0.11" - }, - { - "name": "pc-0.12" - }, - { - "name": "pc-0.13" - }, - { - "name": "pc-0.14" - }, - { - "name": "pc-0.15" - }, - { - "name": "pc-1.0" - }, - { - "name": "pc-1.1" - }, - { - "name": "pc-1.2", - "is-default": true, - "alias": "pc" - }, - { - "name": "none" - } - ], - "id": "libvirt-34" -} - -{ - "return": [ - { - "name": "qemu64" - }, - { - "name": "phenom" - }, - { - "name": "core2duo" - }, - { - "name": "kvm64" - }, - { - "name": "qemu32" - }, - { - "name": "kvm32" - }, - { - "name": "coreduo" - }, - { - "name": "486" - }, - { - "name": "pentium" - }, - { - "name": "pentium2" - }, - { - "name": "pentium3" - }, - { - "name": "athlon" - }, - { - "name": "n270" - }, - { - "name": "Conroe" - }, - { - "name": "Penryn" - }, - { - "name": "Nehalem" - }, - { - "name": "Westmere" - }, - { - "name": "SandyBridge" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G4" - } - ], - "id": "libvirt-35" -} - -{ - "id": "libvirt-36", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-models has not been found" - } -} - -{ - "id": "libvirt-37", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-types has not been found" - } -} - -{ - "id": "libvirt-38", - "error": { - "class": "CommandNotFound", - "desc": "The command query-command-line-options has not been found" - } -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - } - ], - "id": "libvirt-39" -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": [ - { - "name": "qemu64" - }, - { - "name": "phenom" - }, - { - "name": "core2duo" - }, - { - "name": "kvm64" - }, - { - "name": "qemu32" - }, - { - "name": "kvm32" - }, - { - "name": "coreduo" - }, - { - "name": "486" - }, - { - "name": "pentium" - }, - { - "name": "pentium2" - }, - { - "name": "pentium3" - }, - { - "name": "athlon" - }, - { - "name": "n270" - }, - { - "name": "Conroe" - }, - { - "name": "Penryn" - }, - { - "name": "Nehalem" - }, - { - "name": "Westmere" - }, - { - "name": "SandyBridge" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G4" - } - ], - "id": "libvirt-2" -} diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.2.2.x86_64.xml deleted file mode 100644 index f361944a1c..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ /dev/null @@ -1,172 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1002002 - 0 - 26169 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.3.1.x86_64.replies deleted file mode 100644 index fc97bfcf9f..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies +++ /dev/null @@ -1,2141 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 1, - "minor": 3, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": { - "qemu": { - "micro": 1, - "minor": 3, - "major": 1 - }, - "package": "" - }, - "id": "libvirt-2" -} - -{ - "return": { - "arch": "x86_64" - }, - "id": "libvirt-3" -} - -{ - "return": [ - { - "name": "query-target" - }, - { - "name": "query-cpu-definitions" - }, - { - "name": "query-machines" - }, - { - "name": "device-list-properties" - }, - { - "name": "qom-list-types" - }, - { - "name": "change-vnc-password" - }, - { - "name": "nbd-server-stop" - }, - { - "name": "nbd-server-add" - }, - { - "name": "nbd-server-start" - }, - { - "name": "qom-get" - }, - { - "name": "qom-set" - }, - { - "name": "qom-list" - }, - { - "name": "query-block-jobs" - }, - { - "name": "query-balloon" - }, - { - "name": "query-migrate-capabilities" - }, - { - "name": "migrate-set-capabilities" - }, - { - "name": "query-migrate" - }, - { - "name": "query-uuid" - }, - { - "name": "query-name" - }, - { - "name": "query-spice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-mice" - }, - { - "name": "query-status" - }, - { - "name": "query-kvm" - }, - { - "name": "query-pci" - }, - { - "name": "query-cpus" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-block" - }, - { - "name": "query-chardev" - }, - { - "name": "query-events" - }, - { - "name": "query-commands" - }, - { - "name": "query-version" - }, - { - "name": "human-monitor-command" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "add_client" - }, - { - "name": "expire_password" - }, - { - "name": "set_password" - }, - { - "name": "block_set_io_throttle" - }, - { - "name": "block_passwd" - }, - { - "name": "query-fdsets" - }, - { - "name": "remove-fd" - }, - { - "name": "add-fd" - }, - { - "name": "closefd" - }, - { - "name": "getfd" - }, - { - "name": "set_link" - }, - { - "name": "balloon" - }, - { - "name": "drive-mirror" - }, - { - "name": "blockdev-snapshot-sync" - }, - { - "name": "transaction" - }, - { - "name": "block-job-complete" - }, - { - "name": "block-job-resume" - }, - { - "name": "block-job-pause" - }, - { - "name": "block-job-cancel" - }, - { - "name": "block-job-set-speed" - }, - { - "name": "block-commit" - }, - { - "name": "block-stream" - }, - { - "name": "block_resize" - }, - { - "name": "netdev_del" - }, - { - "name": "netdev_add" - }, - { - "name": "dump-guest-memory" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate" - }, - { - "name": "xen-set-global-dirty-log" - }, - { - "name": "xen-save-devices-state" - }, - { - "name": "inject-nmi" - }, - { - "name": "pmemsave" - }, - { - "name": "memsave" - }, - { - "name": "cpu" - }, - { - "name": "send-key" - }, - { - "name": "device_del" - }, - { - "name": "device_add" - }, - { - "name": "system_powerdown" - }, - { - "name": "system_reset" - }, - { - "name": "system_wakeup" - }, - { - "name": "cont" - }, - { - "name": "stop" - }, - { - "name": "screendump" - }, - { - "name": "change" - }, - { - "name": "eject" - }, - { - "name": "quit" - } - ], - "id": "libvirt-4" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - -{ - "id": "libvirt-6", - "error": { - "class": "GenericError", - "desc": "Parameter 'top' is missing" - } -} - -{ - "return": { - "enabled": true, - "present": true - }, - "id": "libvirt-7" -} - -{ - "return": [ - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "POWERDOWN" - }, - { - "name": "RESET" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-8" -} - -{ - "return": [ - { - "name": "port92" - }, - { - "name": "i6300esb" - }, - { - "name": "apic" - }, - { - "name": "virtio-balloon-pci" - }, - { - "name": "virtio-scsi-pci" - }, - { - "name": "ICH9 LPC" - }, - { - "name": "usb-host" - }, - { - "name": "usb-ehci" - }, - { - "name": "ich9-ahci" - }, - { - "name": "ich9-usb-ehci2" - }, - { - "name": "ICH9 SMB" - }, - { - "name": "isa-ide" - }, - { - "name": "ich9-usb-ehci1" - }, - { - "name": "virtio-net-pci" - }, - { - "name": "vt82c686b-usb-uhci" - }, - { - "name": "i82558b" - }, - { - "name": "i82558a" - }, - { - "name": "isa-fdc" - }, - { - "name": "isabus-bridge" - }, - { - "name": "i2c-bus" - }, - { - "name": "piix3-ide" - }, - { - "name": "ioapic" - }, - { - "name": "pci-bridge" - }, - { - "name": "HDA" - }, - { - "name": "am53c974" - }, - { - "name": "vmmouse" - }, - { - "name": "sb16" - }, - { - "name": "i82801b11-bridge" - }, - { - "name": "xlnx,ps7-usb" - }, - { - "name": "isa-cirrus-vga" - }, - { - "name": "dc390" - }, - { - "name": "vmware-svga" - }, - { - "name": "smbus-eeprom" - }, - { - "name": "i82801" - }, - { - "name": "ccid-card-passthru" - }, - { - "name": "piix4-usb-uhci" - }, - { - "name": "fw_cfg" - }, - { - "name": "x86_64-cpu" - }, - { - "name": "piix3-usb-uhci" - }, - { - "name": "ib700" - }, - { - "name": "usb-audio" - }, - { - "name": "i82557c" - }, - { - "name": "i82557b" - }, - { - "name": "i82557a" - }, - { - "name": "qxl" - }, - { - "name": "rtl8139" - }, - { - "name": "hpet" - }, - { - "name": "isa-applesmc" - }, - { - "name": "kvm-pci-assign" - }, - { - "name": "container" - }, - { - "name": "cfi.pflash01" - }, - { - "name": "usb-kbd" - }, - { - "name": "vfio-pci" - }, - { - "name": "isa-vga" - }, - { - "name": "usb-tablet" - }, - { - "name": "vmport" - }, - { - "name": "virtio-rng-pci" - }, - { - "name": "kvmvapic" - }, - { - "name": "usb-bt-dongle" - }, - { - "name": "sysbus-fdc" - }, - { - "name": "piix4-ide" - }, - { - "name": "e1000" - }, - { - "name": "AC97" - }, - { - "name": "mch" - }, - { - "name": "ivshmem" - }, - { - "name": "usb-ccid" - }, - { - "name": "sysbus-ahci" - }, - { - "name": "kvmclock" - }, - { - "name": "i82562" - }, - { - "name": "hda-output" - }, - { - "name": "pci-serial-4x" - }, - { - "name": "ccid-bus" - }, - { - "name": "i82559er" - }, - { - "name": "megasas" - }, - { - "name": "i8042" - }, - { - "name": "intel-hda" - }, - { - "name": "mc146818rtc" - }, - { - "name": "hda-duplex" - }, - { - "name": "virtio-serial-pci" - }, - { - "name": "ne2k_pci" - }, - { - "name": "ich9-usb-uhci6" - }, - { - "name": "virtconsole" - }, - { - "name": "ich9-usb-uhci3" - }, - { - "name": "ich9-usb-uhci5" - }, - { - "name": "ich9-usb-uhci4" - }, - { - "name": "isa-parallel" - }, - { - "name": "pci-serial" - }, - { - "name": "ich9-usb-uhci2" - }, - { - "name": "ich9-usb-uhci1" - }, - { - "name": "PCI" - }, - { - "name": "SUNW,fdtwo" - }, - { - "name": "ide-cd" - }, - { - "name": "isa-debugcon" - }, - { - "name": "i82551" - }, - { - "name": "i82550" - }, - { - "name": "isa-serial" - }, - { - "name": "kvm-ioapic" - }, - { - "name": "q35-pcihost" - }, - { - "name": "System" - }, - { - "name": "kvm-apic" - }, - { - "name": "usb-wacom-tablet" - }, - { - "name": "PIIX4_PM" - }, - { - "name": "kvm-i8259" - }, - { - "name": "nec-usb-xhci" - }, - { - "name": "scsi-cd" - }, - { - "name": "i440FX" - }, - { - "name": "usb-braille" - }, - { - "name": "usb-redir" - }, - { - "name": "pci-serial-2x" - }, - { - "name": "virtserialport" - }, - { - "name": "xio3130-downstream" - }, - { - "name": "pci-ohci" - }, - { - "name": "rng-random" - }, - { - "name": "hda-micro" - }, - { - "name": "scsi-disk" - }, - { - "name": "lsi53c895a" - }, - { - "name": "SCSI" - }, - { - "name": "pcnet" - }, - { - "name": "scsi-generic" - }, - { - "name": "virtio-serial-bus" - }, - { - "name": "usb-bus" - }, - { - "name": "ne2k_isa" - }, - { - "name": "IDE" - }, - { - "name": "ccid-card-emulated" - }, - { - "name": "i440FX-pcihost" - }, - { - "name": "usb-hub" - }, - { - "name": "usb-net" - }, - { - "name": "usb-mouse" - }, - { - "name": "ISA" - }, - { - "name": "pc-sysfw" - }, - { - "name": "usb-serial" - }, - { - "name": "scsi-block" - }, - { - "name": "sga" - }, - { - "name": "PIIX3" - }, - { - "name": "ioh3420" - }, - { - "name": "ES1370" - }, - { - "name": "isa-i8259" - }, - { - "name": "isa-pcspk" - }, - { - "name": "ide-hd" - }, - { - "name": "rng-egd" - }, - { - "name": "cirrus-vga" - }, - { - "name": "virtio-9p-pci" - }, - { - "name": "x3130-upstream" - }, - { - "name": "ide-drive" - }, - { - "name": "qxl-vga" - }, - { - "name": "usb-uas" - }, - { - "name": "kvm-pit" - }, - { - "name": "virtio-blk-pci" - }, - { - "name": "sysbus-ohci" - }, - { - "name": "esp" - }, - { - "name": "piix3-ide-xen" - }, - { - "name": "i82559c" - }, - { - "name": "i82559b" - }, - { - "name": "i82559a" - }, - { - "name": "scsi-hd" - }, - { - "name": "PIIX3-xen" - }, - { - "name": "isa-pit" - }, - { - "name": "usb-storage" - }, - { - "name": "VGA" - } - ], - "id": "libvirt-9" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "scsi", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "heads", - "type": "uint32" - }, - { - "name": "cyls", - "type": "uint32" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - }, - { - "name": "class", - "type": "hex32" - } - ], - "id": "libvirt-10" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "tx", - "type": "string" - }, - { - "name": "x-txburst", - "type": "int32" - }, - { - "name": "x-txtimer", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "netdev", - "type": "netdev" - }, - { - "name": "vlan", - "type": "vlan" - }, - { - "name": "mac", - "type": "macaddr" - }, - { - "name": "ctrl_rx_extra", - "type": "on/off" - }, - { - "name": "ctrl_vlan", - "type": "on/off" - }, - { - "name": "ctrl_rx", - "type": "on/off" - }, - { - "name": "ctrl_vq", - "type": "on/off" - }, - { - "name": "status", - "type": "on/off" - }, - { - "name": "mrg_rxbuf", - "type": "on/off" - }, - { - "name": "host_ufo", - "type": "on/off" - }, - { - "name": "host_ecn", - "type": "on/off" - }, - { - "name": "host_tso6", - "type": "on/off" - }, - { - "name": "host_tso4", - "type": "on/off" - }, - { - "name": "guest_ufo", - "type": "on/off" - }, - { - "name": "guest_ecn", - "type": "on/off" - }, - { - "name": "guest_tso6", - "type": "on/off" - }, - { - "name": "guest_tso4", - "type": "on/off" - }, - { - "name": "gso", - "type": "on/off" - }, - { - "name": "guest_csum", - "type": "on/off" - }, - { - "name": "csum", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-11" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "param_change", - "type": "on/off" - }, - { - "name": "hotplug", - "type": "on/off" - }, - { - "name": "cmd_per_lun", - "type": "uint32" - }, - { - "name": "max_sectors", - "type": "uint32" - }, - { - "name": "num_queues", - "type": "uint32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-12" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" - } -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "configfd", - "type": "string" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "share_intx", - "type": "on/off" - }, - { - "name": "prefer_msi", - "type": "on/off" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "x-intx-mmap-timeout-ms", - "type": "uint32" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "dpofua", - "type": "on/off" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "product", - "type": "string" - }, - { - "name": "vendor", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-19" -} - -{ - "return": [ - { - "name": "unit", - "type": "uint32" - }, - { - "name": "model", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-20" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "s4_val", - "type": "uint8" - }, - { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "disable_s3", - "type": "uint8" - }, - { - "name": "smb_io_base", - "type": "uint32" - } - ], - "id": "libvirt-21" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "filter", - "type": "string" - }, - { - "name": "debug", - "type": "uint8" - }, - { - "name": "chardev", - "type": "chr" - } - ], - "id": "libvirt-22" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "pipeline", - "type": "on/off" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "isobufs", - "type": "uint32" - }, - { - "name": "productid", - "type": "hex32" - }, - { - "name": "vendorid", - "type": "hex32" - }, - { - "name": "hostport", - "type": "string" - }, - { - "name": "hostaddr", - "type": "uint32" - }, - { - "name": "hostbus", - "type": "uint32" - } - ], - "id": "libvirt-23" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-24" -} - -{ - "return": [ - ], - "id": "libvirt-25" -} - -{ - "return": [ - { - "name": "MCFG", - "type": "uint64" - } - ], - "id": "libvirt-26" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "lost_tick_policy", - "type": "LostTickPolicy" - }, - { - "name": "iobase", - "type": "hex32" - } - ], - "id": "libvirt-28" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "mmio", - "type": "on/off" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-29" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-30" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "surfaces", - "type": "int32" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'ICH9-LPC' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "class", - "type": "hex32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - } - ], - "id": "libvirt-33" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-ccw' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-device' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "p3", - "type": "uint32" - }, - { - "name": "p2", - "type": "uint32" - }, - { - "name": "slots", - "type": "uint32" - }, - { - "name": "intrs", - "type": "uint32" - }, - { - "name": "msix", - "type": "on/off" - }, - { - "name": "msi", - "type": "on/off" - } - ], - "id": "libvirt-36" -} - -{ - "return": [ - { - "name": "q35-next", - "alias": "q35" - }, - { - "name": "isapc" - }, - { - "name": "pc-0.10" - }, - { - "name": "pc-0.11" - }, - { - "name": "pc-0.12" - }, - { - "name": "pc-0.13" - }, - { - "name": "pc-0.14" - }, - { - "name": "pc-0.15" - }, - { - "name": "pc-1.0" - }, - { - "name": "pc-1.1" - }, - { - "name": "pc-1.2" - }, - { - "name": "pc-1.3", - "is-default": true, - "alias": "pc" - }, - { - "name": "none" - } - ], - "id": "libvirt-37" -} - -{ - "return": [ - { - "name": "qemu64" - }, - { - "name": "phenom" - }, - { - "name": "core2duo" - }, - { - "name": "kvm64" - }, - { - "name": "qemu32" - }, - { - "name": "kvm32" - }, - { - "name": "coreduo" - }, - { - "name": "486" - }, - { - "name": "pentium" - }, - { - "name": "pentium2" - }, - { - "name": "pentium3" - }, - { - "name": "athlon" - }, - { - "name": "n270" - }, - { - "name": "Conroe" - }, - { - "name": "Penryn" - }, - { - "name": "Nehalem" - }, - { - "name": "Westmere" - }, - { - "name": "SandyBridge" - }, - { - "name": "Haswell" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G4" - }, - { - "name": "Opteron_G5" - } - ], - "id": "libvirt-38" -} - -{ - "id": "libvirt-39", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-models has not been found" - } -} - -{ - "id": "libvirt-40", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-types has not been found" - } -} - -{ - "id": "libvirt-41", - "error": { - "class": "CommandNotFound", - "desc": "The command query-command-line-options has not been found" - } -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - } - ], - "id": "libvirt-42" -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": [ - { - "name": "qemu64" - }, - { - "name": "phenom" - }, - { - "name": "core2duo" - }, - { - "name": "kvm64" - }, - { - "name": "qemu32" - }, - { - "name": "kvm32" - }, - { - "name": "coreduo" - }, - { - "name": "486" - }, - { - "name": "pentium" - }, - { - "name": "pentium2" - }, - { - "name": "pentium3" - }, - { - "name": "athlon" - }, - { - "name": "n270" - }, - { - "name": "Conroe" - }, - { - "name": "Penryn" - }, - { - "name": "Nehalem" - }, - { - "name": "Westmere" - }, - { - "name": "SandyBridge" - }, - { - "name": "Haswell" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G4" - }, - { - "name": "Opteron_G5" - } - ], - "id": "libvirt-2" -} diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.3.1.x86_64.xml deleted file mode 100644 index d6db1ae226..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ /dev/null @@ -1,196 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1003001 - 0 - 29702 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.4.2.x86_64.replies deleted file mode 100644 index 3c96aa71ed..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies +++ /dev/null @@ -1,2191 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 2, - "minor": 4, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": { - "qemu": { - "micro": 2, - "minor": 4, - "major": 1 - }, - "package": "" - }, - "id": "libvirt-2" -} - -{ - "return": { - "arch": "x86_64" - }, - "id": "libvirt-3" -} - -{ - "return": [ - { - "name": "chardev-remove" - }, - { - "name": "chardev-add" - }, - { - "name": "query-target" - }, - { - "name": "query-cpu-definitions" - }, - { - "name": "query-machines" - }, - { - "name": "device-list-properties" - }, - { - "name": "qom-list-types" - }, - { - "name": "change-vnc-password" - }, - { - "name": "nbd-server-stop" - }, - { - "name": "nbd-server-add" - }, - { - "name": "nbd-server-start" - }, - { - "name": "qom-get" - }, - { - "name": "qom-set" - }, - { - "name": "qom-list" - }, - { - "name": "query-block-jobs" - }, - { - "name": "query-balloon" - }, - { - "name": "query-migrate-capabilities" - }, - { - "name": "migrate-set-capabilities" - }, - { - "name": "query-migrate" - }, - { - "name": "query-uuid" - }, - { - "name": "query-name" - }, - { - "name": "query-spice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-mice" - }, - { - "name": "query-status" - }, - { - "name": "query-kvm" - }, - { - "name": "query-pci" - }, - { - "name": "query-cpus" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-block" - }, - { - "name": "query-chardev" - }, - { - "name": "query-events" - }, - { - "name": "query-commands" - }, - { - "name": "query-version" - }, - { - "name": "human-monitor-command" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "add_client" - }, - { - "name": "expire_password" - }, - { - "name": "set_password" - }, - { - "name": "block_set_io_throttle" - }, - { - "name": "block_passwd" - }, - { - "name": "query-fdsets" - }, - { - "name": "remove-fd" - }, - { - "name": "add-fd" - }, - { - "name": "closefd" - }, - { - "name": "getfd" - }, - { - "name": "set_link" - }, - { - "name": "balloon" - }, - { - "name": "drive-mirror" - }, - { - "name": "blockdev-snapshot-sync" - }, - { - "name": "transaction" - }, - { - "name": "block-job-complete" - }, - { - "name": "block-job-resume" - }, - { - "name": "block-job-pause" - }, - { - "name": "block-job-cancel" - }, - { - "name": "block-job-set-speed" - }, - { - "name": "block-commit" - }, - { - "name": "block-stream" - }, - { - "name": "block_resize" - }, - { - "name": "netdev_del" - }, - { - "name": "netdev_add" - }, - { - "name": "dump-guest-memory" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate" - }, - { - "name": "xen-set-global-dirty-log" - }, - { - "name": "xen-save-devices-state" - }, - { - "name": "ringbuf-read" - }, - { - "name": "ringbuf-write" - }, - { - "name": "inject-nmi" - }, - { - "name": "pmemsave" - }, - { - "name": "memsave" - }, - { - "name": "cpu" - }, - { - "name": "send-key" - }, - { - "name": "device_del" - }, - { - "name": "device_add" - }, - { - "name": "system_powerdown" - }, - { - "name": "system_reset" - }, - { - "name": "system_wakeup" - }, - { - "name": "cont" - }, - { - "name": "stop" - }, - { - "name": "screendump" - }, - { - "name": "change" - }, - { - "name": "eject" - }, - { - "name": "quit" - } - ], - "id": "libvirt-4" -} - -{ - "return": { - "fd": 14, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - -{ - "id": "libvirt-6", - "error": { - "class": "GenericError", - "desc": "Parameter 'top' is missing" - } -} - -{ - "return": { - "enabled": true, - "present": true - }, - "id": "libvirt-7" -} - -{ - "return": [ - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "POWERDOWN" - }, - { - "name": "RESET" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-8" -} - -{ - "return": [ - { - "name": "port92" - }, - { - "name": "ICH9 LPC" - }, - { - "name": "pc-testdev" - }, - { - "name": "apic" - }, - { - "name": "i6300esb" - }, - { - "name": "virtio-scsi-pci" - }, - { - "name": "exynos4210-ehci-usb" - }, - { - "name": "virtio-balloon-pci" - }, - { - "name": "usb-host" - }, - { - "name": "ich9-usb-ehci2" - }, - { - "name": "usb-ehci" - }, - { - "name": "ich9-ahci" - }, - { - "name": "ICH9 SMB" - }, - { - "name": "isa-ide" - }, - { - "name": "ich9-usb-ehci1" - }, - { - "name": "virtio-net-pci" - }, - { - "name": "vt82c686b-usb-uhci" - }, - { - "name": "i82558b" - }, - { - "name": "i82558a" - }, - { - "name": "isa-fdc" - }, - { - "name": "isabus-bridge" - }, - { - "name": "i2c-bus" - }, - { - "name": "piix3-ide" - }, - { - "name": "ioapic" - }, - { - "name": "pci-bridge" - }, - { - "name": "HDA" - }, - { - "name": "am53c974" - }, - { - "name": "xlnx,ps7-usb" - }, - { - "name": "vmmouse" - }, - { - "name": "sb16" - }, - { - "name": "i82801b11-bridge" - }, - { - "name": "vmware-svga" - }, - { - "name": "isa-cirrus-vga" - }, - { - "name": "dc390" - }, - { - "name": "piix4-usb-uhci" - }, - { - "name": "smbus-eeprom" - }, - { - "name": "i82801" - }, - { - "name": "ccid-card-passthru" - }, - { - "name": "fw_cfg" - }, - { - "name": "x86_64-cpu" - }, - { - "name": "piix3-usb-uhci" - }, - { - "name": "ib700" - }, - { - "name": "usb-audio" - }, - { - "name": "i82557c" - }, - { - "name": "i82557b" - }, - { - "name": "i82557a" - }, - { - "name": "IndustryPack" - }, - { - "name": "qxl" - }, - { - "name": "rtl8139" - }, - { - "name": "hpet" - }, - { - "name": "isa-applesmc" - }, - { - "name": "kvm-pci-assign" - }, - { - "name": "container" - }, - { - "name": "cfi.pflash01" - }, - { - "name": "usb-kbd" - }, - { - "name": "vfio-pci" - }, - { - "name": "isa-vga" - }, - { - "name": "usb-tablet" - }, - { - "name": "vmport" - }, - { - "name": "virtio-rng-pci" - }, - { - "name": "kvmvapic" - }, - { - "name": "usb-bt-dongle" - }, - { - "name": "sysbus-fdc" - }, - { - "name": "piix4-ide" - }, - { - "name": "e1000" - }, - { - "name": "AC97" - }, - { - "name": "ipoctal232" - }, - { - "name": "mch" - }, - { - "name": "ivshmem" - }, - { - "name": "usb-ccid" - }, - { - "name": "sysbus-ahci" - }, - { - "name": "kvmclock" - }, - { - "name": "mc146818rtc" - }, - { - "name": "i82562" - }, - { - "name": "hda-output" - }, - { - "name": "pci-serial-4x" - }, - { - "name": "ccid-bus" - }, - { - "name": "i82559er" - }, - { - "name": "megasas" - }, - { - "name": "i8042" - }, - { - "name": "intel-hda" - }, - { - "name": "hda-duplex" - }, - { - "name": "virtio-serial-pci" - }, - { - "name": "ne2k_pci" - }, - { - "name": "ich9-usb-uhci6" - }, - { - "name": "virtconsole" - }, - { - "name": "ich9-usb-uhci3" - }, - { - "name": "ich9-usb-uhci5" - }, - { - "name": "ich9-usb-uhci4" - }, - { - "name": "isa-parallel" - }, - { - "name": "pci-serial" - }, - { - "name": "ich9-usb-uhci2" - }, - { - "name": "ich9-usb-uhci1" - }, - { - "name": "PCI" - }, - { - "name": "SUNW,fdtwo" - }, - { - "name": "ide-cd" - }, - { - "name": "isa-debugcon" - }, - { - "name": "i82551" - }, - { - "name": "i82550" - }, - { - "name": "usb-bot" - }, - { - "name": "isa-serial" - }, - { - "name": "kvm-ioapic" - }, - { - "name": "q35-pcihost" - }, - { - "name": "System" - }, - { - "name": "ich9-intel-hda" - }, - { - "name": "kvm-apic" - }, - { - "name": "usb-wacom-tablet" - }, - { - "name": "PIIX4_PM" - }, - { - "name": "kvm-i8259" - }, - { - "name": "nec-usb-xhci" - }, - { - "name": "scsi-cd" - }, - { - "name": "usb-redir" - }, - { - "name": "i440FX" - }, - { - "name": "usb-braille" - }, - { - "name": "pci-serial-2x" - }, - { - "name": "virtserialport" - }, - { - "name": "xio3130-downstream" - }, - { - "name": "pci-ohci" - }, - { - "name": "rng-random" - }, - { - "name": "hda-micro" - }, - { - "name": "scsi-disk" - }, - { - "name": "lsi53c895a" - }, - { - "name": "SCSI" - }, - { - "name": "pcnet" - }, - { - "name": "scsi-generic" - }, - { - "name": "virtio-serial-bus" - }, - { - "name": "usb-bus" - }, - { - "name": "ne2k_isa" - }, - { - "name": "IDE" - }, - { - "name": "ccid-card-emulated" - }, - { - "name": "i440FX-pcihost" - }, - { - "name": "usb-hub" - }, - { - "name": "usb-net" - }, - { - "name": "usb-mouse" - }, - { - "name": "ISA" - }, - { - "name": "pc-sysfw" - }, - { - "name": "usb-serial" - }, - { - "name": "scsi-block" - }, - { - "name": "sga" - }, - { - "name": "isa-debug-exit" - }, - { - "name": "PIIX3" - }, - { - "name": "ioh3420" - }, - { - "name": "ES1370" - }, - { - "name": "isa-i8259" - }, - { - "name": "isa-pcspk" - }, - { - "name": "ide-hd" - }, - { - "name": "rng-egd" - }, - { - "name": "cirrus-vga" - }, - { - "name": "virtio-9p-pci" - }, - { - "name": "x3130-upstream" - }, - { - "name": "ide-drive" - }, - { - "name": "virtio-pci-bus" - }, - { - "name": "qxl-vga" - }, - { - "name": "kvm-pit" - }, - { - "name": "virtio-blk-pci" - }, - { - "name": "sysbus-ohci" - }, - { - "name": "esp" - }, - { - "name": "i82559c" - }, - { - "name": "piix3-ide-xen" - }, - { - "name": "i82559b" - }, - { - "name": "i82559a" - }, - { - "name": "usb-uas" - }, - { - "name": "scsi-hd" - }, - { - "name": "PIIX3-xen" - }, - { - "name": "tpci200" - }, - { - "name": "isa-pit" - }, - { - "name": "usb-storage" - }, - { - "name": "VGA" - } - ], - "id": "libvirt-9" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "x-data-plane", - "type": "on/off" - }, - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "scsi", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "heads", - "type": "uint32" - }, - { - "name": "cyls", - "type": "uint32" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - }, - { - "name": "class", - "type": "hex32" - } - ], - "id": "libvirt-10" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "tx", - "type": "string" - }, - { - "name": "x-txburst", - "type": "int32" - }, - { - "name": "x-txtimer", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "netdev", - "type": "netdev" - }, - { - "name": "vlan", - "type": "vlan" - }, - { - "name": "mac", - "type": "macaddr" - }, - { - "name": "mq", - "type": "on/off" - }, - { - "name": "ctrl_mac_addr", - "type": "on/off" - }, - { - "name": "ctrl_rx_extra", - "type": "on/off" - }, - { - "name": "ctrl_vlan", - "type": "on/off" - }, - { - "name": "ctrl_rx", - "type": "on/off" - }, - { - "name": "ctrl_vq", - "type": "on/off" - }, - { - "name": "status", - "type": "on/off" - }, - { - "name": "mrg_rxbuf", - "type": "on/off" - }, - { - "name": "host_ufo", - "type": "on/off" - }, - { - "name": "host_ecn", - "type": "on/off" - }, - { - "name": "host_tso6", - "type": "on/off" - }, - { - "name": "host_tso4", - "type": "on/off" - }, - { - "name": "guest_ufo", - "type": "on/off" - }, - { - "name": "guest_ecn", - "type": "on/off" - }, - { - "name": "guest_tso6", - "type": "on/off" - }, - { - "name": "guest_tso4", - "type": "on/off" - }, - { - "name": "gso", - "type": "on/off" - }, - { - "name": "guest_csum", - "type": "on/off" - }, - { - "name": "csum", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-11" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "param_change", - "type": "on/off" - }, - { - "name": "hotplug", - "type": "on/off" - }, - { - "name": "cmd_per_lun", - "type": "uint32" - }, - { - "name": "max_sectors", - "type": "uint32" - }, - { - "name": "num_queues", - "type": "uint32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-12" -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" - } -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "configfd", - "type": "string" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "share_intx", - "type": "on/off" - }, - { - "name": "prefer_msi", - "type": "on/off" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-17" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "x-intx-mmap-timeout-ms", - "type": "uint32" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "dpofua", - "type": "on/off" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "product", - "type": "string" - }, - { - "name": "vendor", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-19" -} - -{ - "return": [ - { - "name": "unit", - "type": "uint32" - }, - { - "name": "model", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-20" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "s4_val", - "type": "uint8" - }, - { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "disable_s3", - "type": "uint8" - }, - { - "name": "smb_io_base", - "type": "uint32" - } - ], - "id": "libvirt-21" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "filter", - "type": "string" - }, - { - "name": "debug", - "type": "uint8" - }, - { - "name": "chardev", - "type": "chr" - } - ], - "id": "libvirt-22" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "pipeline", - "type": "on/off" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "isobufs", - "type": "uint32" - }, - { - "name": "productid", - "type": "hex32" - }, - { - "name": "vendorid", - "type": "hex32" - }, - { - "name": "hostport", - "type": "string" - }, - { - "name": "hostaddr", - "type": "uint32" - }, - { - "name": "hostbus", - "type": "uint32" - } - ], - "id": "libvirt-23" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-24" -} - -{ - "return": [ - ], - "id": "libvirt-25" -} - -{ - "return": [ - { - "name": "MCFG", - "type": "uint64" - } - ], - "id": "libvirt-26" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "lost_tick_policy", - "type": "LostTickPolicy" - }, - { - "name": "iobase", - "type": "hex32" - } - ], - "id": "libvirt-28" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "mmio", - "type": "on/off" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-29" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-30" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "surfaces", - "type": "int32" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-31" -} - -{ - "id": "libvirt-32", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'ICH9-LPC' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "class", - "type": "hex32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - } - ], - "id": "libvirt-33" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-ccw' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-device' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "p3", - "type": "uint32" - }, - { - "name": "p2", - "type": "uint32" - }, - { - "name": "slots", - "type": "uint32" - }, - { - "name": "intrs", - "type": "uint32" - }, - { - "name": "msix", - "type": "on/off" - }, - { - "name": "msi", - "type": "on/off" - } - ], - "id": "libvirt-36" -} - -{ - "return": [ - { - "name": "pc-q35-1.4", - "alias": "q35" - }, - { - "name": "isapc" - }, - { - "name": "pc-0.10" - }, - { - "name": "pc-0.11" - }, - { - "name": "pc-0.12" - }, - { - "name": "pc-0.13" - }, - { - "name": "pc-0.14" - }, - { - "name": "pc-0.15" - }, - { - "name": "pc-1.0" - }, - { - "name": "pc-1.1" - }, - { - "name": "pc-1.2" - }, - { - "name": "pc-1.3" - }, - { - "name": "pc-i440fx-1.4", - "is-default": true, - "alias": "pc" - }, - { - "name": "none" - } - ], - "id": "libvirt-37" -} - -{ - "return": [ - { - "name": "Opteron_G5" - }, - { - "name": "Opteron_G4" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Haswell" - }, - { - "name": "SandyBridge" - }, - { - "name": "Westmere" - }, - { - "name": "Nehalem" - }, - { - "name": "Penryn" - }, - { - "name": "Conroe" - }, - { - "name": "n270" - }, - { - "name": "athlon" - }, - { - "name": "pentium3" - }, - { - "name": "pentium2" - }, - { - "name": "pentium" - }, - { - "name": "486" - }, - { - "name": "coreduo" - }, - { - "name": "kvm32" - }, - { - "name": "qemu32" - }, - { - "name": "kvm64" - }, - { - "name": "core2duo" - }, - { - "name": "phenom" - }, - { - "name": "qemu64" - } - ], - "id": "libvirt-38" -} - -{ - "id": "libvirt-39", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-models has not been found" - } -} - -{ - "id": "libvirt-40", - "error": { - "class": "CommandNotFound", - "desc": "The command query-tpm-types has not been found" - } -} - -{ - "id": "libvirt-41", - "error": { - "class": "CommandNotFound", - "desc": "The command query-command-line-options has not been found" - } -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - } - ], - "id": "libvirt-42" -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": [ - { - "name": "Opteron_G5" - }, - { - "name": "Opteron_G4" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Haswell" - }, - { - "name": "SandyBridge" - }, - { - "name": "Westmere" - }, - { - "name": "Nehalem" - }, - { - "name": "Penryn" - }, - { - "name": "Conroe" - }, - { - "name": "n270" - }, - { - "name": "athlon" - }, - { - "name": "pentium3" - }, - { - "name": "pentium2" - }, - { - "name": "pentium" - }, - { - "name": "486" - }, - { - "name": "coreduo" - }, - { - "name": "kvm32" - }, - { - "name": "qemu32" - }, - { - "name": "kvm64" - }, - { - "name": "core2duo" - }, - { - "name": "phenom" - }, - { - "name": "qemu64" - } - ], - "id": "libvirt-2" -} diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.4.2.x86_64.xml deleted file mode 100644 index 671ee93520..0000000000 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ /dev/null @@ -1,198 +0,0 @@ - - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1004002 - 0 - 30419 - - x86_64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 0d136cc8b5..1b5970a4c5 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -163,9 +163,6 @@ mymain(void) ret =3D -1; \ } while (0) =20 - DO_TEST("x86_64", "caps_1.2.2"); - DO_TEST("x86_64", "caps_1.3.1"); - DO_TEST("x86_64", "caps_1.4.2"); DO_TEST("x86_64", "caps_1.5.3"); DO_TEST("x86_64", "caps_1.6.0"); DO_TEST("x86_64", "caps_1.7.0"); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 13:13:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523287247514449.7366514190354; Mon, 9 Apr 2018 08:20:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1451D2F30BD; Mon, 9 Apr 2018 15:20:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F778600C9; Mon, 9 Apr 2018 15:20:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9CE34180610F; Mon, 9 Apr 2018 15:20:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w39FKfpm025380 for ; Mon, 9 Apr 2018 11:20:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id EB0182026990; Mon, 9 Apr 2018 15:20:40 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 924BD2023227 for ; Mon, 9 Apr 2018 15:20:40 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 9 Apr 2018 17:19:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt PATCH v2 05/44] Deprecate QEMU_CAPS_PCI_MULTIFUNCTION X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 09 Apr 2018 15:20:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Supported since QEMU 0.13, but we require QEMU 0.15. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 15 ------ 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 ++--------- 30 files changed, 14 insertions(+), 112 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f427cfdeaa..19294a588a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1112,7 +1112,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjec= tPropsVirtioBalloon[] =3D { }; =20 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] =3D= { - { "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 2203c28aa0..85b9a68fca 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? */ =20 /* 60 */ - QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=3Don|off */ + X_QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=3Don|off */ QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=3Don */ 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 bbd3cd0a7d..05cc4903a4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -356,21 +356,6 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, goto cleanup; } =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION)) { - if (info->addr.pci.function !=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only PCI device addresses with function= =3D0 " - "are supported with this QEMU binary")); - goto cleanup; - } - if (info->addr.pci.multi =3D=3D VIR_TRISTATE_SWITCH_ON) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'multifunction=3Don' is not supported wi= th " - "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.5.3.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.5.3.x86_64.xml index 04c8016490..109fa2adaa 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 @@ - [ ...etc... ] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 24eb8cbc5b..288de59de1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -846,7 +846,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, [ ...etc... ] -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 13:13:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523288241250427.65679295722634; Mon, 9 Apr 2018 08:37:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F25F640F25; Mon, 9 Apr 2018 15:37:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7B08182EA; Mon, 9 Apr 2018 15:37:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AD0D44CAAA; Mon, 9 Apr 2018 15:27:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w39FRuxb029227 for ; Mon, 9 Apr 2018 11:27:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id EBEE0D7E02; Mon, 9 Apr 2018 15:27:55 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76100D7DFD for ; Mon, 9 Apr 2018 15:27:53 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 9 Apr 2018 17:27:49 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [libvirt PATCH v2 40/44] Deprecate QEMU_CAPS_DUMP_GUEST_CORE X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 09 Apr 2018 15:37:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Implied by QEMU >=3D 1.2.0. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 19 +++++----------= ---- 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 +- [ ... etc ... ] tests/qemuxml2argvdata/watchdog.args | 2 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +- tests/qemuxml2argvtest.c | 11 +++-------- 632 files changed, 612 insertions(+), 652 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6af3cc9d61..c46e99362d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3629,7 +3629,6 @@ static qemuMonitorCallbacks callbacks =3D { 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 f1a55c421d..743f37aca3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -203,7 +203,7 @@ typedef enum { =20 /* 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 e6c70f84bf..5bd129c72a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7050,21 +7050,12 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virTristateSwitchTypeToString(smm)); } =20 - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { - if (def->mem.dump_core) { - virBufferAsprintf(&buf, ",dump-guest-core=3D%s", - virTristateSwitchTypeToString(def->mem.dump_= core)); - } else { - virBufferAsprintf(&buf, ",dump-guest-core=3D%s", - cfg->dumpGuestCore ? "on" : "off"); - } + if (def->mem.dump_core) { + virBufferAsprintf(&buf, ",dump-guest-core=3D%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=3D%s", + cfg->dumpGuestCore ? "on" : "off"); } =20 if (def->mem.nosharepages) { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.5.3.x86_64.xml index efe137cb11..779f5032b1 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.6.0.x86_64.xml index a32e1adfdb..a2076c7a5a 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.7.0.x86_64.xml index ff7caea2a0..f57088701b 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.1.1.x86_64.xml index 6d3623bbd4..8d8636655f 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index ea6688fffa..0a6205b408 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -36,7 +36,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index bd2e845f40..af45fc2f4c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index a97e856614..06544e673c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index f563a69b8d..09f5e31415 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 662b4905f2..8d97bee25a 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index c9b363c1b1..c001bc935a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -36,7 +36,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index e98b4fef0a..e902ccb865 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index 6fa93d9bc8..2098743ade 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index c4774482f7..1e460fdd6b 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.4.0.x86_64.xml index 0a7346721b..ee1bdfaa0c 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.5.0.x86_64.xml index 5484a39952..28689bb766 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_2.6.0.aarch64.xml index 88f6087f35..89022c2400 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -38,7 +38,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.6.0.ppc64.xml index a87fa6b921..e07951b126 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.6.0.x86_64.xml index 9a50253bb0..b83cff9192 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.7.0.s390x.xml index 86af6a52d2..b03ef2709e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.7.0.x86_64.xml index 42532805a1..e9944e63c8 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index 4eacbfe168..c2e12ce323 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.8.0.x86_64.xml index 89e0d453a9..07b8c7b9f2 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 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index 40b0b4b6ae..5873af49dd 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index a9a739f956..c5560a62a7 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index 3a5c611c0e..f0525971f1 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 @@ - diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/= qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 6a25e53175..ba4cadbac7 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=3Dtcg \ +-machine virt,accel=3Dtcg,dump-guest-core=3Doff \ -cpu cortex-a53 \ -m 1024 \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2= argvdata/aarch64-acpi-uefi.args index 0b6156a97f..c7b192d384 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=3Dtcg \ +-machine virt,accel=3Dtcg,dump-guest-core=3Doff \ -cpu cortex-a57 \ -drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,\ readonly=3Don \ [ ... etc ... ] diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/= watchdog.args index 21b763e6b1..c8048c2e96 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -S \ --machine pc,accel=3Dtcg \ +-machine pc,accel=3Dtcg,dump-guest-core=3Doff \ -m 214 \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2a= rgvdata/x86-kvm-32-on-64.args index 63c5a4270e..d7674e6b48 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=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name kvm \ -S \ --machine pc,accel=3Dkvm \ +-machine pc,accel=3Dkvm,dump-guest-core=3Doff \ -cpu qemu32 \ -m 4096 \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 670cd92b8f..78d9e10d0f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -732,16 +732,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 =3D true; - DO_TEST("machine-core-off", - QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST("machine-core-off", NONE); driver.config->dumpGuestCore =3D 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, --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list