- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/2] Rename/remove virDomainObjListFindBy{UUID|ID}Ref
by John Ferlan 20 Apr '18

20 Apr '18

These were actually posted before as part of a larger series to rework/rename virDomainObjListFindBy{UUID|ID}Ref as patches 19 and 20: https://www.redhat.com/archives/libvir-list/2018-March/msg00508.html https://www.redhat.com/archives/libvir-list/2018-March/msg00509.html Even though it's only 6 weeks ago, attempting to remember what (if anything) has changed is challenging. In the long run, the point is that the *Ref specific functions are now removed. This makes it much easier for the next step which will be to modify the Add/Remove logic to be simpler and more realistic w/r/t expectations as well as remove a few comments in the code that indicate some day we need to fix this crazy problem (some day is getting closer). John Ferlan (2): conf: Rework/rename virDomainObjListFindByUUIDRef conf: Rework/rename virDomainObjListFindByIDRef src/bhyve/bhyve_driver.c | 6 ++-- src/conf/virdomainobjlist.c | 66 ++++++++++---------------------------------- src/conf/virdomainobjlist.h | 4 --- src/libvirt_private.syms | 2 -- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 6 ++-- src/lxc/lxc_driver.c | 7 ++--- src/openvz/openvz_driver.c | 4 +-- src/qemu/qemu_driver.c | 9 +++--- src/test/test_driver.c | 6 ++-- src/uml/uml_driver.c | 6 ++-- src/util/virclosecallbacks.c | 4 +-- src/vmware/vmware_driver.c | 4 +-- src/vz/vz_driver.c | 6 ++-- src/vz/vz_sdk.c | 14 +++++----- src/vz/vz_utils.c | 2 +- 16 files changed, 51 insertions(+), 97 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] git: add config file telling git-publish how to send patches
by Daniel P. Berrangé 20 Apr '18

20 Apr '18

The "git-publish" tool is a useful git extension for sending patch series for code review. It automatically creates versioned tags each time code on a branch is sent, so that there is a record of each version. It also remembers the cover letter so it does not need re-entering each time the series is reposted. With this config file present it is now sufficient[1] to run $ git publish to send all patches in a branch to the list for review [1] Assuming your $HOME/.gitconfig has an SMTP server listed at least e.g. [sendemail] smtpserver = smtp.example.com Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitpublish diff --git a/.gitpublish b/.gitpublish new file mode 100644 index 0000000000..857f0d552c --- /dev/null +++ b/.gitpublish @@ -0,0 +1,3 @@ +[gitpublishprofile "default"] +base = master +to = libvir-list(a)redhat.com -- 2.14.3

3 7

[libvirt] [dbus PATCH] Fix GError memory leaks
by Pavel Hrdina 20 Apr '18

20 Apr '18

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/gdbus.c | 8 ++++---- src/main.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gdbus.c b/src/gdbus.c index cb06813..3407116 100644 --- a/src/gdbus.c +++ b/src/gdbus.c @@ -86,7 +86,7 @@ virtDBusGDBusHandlePropertyGet(GVariant *parameters, const gchar *interface; const gchar *name; GVariant *value = NULL; - GError *error = NULL; + g_autoptr(GError) error = NULL; g_variant_get(parameters, "(&s&s)", &interface, &name); @@ -128,7 +128,7 @@ virtDBusGDBusHandlePropertySet(GVariant *parameters, const gchar *interface; const gchar *name; g_autoptr(GVariant) value = NULL; - GError *error = NULL; + g_autoptr(GError) error = NULL; g_variant_get(parameters, "(&s&sv)", &interface, &name, &value); @@ -162,7 +162,7 @@ virtDBusGDBusHandlePropertyGetAll(GDBusMethodInvocation *invocation, { GVariant *value; g_auto(GVariantBuilder) builder; - GError *error = NULL; + g_autoptr(GError) error = NULL; g_variant_builder_init(&builder, G_VARIANT_TYPE("(a{sv})")); @@ -202,7 +202,7 @@ virtDBusGDBusHandleMethod(GVariant *parameters, GUnixFDList *inFDs = NULL; GVariant *outArgs = NULL; GUnixFDList *outFDs = NULL; - GError *error = NULL; + g_autoptr(GError) error = NULL; for (gint i = 0; data->methods[i].name; i++) { if (g_str_equal(methodName, data->methods[i].name)) { diff --git a/src/main.c b/src/main.c index b3baf76..eb30ef8 100644 --- a/src/main.c +++ b/src/main.c @@ -52,7 +52,7 @@ virtDBusAcquired(GDBusConnection *connection, gpointer opaque) { virtDBusRegisterData *data = opaque; - GError *error = NULL; + g_autoptr(GError) error = NULL; for (gsize i = 0; i < data->ndrivers; i += 1) { virtDBusConnectNew(&data->connectList[i], connection, -- 2.14.3

2 1

[libvirt] [dbus PATCH 0/3] Introduce GVariant to TypedParams helper
by Pavel Hrdina 20 Apr '18

20 Apr '18

Pavel Hrdina (3): util: Introduce virtDBusUtilTypedParams util: Introduce virtDBusUtilGVariantToTypedParams domain: Implement SetPerfEvents method data/org.libvirt.Domain.xml | 6 +++ src/domain.c | 31 ++++++++++++++++ src/util.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 17 +++++++++ 4 files changed, 143 insertions(+) -- 2.14.3

2 6

[libvirt] --disable-nls is ignored in master
by Olaf Hering 20 Apr '18

20 Apr '18

It seems some of the recent changes for 'po' broke the --disable-nls configure option. I expect no locales will be installed with --disable-nls, but they are installed anyway. This leads to the well known "error: Installed (but unpackaged) file(s) found:" failure. I tested libvirt-20180420T081114.3c66d5108. Olaf

2 1

[libvirt] [dbus PATCH v2] Implement GetAllDomainStats method for Connect Interface
by Katerina Koukiou 20 Apr '18

20 Apr '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 14e66e4..ee7bfdc 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -94,6 +94,13 @@ <arg name="flags" type="u" direction="in"/> <arg name="storagePoolSources" type="s" direction="out"/> </method> + <method name="GetAllDomainStats"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetAllDomain…"/> + <arg name="stats" type="u" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="records" type="a(sa{sv})" direction="out"/> + </method> <method name="GetCapabilities"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCapabilities"/> diff --git a/src/connect.c b/src/connect.c index 1ef5c93..48db724 100644 --- a/src/connect.c +++ b/src/connect.c @@ -503,6 +503,52 @@ virtDBusConnectFindStoragePoolSources(GVariant *inArgs, *outArgs = g_variant_new("(s)", ret); } +static void +virtDBusConnectGetAllDomainStats(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomainStatsRecordPtr) records = NULL; + guint stats; + gint nstats; + guint flags; + GVariant *gret; + GVariantBuilder builder; + + g_variant_get(inArgs, "(uu)", &stats, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nstats = virConnectGetAllDomainStats(connect->connection, + stats, &records, flags); + if (nstats < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sa{sv})")); + + for (gint i = 0; i < nstats; i++) { + const gchar* name; + GVariant *grecords; + + g_variant_builder_open(&builder, G_VARIANT_TYPE("(sa{sv})")); + name = virDomainGetName(records[i]->dom); + grecords = virtDBusUtilTypedParamsToGVariant(records[i]->params, + records[i]->nparams); + g_variant_builder_add(&builder, "s", name); + g_variant_builder_add_value(&builder, grecords); + g_variant_builder_close(&builder); + } + gret = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&gret, 1); +} + static void virtDBusConnectGetCPUModelNames(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -808,6 +854,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "DomainRestore", virtDBusConnectDomainRestoreFlags }, { "DomainSaveImageDefineXML", virtDBusConnectDomainSaveImageDefineXML }, { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, + { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetCPUModelNames", virtDBusConnectGetCPUModelNames }, { "GetDomainCapabilities", virtDBusConnectGetDomainCapabilities }, -- 2.15.0

2 1

[libvirt] [PATCH] remote: remove obsolete & incorrect comment from libvirtd.conf
by Daniel P. Berrangé 20 Apr '18

20 Apr '18

The libvirtd.conf file has a comment pointing people to format.html which has nothing todo with the configuration file format. It also has a comment about tests/daemon-conf which no longer exists, and even if it did exist such comment is not relevant to end users when this file is installed in /etc/. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/libvirtd.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/remote/libvirtd.conf b/src/remote/libvirtd.conf index 7d823cf1ad..28df4021aa 100644 --- a/src/remote/libvirtd.conf +++ b/src/remote/libvirtd.conf @@ -1,10 +1,5 @@ # Master libvirt daemon configuration file # -# For further information consult https://libvirt.org/format.html -# -# NOTE: the tests/daemon-conf regression test script requires -# that each "PARAMETER = VALUE" line in this file have the parameter -# name just after a leading "#". ################################################################# # -- 2.14.3

2 1

[libvirt] [dbus PATCH 0/8] Last APIs for Connect Interface
by Katerina Koukiou 20 Apr '18

20 Apr '18

Notes: - I am not confident about the dummy test on StoragePoolSources. - In GetAllDomainStats I was not able to find a way to create output (aa{sv}) as we need. So I created simple (av), hiding the inner array type. Katerina Koukiou (8): Implement BaselineCPU method for Connect Interface Implement CompareCPU method for Connect Interface Implement FindStoragePoolSources for Domain Interface Move definition for g_autoptr virDomainStatsRecordPtr to util.h Implement GetAllDomainStats method for Connect Interface Introduce virtDBusUtilStringListFree Implement GetCPUModelNames method for Connect Interface Implement GetDomainCapabilties method for Connect Interface data/org.libvirt.Connect.xml | 47 ++++++++++ src/connect.c | 219 +++++++++++++++++++++++++++++++++++++++++++ src/domain.c | 2 - src/util.c | 9 ++ src/util.h | 9 ++ tests/test_connect.py | 9 ++ 6 files changed, 293 insertions(+), 2 deletions(-) -- 2.15.0

3 24

[libvirt] [REPOST PATCH 0/2] vz - Clean/fix test driver usage of FindBy{UUID|ID}
by John Ferlan 20 Apr '18

20 Apr '18

Reposting patches 16-17 from: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html Reposting and using the vz prefix to make it clearer/cleaner as to what's changing (since the 20 patch series perhaps was a bit too daunting to look through it all). There are no changes since v1. John Ferlan (2): vz: Unify vzDomObjFromDomain{Ref} vz: Use virDomainObjListFindBy{UUID|ID}Ref src/vz/vz_driver.c | 119 ++++++++++++++++++++++++++--------------------------- src/vz/vz_sdk.c | 15 +++---- src/vz/vz_utils.c | 32 +------------- src/vz/vz_utils.h | 1 - 4 files changed, 68 insertions(+), 99 deletions(-) -- 2.13.6

2 8

[libvirt] [PATCH jenkins-ci] Add missing job dependencies for libvirt-glib/virt-viewer mingw builds
by Daniel P. Berrangé 20 Apr '18

20 Apr '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- projects/libvirt-glib.yaml | 4 ++-- projects/virt-viewer.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 2d0e721..286d25b 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -15,13 +15,13 @@ parent_jobs: 'libvirt-glib-master-check' machines: '{rpm_machines}' - autotools-build-job: - parent_jobs: + parent_jobs: 'libvirt-master-build-mingw32' variant: -mingw32 local_env: '{mingw32_local_env}' autogen_args: '{mingw32_autogen_args}' machines: '{mingw_machines}' - autotools-build-job: - parent_jobs: + parent_jobs: 'libvirt-master-build-mingw64' variant: -mingw64 local_env: '{mingw64_local_env}' autogen_args: '{mingw64_autogen_args}' diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 3726cd0..633ac9a 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -14,13 +14,13 @@ parent_jobs: 'virt-viewer-master-check' machines: '{rpm_machines}' - autotools-build-job: - parent_jobs: + parent_jobs: 'libvirt-glib-master-build-mingw32' variant: -mingw32 local_env: '{mingw32_local_env}' autogen_args: '{mingw32_autogen_args}' machines: '{mingw_machines}' - autotools-build-job: - parent_jobs: + parent_jobs: 'libvirt-glib-master-build-mingw64' variant: -mingw64 local_env: '{mingw64_local_env}' autogen_args: '{mingw64_autogen_args}' -- 2.14.3

2 1

[libvirt] [PATCH] remote: always build generated source files
by Daniel P. Berrangé 20 Apr '18

20 Apr '18

The generated source files for dispatching libvirtd RPC messages contain translations and are thus listed in POTFILES. This means they are required in order to build libvirt.pot. Rather than changing the files that go into libvirt.pot dynamically, just unconditionally build the remote driver sources so they are always available for building libvirt.pot. This ensures we don't silently loose translation messages based on configure args. This fixes the mingw build which needs to create libvirt.pot but has libvirtd disabled. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed to fix mingw build src/remote/Makefile.inc.am | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 12600b8bb5..eb8d6feb31 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -81,6 +81,17 @@ EXTRA_DIST += \ remote/libvirtd.sysctl \ $(NULL) +# Needed to build libvirt.pot, so must be listed outside +# the WITH_REMOTE/WITH_LIBVIRTD conditionals +BUILT_SOURCES += \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(NULL) +MAINTAINERCLEANFILES += \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(NULL) + if WITH_REMOTE noinst_LTLIBRARIES += libvirt_driver_remote.la libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la @@ -93,9 +104,6 @@ libvirt_driver_remote_la_CFLAGS = \ libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) -BUILT_SOURCES += $(REMOTE_DRIVER_GENERATED) -MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) - endif WITH_REMOTE if WITH_REMOTE @@ -108,9 +116,6 @@ if WITH_LIBVIRTD sbin_PROGRAMS += libvirtd -BUILT_SOURCES += $(LIBVIRTD_GENERATED) -MAINTAINERCLEANFILES += $(LIBVIRTD_GENERATED) - augeas_DATA += remote/libvirtd.aug augeastest_DATA += test_libvirtd.aug -- 2.14.3

1 0

[libvirt] [PATCH 0/2] Disallow qemu-img creation of qcow[2] encryption type
by John Ferlan 20 Apr '18

20 Apr '18

Details in the patches. John Ferlan (2): storage: Separate out the qemu-img help output generation storage: Check qemu-img encryption type capability src/storage/storage_util.c | 63 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 15 deletions(-) -- 2.13.6

3 11

[libvirt] [PATCH v2 0/4] vmware - Clean/fix test driver usage of FindBy{UUID|ID}
by John Ferlan 20 Apr '18

20 Apr '18

Patches 12-15 of the formerly larger series: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html Changes since v1: * In patch 4, call virObjectLock after virDomainObjListRemove in vmwareDomainShutdownFlags and vmwareDomainUndefineFlags because both would return a reffed/locked @vm object and we need to relock before falling in the cleanup call to virDomainObjEndAPI John Ferlan (4): vmware: Properly clean up in vmwareDomainLookupByName vmware: Create accessors to virDomainObjListFindByUUID vmware: Add more descriptive error message on Find failure vmware: Use virDomainObjListFindBy{UUID|ID}Ref src/vmware/vmware_driver.c | 240 ++++++++++++++++----------------------------- 1 file changed, 84 insertions(+), 156 deletions(-) -- 2.13.6

2 10

[libvirt] [PATCH 0/2] vmx: start reading/writing CPU topology
by Pino Toscano 20 Apr '18

20 Apr '18

Read/write only cpuid.coresPerSocket for now. Pino Toscano (2): vmx: convert cpuid.coresPerSocket for CPU topology vmx: write cpuid.coresPerSocket back from CPU topology src/vmx/vmx.c | 57 ++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 3 ++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.vmx | 72 +++++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml | 37 +++++++++++++ tests/vmx2xmltest.c | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-9.vmx | 39 ++++++++++++++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-9.xml | 37 +++++++++++++ tests/xml2vmxtest.c | 1 + 8 files changed, 247 insertions(+) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml create mode 100644 tests/xml2vmxdata/xml2vmx-esx-in-the-wild-9.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-esx-in-the-wild-9.xml -- 2.14.3

3 4

[libvirt] [PATCH v3 0/5] Enable memory-backend-file.discard-data
by Michal Privoznik 20 Apr '18

20 Apr '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-April/msg01437.html diff to v2: - patches 1-4 are the same as in v2, - patch 5 introduces XML knobs to enable the feature in contrast to v2 where the decision was made by libvirt without any user input. Michal Privoznik (5): qemu_capabilities: s/ObjectProps/DeviceProps/g qemu_capabilities: Separate out device props fetching qemu_monitor: Introduce qemuMonitorGetObjectProps qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD qemu: Introduce memoryBacking/discard docs/formatdomain.html.in | 40 +- docs/schemas/cputypes.rng | 5 + docs/schemas/domaincommon.rng | 10 + src/conf/domain_conf.c | 39 +- src/conf/domain_conf.h | 3 + src/conf/numa_conf.c | 27 + src/conf/numa_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 265 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 27 +- src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 62 +- src/qemu/qemu_monitor_json.h | 4 + .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 178 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 348 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 4366 +++++++++---------- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 1086 ++--- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 736 ++-- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 1088 ++--- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 370 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 4408 ++++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 32 +- .../caps_2.12.0.x86_64.replies | 804 ++-- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 196 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 198 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 214 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 2618 ++++++------ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 198 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 204 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 670 +-- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 32 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 4366 +++++++++---------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 798 ++-- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 728 ++-- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemuxml2argvdata/hugepages-pages7.args | 3 +- tests/qemuxml2argvdata/hugepages-pages7.xml | 4 +- tests/qemuxml2argvtest.c | 3 +- 61 files changed, 12341 insertions(+), 11885 deletions(-) -- 2.16.1

2 11

[libvirt] [PATCH] tests: Xen: use qemu-system-i386 for emulator
by Jim Fehlig 20 Apr '18

20 Apr '18

Many of the old xm and sexpr test files used qemu-dm as the emulator. Modern Xen systems no longer use the old, forked qemu-dm, instead preferring the distro provided qemu or an "upstream" qemu that is built when the Xen tools are built. This qemu is typically installed in /usr/lib/xen/bin/qemu-system-i386. The libxl test files already use /usr/lib/xen/bin/qemu-system-i386. For consistency, change the old test files to use the same emulator Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- These config files can serve as examples too, so best not to encourage use of outdated/deprecated config. tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 2 +- tests/xmconfigdata/test-escape-paths.cfg | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-default-feature.cfg | 2 +- tests/xmconfigdata/test-fullvirt-default-feature.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-pci-devs.cfg | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 107 files changed, 107 insertions(+), 107 deletions(-) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr index a18418a17..cdbbaedee 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr @@ -23,7 +23,7 @@ (hvm (kernel /usr/lib/xen/boot/hvmloader) (boot d) - (device_model /usr/lib/xen/bin/qemu-dm) + (device_model /usr/lib/xen/bin/qemu-system-i386) (keymap en-us) (localtime 1) (pae 1) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml index 8eaacc86d..cf6683fee 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -17,7 +17,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/iscsi/winxp'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr index 777f7e08b..1372025df 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot d)(cdrom '/root/boot.iso')\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda')\ (uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml index 8ed2261fc..dd5b46a6a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr index 04cd2aebf..8f31abf18 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)(serial none)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 1)(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ (uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml index 5e176bf91..4c120674b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr index bcb092650..7fee66693 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)(serial none)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(hpet 0)(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ (uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml index 826301182..5652e9a69 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr index 549b2800c..8bc6cfacf 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr @@ -23,7 +23,7 @@ (hvm (kernel /usr/lib/xen/boot/hvmloader) (boot c) - (device_model /usr/lib/xen/bin/qemu-dm) + (device_model /usr/lib/xen/bin/qemu-system-i386) (keymap en-us) (localtime 0) (pae 1) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml index 4f2a39b80..659dcfd8a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <interface type='ethernet'> <target dev='vif1.0'/> <mac address='00:16:3e:3b:b9:d7'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr index 5616d19e3..6673aef55 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(vnc 1)(keymap ja)(localtime 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml index 2d390b52a..d985afbf1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr index b0a344cb4..3516e72a0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml index 5edf0ce26..c15fe80a1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr index 8d017263d..662845291 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel tcp:localhost:9999)\ -(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(serial none)(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml index eccab787b..2c4fd687a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr index 8f5651813..a8d08340a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ -(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')\ (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml index 79e9e69c3..d72e503f8 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr index f0b992526..d9e7336ae 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ -(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(serial (none /dev/ttyS1))(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ (uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml index 111db35b1..860d24e05 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr index 0eac5a436..b52a5e455 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ -(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(serial file:/tmp/serial.log)(device_model '/usr/lib/xen/bin/qemu-system-i386')\ (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml index 40d1c6e62..c56e5432c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr index a00410cd5..caf8b4a87 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)(serial null)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml index 60d5d8e9e..0615bf4b3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr index 2b3a6610a..be3e13cd7 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ -(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib/xen/bin/qemu-system-i386')\ (vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ (mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml index 55a4e9e0b..00518e62f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr index 1029c1a25..3ac68630c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)(serial pty)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ (uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml index 78ddea603..e9d3c0e6a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr index 05a9a1d91..e3eb554ea 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr @@ -3,7 +3,7 @@ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)(serial stdio)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml index 112830ac7..5cdcd25d9 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr index 0d80f8aca..8107efebb 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr @@ -4,7 +4,7 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ (serial telnet:localhost:9999,server,nowait)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml index ab2450469..8457f49f8 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr index 44f2bfe8d..32cb2ba07 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr @@ -4,7 +4,7 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ (serial tcp:localhost:9999,server,nowait)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml index b6afd9b31..973f8c1cd 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr index 2efedf2e5..3eea32995 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr @@ -4,7 +4,7 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ (serial udp:localhost:9998@localhost:9999)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml index cdc05bc52..2f14f17be 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr index 356677e2c..aff06a67f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr @@ -4,7 +4,7 @@ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ (acpi 1)(usb 1)(parallel none)\ (serial unix:/tmp/serial.sock,server,nowait)\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(vnc 1)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ (device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml index 0fa40e95d..c2f32144e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr index d99e13a7e..6b0e82236 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\ (uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml index def03321a..c2ea63f3b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr index 50d67154e..9552b9b72 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml index def03321a..c2ea63f3b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr index 789082ef0..7a10c496b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml index ded0aa853..1f919b8c0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr index e2f77a167..3a2eec794 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\ (device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml index 48ce7cebf..639517ee3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr index 7bfbfaec6..09b7ecd8f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(cdrom '/root/boot.iso')\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml index 1ae44a1d3..d281090c6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr index 92e807c65..135b374c2 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(acpi 1)(vnc 1)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)(acpi 1)(vnc 1)\ (keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\ (mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')\ (mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml index 1ae44a1d3..d281090c6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr index dc4cbf59f..46794a5a1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml index 1ae44a1d3..d281090c6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr index f3e4901e4..bd75f6190 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr @@ -25,7 +25,7 @@ (kernel /usr/lib/xen/boot/hvmloader) (vnc 1) (vncunused 1) - (device_model /usr/lib/xen/bin/qemu-dm) + (device_model /usr/lib/xen/bin/qemu-system-i386) (pae 1) (apic 1) (acpi 1) diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml index 975318294..a02104d0d 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -19,7 +19,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/sda8'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr index e01ecb984..b6511a96f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr @@ -21,7 +21,7 @@ (image (linux (kernel ) - (device_model /usr/lib/xen/bin/qemu-dm) + (device_model /usr/lib/xen/bin/qemu-system-i386) (notes (FEATURES 'writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel' diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml index f2d316c6f..d9cb6569c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/vg_dom0test/test2vm'/> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr index c3ed8e8b9..dbaa57632 100644 --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr @@ -2,7 +2,7 @@ (uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ (on_reboot 'restart')(on_crash 'restart')\ (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ -(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)\ +(device_model '/usr/lib/xen/bin/qemu-system-i386')(boot c)\ (acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ (uname 'file:/root/foo.img')(mode 'w')))\ (device (vbd (dev 'hdc:cdrom')\ diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml index 463d3598b..77be06e94 100644 --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml @@ -17,7 +17,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/root/foo.img'/> diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg index f13254edb..d3e410ffd 100644 --- a/tests/xmconfigdata/test-escape-paths.cfg +++ b/tests/xmconfigdata/test-escape-paths.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm&test" +device_model = "/usr/lib/xen/bin/qemu-system-i386&test" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 712cc8679..d95d34e03 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm&test</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386&test</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg index f72575b53..b01e29023 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg +++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml index b900ee0cf..fdbba8a3a 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.xml +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg index d73b4e9f6..16fe98594 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml index b900ee0cf..fdbba8a3a 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg index d670d36ab..eb118427c 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml index fae684f21..e397a869e 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -21,7 +21,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg index d51be217f..2f8514d5e 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.cfg +++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg @@ -12,7 +12,7 @@ localtime = 1 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index ccb8f1a87..0a42cfd2a 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg index 254bd93b8..b744b2184 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml index cc5c6658f..f57d6eb5c 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg index 5e12c5e6c..f9fce015e 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index 62253645a..4a496cebe 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-nohap.cfg b/tests/xmconfigdata/test-fullvirt-nohap.cfg index 67e251130..e5375dfdb 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.cfg +++ b/tests/xmconfigdata/test-fullvirt-nohap.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml index bbd177a11..d8ac37357 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.xml +++ b/tests/xmconfigdata/test-fullvirt-nohap.xml @@ -20,7 +20,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg index df7b62133..94c52d975 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index f99e90979..d2cae8f98 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg index d5bd759fb..9193cc871 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index ccaa761d8..4b2b432ef 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg index d38f0849b..9ef60b4bd 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index 0010cf100..c657139fd 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg index 9ed3fb783..60e41ab55 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index a2ce6f224..1cb8804bc 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg index b055f7960..d4e0763d1 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index 8485ae216..5dc5e2fa9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg index 5fb13cdd1..efefe109b 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index 5163e0f54..ece851585 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg index 2c0f166fb..224f5274e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index 760e57df4..bd5317787 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg index e90b3755b..e70ab847e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index 517f9ddfb..403bf68c0 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg index 082215d6b..9e7acdf0c 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index eee7365ae..5f0b6c0d1 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg index 2912473ce..964beba4f 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index 1b0f5a6e9..6f6b1cf5b 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg index 6747e699f..501463f54 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.cfg +++ b/tests/xmconfigdata/test-fullvirt-sound.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index f13c920a5..0fbd9f6a4 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg index c7eb1c1b4..660f18e77 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index 2c855cd35..244a42b51 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml index 23535eb70..6dff15ebd 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml @@ -19,7 +19,7 @@ </features> <clock offset='utc' adjustment='reset'/> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg index 8921e7c9c..90428882c 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index e82ffdca1..e315f7e65 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg index 5e12c5e6c..f9fce015e 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.cfg +++ b/tests/xmconfigdata/test-fullvirt-utc.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index 62253645a..4a496cebe 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -19,7 +19,7 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/HostVG/XenGuest2'/> diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg index 424042905..843996121 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.cfg +++ b/tests/xmconfigdata/test-no-source-cdrom.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml index 5d0f3bd68..4a3915079 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -19,7 +19,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/sda8'/> diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg index 1369b32bb..188227e18 100644 --- a/tests/xmconfigdata/test-pci-devs.cfg +++ b/tests/xmconfigdata/test-pci-devs.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-dm" +device_model = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml index f50e1947f..27f59c28b 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -19,7 +19,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <disk type='block' device='disk'> <driver name='phy' type='raw'/> <source dev='/dev/sda8'/> -- 2.16.3

2 2

[libvirt] [PATCH v4 0/5] qemu: add virQEMUBuildBufferEscapeComma in qemu_command.c
by Sukrit Bhatnagar 19 Apr '18

19 Apr '18

Changes in v4: Changes made in v2 anbd v3 to qemu_command.c are discarded. Some changes introduced in v2 are used to create new smaller patches. virQEMUBuildBufferEscapeComma was applied to: - info->romfile in qemuBuildRomStr - disk->vendor and disk->product in qemuBuildDriveDevStr - fs->src->path in qemuBuildFSStr - fs->dst in qemuBuildFSDevStr - cfg->vncTLSx509certdir in qemuBuildGraphicsVNCCommandLine - loader->path and loader->nvram in qemuBuildDomainLoaderCommandLine Changes in v3: virQEMUBuildBufferEscapeComma was applied to: - src->hosts->socket in qemuBuildNetworkDriveURI - src->path, src->configFile in qemuBuildNetworkDriveStr - disk->blkdeviotune.group_name in qemuBuildDiskThrottling - net->data.socket.address, net->data.socket.localaddr in qemuBuildHostNetStr - dev->data.file.path in qemuBuildChrChardevStr - graphics->data.spice.rendernode in qemuBuildGraphicsSPICECommandLine - smartcard->data.cert.file[i], smartcard->data.cert.database in qemuBuildSmartcardCommandLine Link to v3: https://www.redhat.com/archives/libvir-list/2018-April/msg00053.html Changes in v2: virQEMUBuildBufferEscapeComma was applied to: - info->romfile in qemuBuildRomStr - disk->vendor, disk->product in qemuBuildDriveDevStr - fs->src->path in qemuBuildFSStr - fs->dst in qemuBuildFSDevStr - connect= in qemuBuildHostNetStr - fileval handling in qemuBuildChrChardevStr - TYPE_DEV, TYPE_PIPE handling in qemuBuildChrChardevStr - cfg->vncTLSx509certdir in qemuBuildGraphicsVNCCommandLine - cfg->spiceTLSx509certdir in qemuBuildGraphicsSPICECommandLine - loader->path, loader->nvram usage in qemuBuildDomainLoaderCommandLine Link to v2: https://www.redhat.com/archives/libvir-list/2018-March/msg00965.html Sukrit Bhatnagar (5): qemu: Escape commas for qemuBuildRomStr qemu: Escape commas for qemuBuildDriveDevStr qemu: Escape commas for qemuBuildFSStr and qemuBuildFSDevStr qemu: Escape commas for qemuBuildGraphicsVNCCommandLine qemu: Escape commas for qemuBuildDomainLoaderCommandLine src/qemu/qemu_command.c | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) -- 1.8.3.1

3 8

[libvirt] [PATCH] tests: Fix incorrect check for virNetServerClientClose call
by John Ferlan 19 Apr '18

19 Apr '18

Commit id '6df5d777' somehow during the move from one branch to another added an erroneous '!'... Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under the trivial rule. Not quite sure how a git am from my Coverity tree added the not in the condition. tests/virnetserverclienttest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index aa3f0bcf9b..1759d76630 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -152,7 +152,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUSED) ret = 0; cleanup: virObjectUnref(sock); - if (!client) + if (client) virNetServerClientClose(client); virObjectUnref(client); virObjectUnref(ident); -- 2.13.6

1 0

[libvirt] [PATCH 0/3] query-cpu-model-baseline QMP command
by Chris Venteicher 19 Apr '18

19 Apr '18

Implementation of libvirt functions to support the QEMU query-cpu-model-baseline QMP command. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Signed-off-by: Chris Venteicher <cventeic(a)redhat.com> Chris Venteicher (3): qemu_monitor_json: Populate CPUModelInfo struct from json qemu_monitor_json: Build Json CPU Model Info qemu_monitor: query-cpu-model-baseline QMP command src/qemu/qemu_monitor.c | 16 ++++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 179 +++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_monitor_json.h | 7 ++ 4 files changed, 185 insertions(+), 22 deletions(-) -- 2.14.1

4 12

[libvirt] [PATCH v2 0/2] Don't choke on valid NUMA nodesets on daemon restart
by Andrea Bolognani 19 Apr '18

19 Apr '18

Changes from [v1]: * make sure the tests pass even when compiling --without-qemu; * actually run syntax-check before sending out patches. [v1] https://www.redhat.com/archives/libvir-list/2018-April/msg00937.html Andrea Bolognani (2): tests: Create full host NUMA topology in more cases qemu: Figure out nodeset bitmap size correctly src/qemu/qemu_domain.c | 10 ++++- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- tests/testutils.c | 51 ++++++++++++++++++++++++ tests/testutils.h | 2 + tests/testutilsqemu.c | 7 +++- tests/vircapstest.c | 66 +++---------------------------- 6 files changed, 74 insertions(+), 64 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH python] Fix build with older libvirt versions
by Daniel P. Berrangé 19 Apr '18

19 Apr '18

The libvirt python module is supposed to build with historical versions of the API back to 0.9.1, which means all constants / methods must be commit 314b2346df2d8e2d7d705b003c693b4fa0189bdf Author: Edgar Kaziakhmedov <edgar.kaziakhmedov(a)virtuozzo.com> Date: Wed Feb 7 17:49:30 2018 +0300 Set hints for virPyDictToTypedParams Predefine hints for all parameters possible to avoid wrong type convert. This broke the build against any libvirt < 2.0.0 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-override.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/libvirt-override.c b/libvirt-override.c index 580c259..b4c1529 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7740,22 +7740,54 @@ libvirt_virDomainMigrateGetMaxDowntime(PyObject *self ATTRIBUTE_UNUSED, #if LIBVIR_CHECK_VERSION(1, 1, 0) static virPyTypedParamsHint virPyDomainMigrate3Params[] = { +# ifdef VIR_MIGRATE_PARAM_URI { VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_DEST_NAME { VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_DEST_XML { VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_PERSIST_XML { VIR_MIGRATE_PARAM_PERSIST_XML, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_BANDWIDTH { VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG }, +# endif +# ifdef VIR_MIGRATE_PARAM_GRAPHICS_URI { VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_LISTEN_ADDRESS { VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_MIGRATE_DISKS { VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_DISKS_PORT { VIR_MIGRATE_PARAM_DISKS_PORT, VIR_TYPED_PARAM_INT }, +# endif +# ifdef VIR_MIGRATE_PARAM_COMPRESSION { VIR_MIGRATE_PARAM_COMPRESSION, VIR_TYPED_PARAM_STRING }, +# endif +# ifdef VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL { VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL, VIR_TYPED_PARAM_INT }, +# endif +# ifdef VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS { VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS, VIR_TYPED_PARAM_INT }, +# endif +# ifdef VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS { VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS, VIR_TYPED_PARAM_INT }, +# endif +# ifdef VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE { VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE, VIR_TYPED_PARAM_ULLONG }, +# endif +# ifdef VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL { VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL, VIR_TYPED_PARAM_INT }, +# endif +# ifdef VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT { VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT, VIR_TYPED_PARAM_INT }, +# endif }; -- 2.14.3

2 2

[libvirt] [PATCH v2] qemuDomainObjPrivateDataClear: Don't leak @migParams
by Michal Privoznik 19 Apr '18

19 Apr '18

Allocated in qemuMigrationParamsNew() we need to free priv->job.migParams when no longer needed. ==8061== 234 (192 direct, 42 indirect) bytes in 1 blocks are definitely lost in loss record 112 of 123 ==8061== at 0x4C2CF26: calloc (vg_replace_malloc.c:711) ==8061== by 0x5325D05: virAlloc (viralloc.c:144) ==8061== by 0x1984F9: qemuMigrationParamsNew (qemu_migration_params.c:218) ==8061== by 0x19A352: qemuMigrationParamsParse (qemu_migration_params.c:1185) ==8061== by 0x1604D8: qemuDomainObjPrivateXMLParseJob (qemu_domain.c:2390) ==8061== by 0x160AE9: qemuDomainObjPrivateXMLParse (qemu_domain.c:2517) ==8061== by 0x5419EAE: virDomainObjParseXML (domain_conf.c:20442) ==8061== by 0x541A25E: virDomainObjParseNode (domain_conf.c:20555) ==8061== by 0x541A2FC: virDomainObjParseFile (domain_conf.c:20574) ==8061== by 0x13607D: testCompareStatusXMLToXMLFiles (qemuxml2xmltest.c:75) ==8061== by 0x14F3E8: virTestRun (testutils.c:180) ==8061== by 0x14DCD0: mymain (qemuxml2xmltest.c:1200) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e2a8450e2e..027321e1d4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1895,6 +1895,8 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv) virBitmapFree(priv->migrationCaps); priv->migrationCaps = NULL; + + qemuMigrationParamsFree(priv->job.migParams); } -- 2.16.1

2 3

[libvirt] [PATCH 0/2] Don't choke on valid NUMA nodesets on daemon restart
by Andrea Bolognani 19 Apr '18

19 Apr '18

Details in the commit message for 2/2 and the bug report referenced therein. Andrea Bolognani (2): tests: Create full host NUMA topology by default qemu: Figure out nodeset bitmap size correctly src/qemu/qemu_domain.c | 11 +++++- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- tests/testutilsqemu.c | 57 +++++++++++++++++++++++++++- tests/vircapstest.c | 62 +------------------------------ 4 files changed, 68 insertions(+), 64 deletions(-) -- 2.14.3

2 8

[libvirt] [dbus PATCH] Fix memory leaks introduced by commits 40dc3b and 408a25
by Katerina Koukiou 19 Apr '18

19 Apr '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/domain.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/domain.c b/src/domain.c index 6c44377..ae1b68f 100644 --- a/src/domain.c +++ b/src/domain.c @@ -506,7 +506,7 @@ virtDBusDomainBlockPeek(GVariant *inArgs, gsize size; guint flags; g_autofree guchar *buffer = NULL; - GVariantBuilder *builder; + GVariantBuilder builder; GVariant *res; g_variant_get(inArgs, "(&sttu)", &disk, &offset, &size, &flags); @@ -519,11 +519,11 @@ virtDBusDomainBlockPeek(GVariant *inArgs, if (virDomainBlockPeek(domain, disk, offset, size, buffer, flags) < 0) return virtDBusUtilSetLastVirtError(error); - builder = g_variant_builder_new(G_VARIANT_TYPE("ay")); + g_variant_builder_init(&builder, G_VARIANT_TYPE("ay")); for (unsigned int i = 0; i < size; i++) - g_variant_builder_add(builder, "y", buffer[i]); + g_variant_builder_add(&builder, "y", buffer[i]); - res = g_variant_builder_end(builder); + res = g_variant_builder_end(&builder); *outArgs = g_variant_new_tuple(&res, 1); } @@ -1221,7 +1221,7 @@ virtDBusDomainMemoryPeek(GVariant *inArgs, gsize size; guint flags; g_autofree guchar *buffer = NULL; - GVariantBuilder *builder; + GVariantBuilder builder; GVariant *res; g_variant_get(inArgs, "(ttu)", &offset, &size, &flags); @@ -1234,11 +1234,11 @@ virtDBusDomainMemoryPeek(GVariant *inArgs, if (virDomainMemoryPeek(domain, offset, size, buffer, flags) < 0) return virtDBusUtilSetLastVirtError(error); - builder = g_variant_builder_new(G_VARIANT_TYPE("ay")); + g_variant_builder_init(&builder, G_VARIANT_TYPE("ay")); for (unsigned int i = 0; i < size; i++) - g_variant_builder_add(builder, "y", buffer[i]); + g_variant_builder_add(&builder, "y", buffer[i]); - res = g_variant_builder_end(builder); + res = g_variant_builder_end(&builder); *outArgs = g_variant_new_tuple(&res, 1); } -- 2.15.0

2 1

[libvirt] [PATCH v2 0/5] uml: Clean/fix test driver usage of FindBy{UUID|ID}
by John Ferlan 19 Apr '18

19 Apr '18

Patches 9-11 of larger series: v1: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html Changes since v1: * Patches 1 and 2 new - essentially they fix issues with how virDomainObjListRemove was used inconsistently. * Patch 3 should be the same or very similar to the former patch 9: https://www.redhat.com/archives/libvir-list/2018-March/msg00498.html * Patch 4 should be the same as former patch 10: https://www.redhat.com/archives/libvir-list/2018-March/msg00499.html * Patch 5 is altered to also fix virDomainObjListRemove inconsistencies John Ferlan (5): uml: Fix umlProcessAutoDestroyDom dom processing uml: Fix umlInotifyEvent dom object handling uml: Create accessors to virDomainObjListFindByUUID uml: Add more specific error message on failed FindBy call uml: Use virDomainObjListFindBy{UUID|ID}Ref src/uml/uml_driver.c | 353 +++++++++++++++++---------------------------------- 1 file changed, 116 insertions(+), 237 deletions(-) -- 2.13.6

3 13

[libvirt] [PATCH v2 0/7] qemu: Add support for 'write-cache' disk frontend argument (blockdev-add saga)
by Peter Krempa 19 Apr '18

19 Apr '18

Version 2: - new and better testing against the newest capability file - reordered test case, so that the new parameter is visibly added Peter Krempa (7): tests: qemu: Add helper code to lookup most recent capability file tests: qemuxml2argv: Add infrastructure to pass output file suffix tests: qemuxml2argv: Add infrastructure for testing with real qemuCaps qemu: domain: Add helper for translating disk cachemode to qemu flags tests: qemuxml2argv: Test formatting of 'write-cache' parameter qemu: caps: Add capability for 'write-cache' parameter of disk frontends qemu: Format 'write-cache' parameter for disk frontends src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 27 +++++++ src/qemu/qemu_domain.c | 75 +++++++++++++++++ src/qemu/qemu_domain.h | 6 ++ 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.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../disk-drive-write-cache.new.args | 45 +++++++++++ tests/qemuxml2argvdata/disk-drive-write-cache.xml | 45 +++++++++++ tests/qemuxml2argvtest.c | 81 ++++++++++++++++++- tests/testutilsqemu.c | 94 ++++++++++++++++++++++ tests/testutilsqemu.h | 5 ++ 26 files changed, 397 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.new.args create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.xml -- 2.16.2

3 22

[libvirt] [dbus PATCH v2 0/3] Introduce more Domain* APIs
by Katerina Koukiou 19 Apr '18

19 Apr '18

Changes to v1: Resending unmerged patches from previous patchset with fixed comments. Katerina Koukiou (3): Implement FSFreeze method for Domain Interface Implement FSThaw method for Domain Interface Implement GetControlInfo method for Domain Interface data/org.libvirt.Domain.xml | 20 ++++++ src/domain.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) -- 2.15.0

3 8

[libvirt] [PATCH sandbox-image 0/9] Tweaks
by Radostin Stoyanov 19 Apr '18

19 Apr '18

This patch series introduces a few small changes towards making the code of virt-sandbox-image compatible with PEP8. Radostin Stoyanov (9): pylint: Remove unused import statements pylint: Move standard library imports on top pylint: Use consistent indentation of 4 spaces py3: Use 'builtins' instead of '__builtin__' pylint: Fix white-space around keywords setup: Add shebang cli: Remove unused constants cli: Remove redundant global statements docker: Add missing import base64 libvirt_sandbox_image/cli.py | 38 +++++++++++----------------- libvirt_sandbox_image/sources/base.py | 4 +-- libvirt_sandbox_image/sources/docker.py | 10 ++++---- libvirt_sandbox_image/sources/virtbuilder.py | 4 +-- libvirt_sandbox_image/template.py | 4 +-- scripts/virt-sandbox-image | 5 ++-- setup.py | 17 ++++++------- 7 files changed, 37 insertions(+), 45 deletions(-) mode change 100644 => 100755 setup.py -- 2.14.3

3 19

[libvirt] [PATCH v3 0/7] qemu: Better xml->argv testing and add support for write-cache for disks (blockdev-add saga)
by Peter Krempa 19 Apr '18

19 Apr '18

Version 3: - renamed the testing macros - removed hand-rolled code to compare versions - fixed the test case to demonstrate usage of the new test-suite - reworded comment in test suite on how to use it Peter Krempa (7): tests: qemu: Add helper code to lookup latest capability file tests: qemuxml2argv: Add infrastructure to pass output file suffix tests: qemuxml2argv: Add infrastructure for testing with real qemuCaps qemu: domain: Add helper for translating disk cachemode to qemu flags tests: qemuxml2argv: Test formatting of 'write-cache' parameter qemu: caps: Add capability for 'write-cache' parameter of disk frontends qemu: Format 'write-cache' parameter for disk frontends src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 27 +++++++ src/qemu/qemu_domain.c | 75 +++++++++++++++++++ src/qemu/qemu_domain.h | 6 ++ 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.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../disk-drive-write-cache.x86_64-2.6.0.args | 43 +++++++++++ .../disk-drive-write-cache.x86_64-2.7.0.args | 45 ++++++++++++ .../disk-drive-write-cache.x86_64-latest.args | 47 ++++++++++++ tests/qemuxml2argvdata/disk-drive-write-cache.xml | 45 ++++++++++++ tests/qemuxml2argvtest.c | 83 +++++++++++++++++++++- tests/testutilsqemu.c | 63 ++++++++++++++++ tests/testutilsqemu.h | 5 ++ 28 files changed, 458 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.6.0.args create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-2.7.0.args create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.xml -- 2.16.2

2 11

[libvirt] [dbus PATCH 0/6] Some Set APIs for Domain Interface
by Katerina Koukiou 19 Apr '18

19 Apr '18

Katerina Koukiou (6): Implement BlockJobSetSpeed for Domain Interface Implement MigrateSetCompressionCache method for Domain Interface Implement SetUserPassword method for Domain Interface Implement SetTime method for Domain Interface Implement SetMetadata method for Domain Interface Implement SetMemoryStatsPeriod method for Domain Interface data/org.libvirt.Domain.xml | 43 +++++++++++ src/domain.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) -- 2.15.0

2 13

[libvirt] [PATCH 0/2] vz: build fix
by Nikolay Shirokovskiy 19 Apr '18

19 Apr '18

Diff from v1: - add patch "check scripts: handle unintialized driver vars in check-driverimpls.pl" Nikolay Shirokovskiy (2): check scripts: handle unintialized driver vars in check-driverimpls.pl vz: build fix src/check-driverimpls.pl | 2 +- src/vz/vz_driver.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) -- 1.8.3.1

2 6

[libvirt] [dbus PATCH v2] Implement GetDHCPLeases method for Network Interface
by Katerina Koukiou 19 Apr '18

19 Apr '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Network.xml | 9 ++++++ src/network.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml index 9d522dc..cf05062 100644 --- a/data/org.libvirt.Network.xml +++ b/data/org.libvirt.Network.xml @@ -36,6 +36,15 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkDestroy"/> </method> + <method name="GetDHCPLeases"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetDHCPLeas… + Empty string can be used to pass a NULL as @mac argument. + Empty string will be returned in output for NULL variables."/> + <arg name="mac" type="s" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="leases" type="a(stssssuss)" direction="out"/> + </method> <method name="GetXMLDesc"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virNetworkGetXMLDesc"/> diff --git a/src/network.c b/src/network.c index c507225..5d24af8 100644 --- a/src/network.c +++ b/src/network.c @@ -3,6 +3,12 @@ #include <libvirt/libvirt.h> +VIRT_DBUS_ENUM_DECL(virtDBusNetworkIPAddr) +VIRT_DBUS_ENUM_IMPL(virtDBusNetworkIPAddr, + VIR_IP_ADDR_TYPE_LAST, + "ipv4", + "ipv6") + VIRT_DBUS_ENUM_DECL(virtDBusNetworkUpdateCommand) VIRT_DBUS_ENUM_IMPL(virtDBusNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST, @@ -29,6 +35,15 @@ VIRT_DBUS_ENUM_IMPL(virtDBusNetworkUpdateSection, "dns-txt", "dns-srv") +static void +virtDBusNetworkDHCPLeaseListFree(virNetworkDHCPLeasePtr *leases) +{ + for (gint i = 0; leases[i] != NULL; i += 1) + virNetworkDHCPLeaseFree(leases[i]); + + g_free(leases); +} + static virNetworkPtr virtDBusNetworkGetVirNetwork(virtDBusConnect *connect, const gchar *objectPath, @@ -235,6 +250,64 @@ virtDBusNetworkDestroy(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkDHCPLeasePtr, virtDBusNetworkDHCPLeaseListFree); + +static void +virtDBusNetworkGetDHCPLeases(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virNetwork) network = NULL; + const gchar *mac; + guint flags; + g_autoptr(virNetworkDHCPLeasePtr) leases = NULL; + gint nleases; + GVariantBuilder builder; + GVariant *res; + + g_variant_get(inArgs, "(&su)", &mac, &flags); + if (g_str_equal(mac, "")) + mac = NULL; + + network = virtDBusNetworkGetVirNetwork(connect, objectPath, error); + if (!network) + return; + + nleases = virNetworkGetDHCPLeases(network, mac, &leases, flags); + if (nleases < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stssssuss)")); + for (gint i = 0; i < nleases; i++) { + const gchar *typeStr; + + virNetworkDHCPLeasePtr lease = leases[i]; + + typeStr = virtDBusNetworkIPAddrTypeToString(lease->type); + if (!typeStr) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't format virIPAddrType '%d' to string.", lease->type); + return; + } + + g_variant_builder_add(&builder, "(stssssuss)", + lease->iface, lease->expirytime, + typeStr, lease->mac, + lease->iaid ? lease->iaid : "" , + lease->ipaddr, lease->prefix, + lease->hostname ? lease->hostname : "", + lease->clientid ? lease->clientid : ""); + } + res = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&res, 1); +} + static void virtDBusNetworkGetXMLDesc(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -342,6 +415,7 @@ static virtDBusGDBusPropertyTable virtDBusNetworkPropertyTable[] = { static virtDBusGDBusMethodTable virtDBusNetworkMethodTable[] = { { "Create", virtDBusNetworkCreate }, { "Destroy", virtDBusNetworkDestroy }, + { "GetDHCPLeases", virtDBusNetworkGetDHCPLeases }, { "GetXMLDesc", virtDBusNetworkGetXMLDesc }, { "Undefine", virtDBusNetworkUndefine }, { "Update", virtDBusNetworkUpdate }, -- 2.15.0

2 1

[libvirt] [PATCH sandbox-image] Add manual pages to describe virt-sandbox-image
by Daniel P. Berrangé 19 Apr '18

19 Apr '18

There's little point releasing a new tool if we don't provide any docs describing how it is used. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitignore | 1 + MANIFEST.in | 2 + libvirt-sandbox-image.spec.in | 1 + man/virt-sandbox-image-list.pod | 92 +++++++++++++++++++++ man/virt-sandbox-image-prepare.pod | 100 ++++++++++++++++++++++ man/virt-sandbox-image-purge.pod | 96 +++++++++++++++++++++ man/virt-sandbox-image-run.pod | 165 +++++++++++++++++++++++++++++++++++++ man/virt-sandbox-image.pod | 136 ++++++++++++++++++++++++++++++ setup.py | 33 +++++++- 9 files changed, 625 insertions(+), 1 deletion(-) create mode 100644 man/virt-sandbox-image-list.pod create mode 100644 man/virt-sandbox-image-prepare.pod create mode 100644 man/virt-sandbox-image-purge.pod create mode 100644 man/virt-sandbox-image-run.pod create mode 100644 man/virt-sandbox-image.pod diff --git a/.gitignore b/.gitignore index 052e94b..5c7f451 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ build/ AUTHORS ChangeLog *egg-info/ +man/*.1 diff --git a/MANIFEST.in b/MANIFEST.in index 5f690a3..794a949 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,4 +11,6 @@ include libvirt_sandbox_image/source/*.py include autobuild.sh include libvirt-sandbox-image.spec include libvirt-sandbox-image.spec.in +include man/*1 +include man/*pod global-exclude *.pyc diff --git a/libvirt-sandbox-image.spec.in b/libvirt-sandbox-image.spec.in index c122af0..69c18e3 100644 --- a/libvirt-sandbox-image.spec.in +++ b/libvirt-sandbox-image.spec.in @@ -28,6 +28,7 @@ Currently docker and virt-builder images are supported. %files %doc README LICENSE %{_bindir}/virt-sandbox-image +%{_mandir}/man1/virt-sandbox-image*1* %{python3_sitelib}/libvirt_sandbox_image/ %{python3_sitelib}/libvirt_sandbox_image-%{version}-py3.*.egg-info diff --git a/man/virt-sandbox-image-list.pod b/man/virt-sandbox-image-list.pod new file mode 100644 index 0000000..69c8bd5 --- /dev/null +++ b/man/virt-sandbox-image-list.pod @@ -0,0 +1,92 @@ +=encoding utf8 + +=head1 NAME + +virt-sandbox-image list - List cached image templates + +=head1 SYNOPSIS + + virt-sandbox-image list [-h] [-c CONNECT] [-t TEMPLATE_DIR] template + +=head1 DESCRIPTION + +B<virt-sandbox-image> is used to launch sandboxes from a pre-built container +image template. It is able to download image templates in a number of +formats from online image registries, including those built for Docker +and virt-builder. The images can be run with either QEMU (KVM) or LXC +virtualization drivers. + +The B<list> command can be used to display the templates which are present +in the local cache. Existance of a cached template will allow the B<run> +command to launch sandboxes immediately. Unwanted templates in the cache +can be deleted using the B<purge> command. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +Display help message + +=item B<-c URI>, B<--connect URI> + +The connection URI for the hypervisor. The following URIs are currently +supported + + - lxc:/// (if running as root) + - qemu:///system (if running as root) + - qemu:///session (if running as non-root) + +It is not permitted to use non-local URIs (ie URIs with a hostname) +at this time. + +=item B<-t TEMPLATE_DIR> + +Override the default template directory which is usually +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates>. + +=item B<template> + +The URI identifying the template to download and prepare. + +=back + +=head1 EXAMPLE + +Display a list of template images in the cache + + # virt-sandbox-image list -c qemu:///session + + +=head1 SEE ALSO + +C<virt-sandbox(1)>, +C<virt-sandbox-image(1)>, C<virt-sandbox-image-prepare(1)>, +C<virt-sandbox-image-run(1)>, C<virt-sandbox-image-purge(1)> + +=head1 FILES + +Pristine downloaded templates will be stored in subdirectories of +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates> +(non-root) by default. + +Overlay images created when running an instance of the template will +be stored in C</var/lib/libvirt/images> (root) or C<$HOME/.local/share/libvirt/images> +(non-root) by default. + +=head1 AUTHORS + +Daniel P. Berrangé <dan(a)berrange.com>, Eren Yagdiran <erenyagdiran(a)gmail.com> +and Cédric Bosdonnat <cbosdonnat(a)suse.com> + +=head1 COPYRIGHT + +Copyright (C) 2011-2018 Red Hat, Inc. + +=head1 LICENSE + +virt-sandbox is distributed under the terms of the GNU LGPL v2+. +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE diff --git a/man/virt-sandbox-image-prepare.pod b/man/virt-sandbox-image-prepare.pod new file mode 100644 index 0000000..8025c40 --- /dev/null +++ b/man/virt-sandbox-image-prepare.pod @@ -0,0 +1,100 @@ +=encoding utf8 + +=head1 NAME + +virt-sandbox-image prepare - Download and cache an image template + +=head1 SYNOPSIS + + virt-sandbox-image prepare [-h] [-c CONNECT] [-t TEMPLATE_DIR] template + +=head1 DESCRIPTION + +B<virt-sandbox-image> is used to manage and execute application container +images in secure sandboxes. These applications will be launched via l +ibvirt and run within a virtualization technology such as LinuX Containers +(LXC), or QEMU/KVM. The containers / virtual machines will be secured by +SELinux and resource separated using cgroups. + +The B<prepare> command is used to proactively download and cache an image +template. This ensures that when the B<run> command is used later, it will +be able to launch the sandbox immediately. Use of this command is optional, + since the B<run> command will automatically download image templates if +not already present in the cache. + +The cache will contain both the downloaded image in its original native +format, and the same content extracted into qcow2 images formatted with +an ext4 filesystem. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +Display help message + +=item B<-c URI>, B<--connect URI> + +The connection URI for the hypervisor. The following URIs are currently +supported + + - lxc:/// (if running as root) + - qemu:///system (if running as root) + - qemu:///session (if running as non-root) + +It is not permitted to use non-local URIs (ie URIs with a hostname) +at this time. + +=item B<-t TEMPLATE_DIR> + +Override the default template directory which is usually +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates>. + +=item B<template> + +The URI identifying the template to download and prepare. + +=back + +=head1 EXAMPLE + +Download and prepare a Docker Ubuntu 15.04 template for use with KVM + + # virt-sandbox-image prepare -c qemu:///session docker:///ubuntu?tag=15.04 + +Download and prepare a virt-builder Fedora 24 template for use with LXC + + # virt-sandbox-image prepare -c lxc:/// virt-builder:///fedora-24 + +=head1 SEE ALSO + +C<virt-sandbox(1)>, +C<virt-sandbox-image(1)>, C<virt-sandbox-image-run(1)>, +C<virt-sandbox-image-purge(1)>, C<virt-sandbox-image-list(1)> + +=head1 FILES + +Pristine downloaded templates will be stored in subdirectories of +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates> +(non-root) by default. + +Overlay images created when running an instance of the template will +be stored in C</var/lib/libvirt/images> (root) or C<$HOME/.local/share/libvirt/images> +(non-root) by default. + +=head1 AUTHORS + +Daniel P. Berrangé <dan(a)berrange.com>, Eren Yagdiran <erenyagdiran(a)gmail.com> +and Cédric Bosdonnat <cbosdonnat(a)suse.com> + +=head1 COPYRIGHT + +Copyright (C) 2011-2018 Red Hat, Inc. + +=head1 LICENSE + +virt-sandbox is distributed under the terms of the GNU LGPL v2+. +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE diff --git a/man/virt-sandbox-image-purge.pod b/man/virt-sandbox-image-purge.pod new file mode 100644 index 0000000..57f0a91 --- /dev/null +++ b/man/virt-sandbox-image-purge.pod @@ -0,0 +1,96 @@ +=encoding utf8 + +=head1 NAME + +virt-sandbox-image purge - Delete a cached image template + +=head1 SYNOPSIS + + virt-sandbox-image create [-h] [-c CONNECT] [-t TEMPLATE_DIR] template + +=head1 DESCRIPTION + +B<virt-sandbox-image> is used to launch sandboxes from a pre-built container +image template. It is able to download image templates in a number of +formats from online image registries, including those built for Docker +and virt-builder. The images can be run with either QEMU (KVM) or LXC +virtualization drivers. + +The B<purge> command can be used to delete previously cached image templates. +Templates are added to the cache by the B<prepare> and B<run> commands, and +so if a template is no longer required, the space it used should be freed. +Some image distribution formats allow sharing of content between templates. +If there are multiple locally cached images sharing content, the shared +pieces will only be deleted when the last image template is removed. + +It is the callers responsibility to ensure that the templates being deleted +are no longer required by any currently running sandboxes. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +Display help message + +=item B<-c URI>, B<--connect URI> + +The connection URI for the hypervisor. The following URIs are currently +supported + + - lxc:/// (if running as root) + - qemu:///system (if running as root) + - qemu:///session (if running as non-root) + +It is not permitted to use non-local URIs (ie URIs with a hostname) +at this time. + +=item B<-t TEMPLATE_DIR> + +Override the default template directory which is usually +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates>. + +=item B<template> + +The URI identifying the template to download and prepare. + +=back + +=head1 EXAMPLE + +To delete a Docker Ubuntu 15.04 template from the cache + + # virt-sandbox-image purge -c qemu:///session docker:///ubuntu?tag=15.04 + +=head1 SEE ALSO + +C<virt-sandbox(1)>, +C<virt-sandbox-image(1)>, C<virt-sandbox-image-prepare(1)>, +C<virt-sandbox-image-run(1)>, C<virt-sandbox-image-list(1)> + +=head1 FILES + +Pristine downloaded templates will be stored in subdirectories of +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates> +(non-root) by default. + +Overlay images created when running an instance of the template will +be stored in C</var/lib/libvirt/images> (root) or C<$HOME/.local/share/libvirt/images> +(non-root) by default. + +=head1 AUTHORS + +Daniel P. Berrangé <dan(a)berrange.com>, Eren Yagdiran <erenyagdiran(a)gmail.com> +and Cédric Bosdonnat <cbosdonnat(a)suse.com> + +=head1 COPYRIGHT + +Copyright (C) 2011-2018 Red Hat, Inc. + +=head1 LICENSE + +virt-sandbox is distributed under the terms of the GNU LGPL v2+. +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE diff --git a/man/virt-sandbox-image-run.pod b/man/virt-sandbox-image-run.pod new file mode 100644 index 0000000..d14e108 --- /dev/null +++ b/man/virt-sandbox-image-run.pod @@ -0,0 +1,165 @@ +=encoding utf8 + +=head1 NAME + +virt-sandbox-image run - Launch a sandbox from an image template + +=head1 SYNOPSIS + + virt-sandbox-image run [-h] [-n NAME] [-c CONNECT] [-t TEMPLATE_DIR] + [-I IMAGE_DIR] [-N NETWORK] [-e ENV] + TEMPLATE [--] [COMMAND [ARGS...]] + +=head1 DESCRIPTION + +B<virt-sandbox-image> is used to manage and execute application container +images in secure sandboxes. These applications will be launched via l +ibvirt and run within a virtualization technology such as LinuX Containers +(LXC), or QEMU/KVM. The containers / virtual machines will be secured by +SELinux and resource separated using cgroups. + +The B<run> command will launch a sandbox populated with content from the +image name B<TEMPLATE>. + +If B<COMMAND> is provided it determines the binary to run inside the sandbox. +If omitted, then the default binary for that image is run. Not all images +provide a default binary to run, and thus will launch to launch if no B<COMMAND> +is given. It is recommended to insert B<--> before B<COMMAND> to ensure that +any arguments for B<COMMAND> are not mistakenly interpreted as arguments for +B<virt-sandbox-image> + +If the requested B<TEMPLATE> is not already present on the local system, it +will be automatically downloaded and cached, which may delay startup of the +sandbox. To avoid these delays the cache can be populated using the B<prepare> +command ahead of time, while unwanted cached content can be deleted using the +B<purge> command. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +Display help message + +=item B<-c URI>, B<--run URI> + +The connection URI for the hypervisor (lxc:///, qemu:///system or +qemu:///session only). + +=item B<-n NAME>, B<--name=NAME> + +Set the unique name for the sandbox. This defaults to the base +name of the template image used, with a random identifier appended. +This is used as the name of the libvirt virtual machine or container. + +=item B<-t TEMPLATE_DIR>, B<--template-dir TEMPLATE_DIR> + +Override the default location of the directory holding the image +templates. + +=item B<-I IMAGE_DIR>, B<--image-dir IMAGE_DIR> + +Override the default location of the directory holding the instantiated +images. + +=item B<-N NETWORK>, B<--network NETWORK> + +Add a network interface to the sandbox. NETWORK-OPTIONS is a set of +key=val pairs, separated by commas. The following options are valid + +=over 4 + +=item dhcp + +Configure the network interface using dhcp. This key takes no value. +No other keys may be specified. eg + + -N dhcp,source=default + --network dhcp,source=lan + +where 'source' is the name of any libvirt virtual network. + +=item source=NETWORK + +Set the name of the network to connect the interface to. C<NETWORK> +is the name of any libvirt virtual network. See also B<virsh net-list> + +=item mac=NN:NN:NN:NN:NN:NN + +Set the MAC address of the network interface, where each NN is a pair +of hex digits. + +=item address=IP-ADDRESS/PREFIX%BROADCAST + +Configure the network interface with the static IPv4 or IPv6 address +B<IP-ADDRESS>. The B<PREFIX> value is the length of the network +prefix in B<IP-ADDRESS>. The optional B<BROADCAST> parameter +specifies the broadcast address. Some examples + + address=192.168.122.1/24 + address=192.168.122.1/24%192.168.122.255 + address=2001:212::204:2/64 + +=item route=IP-NETWORK/PREFIX%GATEWAY + +Configure the network interface with the static IPv4 or IPv6 route +B<IP-NETWORK>. The B<PREFIX> value is the length of the network +prefix in B<IP-NETWORK>. The B<GATEWAY> parameter specifies the +address of the gateway for the route. Some examples + + route=192.168.122.255/24%192.168.1.1 + +=back + +Can be repeated multiple times to provide multiple virtual interfaces. + +=item B<-e KEY=VAL>, B<--env KEY=VAL> + +Set the environment variable B<KEY> to the value B<VAL> when running +the initial application defined by the image. + +=back + +=head1 EXAMPLE + +Run the Ubuntu image, launching the default binary designated by the +image. + + # virt-sandbox-image run docker:///ubuntu + +Run the Fedora image, launching the '/bin/ls' binary + + # virt-sandbox-image run docker:///fedora -- /bin/ls -l / + +=head1 SEE ALSO + +C<virt-sandbox(1)>, +C<virt-sandbox-image(1)>, C<virt-sandbox-image-prepare(1)>, +C<virt-sandbox-image-purge(1)>, C<virt-sandbox-image-list(1)> + +=head1 FILES + +Pristine downloaded templates will be stored in subdirectories of +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates> +(non-root) by default. + +Overlay images created when running an instance of the template will +be stored in C</var/lib/libvirt/images> (root) or C<$HOME/.local/share/libvirt/images> +(non-root) by default. + +=head1 AUTHORS + +Daniel P. Berrangé <dan(a)berrange.com>, Eren Yagdiran <erenyagdiran(a)gmail.com> +and Cédric Bosdonnat <cbosdonnat(a)suse.com> + +=head1 COPYRIGHT + +Copyright (C) 2011-2018 Red Hat, Inc. + +=head1 LICENSE + +virt-sandbox is distributed under the terms of the GNU LGPL v2+. +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE diff --git a/man/virt-sandbox-image.pod b/man/virt-sandbox-image.pod new file mode 100644 index 0000000..9700c70 --- /dev/null +++ b/man/virt-sandbox-image.pod @@ -0,0 +1,136 @@ +=encoding utf8 + +=head1 NAME + +virt-sandbox-image - Sandbox container image tool + +=head1 SYNOPSIS + + virt-sandbox-image COMMAND [ARGS...] + +Valid B<COMMAND> values are: + + prepare Download and cache an image template + + run Launch a sandbox from an image template + + delete Delete a cached image template + + list List cached image templates + +=head1 DESCRIPTION + +B<virt-sandbox-image> is used to launch sandboxes from pre-built container +image templates. It is able to download image templates in a number of +formats from online image registries, including those built for Docker +and virt-builder. The images can be run with either QEMU (KVM) or LXC +virtualization drivers. + +Refer to the command specific manual pages for information about usage +of each command. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +Display help message + +=item B<-c URI>, B<--connect URI> + +The connection URI for the hypervisor. The following URIs are currently +supported + + - lxc:/// (if running as root) + - qemu:///system (if running as root) + - qemu:///session (if running as non-root) + +It is not permitted to use other virtualization drivers or non-local +URIs (ie URIs with a hostname) at this time. + +=back + +=head1 TEMPLATE URIs + +virt-sandbox-image is intended to be extensible to consume any commonly +distributed container image format. To enable different image format +to be reliably located, a URI syntax is used to identify templates +with the general syntax + + B<format+protocol://server:port/template-name?parameters> + +Refer to the text that follows for detailed information on URI +syntax for each different template format. + +=head1 DOCKER TEMPLATE URIs + +When refering to docker templates it is possible to leave out the +protocol, server port, and parameters, to just give the template +name on its own. For example + +B<docker:///ubuntu> + +Will refer to the latest Ubuntu image available on the default +Docker image registry. + +If an alternative Ubuntu image is desired, it can be requested by +setting the tag parameter. For example to get Ubuntu 15.04 + +B<docker:///ubuntu?tag=15.04> + +Support for downloading from alternative docker registries is +possible by specifying the protocol, server and (optionally) +port. For example, the bare B<docker:///ubuntu> URL above, +when fully specified would look like: + +B<docker+https://index.docker.io:443/ubuntu?tag=latest> + +The driver for Docker images does not currently support the full +range of configuration options that are possible in docker image +metadata. It will, however, honour all command line arguments +and environment variables specified. + +=head1 VIRT BUILDER TEMPLATE URIs + +When refering to virt-builder templates the protocol, server and +port should not currently be used. Only the template name should +be given in the URI. For example + +B<virt-builder:///fedora-20> + +The virt-builder template format does not provide any metadata +about default commands to run, so the user must fully specify +what they wish to launch when running these images. + +=head1 SEE ALSO + +C<virt-sandbox(1)>, +C<virt-sandbox-image-prepare(1)>, C<virt-sandbox-image-run(1)>, +C<virt-sandbox-image-purge(1)>, C<virt-sandbox-image-list(1)> + +=head1 FILES + +Pristine downloaded templates will be stored in subdirectories of +C</var/lib/libvirt/templates> (root) or C<$HOME/.local/share/libvirt/templates> +(non-root) by default. + +Overlay images created when running an instance of the template will +be stored in C</var/lib/libvirt/images> (root) or C<$HOME/.local/share/libvirt/images> +(non-root) by default. + +=head1 AUTHORS + +Daniel P. Berrangé <dan(a)berrange.com>, Eren Yagdiran <erenyagdiran(a)gmail.com> +and Cédric Bosdonnat <cbosdonnat(a)suse.com> + +=head1 COPYRIGHT + +Copyright (C) 2011-2018 Red Hat, Inc. + +=head1 LICENSE + +virt-sandbox is distributed under the terms of the GNU LGPL v2+. +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE diff --git a/setup.py b/setup.py index c23c84d..ddd9302 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ from setuptools import Command from distutils.command.build import build from distutils.util import get_platform +import glob import sys import os import re @@ -38,6 +39,26 @@ class my_build(build): f1.close() f2.close() + def gen_man_pages(self): + for path in glob.glob("man/*.pod"): + base = os.path.basename(path) + appname = os.path.splitext(base)[0] + newpath = os.path.join(os.path.dirname(path), + appname + ".1") + + print("Generating %s" % newpath) + ret = os.system('pod2man ' + '--center "Virtualization Support" ' + '--release %s --name %s ' + '< %s > %s' % (self.distribution.get_version(), + appname.upper(), + path, newpath)) + if ret != 0: + raise RuntimeError("Generating '%s' failed." % newpath) + + if os.system("grep -IRq 'Hey!' man/") == 0: + raise RuntimeError("man pages have errors in them! " + "(grep for 'Hey!')") def gen_changelog(self): f1 = os.popen("git log '--pretty=format:%H:%ct %an <%ae>%n%n%s%n%b%n'") @@ -66,7 +87,7 @@ class my_build(build): self.gen_rpm_spec() self.gen_authors() self.gen_changelog() - + self.gen_man_pages() build.run(self) except: @@ -76,6 +97,7 @@ class my_build(build): for f in files: if os.path.exists(f): os.unlink(f) + raise else: build.run(self) @@ -98,6 +120,15 @@ setup( "libvirt_sandbox_image", "libvirt_sandbox_image/sources" ], + data_files=[ + ("share/man/man1", [ + "man/virt-sandbox-image.1", + "man/virt-sandbox-image-prepare.1", + "man/virt-sandbox-image-run.1", + "man/virt-sandbox-image-list.1", + "man/virt-sandbox-image-purge.1", + ]), + ], install_requires=[], cmdclass = { 'build': my_build, -- 2.14.3

2 1

[libvirt] [PATCH sandbox 0/1] split libvirt-sandbox project
by Daniel P. Berrangé 19 Apr '18

19 Apr '18

I've been preparing todo a long overdue release of the libvirt-sandbox project. First of all I've already killed the virt-sandbox-service tool, since that is essentially a failed concept. It had bitrotted such that it didn't even work on a simple "httpd" systemd unit, let alone anything complex. Docker and/or systemd do this better themselves. I'm then also not entirely comfortable with having the virt-sandbox-image tool as a core part of the libvirt-sandbox repo. It is written entirely in python, and there is a simple one-way dependancy from virt-sandbox-image onto libvirt-sandbox, so there's no compelling reason to force them into the same repo. Separating them will let us release them at independant times. It will also let us use native python tools for build instead of automake which is never a very nice fit for python. The new repository is created using git filter-branch, so it has preserved all git history for the virt-sandbox-image source still. Daniel P. Berrangé (1): Delete virt-sandbox-image tool now in separate repo autobuild.sh | 3 +- bin/virt-sandbox-image | 8 - configure.ac | 4 - libvirt-sandbox.spec.in | 9 - libvirt-sandbox/image/Makefile.am | 10 - libvirt-sandbox/image/__init__.py | 0 libvirt-sandbox/image/cli.py | 282 ----------- libvirt-sandbox/image/sources/Makefile.am | 10 - libvirt-sandbox/image/sources/__init__.py | 0 libvirt-sandbox/image/sources/base.py | 160 ------- libvirt-sandbox/image/sources/docker.py | 690 --------------------------- libvirt-sandbox/image/sources/virtbuilder.py | 109 ----- libvirt-sandbox/image/template.py | 133 ------ m4/virt-win32.m4 | 5 - 14 files changed, 1 insertion(+), 1422 deletions(-) delete mode 100755 bin/virt-sandbox-image delete mode 100644 libvirt-sandbox/image/Makefile.am delete mode 100644 libvirt-sandbox/image/__init__.py delete mode 100644 libvirt-sandbox/image/cli.py delete mode 100644 libvirt-sandbox/image/sources/Makefile.am delete mode 100644 libvirt-sandbox/image/sources/__init__.py delete mode 100644 libvirt-sandbox/image/sources/base.py delete mode 100755 libvirt-sandbox/image/sources/docker.py delete mode 100755 libvirt-sandbox/image/sources/virtbuilder.py delete mode 100644 libvirt-sandbox/image/template.py -- 2.14.3

2 2

[libvirt] [not libvirt PATCH] rcc - resolve capabilities conflicts
by Ján Tomko 19 Apr '18

19 Apr '18

my tool for naively resolving qemu capabilities conflicts after a rebase, that used to contain my latest syntax-check addition --- rcc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100755 rcc diff --git a/rcc b/rcc new file mode 100755 index 0000000..e0fdf41 --- /dev/null +++ b/rcc @@ -0,0 +1,62 @@ +#!/usr/bin/env perl +# Automatically resolve QEMU capability conflicts +# +# Joins both parts of the conflicting hunk in +# qemu_capabilities.[ch] and qemucapabilitiesdata XML +# +# Also rewraps the groups in qemu_capabilities.c if needed +# and stages all the affected files. +# +# Author: Ján Tomko <jtomko(a)redhat.com> + +use warnings; +use v5.10; + +use Git; + +sub union_merge { + my $filename = shift; + + open FILE, '<', $filename or die "cannot open $file: $!"; + my @original = <FILE>; + close FILE; + + my @fixed; + foreach (@original) { + if (/^<<<<</) { + next; + } elsif (/^=====/) { + next; + } elsif (/^>>>>>/) { + next; + } + + push @fixed, $_; + } + + open FILE, '>', $filename or die "cannot open $file: $!"; + foreach my $line (@fixed) { + print FILE $line; + } + close FILE; +} + +my $repo = Git->repository(Directory => '.'); +my ($status_fh, $ctx) = $repo->command_output_pipe('status', '--porcelain'); + +while (<$status_fh>) { + my ($flag, $filename) = split; + if ($flag eq 'UU') { + if ($filename =~ '^src/qemu/qemu_capabilities.[ch]$' or + $filename =~ '^tests/qemucapabilitiesdata/caps.*xml') { + say "Trying to fix $filename"; + &union_merge($filename); + $repo->command('add', $filename); + } + } +} +$repo->command_close_pipe($status_fh, $ctx); +system('tests/group-qemu-caps.pl'); +$repo->command('add', 'src/qemu/qemu_capabilities.c'); +$repo->command('add', 'src/qemu/qemu_capabilities.h'); +$repo->command('rebase', '--continue'); -- 2.13.6

2 2

[libvirt] [PATCHv2 0/3] query-cpu-model-baseline QMP command
by Chris Venteicher 19 Apr '18

19 Apr '18

Implementation of libvirt functions to support the QEMU query-cpu-model-baseline QMP command. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 Signed-off-by: Chris Venteicher <cventeic(a)redhat.com> diff to v1: - Replaced c++ style comments with c style - qemuMonitorJSONGetCPUModelInfo{ToJSON,FromJSON} use To/From form - qemuMonitorJSONGetCPUModelInfo{ToJSON,FromJSON} return pointers not integers - VIR_STEAL_PTR form used - switch statement uses virReportEnumRangeError - qemuMonitorJSONHasError(reply, "GenericError") treated as no info, not fatal error - virJSONValueFree(cpu_props) during error case Chris Venteicher (3): qemu_monitor_json: Populate CPUModelInfo struct from json qemu_monitor_json: Build Json CPU Model Info qemu_monitor: query-cpu-model-baseline QMP command src/qemu/qemu_monitor.c | 13 ++++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 175 +++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_monitor_json.h | 7 ++ 4 files changed, 178 insertions(+), 22 deletions(-) -- 2.14.1

1 3

[libvirt] [PATCH v4 00/14] Basic implementation of persistent reservations
by Michal Privoznik 18 Apr '18

18 Apr '18

v4 of: https://www.redhat.com/archives/libvir-list/2018-March/msg00745.html diff to v3: - Peter's review worked in Michal Privoznik (14): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu: Generate alias and socket path for pr-helper qemu: Store pr runtime data in status XML qemu_ns: Allow /dev/mapper/control for PR qemu_cgroup: Allow /dev/mapper/control for PR qemu: Generate cmd line at startup qemu: Introduce pr_helper to qemu.conf qemu: Start PR daemon on domain startup qemu: Start PR daemon on disk hotplug qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations qemu: Detect pr-manager-helper capability docs/formatdomain.html.in | 25 ++- docs/schemas/domaincommon.rng | 34 +--- docs/schemas/storagecommon.rng | 50 +++++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 38 ++++ src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_alias.c | 11 + src/qemu/qemu_alias.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 33 ++- src/qemu/qemu_command.c | 94 +++++++++ src/qemu/qemu_command.h | 3 + src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 173 +++++++++++++++- src/qemu/qemu_domain.h | 10 + src/qemu/qemu_hotplug.c | 130 ++++++++++++ src/qemu/qemu_process.c | 224 +++++++++++++++++++++ src/qemu/qemu_process.h | 5 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virdevmapper.c | 8 +- src/util/virstoragefile.c | 164 +++++++++++++++ src/util/virstoragefile.h | 18 ++ 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 + .../disk-virtio-scsi-reservations.args | 35 ++++ .../disk-virtio-scsi-reservations.xml | 49 +++++ tests/qemuxml2argvtest.c | 4 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 2 + 36 files changed, 1107 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.16.1

2 51

[libvirt] [PATCH 0/5] qemu: fix domain object wait to handle monitor errors
by Nikolay Shirokovskiy 18 Apr '18

18 Apr '18

Main patch is 4th, others are misc. Nikolay Shirokovskiy (5): qemu: erase synchronous block job cancel mentions in comments qemu: monitor: set error flag even in OOM conditions utils: export virCopyError qemu: fix domain object wait to handle monitor errors qemu: fix races in beingDestroyed usage src/conf/domain_conf.c | 43 --------------------------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 3 +-- src/qemu/qemu_domain.c | 45 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 +++++-- src/qemu/qemu_driver.c | 27 +++++++++++++++---------- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_migration.c | 12 +++++------ src/qemu/qemu_monitor.c | 5 +++++ src/qemu/qemu_process.c | 51 +++++++++++++++++++++++++++++++---------------- src/util/virerror.c | 12 ++++++++--- src/util/virerror.h | 1 + 12 files changed, 124 insertions(+), 89 deletions(-) -- 1.8.3.1

1 6

[libvirt] [dbus PATCH 0/3] Last methods for Network Interface
by Katerina Koukiou 18 Apr '18

18 Apr '18

Katerina Koukiou (3): Fix virtDBusUtilEnumFromString g_str_equal use Implement GetDHCPLeases method for Network Interface Implement Update method for Network Interface data/org.libvirt.Network.xml | 17 ++++++ src/network.c | 125 +++++++++++++++++++++++++++++++++++++++++++ src/util.c | 2 +- tests/test_network.py | 17 ++++++ 4 files changed, 160 insertions(+), 1 deletion(-) -- 2.15.0

2 6

[libvirt] [PATCH v1 0/4] CPU Model Comparsion via QEMU
by Collin Walling 18 Apr '18

18 Apr '18

[Overview] This patch series implements an interface to "query-cpu-model-comparison" (available QEMU ~2.8.0) via virsh cpu-compare. [Using This Feature] Run virsh cpu-compare (ensure you are running the virsh in your build dir) and pass it an xml file describing a cpu definition. You can copy the cpu xml from virsh capabilities (if you want to compare the host cpu to itself), or a cpu defined in any guest xml. Additionally, you can create a cpu xml as such (e.g. for s390x): <cpu> <arch>s390x</arch> <model fallback='forbid'>model_name</model> <feature policy='require|disable' name='feature_name'/> </cpu> NOTE: the presence of <arch> is optional and it will treat the cpu defined in the xml as a host cpu. This will disregard all feature policies (i.e. all features listed will behave with policy='require', even if disable is specified). NOTE: as s390x only supports feature policies 'require' and 'disable', I am uncertain how to handle the other policies when parsing CPUDef to JSON. [Example Output] On an s390x system running a z13.2, this is the expected output (where each file describes a CPU model corresponding to the name of the file): $ virsh cpu-compare zEC12.xml Host CPU is a superset of CPU described in zEC12.xml $ virsh cpu-compare z13.2.xml CPU described in z13.2.xml is identical to host CPU $ virsh cpu-compare z14.xml CPU described in z14.xml is incompatible with host CPU $ virsh cpu-compare z14.xml --error error: Failed to compare host CPU with z14.xml error: the CPU is incompatible with host CPU $ virsh cpu-compare z12345.xml error: Failed to compare host CPU with z12345cpu.xml error: internal error: unable to execute QEMU command 'query-cpu-model-comparison': The CPU definition 'z12345-base' is unknown. [Patch Rundown] The first patch copies the host CPU definition from qemuCaps to virCaps so we can easily access the host CPU model and features when we handle the CPU comparison in qemu_driver. Note that we take care to not clobber anything already stored in the host CPU definition until we have successfully constructed a new host CPU definition. The second patch refactors the xml -> CPUDef code. This is used in virCPUCompareXML, qemuCompareCPU (and potentially for baseline). The third patch creates the interface from libvirt to QEMU and handles parsing the CPUDef -> JSON and JSON -> CPUModelInfo. In order to respect the data returned from this command, we capture the "responsible_properties" field from the comparison command even though it is not entirely necessary for what we are trying to accomplish here (which is to simply report if the comparison result is "incompatible", "superset", or "identical"). The fourth patch creates the interface from virsh cpu-compare to the qemu driver. The qemu driver will handle parsing the xml passed to the virsh command and parsing the result of the QMP command. Note that the "incompatible" and "subset" results are grouped together (and report "incompatible"). TODO: - implement cpu-baseline (I've noted Chris Venteicher's current progress on this): https://www.redhat.com/archives/libvir-list/2018-April/msg01274.html - update qemucapabilitiestest files for qemu >= 2.8.0 (need to add comparison command) - consider adding a new test file for comparing cpu models via QEMU if necessary Collin Walling (4): qemu: place qemuCaps host cpu model in virCaps cpu_conf: xml to cpu definition parse helper qemu: implement query-cpu-model-comparison via qemu qemu: hook up cpu-comparison to qemu driver src/conf/cpu_conf.c | 30 ++++++++++ src/conf/cpu_conf.h | 6 ++ src/cpu/cpu.c | 14 +---- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 108 +++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 9 +++ src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 14 +++++ src/qemu/qemu_monitor.h | 6 ++ src/qemu/qemu_monitor_json.c | 128 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++ 11 files changed, 404 insertions(+), 14 deletions(-) -- 2.7.4

3 9

[libvirt] [PATCH] vz: build fix
by Nikolay Shirokovskiy 18 Apr '18

18 Apr '18

Broken by [1] commit - trailing comma instead of semicolon. Fortunately the issue did not get sneak in released 4.2 version. Note that uriSchemes for parallelsConnectDriver should not be allocated on stack. [1] 8e4f9a27: "driver: declare supported URI schemes in virConnectDriver struct" --- src/vz/vz_driver.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 4c30ee1..a9ee773 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4163,7 +4163,11 @@ static virStateDriver vzStateDriver = { /* Parallels domain type backward compatibility*/ static virHypervisorDriver parallelsHypervisorDriver; -static virConnectDriver parallelsConnectDriver; +static virConnectDriver parallelsConnectDriver = { + .localOnly = true, + .uriSchemes = (const char *[]){ "parallels", NULL }, + .hypervisorDriver = &parallelsHypervisorDriver, +}; /** * vzRegister: @@ -4186,9 +4190,6 @@ vzRegister(void) /* Backward compatibility with Parallels domain type */ parallelsHypervisorDriver = vzHypervisorDriver; parallelsHypervisorDriver.name = "Parallels"; - parallelsConnectDriver = vzConnectDriver; - parallelsConnectDriver.hypervisorDriver = &parallelsHypervisorDriver; - parallelsConnectDriver.uriSchemes = (const char *[]){ "parallels", NULL }, if (virRegisterConnectDriver(&parallelsConnectDriver, true) < 0) return -1; -- 1.8.3.1

2 2

[libvirt] [dbus PATCH 00/25] Introduce more Domain* APIs
by Katerina Koukiou 18 Apr '18

18 Apr '18

Katerina Koukiou (25): Implement GetControlInfo method for Domain Interface Implement SendKey method for Domain Interface Implement InjectNMI method for Domain Interface Implement BlockPeek metohd for Domain Interface Implement MemoryPeek method for Domain Interface Add AddIOThread method for Domain Interface Implement BlockCommit method for Domain Interface Implement BlockJobAbort method for Domain Interface Implement BlockPull method for Domain Interface Implement BlockRebase method for Domain Interface Implement BlockResize method for Domain Interface Implement CoreDumpWithFormat method for Domain Interface Implement DelIOThread method for Domain Interface Implement FSFreeze method for Domain Interface Implement FSThaw method for Domain Interface Implement FSTrim method for Domain Interface Implement MigrateStartPostCopy method for Domain Interface Implement PinEmulator method for Domain Interface Implement PinIOThread method for Domain Interface Implement Rename method for Domain Interface Implement DomainRestore method for Connect Interface Implement Save method for Domain Interface Implement DomainSaveImageDefineXML method for Connect Interface Implement SendProcessSignal method for Domain Interface Implement UpdateDevice method for Domain Interface data/org.libvirt.Connect.xml | 14 + data/org.libvirt.Domain.xml | 157 ++++++++++ src/connect.c | 52 ++++ src/domain.c | 723 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 946 insertions(+) -- 2.15.0

4 59

[libvirt] [dbus PATCH] connect: remove unused domain variables
by Ján Tomko 18 Apr '18

18 Apr '18

Neither virDomainRestoreFlags nor virDomainSaveImageDefineXML take a virDomain argument. Remove the unused domain variables. Introduced by commits 1ce556b and 2597d41 respectively. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/connect.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/connect.c b/src/connect.c index 8faaeaf..3a563bb 100644 --- a/src/connect.c +++ b/src/connect.c @@ -357,7 +357,6 @@ virtDBusConnectDomainRestoreFlags(GVariant *inArgs, GError **error) { virtDBusConnect *connect = userData; - g_autoptr(virDomain) domain = NULL; const gchar *from; const gchar *xml; guint flags; @@ -383,7 +382,6 @@ virtDBusConnectDomainSaveImageDefineXML(GVariant *inArgs, GError **error) { virtDBusConnect *connect = userData; - g_autoptr(virDomain) domain = NULL; const gchar *file; const gchar *xml; guint flags; -- 2.16.1

2 1

[libvirt] [PATCH 0/6] Various disk-related fixes/cleanups
by Peter Krempa 18 Apr '18

18 Apr '18

noticed while doing blockdev work but didn't turn out to be relevant. Peter Krempa (6): conf: Make argument of virDomainDiskGetDriver const qemu: Move disk driver name validation into disk validation callback conf, qemu: Replace access to disk driver name with accessors conf: Punt 'driverName' back to disk definition structure conf: Disk 'shared' state is not guest ABI qemu: driver: Fix error message in qemuDomainBlockCommit src/conf/domain_conf.c | 20 ++++++++++---------- src/conf/domain_conf.h | 4 +++- src/qemu/qemu_command.c | 12 ------------ src/qemu/qemu_domain.c | 9 +++++++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 7 ------- src/qemu/qemu_parse_command.c | 2 +- src/util/virstoragefile.c | 6 ------ src/util/virstoragefile.h | 1 - 9 files changed, 24 insertions(+), 39 deletions(-) -- 2.16.2

2 17

[libvirt] [PATCH] conf: Reindent virDomainObjCheckActive
by Jiri Denemark 18 Apr '18

18 Apr '18

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ae2135263e..5f1af911b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6001,9 +6001,9 @@ int virDomainObjCheckActive(virDomainObjPtr dom) { if (!virDomainObjIsActive(dom)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - return -1; + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + return -1; } return 0; } -- 2.17.0

1 0

[libvirt] [PATCH v2 0/2] qemu: cpu: fix "full" CPU to include all "reported" CPU features
by Nikolay Shirokovskiy 18 Apr '18

18 Apr '18

diff from v1: - add test data for CPU for which issue was triggered Patch 1 adds tests for CPU on which problem was detected. However we don't test <cpu mode='host-model' check='partial'> case which have issue. Patch 2 is actual fix. Nikolay Shirokovskiy (2): cputest: New test for Intel Core i5-650 qemu: cpu: fix "full" CPU to include all "reported" CPU features src/qemu/qemu_capabilities.c | 12 +- tests/cputest.c | 1 + .../x86_64-cpuid-Core-i5-650-disabled.xml | 5 + .../x86_64-cpuid-Core-i5-650-enabled.xml | 7 + .../cputestdata/x86_64-cpuid-Core-i5-650-guest.xml | 24 + .../cputestdata/x86_64-cpuid-Core-i5-650-host.xml | 25 + .../cputestdata/x86_64-cpuid-Core-i5-650-json.xml | 12 + tests/cputestdata/x86_64-cpuid-Core-i5-650.json | 1068 ++++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Core-i5-650.xml | 30 + 9 files changed, 1181 insertions(+), 3 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650.xml -- 1.8.3.1

2 5

[libvirt] [PATCH] qemuDomainObjPrivateDataClear: Don't leak @migParams
by Michal Privoznik 18 Apr '18

18 Apr '18

Allocated in qemuMigrationParamsNew() we need to free priv->job.migParams when no longer needed. ==8061== 234 (192 direct, 42 indirect) bytes in 1 blocks are definitely lost in loss record 112 of 123 ==8061== at 0x4C2CF26: calloc (vg_replace_malloc.c:711) ==8061== by 0x5325D05: virAlloc (viralloc.c:144) ==8061== by 0x1984F9: qemuMigrationParamsNew (qemu_migration_params.c:218) ==8061== by 0x19A352: qemuMigrationParamsParse (qemu_migration_params.c:1185) ==8061== by 0x1604D8: qemuDomainObjPrivateXMLParseJob (qemu_domain.c:2390) ==8061== by 0x160AE9: qemuDomainObjPrivateXMLParse (qemu_domain.c:2517) ==8061== by 0x5419EAE: virDomainObjParseXML (domain_conf.c:20442) ==8061== by 0x541A25E: virDomainObjParseNode (domain_conf.c:20555) ==8061== by 0x541A2FC: virDomainObjParseFile (domain_conf.c:20574) ==8061== by 0x13607D: testCompareStatusXMLToXMLFiles (qemuxml2xmltest.c:75) ==8061== by 0x14F3E8: virTestRun (testutils.c:180) ==8061== by 0x14DCD0: mymain (qemuxml2xmltest.c:1200) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 672f08b442..47595e244a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1895,6 +1895,8 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv) virBitmapFree(priv->migrationCaps); priv->migrationCaps = NULL; + + qemuMigrationParamsFree(priv->job.migParams); } -- 2.16.1

2 1

[libvirt] [PATCH] news: Xen: announce support for setting CPU features
by Jim Fehlig 18 Apr '18

18 Apr '18

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index a5c489151..dec3f134c 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -44,6 +44,18 @@ add this controller when traditional PCI devices are in use. </description> </change> + <change> + <summary> + Xen: Support setting CPU features for host-passthrough model + </summary> + <description> + The CPU model presented to Xen HVM domains is equivalent to libvirt's + host-passthrough model, although individual features can be enabled + and disabled via the cpuid setting. The libvirt libxl driver now + supports enabling and disabling individual features of the + host-passthrough CPU model. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.16.3

2 1

[libvirt] [PATCH v2 0/9] Add function that raises error if domain is not active
by Clementine Hayat 18 Apr '18

18 Apr '18

This is my GSOC patch contribution. This change was suggested on BiteSizedTasks in the libvirt wiki[1]. in libvirt there is lots of occurences of this same pattern: if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto out; } This series replace these calls with a new function that check if the domain is active and log directly the error. This allows to remove almost 300 lines of code in the code base. [1] https://wiki.libvirt.org/page/BiteSizedTasks#Add_function_that_raises_error… Changes since v2: * renamed virDomainObjCheckIsActive into virDomainObjCheckActive * add the remaining occurences Clementine Hayat (9): Add function that raises error if domain is not active qemu: start using virDomainObjCheckActive test: start using virDomainObjCheckActive libxl: start using virDomainObjCheckActive bhyve: start using virDomainObjCheckActive lxc: start using virDomainObjCheckActive openvz: start using virDomainObjCheckActive uml: start using virDomainObjCheckActive vz: start using virDomainObjCheckActive src/bhyve/bhyve_driver.c | 20 +-- src/conf/domain_conf.c | 11 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 97 +++---------- src/lxc/lxc_driver.c | 60 ++------ src/openvz/openvz_driver.c | 20 +-- src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_driver.c | 271 ++++++++----------------------------- src/test/test_driver.c | 35 +---- src/uml/uml_driver.c | 5 +- src/vz/vz_driver.c | 5 +- 12 files changed, 120 insertions(+), 412 deletions(-) -- 2.17.0

2 19

[libvirt] [PATCH v3 0/5] virClassNew rework
by Michal Privoznik 18 Apr '18

18 Apr '18

2 12

[libvirt] [PATCH 0/2] Two patches to fix the build
by Michal Privoznik 18 Apr '18

18 Apr '18

After 446d09149802677 the build was broken. I've pushed these under build breaker rule. And they're trivial too. Michal Privoznik (2): virmocklibxl.c: Fix include of virfile.h tests: Compile and link virmocklibxl with libxml tests/Makefile.am | 2 +- tests/virmocklibxl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.16.1

1 2

[libvirt] [PATCH 0/7] Addressing some Coverity complaints...
by John Ferlan 18 Apr '18

18 Apr '18

My current pile is 48 patches - most of those are known false positives or have been posted before and either rejected or ignored. In any case, the following is a list of more recent adjustments from my coverity tree. Seems we've largely moved away from resource leaks and into return value checking issues. Some good, some not so good. John Ferlan (7): conf: Add error checking to virDomainSnapshotDiskDefFormat remote: Fix usage of ATTRIBUTE_FALLTHROUGH tests: Return failure if log not fopen'd tests: Don't call virNetServerClientClose without valid client tests: Add checks for possible errors qemu: Fix possible memory leak in migration param processing qemu: Check for missing 'return' in qemuMonitorJSONCheckReply src/conf/snapshot_conf.c | 16 ++++++++++------ src/qemu/qemu_migration_params.c | 1 + src/qemu/qemu_monitor_json.c | 7 ++++++- src/remote/remote_driver.c | 2 +- tests/commandhelper.c | 2 +- tests/testutilsqemuschema.c | 40 +++++++++++++++++++++++++++++----------- tests/virnetserverclienttest.c | 3 ++- 7 files changed, 50 insertions(+), 21 deletions(-) -- 2.13.6

2 14

[libvirt] [PATCH v7 0/9] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 18 Apr '18

18 Apr '18

Add support for CPUID setting based on <cpu> element. Since libxl format support only adjusting specific bits over host CPU, only mode='host-passthrough' is supported - other values are rejected (including default 'custom'). This will break some configurations working before (bare <cpu> element with for example NUMA configuration), but libxl driver never supported full 'custom' mode - it was silently ignored, which might lead to some unexpected effects. Since mode='host-passthrough' is now necessary to specify CPU options, do not enable nested HVM feature by mere presence of this element, require also enabling it in libxl.conf. Nested HVM is still in "preview" state, so better be explicit here. v2 of this patch series: https://www.redhat.com/archives/libvir-list/2017-July/msg00050.html v3 of this patch series: https://www.redhat.com/archives/libvir-list/2017-December/msg00314.html v4 of this patch series: https://www.redhat.com/archives/libvir-list/2018-February/msg00504.html v5 of this patch series: https://www.redhat.com/archives/libvir-list/2018-March/msg00796.html v6 of this patch series: https://www.redhat.com/archives/libvir-list/2018-March/msg01310.html Marek Marczykowski-Górecki (9): libxl: fix libxlDriverConfigDispose for partially constructed object libxl: pass driver config to libxlMakeDomBuildInfo libxl: warn about ignored CPU mode=custom libxl: do not enable nested HVM unless global nested_hvm option enabled xenconfig: do not override def->cpu if already set elsewhere libxl: add support for CPUID features policy tests: check CPU features handling in libxl driver xenconfig: add CPUID handling to domXML <-> xl.cfg conversion tests: add test case for CPUID in xenconfig driver src/libxl/libvirtd_libxl.aug | 2 +- src/libxl/libxl.conf | 8 +- src/libxl/libxl_conf.c | 66 +++- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_domain.c | 2 +- src/libxl/test_libvirtd_libxl.aug.in | 1 +- src/xenconfig/xen_xl.c | 236 ++++++++++++++-- src/xenconfig/xen_xl.h | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 60 ++++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 34 ++- tests/libxlxml2domconfigtest.c | 27 +- tests/virmocklibxl.c | 31 ++- tests/xlconfigdata/test-fullvirt-cpuid.cfg | 25 ++- tests/xlconfigdata/test-fullvirt-cpuid.xml | 36 ++- tests/xlconfigtest.c | 1 +- 15 files changed, 492 insertions(+), 45 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.xml base-commit: dffe584aa4194b0667924632e9e1ae12c5520956 -- git-series 0.9.1

2 15

[libvirt] [PATCH v2 0/2] Fix vmware driver for VMware Fusion 10
by Rainer Müller 17 Apr '18

17 Apr '18

These changes were required to get VMware Fusion working at all. I tested with VMware Fusion 10.1.1 on macOS 10.12 Sierra. I am not sure whether calling virCapabilitiesInitCaches() makes sense at all on macOS. This function looks highly specific to Linux as it relies on /sys/devices/system, so it should probably be wrapped with an appropriate #ifdef. I do not feel proficient enough with the libvirt internals to make this change, though. v1 was here: https://www.redhat.com/archives/libvir-list/2018-April/msg00087.html diff to v1: - Fix a possible segfault when vmrun is not found in PATH. Rainer Müller (2): vmware: Fix initialization of VMware Fusion vmware: Failures in cache info init are non-fatal src/vmware/vmware_conf.c | 7 ++++++- src/vmware/vmware_driver.c | 11 ++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) -- 2.17.0

2 3

[libvirt] [jenkins-ci PATCH v3 0/3] Mostly drop CentOS 6
by Andrea Bolognani 17 Apr '18

17 Apr '18

This applies on top of https://www.redhat.com/archives/libvir-list/2018-April/msg01526.html Changes from [v2]: * several patches have been pushed already; * define the libvirt-master-build-website job using the newly variants-enabled generic-build-job template; * add 'mingw_machines' variable along with 'all_machines' and 'rpm_machines'. Changes from [v1]: * instead of dropping CentOS 6 altogether, simply stop building pretty much all projects on it; * introduce a new job type specifically for whatever little stuff we need to ensure still works on CentOS 6; * the end result is still a nice cleanup thanks to not repeating the list of machines all over the place; moreover, the message about our support of the OS is very clear because it disappears from all but one page on the CI web interface. [v1] https://www.redhat.com/archives/libvir-list/2018-April/msg00453.html [v2] https://www.redhat.com/archives/libvir-list/2018-April/msg01051.html Andrea Bolognani (3): jobs: Introduce machine groups guests: Introduce libvirt+website project projects: Add libvirt-master-build-website job guests/host_vars/libvirt-centos-6/main.yml | 3 +++ guests/vars/projects/libvirt+website.yml | 5 ++++ jobs/defaults.yaml | 16 ++++++++++++ projects/libosinfo.yaml | 16 ++---------- projects/libvirt-cim.yaml | 6 +---- projects/libvirt-dbus.yaml | 6 +---- projects/libvirt-glib.yaml | 22 +++------------- projects/libvirt-go-xml.yaml | 10 +------ projects/libvirt-go.yaml | 10 +------ projects/libvirt-perl.yaml | 16 ++---------- projects/libvirt-python.yaml | 16 ++---------- projects/libvirt.yaml | 42 ++++++++++++++++-------------- projects/osinfo-db-tools.yaml | 16 ++---------- projects/osinfo-db.yaml | 16 ++---------- projects/virt-viewer.yaml | 22 +++------------- 15 files changed, 69 insertions(+), 153 deletions(-) create mode 100644 guests/vars/projects/libvirt+website.yml -- 2.14.3

2 5

[libvirt] [jenkins-ci PATCH 0/3] Introduce variants and use them for MinGW
by Andrea Bolognani 17 Apr '18

17 Apr '18

Andrea Bolognani (3): jobs: Introduce variants jobs: Tweak autotools-mingw-job template jobs: Drop autotools-mingw-job jobs/autotools.yaml | 94 ++++------------------------------------------ jobs/defaults.yaml | 17 +++++++++ jobs/generic.yaml | 16 ++++---- jobs/go.yaml | 8 ++-- jobs/perl-makemaker.yaml | 12 +++--- jobs/perl-modulebuild.yaml | 12 +++--- jobs/python-distutils.yaml | 12 +++--- projects/libvirt-glib.yaml | 12 +++++- projects/libvirt.yaml | 12 +++++- projects/virt-viewer.yaml | 12 +++++- 10 files changed, 88 insertions(+), 119 deletions(-) -- 2.14.3

2 6

[libvirt] [PATCH v2 0/5] virClassNew rework
by Michal Privoznik 17 Apr '18

17 Apr '18

2 9

[libvirt] [PATCH] domain: avoid slash characters to the new domain name.
by Julio Faracco 17 Apr '18

17 Apr '18

The 'domrename' command needs to check if the new domain name contains the slash character. This character is not accepted by libvirt XML definition because it is an invalid char (see Cole's commit b1fc6a7b7). This commit enhace the 'domrename' command adding this check. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1333232 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/internal.h | 9 +++++++++ src/libvirt-domain.c | 1 + 2 files changed, 10 insertions(+) diff --git a/src/internal.h b/src/internal.h index 1760e3b69..e976b1caa 100644 --- a/src/internal.h +++ b/src/internal.h @@ -484,6 +484,15 @@ goto label; \ } \ } while (0) +# define virCheckNonSlashGoto(argname, label) \ + do { \ + if (strchr(argname, '/')) { \ + virReportInvalidArg(ctl, \ + _("name %s cannot contain '/'"), \ + argname); \ + goto label; \ + } \ + } while (0) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 63d2ae23d..47bc59b11 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8536,6 +8536,7 @@ virDomainRename(virDomainPtr dom, virResetLastError(); virCheckDomainReturn(dom, -1); virCheckNonEmptyStringArgGoto(new_name, error); + virCheckNonSlashGoto(new_name, error); virCheckReadOnlyGoto(dom->conn->flags, error); if (dom->conn->driver->domainRename) { -- 2.14.1

2 2

[libvirt] [PATCHv2 0/4] qemu: enable sandbox whitelist by default
by Ján Tomko 17 Apr '18

17 Apr '18

v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01965.html https://bugzilla.redhat.com/show_bug.cgi?id=1492597 v2: * also deny resource control * split out and refactor the command line building * be explicit about denying the obsolete syscalls Ján Tomko (4): Introduce QEMU_CAPS_SECCOMP_BLACKLIST Introduce qemuBuildSeccompSandboxCommandLine Refactor qemuBuildSeccompSandboxCommandLine qemu: deny privilege elevation and spawn in seccomp src/qemu/qemu.conf | 7 ++-- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 46 +++++++++++++++++----- 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/qemuxml2argvdata/minimal-sandbox.args | 29 ++++++++++++++ tests/qemuxml2argvdata/minimal-sandbox.xml | 34 ++++++++++++++++ tests/qemuxml2argvtest.c | 11 ++++++ 12 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.args create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.xml -- 2.16.1

3 14

[libvirt] [jenkins-ci PATCH v2 0/6] Mostly drop CentOS 6
by Andrea Bolognani 17 Apr '18

17 Apr '18

Changes from [v1]: * instead of dropping CentOS 6 altogether, simply stop building pretty much all projects on it; * introduce a new job type specifically for whatever little stuff we need to ensure still works on CentOS 6; * the end result is still a nice cleanup thanks to not repeating the list of machines all over the place; moreover, the message about our support of the OS is very clear because it disappears from all but one page on the CI web interface. [v1] https://www.redhat.com/archives/libvir-list/2018-April/msg00453.html Andrea Bolognani (6): jobs: Introduce autotools-website-job guests: Introduce libvirt+website project projects: Add libvirt-master-website job projects: Stop building on CentOS 6 guests: Drop projects from CentOS 6 jobs: Introduce {all_machines} and {rpm_machines} guests/host_vars/libvirt-centos-6/main.yml | 5 +-- guests/vars/projects/libvirt+website.yml | 5 +++ jobs/autotools.yaml | 67 ++++++++++++++++++++++++++++++ jobs/defaults.yaml | 14 +++++++ projects/libosinfo.yaml | 16 +------ projects/libvirt-cim.yaml | 7 +--- projects/libvirt-glib.yaml | 16 +------ projects/libvirt-go-xml.yaml | 10 +---- projects/libvirt-go.yaml | 10 +---- projects/libvirt-perl.yaml | 17 +------- projects/libvirt-python.yaml | 18 +------- projects/libvirt.yaml | 34 +++++++-------- projects/osinfo-db-tools.yaml | 16 +------ projects/osinfo-db.yaml | 16 +------ projects/virt-viewer.yaml | 16 +------ 15 files changed, 119 insertions(+), 148 deletions(-) create mode 100644 guests/vars/projects/libvirt+website.yml -- 2.14.3

2 26

[libvirt] [PATCH v2 0/5] Enable memory-backend-file.discard-data
by Michal Privoznik 17 Apr '18

17 Apr '18

diff to v1: - Merged two patches into one (5/7 and 6/7 from the original series) - reworked last patch - 1/7 from the original series is pushed now Michal Privoznik (5): qemu_capabilities: s/ObjectProps/DeviceProps/g qemu_capabilities: Separate out device props fetching qemu_monitor: Introduce qemuMonitorGetObjectProps qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD qemu: Enable memory-backend-file.discard-data whenever possible src/qemu/qemu_capabilities.c | 267 +++++---- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 62 ++- src/qemu/qemu_monitor_json.h | 4 + .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 540 +++++++++--------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 26 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 24 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 24 +- .../caps_2.12.0.x86_64.replies | 612 +++++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 28 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 536 +++++++++--------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- 50 files changed, 1452 insertions(+), 1128 deletions(-) -- 2.16.1

4 9

[libvirt] [PATCH 0/6] qemu: Add support for 'write-cache' disk frontend argument (blockdev-add saga)
by Peter Krempa 17 Apr '18

17 Apr '18

'write-cache' is one of the booleans the 'cache' attribute of -drive translates to. Since we are getting rid of -drive this needs to be implemented in a different way. Peter Krempa (6): tests: utils: Allow parsing test capability file without virCaps tests: qemuxm2argv: Add infrastructure for testing with real qemuCaps qemu: domain: Add helper for translating disk cachemode to qemu flags qemu: caps: Add capability for 'write-cache' parameter of disk frontends qemu: Format 'write-cache' parameter for disk frontends tests: qemuxml2argv: Test formatting of 'write-cache' parameter src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 27 ++++++++ src/qemu/qemu_domain.c | 75 ++++++++++++++++++++++ src/qemu/qemu_domain.h | 6 ++ 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.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/disk-drive-write-cache.args | 45 +++++++++++++ tests/qemuxml2argvdata/disk-drive-write-cache.xml | 45 +++++++++++++ tests/qemuxml2argvtest.c | 32 +++++++++ tests/testutilsqemu.c | 21 ++++-- tests/testutilsqemu.h | 3 + 26 files changed, 270 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.args create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.xml -- 2.16.2

3 24

[libvirt] [jenkins-ci PATCH] guests: Force use of nodebug kernel on Rawhide
by Andrea Bolognani 17 Apr '18

17 Apr '18

The nodebug kernel provides much better performance than the standard Rawhide kernel, so we want to use it; however, it can sometimes lag behind a bit, which might cause it to be replaced with the regular one when performing a system update. To work around the issue, perform the update in two steps: first with all repositories enabled but excluding the kernel packages, then only the kernel packages but with all repositories except fedora-rawhide-kernel-nodebug disabled. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/base.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 616db0a..70d5abc 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -104,6 +104,24 @@ state: latest when: - package_format == 'rpm' + - not ( os_name == 'Fedora' and + os_version == 'Rawhide' ) + +- name: Update installed packages + command: dnf update --refresh --exclude 'kernel*' -y + args: + warn: no + when: + - os_name == 'Fedora' + - os_version == 'Rawhide' + +- name: Update installed packages + command: dnf update --disablerepo='*' --enablerepo=fedora-rawhide-kernel-nodebug 'kernel*' -y + args: + warn: no + when: + - os_name == 'Fedora' + - os_version == 'Rawhide' - name: Update installed packages apt: -- 2.14.3

2 1

[libvirt] [PATCH] tests: remove double space
by Ján Tomko 17 Apr '18

17 Apr '18

Commit 70255fa5 introduced a double space before the newline-escaping backslash and broke syntax check. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a trivial build-breaker fix. tests/qemuxml2argvtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 43f07efc1..509fe776e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -668,7 +668,7 @@ mymain(void) testCompareXMLToArgv, &info) < 0) \ ret = -1; \ if (virTestRun("QEMU XML-2-startup-XML " name, \ - testCompareXMLToStartupXML, &info) < 0) \ + testCompareXMLToStartupXML, &info) < 0) \ ret = -1; \ virObjectUnref(info.qemuCaps); \ virObjectUnref(info.vm); \ -- 2.16.1

3 2

[libvirt] [libvirt PATCH v2 00/4] Require QEMU 1.5.0
by Ján Tomko 17 Apr '18

17 Apr '18

v2: * Change the version from 1.3.0 to 1.5.0 * Mention this breaks RHEL 6 QEMU and list the versions in relevant long-term releases Some of the patches are very big, available in my repo: https://repo.or.cz/libvirt/jtomko.git/shortlog/refs/heads/caps_cleanup_v2 git fetch git://repo.or.cz/libvirt/jtomko.git caps_cleanup_v2: Ján Tomko (44): qemuxml2argvtest: Fix q35-virt-manager capabilities Delete bogus cpu-host-passthrough test Force QMP capability probing Require QEMU 1.5.0 The following patches are nearly identical to v1: * rebased on the 1.3.1 and 1.4.2 caps deletion * luks-disks-source-qcow2.args is fixed Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON Deprecate QEMU_CAPS_NO_USER_CONFIG Deprecate QEMU_CAPS_MEM_PATH Deprecate QEMU_CAPS_DRIVE_SERIAL Deprecate QEMU_CAPS_SDL Deprecate QEMU_CAPS_RTC Deprecate QEMU_CAPS_RTC_TD_HACK Deprecate QEMU_CAPS_VHOST_NET Deprecate QEMU_CAPS_NODEFCONFIG Deprecate QEMU_CAPS_BOOT_MENU Deprecate QEMU_CAPS_FSDEV Deprecate QEMU_CAPS_NAME_PROCESS Deprecate QEMU_CAPS_SMBIOS_TYPE Deprecate QEMU_CAPS_VGA_NONE Deprecate QEMU_CAPS_DRIVE_AIO Deprecate QEMU_CAPS_CHARDEV_SPICEVMC Deprecate QEMU_CAPS_DEVICE_SPICEVMC Deprecate QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC Deprecate QEMU_CAPS_NO_SHUTDOWN Deprecate QEMU_CAPS_DRIVE_CACHE_UNSAFE Deprecate QEMU_CAPS_FSDEV_READONLY Deprecate QEMU_CAPS_DRIVE_COPY_ON_READ Deprecate QEMU_CAPS_FSDEV_WRITEOUT Deprecate QEMU_CAPS_DRIVE_IOTUNE Deprecate QEMU_CAPS_WAKEUP Deprecate QEMU_CAPS_NETDEV_BRIDGE Deprecate QEMU_CAPS_SECCOMP_SANDBOX Deprecate QEMU_CAPS_DTB Deprecate QEMU_CAPS_IPV6_MIGRATION Deprecate QEMU_CAPS_MACHINE_OPT Deprecate QEMU_CAPS_DUMP_GUEST_CORE Deprecate QEMU_CAPS_VNC_SHARE_POLICY Deprecate QEMU_CAPS_HOST_PCI_MULTIDOMAIN Deprecate QEMU_CAPS_DISPLAY Deprecate QEMU_CAPS_MACHINE_USB_OPT cfg.mk | 2 +- src/qemu/qemu_capabilities.c | 936 +-------- src/qemu/qemu_capabilities.h | 74 +- src/qemu/qemu_capspriv.h | 17 +- src/qemu/qemu_command.c | 690 ++---- src/qemu/qemu_domain.c | 16 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 48 +- src/qemu/qemu_hotplug.c | 147 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_interface.h | 1 - src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_process.c | 23 +- tests/Makefile.am | 8 +- .../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/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 35 - tests/qemucapabilitiestest.c | 3 - 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 ---- .../aarch64-aavmf-virtio-mmio.args | 14 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 9 +- [... lots of .args files ...] tests/qemuxml2argvdata/watchdog.args | 9 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 9 +- tests/qemuxml2argvtest.c | 744 +++---- tests/qemuxml2xmltest.c | 119 +- 670 files changed, 4582 insertions(+), 14981 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 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 delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml -- 2.16.1

4 102

[libvirt] [PATCH] tests: mock qemuInterfaceOpenVhostNet
by Ján Tomko 17 Apr '18

17 Apr '18

This functions contains logic that tries to use vhost for virtio interfaces, even if <driver name='vhost'/> was not supplied. In this case, a failure is non-fatal. On my system, /dev/vhost-net was not accessible to the user running 'make check', but we should not depend on that. Mock it to prevent accessing /dev/vhost-net and return some predictable file descriptor numbers instead. Introduced by commit c1f684e - deprecate QEMU_CAPS_VHOST_NET. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Jiří Denemark <jdenemar(a)redhat.com> --- tests/qemuxml2argvdata/user-aliases.args | 2 +- tests/qemuxml2argvmock.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args index d887d53fa..774c599b5 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -51,7 +51,7 @@ id=ua-myEncryptedDisk1 \ if=none,id=drive-ua-WhatAnAwesomeCDROM,media=cdrom,readonly=on,cache=none \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ua-WhatAnAwesomeCDROM,\ id=ua-WhatAnAwesomeCDROM \ --netdev tap,fd=3,id=hostua-CheckoutThisNIC \ +-netdev tap,fd=3,id=hostua-CheckoutThisNIC,vhost=on,vhostfd=44 \ -device virtio-net-pci,netdev=hostua-CheckoutThisNIC,id=ua-CheckoutThisNIC,\ mac=52:54:00:d6:c0:0b,bus=pci.0,addr=0x3 \ -netdev socket,listen=127.0.0.1:1234,id=hostua-WeCanAlsoDoServerMode \ diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 177b24e0a..adab5c911 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -36,6 +36,7 @@ #include "virstring.h" #include "virtpm.h" #include "virutil.h" +#include "qemu/qemu_interface.h" #include <time.h> #include <unistd.h> @@ -188,3 +189,21 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, { return VIR_STRDUP(*ifname, "vhost-user0"); } + +int +qemuInterfaceOpenVhostNet(virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainNetDefPtr net, + int *vhostfd, + size_t *vhostfdSize) +{ + size_t i; + + if (!(net->model && STREQ(net->model, "virtio"))) { + *vhostfdSize = 0; + return 0; + } + + for (i = 0; i < *vhostfdSize; i++) + vhostfd[i] = STDERR_FILENO + 42 + i; + return 0; +} -- 2.16.1

2 1

[libvirt] [PATCH] tests: Don't touch /dev/vhost-net in qemuxml2argvtest
by Martin Kletzander 17 Apr '18

17 Apr '18

The code is trying to open /dev/vhost-net from the host machine and if the current user has access to it, the command line will end up having two more options for an interface (,vhost=on,vhostfd=X where X is next free file descriptor). Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/qemuxml2argvmock.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 177b24e0a953..11626e2794c1 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -20,6 +20,10 @@ #include <config.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + #include "internal.h" #include "viralloc.h" #include "vircommand.h" @@ -188,3 +192,35 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, { return VIR_STRDUP(*ifname, "vhost-user0"); } + +static int (*real_open)(const char *path, int flags, ...); + +static void init_syms(void) +{ + if (real_open) + return; + + VIR_MOCK_REAL_INIT(open); +} + +int open(const char *path, int flags, ...) +{ + va_list ap; + mode_t mode = 0; + + init_syms(); + + if (STREQ(path, "/dev/vhost-net")) + return -1; + + /* The mode argument is mandatory when O_CREAT is set in flags, + * otherwise the argument is ignored. + */ + if (flags & O_CREAT) { + va_start(ap, flags); + mode = (mode_t) va_arg(ap, int); + va_end(ap); + } + + return real_open(path, flags, mode); +} -- 2.17.0

3 4

[libvirt] [PATCH] tests: Fix up test numbering in qemuxml2argvtest
by Martin Kletzander 17 Apr '18

17 Apr '18

Due to conditional execution of virTestRun(), the testCounter was incremented only if all the cases were run. When using VIR_TEST_RANGE=x-y, first x/2 of the increments were skipped and that made figuring out a precise case a PITA. Moving the condition into the test function makes it way nicer to find out the test numbers to use in VIR_TEST_RANGE. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/qemuxml2argvtest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7f1855782442..51adaabe1cc3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -410,6 +410,9 @@ testCompareXMLToStartupXML(const void *data) char *actual = NULL; int ret = -1; + if (!info->vm) + return EXIT_AM_SKIP; + if (virAsprintf(&xml, "%s/qemuxml2startupxmloutdata/%s.xml", abs_srcdir, info->name) < 0) goto cleanup; @@ -664,8 +667,8 @@ mymain(void) if (virTestRun("QEMU XML-2-ARGV " name, \ testCompareXMLToArgv, &info) < 0) \ ret = -1; \ - if (info.vm && virTestRun("QEMU XML-2-startup-XML " name, \ - testCompareXMLToStartupXML, &info) < 0) \ + if (virTestRun("QEMU XML-2-startup-XML " name, \ + testCompareXMLToStartupXML, &info) < 0) \ ret = -1; \ virObjectUnref(info.qemuCaps); \ virObjectUnref(info.vm); \ -- 2.17.0

2 1

[libvirt] [jenkins-ci PATCH 0/4] MinGW builds tweaks and fixes
by Andrea Bolognani 17 Apr '18

17 Apr '18

Foreshadowed in https://www.redhat.com/archives/libvir-list/2018-April/msg01162.html Andrea Bolognani (4): guests: Add libvirt-glib+mingw project guests: Add virt-viewer+mingw project guests: Add icoutils dependency to virt-viewer+mingw guests: Rename gtk-vnc mapping to gtk-vnc2 guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 ++ guests/vars/mappings.yml | 6 +++++- .../{libvirt-glib.yml => libvirt-glib+mingw.yml} | 2 -- guests/vars/projects/libvirt-glib.yml | 4 ---- .../{virt-viewer.yml => virt-viewer+mingw.yml} | 7 +------ guests/vars/projects/virt-viewer.yml | 24 +--------------------- 6 files changed, 9 insertions(+), 36 deletions(-) copy guests/vars/projects/{libvirt-glib.yml => libvirt-glib+mingw.yml} (87%) copy guests/vars/projects/{virt-viewer.yml => virt-viewer+mingw.yml} (88%) -- 2.14.3

2 8

[libvirt] [PATCH] tools: fix check_guests_shutdown loop
by Christian Ehrhardt 17 Apr '18

17 Apr '18

The recent fix to libvirt-guests.sh.in works for what it intended to fix (variable scope) but failed to adapt the loop in check_guests_shutdown correctly. Due to that it currently might detect all guests as "Failed to determine state of guest" by bad var content or just assumes they are shut down by picking up an empty variable. This commit fixes loop to use the passed value and the call in the loop to actually use the variable assigned in the iterated. Fixes: 7e476356 "tools: fix variable scope in in check_guests_shutdown" Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1764668 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- tools/libvirt-guests.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index fcada31..28fe506 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -336,8 +336,8 @@ check_guests_shutdown() guests_to_check=$2 guests_shutting_down= - for guest in $guests; do - if ! guest_is_on "$uri" "$guests_to_check" >/dev/null 2>&1; then + for guest in $guests_to_check; do + if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." echo continue -- 2.7.4

2 1

[libvirt] [PATCH v2 00/73] qemu: Refactor migration parameters
by Jiri Denemark 17 Apr '18

17 Apr '18

This series changes the way we handle migration parameters and capabilities with several goals: - make it all consistent and avoid storing the same parameters in several structs - reduce the number of QMP commands we use for setting migration capabilities - concentrate the logic in a separate file and make the code for migration parameters and capabilities in qemu_migration.c less complicated - reset all parameters and capabilities at the end of migration - make adding new parameters and capabilities easier Version 2: - qemuDomainCheckMigrationCapabilities is moved to qemu_migration_params.c (rather than to qemu_migration.c) - supported migration capabilities are sent via migration cookie so that some caps may be automatically enabled only when both sides support them Jiri Denemark (73): qemu: Rename qemuMigrationAnyCapsGet as qemuMigrationCapsGet qemu: Rename qemuMigrationParams qemu: New file for all APIs related to migration parameters qemu: Move qemuDomainCheckMigrationCapabilities qemu: Move qemuMigrationCapsGet qemu: Reindent qemuMigrationParamsSetEmptyTLS qemu: Make qemuMigrationParamsFree follow common pattern qemu: Allocate struct for migration parameters qemu: Drop qemuMigrationParamsClear qemu: Move qemuMigrationCompression struct qemu: Introduce qemuMigrationParams struct qemu: Reset migration parameters in qemuMigrationSrcCleanup qemu: Store original migration params in job qemu: Typedef struct qemuDomainJobObj qemu: Pass job object to qemuProcessRecoverMigration{In,Out} qemu: Reset all migration parameters qemu: Drop qemuMigrationParamsCheckSetupTLS qemu: Drop qemuMigrationParamsCheckTLSCreds qemu: Rename qemuMigrationParamsSetEmptyTLS qemu: Rename qemuMigrationParamsAddTLSObjects qemu: Set tlsHostname inside qemuMigrationParamsEnableTLS qemu: Hide cfg inside qemuMigrationParamsEnableTLS qemu: Rename qemuMigrationParamsSet qemu: Hide internals of qemuMigrationParams struct qemu: Introduce qemuMonitorSetMigrationCapabilities qemu: Set migration caps via migration params APIs qemu: Do not use qemuMonitorSetMigrationCapability qemu: Drop unused qemuMonitorSetMigrationCapability qemu: Add support for xbzrle-cache-size migration parameter qemu: Set XBZRLE cache size via migration parameters qemu: Move ParamsCheck closer to ParamsApply on Dst side qemu: Move ParamsCheck closer to ParamsApply on Src side qemu: Check supported caps in qemuMigrationParamsCheck qemu: Introduce qemuMigrationParty enum qemu: Use qemuMigrationParamsFromFlags everywhere qemu: Hide qemuMigrationParamsNew qemu: Drop qemuMigrationParamsSetPostCopy qemu: Set always-on migration caps in ParamsCheck qemu: Set migration capabilities automatically qemu: Call qemuMigrationAnyCompressionParse only from driver qemu: Generalize macro for getting VIR_MIGRATE_* typed params qemu: Drop qemuMigrationParamsSetCapability qemu: Move qemuMigrationParamsSetCompression qemu: Move qemuMigrationAnyCompression* qemu: Hide qemuMigrationParamsSetCompression qemu: Replace qemuMigrationAnyCompressionDump qemu: Drop qemuMigrationCompression structure qemu: Introduce qemuMigrationParamsFetch qemu: Limit usage of qemuMonitorMigrationParams qemumonitorjsontest: Drop migration params test util: Introduce virJSONValueObjectStealObject qemu: Move migration parameters JSON parsing qemu: Move migration parameters JSON formatting qemu: Export qemuMigrationParams{To,From}JSON for tests qemu: Move qemuMonitorMigrationParams structure qemu: Refactor qemuMigrationParams qemu: Move migration capabilities JSON formatting qemu: Move qemuMonitorMigrationCaps enum qemu: Add support for sending capabilities in migration cookie qemu: Check remote caps when enabling always-on capabilities qemu: Generalize qemuMigrationParamsGetDowntimeLimit qemu: Set migration parameters automatically qemu: Properly reset migration params when libvirtd restarts tests: Add tests for QEMU migration parameters qemumigparamstest: Add basic test data qemumigparamstest: Add test data for TLS parameters qemu: Store API flags for async jobs in qemuDomainJobObj qemu: Properly avoid cancelling memory-only dump qemu: Drop priv->job.dump_memory_only bool qemu: Drop priv->job.postcopyEnabled bool qemu: Store API flags for async jobs in status XML qemu: Don't delete TLS objects unless TLS migration was requested qemuxml2xmltest: Add status XML tests for migration params po/POTFILES.in | 1 + src/libvirt_private.syms | 1 + src/qemu/Makefile.inc.am | 3 + src/qemu/qemu_domain.c | 110 +- src/qemu/qemu_domain.h | 25 +- src/qemu/qemu_driver.c | 175 ++- src/qemu/qemu_migration.c | 926 ++--------- src/qemu/qemu_migration.h | 66 +- src/qemu/qemu_migration_cookie.c | 136 +- src/qemu/qemu_migration_cookie.h | 15 + src/qemu/qemu_migration_params.c | 1351 +++++++++++++++++ src/qemu/qemu_migration_params.h | 156 ++ src/qemu/qemu_migration_paramspriv.h | 35 + src/qemu/qemu_monitor.c | 76 +- src/qemu/qemu_monitor.h | 56 +- src/qemu/qemu_monitor_json.c | 133 +- src/qemu/qemu_monitor_json.h | 9 +- src/qemu/qemu_process.c | 30 +- src/qemu/qemu_process.h | 3 +- src/util/virjson.c | 8 + src/util/virjson.h | 2 + tests/Makefile.am | 12 + tests/qemumigparamsdata/basic.json | 9 + tests/qemumigparamsdata/basic.reply | 12 + tests/qemumigparamsdata/basic.xml | 11 + tests/qemumigparamsdata/empty.json | 3 + tests/qemumigparamsdata/empty.reply | 5 + tests/qemumigparamsdata/empty.xml | 4 + tests/qemumigparamsdata/tls-enabled.json | 11 + tests/qemumigparamsdata/tls-enabled.reply | 14 + tests/qemumigparamsdata/tls-enabled.xml | 13 + tests/qemumigparamsdata/tls-hostname.json | 11 + tests/qemumigparamsdata/tls-hostname.reply | 14 + tests/qemumigparamsdata/tls-hostname.xml | 13 + tests/qemumigparamsdata/tls.json | 11 + tests/qemumigparamsdata/tls.reply | 14 + tests/qemumigparamsdata/tls.xml | 13 + tests/qemumigparamsdata/unsupported.json | 3 + tests/qemumigparamsdata/unsupported.reply | 7 + tests/qemumigparamsdata/unsupported.xml | 4 + tests/qemumigparamstest.c | 242 +++ tests/qemumonitorjsontest.c | 123 +- .../migration-in-params-in.xml | 400 +++++ .../migration-in-params-out.xml | 1 + .../migration-out-nbd-out.xml | 450 +++++- .../migration-out-params-in.xml | 414 +++++ .../migration-out-params-out.xml | 1 + tests/qemuxml2xmltest.c | 2 + 48 files changed, 3766 insertions(+), 1368 deletions(-) create mode 100644 src/qemu/qemu_migration_params.c create mode 100644 src/qemu/qemu_migration_params.h create mode 100644 src/qemu/qemu_migration_paramspriv.h create mode 100644 tests/qemumigparamsdata/basic.json create mode 100644 tests/qemumigparamsdata/basic.reply create mode 100644 tests/qemumigparamsdata/basic.xml create mode 100644 tests/qemumigparamsdata/empty.json create mode 100644 tests/qemumigparamsdata/empty.reply create mode 100644 tests/qemumigparamsdata/empty.xml create mode 100644 tests/qemumigparamsdata/tls-enabled.json create mode 100644 tests/qemumigparamsdata/tls-enabled.reply create mode 100644 tests/qemumigparamsdata/tls-enabled.xml create mode 100644 tests/qemumigparamsdata/tls-hostname.json create mode 100644 tests/qemumigparamsdata/tls-hostname.reply create mode 100644 tests/qemumigparamsdata/tls-hostname.xml create mode 100644 tests/qemumigparamsdata/tls.json create mode 100644 tests/qemumigparamsdata/tls.reply create mode 100644 tests/qemumigparamsdata/tls.xml create mode 100644 tests/qemumigparamsdata/unsupported.json create mode 100644 tests/qemumigparamsdata/unsupported.reply create mode 100644 tests/qemumigparamsdata/unsupported.xml create mode 100644 tests/qemumigparamstest.c create mode 100644 tests/qemustatusxml2xmldata/migration-in-params-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-in-params-out.xml mode change 120000 => 100644 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml create mode 100644 tests/qemustatusxml2xmldata/migration-out-params-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-params-out.xml -- 2.17.0

3 148

[libvirt] [PATCH v1 0/7] Enable memory-backend-file.discard-data
by Michal Privoznik 17 Apr '18

17 Apr '18

Qemu introduced this in 11ae6ed8affdd13. A small refactor is needed however. Michal Privoznik (7): qemu: Rename qemuMonitorGetObjectProps to qemuMonitorGetDeviceProps qemu_capabilities: s/ObjectProps/DeviceProps/g qemu_capabilities: Separate out device props fetching qemu_monitor: Introduce qemuMonitorGetObjectProps qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD tests: Update qemucapabilitiesdata qemu: Enable memory-backend-file.discard-data whenever possible src/qemu/qemu_capabilities.c | 269 +++++---- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 + src/qemu/qemu_monitor.c | 21 +- src/qemu/qemu_monitor.h | 5 +- src/qemu/qemu_monitor_json.c | 62 ++- src/qemu/qemu_monitor_json.h | 6 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 540 +++++++++--------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 26 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 24 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 24 +- .../caps_2.12.0.x86_64.replies | 612 +++++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 20 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 30 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 28 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 22 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 28 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 32 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 536 +++++++++--------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- 50 files changed, 1458 insertions(+), 1135 deletions(-) -- 2.16.1

2 15

[libvirt] [PATCH] docs: index.html.in: Fix a typo in "virtualization platforms" link
by Erik Skultety 17 Apr '18

17 Apr '18

This was pointing to an .html.in file rather than to the intended html document. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the trivial rule. docs/index.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html.in b/docs/index.html.in index 4783c39e3..1f9f44839 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -28,7 +28,7 @@ The libvirt project: </p> <ul> - <li>is a toolkit to manage <a href="platforms.html.in">virtualization platforms</a></li> + <li>is a toolkit to manage <a href="platforms.html">virtualization platforms</a></li> <li>is accessible from C, Python, Perl, Java and more</li> <li>is licensed under open source licenses</li> <li>supports <a href="drvqemu.html">KVM</a>, -- 2.14.3

1 0

[libvirt] [PATCH 0/9] virClassNew rework
by Michal Privoznik 17 Apr '18

17 Apr '18

4 29

[libvirt] [PATCH] virsh: Clear vsh last error during virshCommandOptVolBy
by John Ferlan 17 Apr '18

17 Apr '18

https://bugzilla.redhat.com/show_bug.cgi?id=1529256 If one of the virStorageVolLookupBy{Key|Name|Path} succeeds and we have a @vol, then clear the last libvirt error; otherwise, a subsequent "other" failure may cause vshReportError to erroneously report the wrong error as well as a reported 'vshError' error that caused the failure. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh-volume.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index bacbec0d27..9d6ebd2325 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -129,6 +129,8 @@ virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, else vshError(ctl, _("failed to get vol '%s', specifying --%s " "might help"), n, pooloptname); + } else { + vshResetLibvirtError(); } /* If the pool was specified, then make sure that the returned -- 2.13.6

2 1

[libvirt] [PATCH 0/2] Trivial fixes
by Radostin Stoyanov 16 Apr '18

16 Apr '18

Radostin Stoyanov (2): lxc: s/subtreee/subtree/ lxc: Clean up /.oldroot src/lxc/lxc_container.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.14.3

3 5

[libvirt] [PATCH] qemu_domain: Don't leak @paths in qemuDomainNamespaceSetupDisk
by Michal Privoznik 16 Apr '18

16 Apr '18

Introduced in d3db304d2e4. Instead of returning immediately we need to jump onto cleanup label where @paths is freed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7000de6a91..6e18886d07 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11199,7 +11199,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, } if (qemuDomainNamespaceMknodPaths(vm, paths, npaths) < 0) - return -1; + goto cleanup; ret = 0; cleanup: -- 2.16.1

1 0

[libvirt] [PATCH 0/3] qemu: use FD passing for monitor (and other unix sockets)
by Daniel P. Berrangé 16 Apr '18

16 Apr '18

This series makes use of the chardev fd passing arriving in QEMU 2.12 to get rid of the startup race wrt opening the QEMU monitor. The same thing benefits the agent too but I've not tackled that yet. Daniel P. Berrangé (3): qemu: probe for -chardev 'fd' parameter for FD passing qemu: support passing pre-opened UNIX socket listen FD qemu: don't retry connect() if doing FD passing src/qemu/qemu_capabilities.c | 4 ++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 58 ++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 54 ++++++++++++++++++++++++----------------- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_process.c | 27 +++++++++++++++------ tests/qemumonitortestutils.c | 1 + 7 files changed, 114 insertions(+), 32 deletions(-) -- 2.14.3

3 9

[libvirt] [PATCH 0/2] A couple of openvz fixups
by John Ferlan 16 Apr '18

16 Apr '18

Patch 1 came from "the next part" of the code when I determined that the Unref was unnecessary Patch 2 is a result of Jim Fehlig's review that openvzDomainGetHostname doesn't really need the error/cleanup logic. John Ferlan (2): openvz: Remove unnecessary Unref in openvzLoadDomains openvz: Clean up openvzDomainGetHostname src/openvz/openvz_conf.c | 1 - src/openvz/openvz_driver.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) -- 2.13.6

2 4

[libvirt] [dbus PATCH] maint: rename test directory to tests
by Pavel Hrdina 16 Apr '18

16 Apr '18

Our ci.centos.org expects the project uses 'tests' name. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- .travis.yml | 2 +- Makefile.am | 2 +- configure.ac | 2 +- {test => tests}/Makefile.am | 0 {test => tests}/conftest.py | 0 {test => tests}/libvirttest.py | 0 {test => tests}/test_connect.py | 0 {test => tests}/test_domain.py | 0 {test => tests}/test_network.py | 0 {test => tests}/travis-run | 0 10 files changed, 3 insertions(+), 3 deletions(-) rename {test => tests}/Makefile.am (100%) rename {test => tests}/conftest.py (100%) rename {test => tests}/libvirttest.py (100%) rename {test => tests}/test_connect.py (100%) rename {test => tests}/test_domain.py (100%) rename {test => tests}/test_network.py (100%) rename {test => tests}/travis-run (100%) diff --git a/.travis.yml b/.travis.yml index 71c2e9c..d60eaf2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: trusty language: c sudo: true -script: test/travis-run +script: tests/travis-run env: - ARCH=amd64 - ARCH=i386 diff --git a/Makefile.am b/Makefile.am index a890ff1..16f57b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = data src test +SUBDIRS = data src tests ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index ea2c330..6f166f2 100644 --- a/configure.ac +++ b/configure.ac @@ -75,5 +75,5 @@ AC_CONFIG_FILES([run], AC_OUTPUT(Makefile data/Makefile src/Makefile - test/Makefile + tests/Makefile libvirt-dbus.spec) diff --git a/test/Makefile.am b/tests/Makefile.am similarity index 100% rename from test/Makefile.am rename to tests/Makefile.am diff --git a/test/conftest.py b/tests/conftest.py similarity index 100% rename from test/conftest.py rename to tests/conftest.py diff --git a/test/libvirttest.py b/tests/libvirttest.py similarity index 100% rename from test/libvirttest.py rename to tests/libvirttest.py diff --git a/test/test_connect.py b/tests/test_connect.py similarity index 100% rename from test/test_connect.py rename to tests/test_connect.py diff --git a/test/test_domain.py b/tests/test_domain.py similarity index 100% rename from test/test_domain.py rename to tests/test_domain.py diff --git a/test/test_network.py b/tests/test_network.py similarity index 100% rename from test/test_network.py rename to tests/test_network.py diff --git a/test/travis-run b/tests/travis-run similarity index 100% rename from test/travis-run rename to tests/travis-run -- 2.14.3

1 1

[libvirt] [jenkins-ci PATCH] guests: Only attempt to fix intltool-update if it exists
by Andrea Bolognani 16 Apr '18

16 Apr '18

If we're running against a freshly-provisioned FreeBSD guest, intltool won't have been installed yet and attempts to fix it will fail. Make sure the file exists. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/kludges.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guests/tasks/kludges.yml b/guests/tasks/kludges.yml index 4dd06a4..0ad61a7 100644 --- a/guests/tasks/kludges.yml +++ b/guests/tasks/kludges.yml @@ -52,6 +52,13 @@ # wait for the port to be fixed, we can patch things up ourselves. # # See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227444 +- name: Look for intltool-update + stat: + path: /usr/local/bin/intltool-update + register: intltoolupdate + when: + - os_name == 'FreeBSD' + - name: Fix intltool-update replace: path: /usr/local/bin/intltool-update @@ -59,3 +66,4 @@ replace: '\1 !~ /\\$\\{?$2}?/;' when: - os_name == 'FreeBSD' + - intltoolupdate.stat.exists -- 2.14.3

2 4

[libvirt] [jenkins-ci PATCH] guests: Add icoutils dependency to virt-viewer project
by Andrea Bolognani 16 Apr '18

16 Apr '18

The icotool command is used to manipulate Windows icon files. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/virt-viewer.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index e074648..6af5065 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -173,6 +173,10 @@ mappings: hal: FreeBSD: hal + icoutils: + default: icoutils + CentOS6: + intltool: default: intltool diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer.yml index 6f3dbf9..54c96fe 100644 --- a/guests/vars/projects/virt-viewer.yml +++ b/guests/vars/projects/virt-viewer.yml @@ -3,6 +3,7 @@ packages: - glib2 - gtk-vnc - gtk3 + - icoutils - intltool - libgovirt - libxml2 -- 2.14.3

2 2

[libvirt] [jenkins-ci PATCH] guests: Set remote_user at the playbook level
by Andrea Bolognani 16 Apr '18

16 Apr '18

This is very convenient for developers using the 'test' flavor, because it ensures $ ./lcitool update all still works by logging in as root, but at the same time ad-hoc invocations such as $ ansible all -m shell -a 'cd libvirt && $MAKE -j check' and custom playbooks log in as the 'test' user instead, and as such have all the usual environment variables ($MAKE, $PYTHON, $PATH, $VIRT_PREFIX and friends) available to them, which makes testing changes locally a breeze. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/group_vars/all/main.yml | 2 -- guests/site.yml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 2bdb7b3..4e05c66 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -1,6 +1,4 @@ --- -ansible_user: root - # This password is only used to access the guest the very first time # Ansible is used: afterwards, the user's SSH key will have been installed # in the guest and SSH password authentication will have been disabled diff --git a/guests/site.yml b/guests/site.yml index 26127be..520aea7 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -1,5 +1,6 @@ --- - hosts: all + remote_user: root gather_facts: no tasks: @@ -8,6 +9,7 @@ - include: tasks/bootstrap.yml - hosts: all + remote_user: root vars_files: - vars/mappings.yml -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH v2] guests: Clean up packages after update
by Andrea Bolognani 16 Apr '18

16 Apr '18

The package cache can grow to eat up a lot of disk space, and not removing unused packages can lead to upgrade issues down the line for fast moving distributions such as Fedora Rawhide. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Changes from [v1]: * call 'yum autoremove' when possible. [v1] https://www.redhat.com/archives/libvir-list/2018-April/msg00970.html guests/tasks/base.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 53cbd65..616db0a 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -117,6 +117,34 @@ when: - package_format == 'pkg' +- name: Clean up packages after update + command: yum clean packages -y + args: + warn: no + when: + - package_format == 'rpm' + +- name: Clean up packages after update + command: yum autoremove -y + args: + warn: no + when: + - package_format == 'rpm' + - not ( os_name == 'CentOS' and + os_version == '6' ) + +- name: Clean up packages after update + apt: + autoclean: yes + autoremove: yes + when: + - package_format == 'deb' + +- name: Clean up packages after update + shell: pkg clean -y && pkg autoremove -y + when: + - package_format == 'pkg' + - name: Configure hostname hostname: name: '{{ inventory_hostname }}' -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH] guests: Introduce libvirt+mingw project
by Andrea Bolognani 16 Apr '18

16 Apr '18

Instead of cramming the dependencies that we need for a MinGW build of libvirt along with those we need for a native build, create a new project for the former. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/vars/projects/libvirt+mingw.yml | 28 ++++++++++++++++++++++++ guests/vars/projects/libvirt.yml | 24 -------------------- 3 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 guests/vars/projects/libvirt+mingw.yml diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 3f69f80..c905fb0 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -5,6 +5,7 @@ PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages projects: - libosinfo - libvirt + - libvirt+mingw - libvirt-cim - libvirt-dbus - libvirt-glib diff --git a/guests/vars/projects/libvirt+mingw.yml b/guests/vars/projects/libvirt+mingw.yml new file mode 100644 index 0000000..0dacb30 --- /dev/null +++ b/guests/vars/projects/libvirt+mingw.yml @@ -0,0 +1,28 @@ +--- +packages: + - mingw32-curl + - mingw32-dbus + - mingw32-dlfcn + - mingw32-gcc + - mingw32-gettext + - mingw32-gnutls + - mingw32-libssh2 + - mingw32-libxml2 + - mingw32-openssl + - mingw32-pkg-config + - mingw32-portablexdr + - mingw32-readline + - mingw64-curl + - mingw64-dbus + - mingw64-dlfcn + - mingw64-gcc + - mingw64-gettext + - mingw64-gnutls + - mingw64-libssh2 + - mingw64-libxml2 + - mingw64-openssl + - mingw64-pkg-config + - mingw64-portablexdr + - mingw64-readline + - rpcgen + - xsltproc diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 598dfc4..ad42fd5 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -36,30 +36,6 @@ packages: - libudev - libxml2 - lvm2 - - mingw32-curl - - mingw32-dbus - - mingw32-dlfcn - - mingw32-gcc - - mingw32-gettext - - mingw32-gnutls - - mingw32-libssh2 - - mingw32-libxml2 - - mingw32-openssl - - mingw32-pkg-config - - mingw32-portablexdr - - mingw32-readline - - mingw64-curl - - mingw64-dbus - - mingw64-dlfcn - - mingw64-gcc - - mingw64-gettext - - mingw64-gnutls - - mingw64-libssh2 - - mingw64-libxml2 - - mingw64-openssl - - mingw64-pkg-config - - mingw64-portablexdr - - mingw64-readline - netcf - numad - openwsman -- 2.14.3

2 1

[libvirt] [dbus PATCH] tests: Avoid hidding TimeoutError in main loop
by Katerina Koukiou 16 Apr '18

16 Apr '18

Currently the error was not propagated from the timeout handler properly, and we had PASSED tests even with timeouts. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- test/libvirttest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/libvirttest.py b/test/libvirttest.py index 7168e66..d1b71cc 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -60,11 +60,14 @@ class BaseTestClass(): def timeout(): self.loop.quit() del self.loop - raise TimeoutError() + self.timeout = True + self.timeout = False self.loop = GLib.MainLoop() GLib.timeout_add(2000, timeout) self.loop.run() + if self.timeout: + raise TimeoutError() def domain(self): path = self.connect.ListDomains(0)[0] -- 2.15.0

2 1

[libvirt] [PATCHv3 0/6] Use query-cpus-fast instead of query-cpus
by Viktor Mihajlovski 16 Apr '18

16 Apr '18

The QEMU monitor commmand query-cpus is deprecated starting with QEMU 2.12.0 because it can adversely affect the performance of a running virtual machine. This series enables libvirt to use the new query-cpus-fast interface if supported by the local QEMU instance and is required in order to support QEMU once the interface has been removed. query-cpus-fast doesn't return the halted state for a virtual CPU, meaning that the vcpu.<n>.halted value won't be reported with 'virsh domstats' anymore. This is OK, as stats values are not guaranteed to be reported under all circumstances and on all architectures. Upstream discussion consensus was that the halted state was problematic anyway, as it had different semantics per architecture. The only known exploitation happened for s390, for this architecture the halted state will be computed based on an architecture-specific cpu value returned in query-cpus-fast. v2 -> v3: ========= Patch changes: 1/6: - formatting changes as requested by John Ferlan - updated the qemucapabilitiestest XML files - dropped A/R-bys (due to change above) 2/6: - fixed comment to also account for query-cpus-fast 3/6: - updated json monitor tests to account for props returned by query-cpus and query-cpus-fast - updated json monitor tests to handle the halted property (moved here from patch 5) 4/6: - removed stale text (about callbacks) from commit message - simplified qemuMonitorJSONExtractCPUArchInfo call - enhanced sample JSON response in comment - fixed inter-function spacing 5/6: - kept s390-specific tests and moved the rest to patch 3 - reformatted the JSON responses (indented "props") - dropped R-b v1 -> v2: ========= Patch changes: 1/6: - add Acked-by: Peter Krempa 2/6: - evaluate capability outside of monitor code (changes signatures of qemuMonitorGetCPUInfo and qemuMonitorGetCpuHalted) - remove ternary expressions as requested by review - remove Reviewed-bys due to code changes 3/6 - adapt test cases to changes above - remove Reviewed-bys due to code changes 4/6 - replace callbacks for architecture data extraction with direct function calls - remove Reviewed-bys due to code changes Viktor Mihajlovski (6): qemu: add capability detection for query-cpus-fast qemu: use query-cpus-fast in JSON monitor tests: add qemumonitorjson tests for query-cpus-fast qemu: add architecture-specific CPU info handling tests: add testcase for s390 query-cpus-fast qemu: refresh vcpu halted state only via query-cpus-fast src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 23 +++- src/qemu/qemu_monitor.c | 30 +++-- src/qemu/qemu_monitor.h | 7 +- src/qemu/qemu_monitor_json.c | 133 +++++++++++++++++++-- src/qemu/qemu_monitor_json.h | 3 +- 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 + .../qemumonitorjson-cpuinfo-ppc64-hotplug-4.data | 8 ++ .../qemumonitorjson-cpuinfo-s390-fast-cpus.json | 25 ++++ .../qemumonitorjson-cpuinfo-s390-fast-hotplug.json | 21 ++++ .../qemumonitorjson-cpuinfo-s390-fast.data | 19 +++ ...emumonitorjson-cpuinfo-x86-basic-pluggable.data | 5 + ...qemumonitorjson-cpuinfo-x86-full-fast-cpus.json | 126 +++++++++++++++++++ ...umonitorjson-cpuinfo-x86-full-fast-hotplug.json | 115 ++++++++++++++++++ .../qemumonitorjson-cpuinfo-x86-full-fast.data | 109 +++++++++++++++++ .../qemumonitorjson-cpuinfo-x86-node-full.data | 2 + tests/qemumonitorjsontest.c | 123 +++++++++++++++---- tests/qemumonitortestutils.c | 7 ++ tests/qemumonitortestutils.h | 1 + 23 files changed, 706 insertions(+), 58 deletions(-) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-cpus.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-hotplug.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast.data -- 1.9.1

3 11

[libvirt] [PATCH] qemu: remove obsolete qemuMonitorMigrateToCommand
by Daniel P. Berrangé 15 Apr '18

15 Apr '18

The last use of qemuMonitorMigrateToCommand was removed years back in commit 2e90c9daf9eabe15d826a48c06607acb9d18fda6 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Fri Nov 6 16:50:26 2015 +0000 qemu: assume support for all migration protocols except rdma Prior to that commit, 'exec:' to used to replicate the 'unix:' protocol by spawning 'nc'. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_monitor.c | 31 ------------------------------- src/qemu/qemu_monitor.h | 4 ---- 2 files changed, 35 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7b647525b3..22f05222db 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2730,37 +2730,6 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, } -int -qemuMonitorMigrateToCommand(qemuMonitorPtr mon, - unsigned int flags, - const char * const *argv) -{ - char *argstr; - char *dest = NULL; - int ret = -1; - VIR_DEBUG("argv=%p flags=0x%x", argv, flags); - - QEMU_CHECK_MONITOR(mon); - - argstr = virArgvToString(argv); - if (!argstr) - goto cleanup; - - if (virAsprintf(&dest, "exec:%s", argstr) < 0) - goto cleanup; - - if (mon->json) - ret = qemuMonitorJSONMigrate(mon, flags, dest); - else - ret = qemuMonitorTextMigrate(mon, flags, dest); - - cleanup: - VIR_FREE(argstr); - VIR_FREE(dest); - return ret; -} - - int qemuMonitorMigrateCancel(qemuMonitorPtr mon) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d04148e568..9556a51341 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -784,10 +784,6 @@ int qemuMonitorMigrateToHost(qemuMonitorPtr mon, const char *hostname, int port); -int qemuMonitorMigrateToCommand(qemuMonitorPtr mon, - unsigned int flags, - const char * const *argv); - int qemuMonitorMigrateCancel(qemuMonitorPtr mon); int qemuMonitorGetDumpGuestMemoryCapability(qemuMonitorPtr mon, -- 2.14.3

2 1

[libvirt] [PATCH] apparmor: add rules to use qemu_bridge_helper
by Christian Ehrhardt 14 Apr '18

14 Apr '18

Due to mediation of socket and signal activity currently qemu:///session connections calling qemu_bridge_helper fail. We need the profile for libvirtd itself and the subprofile for qemu-bridge-helper to be able to talk/notify to each other via unix socket and signals. Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1754871 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/usr.sbin.libvirtd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index be4fabf..3102cab 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -65,6 +65,10 @@ signal (read, send) peer=libvirt-*, signal (send) set=("kill", "term") peer=unconfined, + # For communication/control to qemu-bridge-helper + unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd//qemu_bridge_helper), + signal (send) set=("term") peer=/usr/sbin/libvirtd//qemu_bridge_helper, + # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. / r, @@ -112,6 +116,10 @@ network inet stream, + # For communication/control from libvirtd + unix (send, receive) type=stream addr=none peer=(label=/usr/sbin/libvirtd), + signal (receive) set=("term") peer=/usr/sbin/libvirtd, + /dev/net/tun rw, /etc/qemu/** r, owner @{PROC}/*/status r, -- 2.7.4

3 3

[libvirt] [PATCH] acl: remove various left over Xen ACL whitelist entries
by Daniel P. Berrangé 13 Apr '18

13 Apr '18

The legacy xen driver is removed, so these ACLL hacks can be removed too now. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/check-aclrules.pl | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/check-aclrules.pl b/src/check-aclrules.pl index 5b6c711dc8..374abaa722 100755 --- a/src/check-aclrules.pl +++ b/src/check-aclrules.pl @@ -61,26 +61,12 @@ my %whitelist = ( "interfaceClose" => 1, ); -# Temp hack - remove it once xen driver is fixed +# XXX this vzDomainMigrateConfirm3Params looks +# bogus - determine why it doesn't have a valid +# ACL check. my %implwhitelist = ( - "xenUnifiedDomainRestore" => 1, - "xenUnifiedDomainRestoreFlags" => 1, - "xenUnifiedDomainMigratePrepare" => 1, - "xenUnifiedNodeDeviceDettach" => 1, - "xenUnifiedNodeDeviceDetachFlags" => 1, - "xenUnifiedNodeDeviceReset" => 1, - "xenUnifiedDomainIsActive" => 1, - "xenUnifiedDomainIsPersistent" => 1, - "xenUnifiedDomainIsUpdated" => 1, - "xenUnifiedDomainOpenConsole" => 1, "vzDomainMigrateConfirm3Params" => 1, ); -my %filterimplwhitelist = ( - "xenUnifiedConnectListDomains" => 1, - "xenUnifiedConnectNumOfDomains" => 1, - "xenUnifiedConnectListDefinedDomains" => 1, - "xenUnifiedConnectNumOfDefinedDomains" => 1, - ); my $lastfile; @@ -234,8 +220,7 @@ while (<>) { } if (exists $filtered{$api} && - !exists $aclfilters{$impl} && - !exists $filterimplwhitelist{$impl}) { + !exists $aclfilters{$impl}) { print "$ARGV:$. Missing ACL filter in function '$impl' for '$api'\n"; $status = 1; } -- 2.14.3

2 1

[libvirt] [PATCH 0/2] Fix vmware driver for VMware Fusion 10
by Rainer Müller 13 Apr '18

13 Apr '18

These changes were required to get VMware Fusion working at all. I tested with VMware Fusion 10.1.1 on macOS 10.12 Sierra. I am not sure whether calling virCapabilitiesInitCaches() makes sense at all on macOS. This function looks highly specific to Linux as it relies on /sys/devices/system, so it should probably be wrapped with an appropriate #ifdef. I do not feel proficient enough with the libvirt internals to make this change, though. Rainer Müller (2): vmware: Fix initialization of VMware Fusion vmware: Failures in cache info init are non-fatal src/vmware/vmware_conf.c | 7 ++++++- src/vmware/vmware_driver.c | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) -- 2.16.3

2 5

[libvirt] [PATCH jenkins-ci 0/2] Enable virt-viewer mingw build
by Daniel P. Berrangé 13 Apr '18

13 Apr '18

Daniel P. Berrangé (2): Enable mingw build for libvirt-glib project Enable mingw build for virt-viewer project guests/vars/mappings.yml | 72 +++++++++++++++++++++++++++++++++++ guests/vars/projects/libvirt-glib.yml | 2 + guests/vars/projects/virt-viewer.yml | 24 ++++++++++++ projects/libvirt-glib.yaml | 4 ++ projects/virt-viewer.yaml | 4 ++ 5 files changed, 106 insertions(+) -- 2.14.3

2 16

[libvirt] [RFC] passing standard input to host bootloaders
by Fabian Freyer 13 Apr '18

13 Apr '18

Hello list, Some host boot loaders, e.g. grub-bhyve when using the bhyve driver, take commands on stdin. While there is the <bootloader_args> tag to set arbitrary command line tags, there is no <bootloader_stdin> or similar to provide standard input to the boot loader. Typical input could be something along the lines of e.g. the following grub commands: kernel (cd)/path/to/vmlinuz some-cmdline initrd (root)/path/to/host/initrd boot Using e.g. the (root) device is especially useful on the bhyve driver when creating diskless VMs. Before I start implementing this, I’d appreciate some feedback on the following two points: 1) should this be an attr on the <bootloader> tag, e.g. <bootloader_stdin=“/path/to/file”>/path/to/bootloader</bootloader> or rather, as there already exists a <bootloader_args> tag a separate <bootloader_stdin> tag? 2) should the input be passed verbatim in the domain def, e.g. using a CDATA block or from a file? Should this be user-specified, e.g. in an attr? <bootloader_stdin from=“/path/to/file”/> <bootloader_stdin> <![CDATA[ kernel (host)/path/to/kernel with cmdline initrd (host)/path/to/ramdisk boot ]]> </bootloader_stdin> Regards, Fabian

1 0

[libvirt] [PATCH] Add function that raises error if domain is not active
by Clementine Hayat 13 Apr '18

13 Apr '18

Add a function named virDomainObjCheckIsActive in src/conf/domain_conf.c. It calls virDomainObjIsActive, raises error and returns. There is a lot of occurence of this pattern and it will save 3 lines on each call. Knowing that there is over 100 occurences, it will remove 300 lines from the code base. Signed-off-by: Clementine Hayat <clem(a)lse.epita.fr> --- Patch proposed for gsoc2018. src/conf/domain_conf.c | 11 +++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 96 +++++++++------------------------------- 4 files changed, 34 insertions(+), 76 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d23182f18..86d28c26a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6003,6 +6003,17 @@ virDomainDefValidate(virDomainDefPtr def, return 0; } +int +virDomainObjCheckIsActive(virDomainObjPtr dom) +{ + if (!virDomainObjIsActive(dom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + return -1; + } + return 0; +} + /** * virDomainDeviceLoadparmIsValid diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bbaa24137..8de4c4145 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2722,6 +2722,8 @@ virDomainObjIsActive(virDomainObjPtr dom) return dom->def->id != -1; } +int virDomainObjCheckIsActive(virDomainObjPtr dom); + int virDomainDefSetVcpusMax(virDomainDefPtr def, unsigned int vcpus, virDomainXMLOptionPtr xmlopt); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cab324c4d..d90df3583 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -474,6 +474,7 @@ virDomainNostateReasonTypeFromString; virDomainNostateReasonTypeToString; virDomainObjAssignDef; virDomainObjBroadcast; +virDomainObjCheckIsActive; virDomainObjCopyPersistentDef; virDomainObjEndAPI; virDomainObjFormat; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcd79bd71..22cc9bddb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3537,11 +3537,8 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, if (virDomainSaveFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto cleanup; - } ret = qemuDomainSaveInternal(driver, vm, path, compressed, compressedpath, dxml, flags); @@ -3595,11 +3592,9 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) if (virDomainManagedSaveEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto cleanup; - } + if (!vm->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot do managed save for transient domain")); @@ -3939,11 +3934,8 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, VIR_DOMAIN_JOB_OPERATION_DUMP) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; priv->job.current->statsType = QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP; @@ -4054,11 +4046,8 @@ qemuDomainScreenshot(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } /* Well, even if qemu allows multiple graphic cards, heads, whatever, * screenshot command does not */ @@ -4165,11 +4154,8 @@ processWatchdogEvent(virQEMUDriverPtr driver, goto cleanup; } - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0; if ((ret = doCoreDump(driver, vm, dumpfile, flags, @@ -10841,11 +10827,8 @@ qemuDomainBlockResize(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } if (!(disk = virDomainDiskByName(vm->def, path, false))) { virReportError(VIR_ERR_INVALID_ARG, @@ -11001,11 +10984,8 @@ qemuDomainBlockStats(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } if (qemuDomainBlocksStatsGather(driver, vm, path, &blockstats) < 0) goto endjob; @@ -11058,11 +11038,8 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } if ((nstats = qemuDomainBlocksStatsGather(driver, vm, path, &blockstats)) < 0) @@ -11128,11 +11105,8 @@ qemuDomainInterfaceStats(virDomainPtr dom, if (virDomainInterfaceStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto cleanup; - } if (!(net = virDomainNetFind(vm->def, device))) goto cleanup; @@ -11484,11 +11458,8 @@ qemuDomainMemoryStatsInternal(virQEMUDriverPtr driver, int ret = -1; long rss; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) return -1; - } if (vm->def->memballoon && vm->def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) { @@ -11638,11 +11609,8 @@ qemuDomainMemoryPeek(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } if (virAsprintf(&tmp, "%s/qemu.mem.XXXXXX", cfg->cacheDir) < 0) goto endjob; @@ -13294,11 +13262,8 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) return -1; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto cleanup; - } if (!priv->job.current) { jobInfo->status = QEMU_DOMAIN_JOB_STATUS_NONE; @@ -13426,11 +13391,8 @@ static int qemuDomainAbortJob(virDomainPtr dom) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_ABORT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; @@ -13493,11 +13455,8 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; @@ -13538,11 +13497,8 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); @@ -13591,11 +13547,8 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; @@ -13642,11 +13595,8 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; @@ -13704,11 +13654,8 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth); qemuDomainObjEnterMonitor(driver, vm); @@ -13779,11 +13726,8 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); + if (virDomainObjCheckIsActive(vm) < 0) goto endjob; - } priv = vm->privateData; -- 2.17.0

6 6

[libvirt] [dbus PATCH v3 00/20] More APIs for Domain Interface
by Katerina Koukiou 13 Apr '18

13 Apr '18

Changes from v2: Adjusted to reviews. Katerina Koukiou (20): Implement Setter for Autostart property for Domain interface Implement SchedulerType property for Domain Interface Implement MemoryStats for Domain Interface Implement AttachDevice method for Domain Interface Implement DetachDevice method for Domain Interface Implement GetJobInfo method for Domain interface Implement AbortJob for Domain interface Implement MigrateSetMaxDowntime method for Domain interface Implement MigrateGetMaxDowntime method for Domain Interface Implement ManagedSave method for Domain Interface Implement HasManagedSaveImage method for Domain Interface Implement ManagedSaveRemove method for Domain Interface Implement SetVcpus method for Domain Interface Implement GetMemoryParameters method for Domain Interface Implement GetBlkioParameters method for domain Interface Implement Updated property for Domain Interface Implement MigrateGetMaxSpeed method for Domain Interface Implement MigrateSetMaxSpeed method for Domain Interface Implement SetMemory method for Domain Interface Implement GetSchedulerParameters method for Domain Interface data/org.libvirt.Domain.xml | 110 +++++++- src/domain.c | 605 +++++++++++++++++++++++++++++++++++++++++++- test/test_domain.py | 37 ++- 3 files changed, 747 insertions(+), 5 deletions(-) -- 2.15.0

2 25

[libvirt] [PATCH v5 00/10] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 13 Apr '18

13 Apr '18

This patch series provides support for launching an encrypted guest using AMD's new Secure Encrypted Virtualization (SEV) feature. SEV is an extension to the AMD-V architecture which supports running multiple VMs under the control of a hypervisor. When enabled, SEV feature allows the memory contents of a virtual machine (VM) to be transparently encrypted with a key unique to the guest VM. At very high level the flow looks this: 1. mgmt tool calls virConnectGetDomainCapabilities. This returns an XML document that includes the following <feature> ... <sev supported='yes'> <cbitpos> </cbitpos> <reduced-phys-bits> </reduced-phys-bits> <pdh> </pdh> <cert-chain> </cert-chain> </feature> If <sev> is provided then we indicate that hypervisor is capable of launching SEV guest. 2. (optional) mgmt tool can provide the PDH and Cert-chain to guest owner in case if guest owner wish to establish a secure connection with SEV firmware to negotiate a key used for validating the measurement. 3. mgmt tool requests to start a guest calling virCreateXML(), passing VIR_DOMAIN_START_PAUSED. The xml would include <launch-security type='sev'> <cbitpos> </cbitpos> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <reduced-phys-bits> </reduced-phys-bits> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <dh-cert> .. </dh> /* guest owners diffie-hellman key */ (optional) <session> ..</session> /* guest owners session blob */ (optional) <policy> ..</policy> /* guest policy */ (optional) </launch-security> 4. Libvirt generate the QEMU cli arg to enable the SEV feature, a typical args looks like this: # $QEMU .. -machine memory-encryption=sev0 \ -object sev-guest,id=sev0,dh-cert-file=<file>.... 5. Libvirt generates lifecycle VIR_DOMAIN_EVENT_SUSPENDED_PAUSED event 6. mgmt tool gets the VIR_DOMAIN_EVENT_SUSPENDED_PAUSED and calls virDomainGetLaunchSecretInfo() to retrieve the measurement of encrypted memory. 7. (optional) mgmt tool can provide the measurement value to guest owner, which can validate the measurement and gives GO/NO-GO answer. If mgmt tool gets GO then it resumes the guest otherwise it calls destroy() to kill the guest. 8. mgmt tool resumes the guest TODO: * SEV guest require to use DMA apis for the virtio devices. In order to use the DMA apis the virtio devices must have this tag <driver iommu=on ats=on> It is a bit unclear to me where these changes need to go. Do we need to modify the libvirt to automatically add these when SEV is enabled or we ask mgmt tool to make sure that it creates XML with right tag to enable the DMA APIs for virtio devices. I am looking for some suggestions. Using these patches we have succesfully booted and tested a guest both with and without SEV enabled. SEV Firmware API spec is available at: https://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf Changes since v4: * add /dev/sev in shared device list Changes since v3: * rename QEMU_CAPS_SEV -> QEMU_CAPS_SEV_GUEST * update caps_2.12.0.x86_64.replies to include query-sev-capabilities data Changes since v2: * make cbitpos, policy and reduced-phys-bits as unsigned int * update virDomainGetLaunchSecurityInfo to accept virTypedParameterPtr *params instead of virTypedParameterPtr params. Changes since v1: * rename <sev> -> <launch-security> for domain * add more information about policy and other fields in domaincaps.html * split the domain_conf support in two patches * add virDomainGetLaunchInfo() to retrieve the SEV measurement * extend virsh command to show the domain's launch security information * add test cases to validate newly added <launch-security> element * fix issues reported with 'make check' and 'make syntax-check' The complete git tree is available at: https://github.com/codomania/libvirt/tree/v5 Brijesh Singh (9): qemu: provide support to query the SEV capability qemu: introduce SEV feature in hypervisor capabilities conf: introduce launch-security element in domain qemu/cgroup: add /dev/sev in shared devices list qemu: add support to launch SEV guest libvirt: add new public API to get launch security info remote: implement the remote protocol for launch security qemu_driver: add support to launch security info virsh: implement new command for launch security Xiaogang Chen (1): tests: extend tests to include sev specific tag parsing docs/drvqemu.html.in | 1 + docs/formatdomain.html.in | 120 +++++++++++++++++++++ docs/formatdomaincaps.html.in | 40 +++++++ docs/schemas/domaincaps.rng | 20 ++++ docs/schemas/domaincommon.rng | 39 +++++++ include/libvirt/libvirt-domain.h | 17 +++ src/conf/domain_capabilities.c | 20 ++++ src/conf/domain_capabilities.h | 14 +++ src/conf/domain_conf.c | 110 +++++++++++++++++++ src/conf/domain_conf.h | 26 +++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 48 +++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu.conf | 2 +- src/qemu/qemu_capabilities.c | 40 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_capspriv.h | 4 + src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 35 ++++++ src/qemu/qemu_driver.c | 66 ++++++++++++ src/qemu/qemu_monitor.c | 17 +++ src/qemu/qemu_monitor.h | 6 ++ src/qemu/qemu_monitor_json.c | 105 ++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 58 ++++++++++ src/remote/remote_daemon_dispatch.c | 47 ++++++++ src/remote/remote_driver.c | 42 +++++++- src/remote/remote_protocol.x | 20 +++- src/remote_protocol-structs | 11 ++ tests/genericxml2xmlindata/sev.xml | 20 ++++ tests/genericxml2xmloutdata/sev.xml | 22 ++++ tests/genericxml2xmltest.c | 2 + .../caps_2.12.0.x86_64.replies | 10 ++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- tests/qemuxml2argvdata/sev.args | 24 +++++ tests/qemuxml2argvdata/sev.xml | 35 ++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmloutdata/sev.xml | 39 +++++++ tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 84 +++++++++++++++ 40 files changed, 1166 insertions(+), 5 deletions(-) create mode 100644 tests/genericxml2xmlindata/sev.xml create mode 100644 tests/genericxml2xmloutdata/sev.xml create mode 100644 tests/qemuxml2argvdata/sev.args create mode 100644 tests/qemuxml2argvdata/sev.xml create mode 100644 tests/qemuxml2xmloutdata/sev.xml -- 2.7.4

3 39

[libvirt] [PATCH v3] qemu: add virQEMUBuildBufferEscapeComma in qemu_command.c
by Sukrit Bhatnagar 13 Apr '18

13 Apr '18

This patch adds virQEMUBuildBufferEscapeComma to properly escape commas in user provided data fields for qemu command line processing. Signed-off-by: Sukrit Bhatnagar <skrtbhtngr(a)gmail.com> --- Thank you for the helpful feedback and apologies for the delay. Changes in v3: virQEMUBuildBufferEscapeComma was applied to: - src->hosts->socket in qemuBuildNetworkDriveURI - src->path, src->configFile in qemuBuildNetworkDriveStr - disk->blkdeviotune.group_name in qemuBuildDiskThrottling - net->data.socket.address, net->data.socket.localaddr in qemuBuildHostNetStr - dev->data.file.path in qemuBuildChrChardevStr - graphics->data.spice.rendernode in qemuBuildGraphicsSPICECommandLine - smartcard->data.cert.file[i], smartcard->data.cert.database in qemuBuildSmartcardCommandLine Changes in v2: virQEMUBuildBufferEscapeComma was applied to: - info->romfile in qemuBuildRomStr - disk->vendor, disk->product in qemuBuildDriveDevStr - fs->src->path in qemuBuildFSStr - fs->dst in qemuBuildFSDevStr - connect= in qemuBuildHostNetStr - fileval handling in qemuBuildChrChardevStr - TYPE_DEV, TYPE_PIPE handling in qemuBuildChrChardevStr - cfg->vncTLSx509certdir in qemuBuildGraphicsVNCCommandLine - cfg->spiceTLSx509certdir in qemuBuildGraphicsSPICECommandLine - loader->path, loader->nvram usage in qemuBuildDomainLoaderCommandLine Link to v2: https://www.redhat.com/archives/libvir-list/2018-March/msg00965.html When I tried to change src->path in qemuBuildNetworkDriveStr for this portion 961 } else if (src->nhosts == 1) { 962 if (virAsprintf(&ret, "sheepdog:%s:%u:%s", 963 src->hosts->name, src->hosts->port, 964 src->path) < 0) 965 goto cleanup; 966 } else { make check reported the following error. 141) QEMU XML-2-ARGV disk-drive-network-sheepdog ... In '/home/skrtbhtngr/libvirt/tests/qemuxml2argvdata/disk-drive-network-sheepdog.args': Offset 0 Expect [LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu-system-i686 -name QEMUGuest1 -S -M pc -m 214 -smp 1,sockets=1,cores=1,threads=1 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 -nographic -nodefaults -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb -drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive file=sheepdog:example.org:6000:image,,with,,commas,format=raw,if=none,id=drive-virtio-disk0 -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 ] Actual [LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu-system-i686 -name QEMUGuest1 -S -M pc -m 214 -smp 1,sockets=1,cores=1,threads=1 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 -nographic -nodefaults -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb -drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -drive file=sheepdog:example.org:6000:image,,,,with,,,,commas,format=raw,if=none,id=drive-virtio-disk0 -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 ] ... FAILED In disk-drive-network-sheepdog.args: ... -drive file=sheepdog:example.org:6000:image,,with,,commas,format=raw,if=none,\ ... I was not quite sure how to handle this part. Adding virQEMUBuildBufferEscapeComma there is escaping the twin commas in the file name again. I have left that part unchanged. src/qemu/qemu_command.c | 111 +++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f76f18ab..26b36551c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -844,14 +844,18 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { virURIPtr uri = NULL; - char *ret = NULL; + char *ret = NULL, *socket = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; if (!(uri = qemuBlockStorageSourceGetURI(src))) goto cleanup; - if (src->hosts->socket && - virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) - goto cleanup; + if (src->hosts->socket) { + virQEMUBuildBufferEscapeComma(&buf, src->hosts->socket); + socket = virBufferContentAndReset(&buf); + if (virAsprintf(&uri->query, "socket=%s", socket) < 0) + goto cleanup; + } if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) goto cleanup; @@ -860,6 +864,8 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, cleanup: virURIFree(uri); + virBufferFreeAndReset(&buf); + return ret; } @@ -868,8 +874,9 @@ static char * qemuBuildNetworkDriveStr(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { - char *ret = NULL; + char *ret = NULL, *path = NULL, *file = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + virBuffer bufTemp = VIR_BUFFER_INITIALIZER; size_t i; switch ((virStorageNetProtocol) src->protocol) { @@ -914,8 +921,10 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, goto cleanup; } - if (src->path) - virBufferAsprintf(&buf, ":exportname=%s", src->path); + if (src->path) { + virBufferAddLit(&buf, ":exportname="); + virQEMUBuildBufferEscapeComma(&buf, src->path); + } if (virBufferCheckError(&buf) < 0) goto cleanup; @@ -945,7 +954,9 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } if (src->nhosts == 0) { - if (virAsprintf(&ret, "sheepdog:%s", src->path) < 0) + virQEMUBuildBufferEscapeComma(&bufTemp, src->path); + path = virBufferContentAndReset(&bufTemp); + if (virAsprintf(&ret, "sheepdog:%s", path) < 0) goto cleanup; } else if (src->nhosts == 1) { if (virAsprintf(&ret, "sheepdog:%s:%u:%s", @@ -967,8 +978,9 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, src->path); goto cleanup; } - - virBufferStrcat(&buf, "rbd:", src->volume, "/", src->path, NULL); + virQEMUBuildBufferEscapeComma(&bufTemp, src->path); + path = virBufferContentAndReset(&bufTemp); + virBufferStrcat(&buf, "rbd:", src->volume, "/", path, NULL); if (src->snapshot) virBufferEscape(&buf, '\\', ":", "@%s", src->snapshot); @@ -994,8 +1006,11 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } } - if (src->configFile) - virBufferEscape(&buf, '\\', ":", ":conf=%s", src->configFile); + if (src->configFile) { + virQEMUBuildBufferEscapeComma(&bufTemp, src->configFile); + file = virBufferContentAndReset(&bufTemp); + virBufferEscape(&buf, '\\', ":", ":conf=%s", file); + } if (virBufferCheckError(&buf) < 0) goto cleanup; @@ -1022,6 +1037,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } cleanup: + virBufferFreeAndReset(&bufTemp); virBufferFreeAndReset(&buf); return ret; @@ -1630,6 +1646,8 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk, virBufferAsprintf(buf, ",throttling." _label "=%llu", \ disk->blkdeviotune._field); \ } + virBuffer bufTemp = VIR_BUFFER_INITIALIZER; + char *name = NULL; IOTUNE_ADD(total_bytes_sec, "bps-total"); IOTUNE_ADD(read_bytes_sec, "bps-read"); @@ -1647,8 +1665,9 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk, IOTUNE_ADD(size_iops_sec, "iops-size"); if (disk->blkdeviotune.group_name) { - virBufferEscapeString(buf, ",throttling.group=%s", - disk->blkdeviotune.group_name); + virQEMUBuildBufferEscapeComma(&bufTemp, disk->blkdeviotune.group_name); + name = virBufferContentAndReset(&bufTemp); + virBufferEscapeString(buf, ",throttling.group=%s", name); } IOTUNE_ADD(total_bytes_sec_max_length, "bps-total-max-length"); @@ -1657,6 +1676,8 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk, IOTUNE_ADD(total_iops_sec_max_length, "iops-total-max-length"); IOTUNE_ADD(read_iops_sec_max_length, "iops-read-max-length"); IOTUNE_ADD(write_iops_sec_max_length, "iops-write-max-length"); + + virBufferFreeAndReset(&bufTemp); #undef IOTUNE_ADD } @@ -3651,27 +3672,25 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_SERVER: - virBufferAsprintf(&buf, "socket%clisten=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket%clisten=", type_sep); + virQEMUBuildBufferEscapeComma(&buf, net->data.socket.address ? net->data.socket.address - : "", - net->data.socket.port); + : ""); + virBufferAsprintf(&buf, ":%d,", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAsprintf(&buf, "socket%cmcast=%s:%d,", - type_sep, - net->data.socket.address, - net->data.socket.port); + virBufferAsprintf(&buf, "socket%cmcast=", type_sep); + virQEMUBuildBufferEscapeComma(&buf, net->data.socket.address); + virBufferAsprintf(&buf, ":%d,", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_UDP: - virBufferAsprintf(&buf, "socket%cudp=%s:%d,localaddr=%s:%d,", - type_sep, - net->data.socket.address, - net->data.socket.port, - net->data.socket.localaddr, - net->data.socket.localport); + virBufferAsprintf(&buf, "socket%cudp=", type_sep); + virQEMUBuildBufferEscapeComma(&buf, net->data.socket.address); + virBufferAsprintf(&buf, ":%d,localaddr=", net->data.socket.port); + virQEMUBuildBufferEscapeComma(&buf, net->data.socket.localaddr); + virBufferAsprintf(&buf, ":%d,", net->data.socket.localport); break; case VIR_DOMAIN_NET_TYPE_USER: @@ -4954,9 +4973,10 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, bool chardevStdioLogd) { virBuffer buf = VIR_BUFFER_INITIALIZER; + virBuffer bufTemp = VIR_BUFFER_INITIALIZER; bool telnet; char *charAlias = NULL; - char *ret = NULL; + char *ret = NULL, *path = NULL; if (!(charAlias = qemuAliasChardevFromDevAlias(alias))) goto cleanup; @@ -4990,9 +5010,11 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, _("append not supported in this QEMU binary")); goto cleanup; } + virQEMUBuildBufferEscapeComma(&bufTemp, dev->data.file.path); + path = virBufferContentAndReset(&bufTemp); if (qemuBuildChrChardevFileStr(chardevStdioLogd ? logManager : NULL, cmd, def, &buf, - "path", dev->data.file.path, + "path", path, "append", dev->data.file.append) < 0) goto cleanup; break; @@ -8150,8 +8172,8 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, _("This QEMU doesn't support spice OpenGL rendernode")); goto error; } - - virBufferAsprintf(&opt, "rendernode=%s,", graphics->data.spice.rendernode); + virBufferAddLit(&opt, "rendernode="); + virQEMUBuildBufferEscapeComma(&opt, graphics->data.spice.rendernode); } } @@ -8771,7 +8793,6 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, virDomainSmartcardDefPtr smartcard; char *devstr; virBuffer opt = VIR_BUFFER_INITIALIZER; - const char *database; const char *contAlias = NULL; if (!def->nsmartcards) @@ -8814,29 +8835,15 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, virBufferAddLit(&opt, "ccid-card-emulated,backend=certificates"); for (i = 0; i < VIR_DOMAIN_SMARTCARD_NUM_CERTIFICATES; i++) { - if (strchr(smartcard->data.cert.file[i], ',')) { - virBufferFreeAndReset(&opt); - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid certificate name: %s"), - smartcard->data.cert.file[i]); - return -1; - } - virBufferAsprintf(&opt, ",cert%zu=%s", i + 1, - smartcard->data.cert.file[i]); + virBufferAsprintf(&opt, ",cert%zu=", i + 1); + virQEMUBuildBufferEscapeComma(&opt, smartcard->data.cert.file[i]); } if (smartcard->data.cert.database) { - if (strchr(smartcard->data.cert.database, ',')) { - virBufferFreeAndReset(&opt); - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid database name: %s"), - smartcard->data.cert.database); - return -1; - } - database = smartcard->data.cert.database; + virBufferAddLit(&opt, ",db="); + virQEMUBuildBufferEscapeComma(&opt, smartcard->data.cert.database); } else { - database = VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE; + virBufferAsprintf(&opt, ",db=%s", VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE); } - virBufferAsprintf(&opt, ",db=%s", database); break; case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: -- 2.16.2

2 3

[libvirt] [PATCHv2] Remove redundant virFileIsExecutable check
by Radostin Stoyanov 13 Apr '18

13 Apr '18

Remove unnecessary virFileIsExecutable check after virFindFileInPath. Since commit 9ae992f, virFindFileInPath will reject non-executables. 9ae992f24353d6506f570fc9dd58355b165e4472 virFindFileInPath: only find executable non-directory Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 4 ---- src/qemu/qemu_capabilities.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 381cc0de3..e13085b1d 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -179,8 +179,6 @@ virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) binary = virFindFileInPath("grub-bhyve"); if (binary == NULL) goto out; - if (!virFileIsExecutable(binary)) - goto out; cmd = virCommandNew(binary); virCommandAddArg(cmd, "--help"); @@ -315,8 +313,6 @@ virBhyveProbeCaps(unsigned int *caps) binary = virFindFileInPath("bhyve"); if (binary == NULL) goto out; - if (!virFileIsExecutable(binary)) - goto out; if ((ret = bhyveProbeCapsRTC_UTC(caps, binary))) goto out; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 27180e850..13c6c85d8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -653,7 +653,7 @@ virQEMUCapsFindBinary(const char *format, ret = virFindFileInPath(binary); VIR_FREE(binary); - if (ret && virFileIsExecutable(ret)) + if (ret) goto out; VIR_FREE(ret); -- 2.14.3

2 1

[libvirt] [dbus PATCH v2 00/22] More APIs for Domain Interface
by Katerina Koukiou 13 Apr '18

13 Apr '18

Changes from v1: Added some more APIs. Katerina Koukiou (22): Implement Setter for Autostart property for Domain interface Implement SchedulerType property for Domain Interface Introduce virtDBusDomainMemoryStatTypeToString helper function Implement MemoryStats for Domain Interface Implement AttachDevice method for Domain Interface Implement DetachDevice method for Domain Interface Introduce virtDBusDomainJobTypeToString function Implement GetJobInfo method for Domain interface Implement AbortJob for Domain interface Implement MigrateSetMaxDowntime method for Domain interface Implement MigrateGetMaxDowntime method for Domain Interface Implement ManagedSave method for Domain Interface Implement HasManagedSaveImage method for Domain Interface Implement ManagedSaveRemove method for Domain Interface Implement SetVcpus method for Domain Interface Implement GetMemoryParameters method for Domain Interface Implement GetBlkioParameters method for domain Interface Implement Updated property for Domain Interface Implement MigrateGetMaxSpeed method for Domain Interface Implement MigrateSetMaxSpeed method for Domain Interface Implement SetMemory method for Domain Interface Implement GetSchedulerParameters method for Domain Interface data/org.libvirt.Domain.xml | 111 +++++++- src/domain.c | 599 +++++++++++++++++++++++++++++++++++++++++++- test/test_domain.py | 37 ++- 3 files changed, 742 insertions(+), 5 deletions(-) -- 2.15.0

2 40

[libvirt] [PATCH] Remove redundant virFileIsExecutable check
by Radostin Stoyanov 13 Apr '18

13 Apr '18

Remove unnecessary virFileIsExecutable check after virFindFileInPath. Since the commit 9ae992f virFindFileInPath will reject non-executables. 9ae992f24353d6506f570fc9dd58355b165e4472 virFindFileInPath: only find executable non-directory Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 4 ---- src/qemu/qemu_capabilities.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 381cc0de3..e13085b1d 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -179,8 +179,6 @@ virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) binary = virFindFileInPath("grub-bhyve"); if (binary == NULL) goto out; - if (!virFileIsExecutable(binary)) - goto out; cmd = virCommandNew(binary); virCommandAddArg(cmd, "--help"); @@ -315,8 +313,6 @@ virBhyveProbeCaps(unsigned int *caps) binary = virFindFileInPath("bhyve"); if (binary == NULL) goto out; - if (!virFileIsExecutable(binary)) - goto out; if ((ret = bhyveProbeCapsRTC_UTC(caps, binary))) goto out; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 27180e850..5ebc72f6f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -653,7 +653,7 @@ virQEMUCapsFindBinary(const char *format, ret = virFindFileInPath(binary); VIR_FREE(binary); - if (ret && virFileIsExecutable(ret)) + if (ret == NULL) goto out; VIR_FREE(ret); -- 2.14.3

2 2