- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Add more host validation checks
by Daniel P. Berrange 12 Oct '15

12 Oct '15

This extends the virt-host-validate command todo a bunch more checks. Probably the most interesting is the last one which checks for Intel IOMMU needed todo PCI assignment with KVM. It is pretty crude, so further suggestions welcome. I don't want to grep dmesg as suggested in [1] since dmesg can be purged by the time we look at it. What kmods should we look for for VT-D too ? [1] http://www.linux-kvm.org/page/How_to_assign_devices_with_VT-d_in_KVM Daniel P. Berrange (4): virt-host-validate.c: check for kernel namespaces virt-host-validate: distinguish exists vs accessible for devices virt-host-validate: check for required cgroups virt-host-validate: check for intel_iommu=on cmdline flag tools/virt-host-validate-common.c | 209 +++++++++++++++++++++++++++++++++++--- tools/virt-host-validate-common.h | 31 +++++- tools/virt-host-validate-lxc.c | 60 +++++++++++ tools/virt-host-validate-qemu.c | 66 ++++++++++-- 4 files changed, 338 insertions(+), 28 deletions(-) -- 2.4.3

3 12

[libvirt] [PATCH 0/2] improve the error in 2 function
by Luyao Huang 12 Oct '15

12 Oct '15

*** BLURB HERE *** Luyao Huang (2): util: split the virNumaGetHugePageInfoPath into separate function util: Produce friendlier error message to user src/util/virnuma.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) -- 1.8.3.1

3 10

[libvirt] virsh can't support VM offline blockcommit
by 陈明 12 Oct '15

12 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: * error: Requested operation is not valid: domain is not running* when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile，* the main question* is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks!

1 0

[libvirt] virsh can't support VM offline blockcommit
by justlibvirt 10 Oct '15

10 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: error: Requested operation is not valid: domain is not running when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile， the main question is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we shoule solve the question? thanks!

1 0

[libvirt] [PATCH] src: Include $(builddir)/util in the header search path
by Andrea Bolognani 09 Oct '15

09 Oct '15

Since a9fe620372144db, we are generating virkeymaps.h at build time; however, we are not including $(builddir)/util in the header search path, so when doing a VPATH build the compiler is unable to locate the file. make[2]: Entering directory `/home/jenkins/libvirt/systems/libvirt-fedora-20/build/src' GEN util/virkeymaps.h ... CC util/libvirt_util_la-virkeycode.lo CC util/libvirt_util_la-virkeyfile.lo CC util/libvirt_util_la-virlockspace.lo CC util/libvirt_util_la-virlog.lo ../../src/util/virkeycode.c:27:24: fatal error: virkeymaps.h: No such file or directory #include "virkeymaps.h" ^ compilation terminated. --- Tested by * running 'git clean -xdf' in the source directory * running './autogen.sh' * running 'make distclean' * making sure src/util/virkeymaps.h did not exist * moving to an empty build directory * running '../libvirt/configure' * running 'make check' * running 'make distcheck' This is another take on the problem Michal's trying to solve with https://www.redhat.com/archives/libvir-list/2015-October/msg00254.html The commit message is "inspired" by his ;) src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index e4660eb..01e816a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ INCLUDES = -I../gnulib/lib \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ + -I$(builddir)/util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ -- 2.4.3

4 7

[libvirt] [PATCH] src: Remove $(builddir) usage
by Andrea Bolognani 09 Oct '15

09 Oct '15

Commit 4e8032272f1704f7 used $(builddir) in the header search path to fix a build issue; however, $(builddir) is not defined by old autoconf versions such as the one available in CentOS 5, resulting in the following error: cc1: error: /util: No such file or directory make[3]: *** [libvirt_driver_la-fdstream.lo] Error 1 Since $(builddir) is defined to always be '.', just use that value directly instead. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 01e816a..d5dd9fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ INCLUDES = -I../gnulib/lib \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ - -I$(builddir)/util \ + -I./util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ -- 2.4.3

2 2

[libvirt] [PATCH] virJSONValueArraySize: return ssize_t
by Michal Privoznik 09 Oct '15

09 Oct '15

The internal representation of a JSON array counts the items in size_t. However, for some reason, when asking for the count it's reported as int. Firstly, we need the function to return a signed type as it's returning -1 on an error. But, not every system has integer the same size as size_t. Therefore, lets return ssize_t. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/lock_daemon.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_agent.c | 12 ++++++------ src/qemu/qemu_monitor_json.c | 28 ++++++++++++++-------------- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/util/virjson.c | 2 +- src/util/virjson.h | 2 +- src/util/virlockspace.c | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index bf87af1..55fc0c3 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -184,7 +184,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) virJSONValuePtr lockspaces; virNetServerPtr srv; size_t i; - int n; + ssize_t n; if (VIR_ALLOC(lockd) < 0) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c343e5b..cd9a51e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3599,7 +3599,7 @@ networkGetDHCPLeases(virNetworkPtr network, size_t i, j; size_t nleases = 0; int rv = -1; - int size = 0; + ssize_t size = 0; int custom_lease_file_len = 0; bool need_results = !!leases; long long currtime = 0; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 7021a7a..5735ed8 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1461,7 +1461,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; - int ndata; + ssize_t ndata; if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; @@ -1767,7 +1767,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, { size_t i, j, k; int ret = -1; - int ndata = 0, ndisk; + ssize_t ndata = 0, ndisk; char **alias; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; @@ -1810,7 +1810,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%d' missing in " + _("array element '%zd' of '%zd' missing in " "guest-get-fsinfo return data"), i, ndata); goto cleanup; @@ -1871,7 +1871,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, if (!disk) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%d' missing in " + _("array element '%zd' of '%zd' missing in " "guest-get-fsinfo 'disk' data"), j, ndisk); goto cleanup; @@ -1954,7 +1954,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, { int ret = -1; size_t i, j; - int size = -1; + ssize_t size = -1; virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr ret_array = NULL; @@ -1994,7 +1994,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i); virJSONValuePtr ip_addr_arr = NULL; const char *hwaddr, *ifname_s, *name = NULL; - int ip_addr_arr_size; + ssize_t ip_addr_arr_size; virDomainInterfacePtr iface = NULL; /* Shouldn't happen but doesn't hurt to check neither */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df0c82a..b39b29b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1265,7 +1265,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, int ret = -1; size_t i; int *threads = NULL; - int ncpus; + ssize_t ncpus; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3061,7 +3061,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, int ret = -1; const char *tmp; virJSONValuePtr returnArray, entry, table, element; - int nTable; + ssize_t nTable; size_t i; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); @@ -4090,7 +4090,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr data; - int nr_results; + ssize_t nr_results; size_t i; virHashTablePtr blockJobs = NULL; @@ -4597,7 +4597,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorMachineInfoPtr *infolist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *machines = NULL; @@ -4777,7 +4777,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **commandlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *commands = NULL; @@ -4845,7 +4845,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **eventlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *events = NULL; @@ -4922,7 +4922,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, virJSONValuePtr data = NULL; virJSONValuePtr array = NULL; char **paramlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *params = NULL; @@ -5093,7 +5093,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **typelist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *types = NULL; @@ -5162,7 +5162,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorJSONListPathPtr *pathlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *paths = NULL; @@ -5408,7 +5408,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **proplist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *props = NULL; @@ -5527,7 +5527,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; char **list = NULL; size_t i; - int n; + ssize_t n; *capabilities = NULL; @@ -5804,7 +5804,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **list = NULL; - int n = 0; + ssize_t n = 0; size_t i; *array = NULL; @@ -6167,7 +6167,7 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, virCPUx86Data *x86Data = NULL; virCPUx86CPUID cpuid; size_t i; - int n; + ssize_t n; int ret = -1; /* look up if the property exists before asking */ @@ -6330,7 +6330,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorIOThreadInfoPtr *infolist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *iothreads = NULL; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 80b5588..547e52e 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -369,7 +369,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, virJSONValuePtr clients; virJSONValuePtr services; size_t i; - int n; + ssize_t n; unsigned int min_workers; unsigned int max_workers; unsigned int priority_workers; diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 3b35fc0..1ef0636 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -328,7 +328,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj virNetServerServicePtr svc; virJSONValuePtr socks; size_t i; - int n; + ssize_t n; unsigned int max; if (virNetServerServiceInitialize() < 0) diff --git a/src/util/virjson.c b/src/util/virjson.c index c123943..ae6362b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -864,7 +864,7 @@ virJSONValueIsArray(virJSONValuePtr array) } -int +ssize_t virJSONValueArraySize(const virJSONValue *array) { if (array->type != VIR_JSON_TYPE_ARRAY) diff --git a/src/util/virjson.h b/src/util/virjson.h index a7df6e5..66ed48a 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -114,7 +114,7 @@ virJSONValuePtr virJSONValueObjectGetByType(virJSONValuePtr object, const char *key, virJSONType type); bool virJSONValueIsArray(virJSONValuePtr array); -int virJSONValueArraySize(const virJSONValue *array); +ssize_t virJSONValueArraySize(const virJSONValue *array); virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element); virJSONValuePtr virJSONValueArraySteal(virJSONValuePtr object, unsigned int element); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 2366a74..7aa0f1d 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -293,7 +293,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) { virLockSpacePtr lockspace; virJSONValuePtr resources; - int n; + ssize_t n; size_t i; VIR_DEBUG("object=%p", object); @@ -336,7 +336,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) const char *tmp; virJSONValuePtr owners; size_t j; - int m; + ssize_t m; if (VIR_ALLOC(res) < 0) goto error; -- 2.4.9

2 1

[libvirt] Cannot dump core: error: Requested operation is not valid: domain is marked for auto destroy
by Richard W.M. Jones 09 Oct '15

09 Oct '15

I wonder if there's a reason why it is not possible to dump the core of a KVM domain which is set to autodestroy. $ virsh dump guestfs-4xe592eyqq4rfnk9 /tmp/guestfs-4xe592eyqq4rfnk9.core error: Failed to core dump domain guestfs-4xe592eyqq4rfnk9 to /tmp/guestfs-4xe592eyqq4rfnk9.core error: Requested operation is not valid: domain is marked for auto destroy All libguestfs domains have the autodestroy flag, but I am trying to debug one which is crashing in the guest (RHBZ#1269779) and having the ability to dump it would be very helpful. I added the following patch to libvirt, which allowed me to dump the domain with no apparent ill effects. (The patch is a bit of a hack, and I did not check it very closely, so it's probably not suitable for going upstream). Rich. >From ffb899e436c15974b0f42b1cbd8337701c3a05d1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones(a)redhat.com> Date: Thu, 8 Oct 2015 11:11:10 +0100 Subject: [PATCH] qemu: Don't prevent core dump of auto-destroy domain. --- src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_migration.c | 16 +++++++++------- src/qemu/qemu_migration.h | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8cd5ee3..c3778de 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3184,7 +3184,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SAVE) < 0) @@ -3616,7 +3616,7 @@ doCoreDump(virQEMUDriverPtr driver, goto cleanup; } - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, true, 0)) goto cleanup; ret = qemuMigrationToFile(driver, vm, fd, 0, path, @@ -13690,7 +13690,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn, bool resume = false; int ret = -1; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { @@ -14505,7 +14505,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, /* do the memory snapshot if necessary */ if (memory) { /* check if migration is possible */ - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; /* allow the migration job to be cancelled or the domain to be paused */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d0f1e46..19031f9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2201,7 +2201,7 @@ qemuMigrationIsAllowedHostdev(const virDomainDef *def) bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, - bool remote, + bool remote, bool coreDump, unsigned int flags) { int nsnapshots; @@ -2235,10 +2235,12 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, /* following checks don't make sense for offline migration */ if (!(flags & VIR_MIGRATE_OFFLINE)) { - if (qemuProcessAutoDestroyActive(driver, vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is marked for auto destroy")); - return false; + if (!coreDump) { + if (qemuProcessAutoDestroyActive(driver, vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is marked for auto destroy")); + return false; + } } @@ -2987,7 +2989,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_BEGIN3); - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationIsAllowed(driver, vm, true, false, flags)) goto cleanup; if (!(flags & VIR_MIGRATE_UNSAFE) && @@ -5347,7 +5349,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, goto endjob; } - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationIsAllowed(driver, vm, true, false, flags)) goto endjob; if (!(flags & VIR_MIGRATE_UNSAFE) && diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 8175f4b..cc4d25d 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -174,7 +174,7 @@ int qemuMigrationConfirm(virConnectPtr conn, int cancelled); bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, - bool remote, unsigned int flags); + bool remote, bool coreDump, unsigned int flags); int qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int fd, off_t offset, const char *path, -- 2.5.3 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

3 4

[libvirt] [libvirt-test-API] [PATCH] fix some typo
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- repos/domain/fsinfo.py | 2 +- repos/domain/install_linux_check.py | 2 +- repos/domain/install_linux_net.py | 2 +- repos/interface/define.py | 2 +- repos/interface/undefine.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repos/domain/fsinfo.py b/repos/domain/fsinfo.py index e6d1bf0..d4614f5 100644 --- a/repos/domain/fsinfo.py +++ b/repos/domain/fsinfo.py @@ -81,7 +81,7 @@ def fsinfo(params): return 1 fsinfo = vm.fsInfo() - logger.info("get geust filesystem information") + logger.info("get guest filesystem information") mac = get_guest_mac(vm) if not mac: diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py index ab1e7db..bb3cc2a 100644 --- a/repos/domain/install_linux_check.py +++ b/repos/domain/install_linux_check.py @@ -99,7 +99,7 @@ def install_linux_check(params): Test_Result = 1 return Test_Result - # Check whether vcpu equals the value set in geust config xml + # Check whether vcpu equals the value set in guest config xml logger.info("check point3: check cpu number in guest equals to \ the value set in domain config xml") vcpunum_expect = int(utils.get_num_vcpus(domain_name)) diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py index 4367d97..7173294 100644 --- a/repos/domain/install_linux_net.py +++ b/repos/domain/install_linux_net.py @@ -239,7 +239,7 @@ def install_linux_net(params): logger.info("booting guest vm off harddisk failed") return 1 else: - logger.info("geust is booting up") + logger.info("guest is booting up") else: interval = 0 while(interval < 3600): diff --git a/repos/interface/define.py b/repos/interface/define.py index 18ba71b..e0dbcf4 100644 --- a/repos/interface/define.py +++ b/repos/interface/define.py @@ -42,7 +42,7 @@ def define(params): try: conn.interfaceDefineXML(xmlstr, 0) if check_define_interface(ifacename): - logger.info("define a interface form xml is successful") + logger.info("define a interface from xml is successful") else: logger.error("fail to check define interface") return 1 diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py index f9b2d74..8b250de 100644 --- a/repos/interface/undefine.py +++ b/repos/interface/undefine.py @@ -39,14 +39,14 @@ def undefine(params): try: ifaceobj.undefine() if check_undefine_interface(ifacename): - logger.info("undefine a interface form xml is successful") + logger.info("undefine a interface is successful") else: logger.error("fail to check undefine interface") return 1 except libvirtError, e: logger.error("API error message: %s, error code is %s" \ % (e.message, e.get_error_code())) - logger.error("fail to undefine a interface from xml") + logger.error("fail to undefine a interface") return 1 return 0 -- 1.8.3.1

2 1

[libvirt] [libvirt-test-API] [PATCH] fix two error in script pin_iothread.py and connection_getAllDomainStats.py
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- repos/domain/pin_iothread.py | 2 +- repos/virconn/connection_getAllDomainStats.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/domain/pin_iothread.py b/repos/domain/pin_iothread.py index 28ee2c4..d2d812f 100644 --- a/repos/domain/pin_iothread.py +++ b/repos/domain/pin_iothread.py @@ -116,7 +116,7 @@ def pin_iothread(params): if not find_iothreadid_fromxml(vm, 1, 1): logger.info("add iothread %d to running guest" % 1) - vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_LIVE) vm.pinIOThread(1, tu_cpu, libvirt.VIR_DOMAIN_AFFECT_LIVE) cpuset = find_iothreadpin_fromxml(vm, 1, 1) diff --git a/repos/virconn/connection_getAllDomainStats.py b/repos/virconn/connection_getAllDomainStats.py index d95004f..3362444 100644 --- a/repos/virconn/connection_getAllDomainStats.py +++ b/repos/virconn/connection_getAllDomainStats.py @@ -164,7 +164,7 @@ def check_each_vcpu(logger,dom_name,dom_active,dom_eles): if not vcpu_cur: for i in range(0,vcpu_max): vcpu_pre = "vcpu."+ str(i) + "." - logger.debug("Checking %sstate: %d" \ + logger.debug("Checking %sstate: %s" \ %(vcpu_pre, dom_eles.get(vcpu_pre + "state"))) if not compare_value(logger,vcpu_stat, \ dom_eles.get(vcpu_pre + "state")): @@ -172,7 +172,7 @@ def check_each_vcpu(logger,dom_name,dom_active,dom_eles): elif int(vcpu_cur.nodeValue) <= vcpu_max: for i in range(0,int(vcpu_cur.nodeValue)): vcpu_pre = "vcpu."+ str(i) + "." - logger.debug("Checking %sstate: %d" \ + logger.debug("Checking %sstate: %s" \ %(vcpu_pre, dom_eles.get(vcpu_pre + "state"))) if not compare_value(logger,vcpu_stat, \ dom_eles.get(vcpu_pre + "state")): -- 1.8.3.1

2 1

[libvirt] [libvirt-test-API] [PATCH] Add two cases for API interfaceAddresses and make small changes to global.cfg
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 12 +++++++ global.cfg | 8 +++-- repos/domain/get_guest_network_info.py | 66 ++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 repos/domain/get_guest_network_info.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 8440c61..5b216f9 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -66,6 +66,18 @@ domain:set_guest_time flags sync +domain:get_guest_network_info + guestname + $defaultname + flags + lease + +domain:get_guest_network_info + guestname + $defaultname + flags + agent + virconn:connection_getAllDomainStats stats state|cpu|balloon|vcpu|interface|block diff --git a/global.cfg b/global.cfg index 56677a5..1b72119 100644 --- a/global.cfg +++ b/global.cfg @@ -44,6 +44,8 @@ rhel6u1_i386 = http:// rhel6u1_x86_64 = http:// rhel6u2_i386 = http:// rhel6u2_x86_64 = http:// +rhel7u1_x86_64 = http:// +rhel7u2_x86_64 = http:// fedora12_i386 = http:// fedora12_x86_64 = http:// win2008_i386 = http:// @@ -70,6 +72,8 @@ rhel6_i386_http_ks = http:// rhel6_x86_64_http_ks = http:// rhel6u2_i386_http_ks = http:// rhel6u2_x86_64_http_ks = kickstart.cfg +rhel7u1_x86_64_http_ks = http:// +rhel7u2_x86_64_http_ks = http:// fedora12_i386_http_ks = http:// fedora12_x86_64_http_ks = http:// @@ -97,7 +101,7 @@ sourcepath = /media/share # also exercise DNS resolution # [other] -wget_url = http:// +wget_url = http://libvirt.org/index.html # # The variables section is a set of variables used by the @@ -127,7 +131,7 @@ defaulthv = kvm defaultname = libvirt_test_api # default os version to use for installing a new guest # the value of it is the first part of 'rhel6u2_x86_64' in [guest] section above -defaultos = rhel6u2 +defaultos = rhel7u2 # default architecture to use for installing a new guest defaultarch = x86_64 # default the number of vcpu to use for defining or installing a guest diff --git a/repos/domain/get_guest_network_info.py b/repos/domain/get_guest_network_info.py new file mode 100644 index 0000000..35bba3b --- /dev/null +++ b/repos/domain/get_guest_network_info.py @@ -0,0 +1,66 @@ +#!/usr/bin/python + +import libvirt +from libvirt import libvirtError +from src import sharedmod + +required_params = ('guestname', 'flags',) +optional_params = {} + +def check_guest_status(domobj): + """check guest current status + """ + state = domobj.info()[0] + if state == libvirt.VIR_DOMAIN_SHUTOFF or \ + state == libvirt.VIR_DOMAIN_SHUTDOWN: + return False + else: + return True + +def get_guest_network_info(params): + """get guest network interface info + """ + + logger = params['logger'] + guestname = params['guestname'] + flags = params['flags'] + + conn = sharedmod.libvirtobj['conn'] + + domobj = conn.lookupByName(guestname) + + flags = params['flags'] + logger.info("The flags are %s" % flags) + flags_string = flags.split("|") + flags = 0 + + for flag in flags_string: + if flag == 'lease': + flags |= libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE + elif flag == 'agent': + flags |= libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT + else: + logger.error("unknow flags") + return 1 + + logger.info("the given flags is %d" % flags) + + # Check domain status + if check_guest_status(domobj): + logger.info("Guest is running") + else: + logger.error("Guest is shut off status") + return 1 + + try: + info = domobj.interfaceAddresses(flags) + logger.info("get guest interface info") + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % (e.message, e.get_error_code())) + return 1 + + return 0 + + -- 1.8.3.1

2 1

[libvirt] [PATCH tck 0/6] Update TCK for current libvirt/qemu environments
by Mike Latimer 09 Oct '15

09 Oct '15

Hi, TCK needs some changes in order to better handle current libvirt/qemu environments. This patch series contains patches to address most (not all*) of the issues I've been encountering: - IP addresses can no longer be retrieved from default.leases - NUMA flags AFFECT_LIVE and AFFECT_CONFIG are mutually exclusive - cow format is no longer supported by qemu - dnsmasq spawns a child process with the same process name and params In addition to the above fixes, additional delays improve the reliability of the nwfilter and hotplugging tests. Thanks, Mike * I'll post another series shortly, dealing with issues in 121-block-info.t. Mike Latimer (6): Retrieve ip address from arp instead of leases nwfilter startup and shutdown delay NUMA flags are exclusive Remove cow format tests Delay before hotplugging Handle dnsmasq child processes lib/Sys/Virt/TCK/NetworkHelpers.pm | 8 ++++---- scripts/domain/200-disk-hotplug.t | 1 + scripts/domain/202-numa-set-parameters.t | 14 +++++++++----- scripts/domain/210-nic-hotplug.t | 1 + scripts/domain/215-nic-hotplug-many.t | 1 + scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 2 +- scripts/nwfilter/100-ping-still-working.t | 4 ++-- scripts/nwfilter/210-no-mac-spoofing.t | 4 ++-- scripts/nwfilter/220-no-ip-spoofing.t | 15 ++++++++++++--- scripts/nwfilter/230-no-mac-broadcast.t | 4 ++-- scripts/nwfilter/240-no-arp-spoofing.t | 4 ++-- scripts/storage/100-create-vol-dir.t | 19 +------------------ scripts/storage/200-clone-vol-dir.t | 4 ++-- 15 files changed, 42 insertions(+), 43 deletions(-) -- 1.8.4.5

3 16

[libvirt] [PATCH] src: Generate virkeymaps.h into the correct directory
by Michal Privoznik 08 Oct '15

08 Oct '15

So after a9fe620372144db we are generating virkeymaps.h all the time during build. This is good. However, when doing a VPATH build, we are not generating it into the correct directory, since there's $(srcdir) prefix missing to the path to the file: make[2]: Entering directory `/home/jenkins/libvirt/systems/libvirt-fedora-20/build/src' GEN util/virkeymaps.h ... CC util/libvirt_util_la-virkeycode.lo CC util/libvirt_util_la-virkeyfile.lo CC util/libvirt_util_la-virlockspace.lo CC util/libvirt_util_la-virlog.lo ../../src/util/virkeycode.c:27:24: fatal error: virkeymaps.h: No such file or directory #include "virkeymaps.h" ^ compilation terminated. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Even though this would qualify as build breaker, I'm sending it for review. src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e4660eb..0bf28cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,10 +177,10 @@ EXTRA_DIST += $(srcdir)/util/keymaps.csv $(srcdir)/util/virkeycode-mapgen.py BUILT_SOURCES += util/virkeymaps.h MAINTAINERCLEANFILES += util/virkeymaps.h -util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ +$(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.4.9

3 2

[libvirt] [PATCH v2 0/4] Be tolerant to relabel errors for session mode
by Michal Privoznik 08 Oct '15

08 Oct '15

This is a reworked version of my previous patch: https://www.redhat.com/archives/libvir-list/2015-July/msg00576.html Michal Privoznik (4): virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType security_selinux: Replace SELinuxSCSICallbackData with proper struct virSecurityManager: Track if running as privileged security_selinux: Take @privileged into account src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_driver.c | 7 +- src/security/security_manager.c | 29 ++++++-- src/security/security_manager.h | 5 +- src/security/security_selinux.c | 147 ++++++++++++++++++++++++--------------- tests/qemuhotplugtest.c | 2 +- tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- 10 files changed, 127 insertions(+), 74 deletions(-) -- 2.4.6

3 6

[libvirt] [PATCH] vz: cleanup
by Maxim Nestratov 08 Oct '15

08 Oct '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> Remove unused definitions, functions and structure fields. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 1 - src/vz/vz_utils.c | 67 ---------------------------------------------------- src/vz/vz_utils.h | 20 --------------- 3 files changed, 0 insertions(+), 88 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d0b4692..15dc70f 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -262,7 +262,6 @@ vzOpenDefault(virConnectPtr conn) error: virObjectUnref(privconn->domains); virObjectUnref(privconn->caps); - virStoragePoolObjListFree(&privconn->pools); virObjectEventStateFree(privconn->domainEventState); prlsdkDisconnect(privconn); prlsdkDeinit(); diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 08b7f5a..894f7dd 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -115,33 +115,6 @@ vzDoCmdRun(char **outbuf, const char *binary, va_list list) } /* - * Run command and parse its JSON output, return - * pointer to virJSONValue or NULL in case of error. - */ -virJSONValuePtr -vzParseOutput(const char *binary, ...) -{ - char *outbuf; - virJSONValuePtr jobj = NULL; - va_list list; - int ret; - - va_start(list, binary); - ret = vzDoCmdRun(&outbuf, binary, list); - va_end(list); - if (ret) - return NULL; - - jobj = virJSONValueFromString(outbuf); - if (!jobj) - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid output from prlctl: %s"), outbuf); - - VIR_FREE(outbuf); - return jobj; -} - -/* * Run command and return its output, pointer to * buffer or NULL in case of error. Caller os responsible * for freeing the buffer. @@ -161,43 +134,3 @@ vzGetOutput(const char *binary, ...) return outbuf; } - -/* - * Run prlctl command and check for errors - * - * Return value is 0 in case of success, else - -1 - */ -int -vzCmdRun(const char *binary, ...) -{ - int ret; - va_list list; - - va_start(list, binary); - ret = vzDoCmdRun(NULL, binary, list); - va_end(list); - - return ret; -} - -/* - * Return new file path in malloced string created by - * concatenating first and second function arguments. - */ -char * -vzAddFileExt(const char *path, const char *ext) -{ - char *new_path = NULL; - size_t len = strlen(path) + strlen(ext) + 1; - - if (VIR_ALLOC_N(new_path, len) < 0) - return NULL; - - if (!virStrcpy(new_path, path, len)) { - VIR_FREE(new_path); - return NULL; - } - strcat(new_path, ext); - - return new_path; -} diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 77f49f0..84cf08f 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -27,11 +27,8 @@ # include "driver.h" # include "conf/domain_conf.h" -# include "conf/storage_conf.h" # include "conf/domain_event.h" -# include "conf/network_conf.h" # include "virthread.h" -# include "virjson.h" # define vzParseError() \ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \ @@ -50,11 +47,6 @@ # define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "Routed" # define PARALLELS_DOMAIN_BRIDGED_NETWORK_NAME "Bridged" -# define PARALLELS_REQUIRED_HOSTONLY_NETWORK "Host-Only" -# define PARALLELS_HOSTONLY_NETWORK_TYPE "host-only" -# define PARALLELS_REQUIRED_BRIDGED_NETWORK "Bridged" -# define PARALLELS_BRIDGED_NETWORK_TYPE "bridged" - struct _vzConn { virMutex lock; @@ -62,12 +54,9 @@ struct _vzConn { virDomainObjListPtr domains; PRL_HANDLE server; - virStoragePoolObjList pools; - virNetworkObjListPtr networks; virCapsPtr caps; virDomainXMLOptionPtr xmlopt; virObjectEventStatePtr domainEventState; - virStorageDriverStatePtr storageState; const char *drivername; }; @@ -97,19 +86,10 @@ typedef struct vzDomObj *vzDomObjPtr; virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); virDomainObjPtr vzDomObjFromDomainRef(virDomainPtr domain); -virJSONValuePtr vzParseOutput(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; char * vzGetOutput(const char *binary, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; -int vzCmdRun(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; -char * vzAddFileExt(const char *path, const char *ext); void vzDriverLock(vzConnPtr driver); void vzDriverUnlock(vzConnPtr driver); -virStorageVolPtr vzStorageVolLookupByPathLocked(virConnectPtr conn, - const char *path); -int vzStorageVolDefRemove(virStoragePoolObjPtr privpool, - virStorageVolDefPtr privvol); # define PARALLELS_BLOCK_STATS_FOREACH(OP) \ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ -- 1.7.1

2 1

[libvirt] [PATCH] AUTHORS: Add myself to the list of committers
by Andrea Bolognani 08 Oct '15

08 Oct '15

--- Ján insisted so much. Pushed as trivial. AUTHORS.in | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.in b/AUTHORS.in index 7e4359f..d385fbc 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -8,6 +8,7 @@ Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> The primary maintainers and people with commit access rights: Alex Jia <ajia(a)redhat.com> +Andrea Bolognani <abologna(a)redhat.com> Cédric Bosdonnat <cbosdonnat(a)suse.com> Christophe Fergeau <cfergeau(a)redhat.com> Claudio Bley <claudio.bley(a)gmail.com> -- 2.4.3

1 0

[libvirt] [PATCH tck 0/3] Account for blockstats changes in 121-block-info.t
by Mike Latimer 08 Oct '15

08 Oct '15

Hi, Due to libvirt commit 0282ca45, 121-block-info.t fails as the allocation size returned by block-info is now zero. While addressing this, a few aspects of the test were also cleaned up. The changes are not extensive, but it made more sense to submit them in a series. Thanks, Mike Mike Latimer (3): Rename volume1 variables Reorder and add qcow tests Disk allocation should be zero scripts/domain/121-block-info.t | 65 +++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -- 1.8.4.5

2 6

[libvirt] [sandbox] virt-sandbox-image: separate templates from the different sources
by Cédric Bosdonnat 08 Oct '15

08 Oct '15

Put templates files in a folder for the corresponding source to avoid potential name conflicts. --- libvirt-sandbox/image/cli.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index d449a7b..9b9c00b 100755 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -64,17 +64,21 @@ def debug(msg): def info(msg): sys.stdout.write(msg) +def get_template_dir(args): + tmpl = template.Template.from_uri(args.template) + return "%s/%s" % (args.template_dir, tmpl.source) + def delete(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() source.delete_template(template=tmpl, - templatedir=args.template_dir) + templatedir=get_template_dir(args)) def create(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() source.create_template(template=tmpl, - templatedir=args.template_dir, + templatedir=get_template_dir(args), connect=args.connect) def run(args): @@ -83,9 +87,10 @@ def run(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() + template_dir = get_template_dir(args) # Create the template image if needed - if not source.has_template(tmpl, args.template_dir): + if not source.has_template(tmpl, template_dir): create(args) name = args.name @@ -94,11 +99,11 @@ def run(args): name = tmpl.path[1:] + ":" + randomid diskfile = source.get_disk(template=tmpl, - templatedir=args.template_dir, + templatedir=template_dir, imagedir=args.image_dir, sandboxname=name) - commandToRun = source.get_command(tmpl, args.template_dir, args.args) + commandToRun = source.get_command(tmpl, template_dir, args.args) if len(commandToRun) == 0: commandToRun = ["/bin/sh"] cmd = ['virt-sandbox', '--name', name] @@ -112,7 +117,7 @@ def run(args): params.append('-N') params.append(networkArgs) - allEnvs = source.get_env(tmpl, args.template_dir) + allEnvs = source.get_env(tmpl, template_dir) envArgs = args.env if envArgs is not None: allEnvs = allEnvs + envArgs @@ -128,7 +133,7 @@ def run(args): cmd = cmd + params + ['--'] + commandToRun subprocess.call(cmd) os.unlink(diskfile) - source.post_run(tmpl, args.template_dir, name) + source.post_run(tmpl, template_dir, name) def requires_template(parser): parser.add_argument("template", -- 2.1.4

2 1

Re: [libvirt] [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by John Ferlan 08 Oct '15

08 Oct '15

On 09/29/2015 10:06 AM, Shivaprasad bhat wrote: [...] >> Perhaps I should clarify my query-migrate has no timeout comment... It >> seems based on what I've read so far, the 'query-migrate' command >> started successfully, because if it hadn't we would have received a >> failure (as shown below). Thus libvirt has sent the command via the >> monitor and is waiting for a response (e.g. the virCondWait after the >> qemuMonitorSend in the trace below). The response isn't coming because >> either "A" qemu didn't send it back or "B" libvirt missed it - that >> should be determinable. >> >> There's a way to turn on debugging so the monitor dialog can be seen - >> via changes to /etc/libvirt/libvirtd.conf. I use : >> >> log_level = 1 >> log_filters="3:remote 4:event 3:json 3:rpc" >> log_outputs="1:file:/var/log/libvirt/libvirtd.log" >> >> But you may need to remove the "3:json" in order to see the dialog since >> that where it "feels like" the issue might be. Then start libvirtd in >> the debugger again. Once it's hung - you should be able to scan (eg, >> edit) the libvirtd.log file and search for the "query-migrate" command >> being sent and then follow the copious output looking for the presence >> of a returned command. If there is none, then something in qemu isn't >> returning the failure correctly and it would need to be fixed there I >> would think as opposed to throwing down the big hammer of closing the fd. > > Had a chance to run with your log settings. The query-migrate doesn't seem to > have a corresponding "return" in the logs. So as you say, there may be > a qemu bug > that is not returning a response when the fd is still open(as libvirt > didnt close it) but > no read actually happening there. I felt qemu can't sense the failure as the fd > is open, so posted this patch. Though, the qemu should return with the > current state > of migration as it sees instead of not returning at all. Hope we are > on the same page. > > Thanks, > Shivaprasad > Meant to respond yesterday but got wrapped up in other things. OK - so at least now it makes a bit more sense why purely adding a stream_abort didn't work - we're not getting a reply from the monitor. So there's perhaps 3 ways to "resolve" this issue (that come to my mind) 1. As you've done with the close() in the error path of qemuMigrationIOFunc when the virStream{Send|Finish} fails. Although this does feel like a work-around, I suppose since the tunnel is a libvirt created thing and qemu isn't aware of it, then it feels reasonable. Although that does make me wonder how qemu could be hung up. What would something like a "virsh qemu-monitor-command $dom '{"execute":"query-migrate"}' return when the source is hung? Or does it hang too? 2. Adding some sort of "timeout" logic in qemuMonitorSend (e.g. virCondWaitUntil instead of virCondWait) to handle when a command doesn't get a response. Not sure this is right either since it's not clear to me there is a "time" that "all" commands are guaranteed to be run in/by, especially async ones. 3. Dig into qemu to figure out why it's not returning anything for a migrate-status request. Currently a bit beyond what I've done, but I believe would require attaching into the running qemu process to see if there was some thread "stuck" somewhere "waiting" on something that won't return because the stream closed. Hopefully Jiri (or perhaps Daniel) could provide some other insights. John

2 1

[libvirt] [PATCH 0/4] storage: Add a 'created' boolean for buildVol[From]
by John Ferlan 08 Oct '15

08 Oct '15

In the review of a recent series dealing with a needing to refresh a pool prior to adding a new volume: http://www.redhat.com/archives/libvir-list/2015-October/msg00109.html it was noted that there would be a small timing window possible between the check and the actual volume creation attempt. Michal noted that we could add a 'created' type flag in order to "know" whether the libvirt API's created the volume or not during their buildVol API. As these things usually do, this also morphed into also needing the same boolean for the buildVolFrom API. So that's what this series does... Ok mostly, patch 1 doesn't have anything to do with this, but I saw the anomaly why working my way through the code. John Ferlan (4): storage: Perform some cleanup of calls storage: Add created to virFileOpenAs storage: Add created to virDirCreate storage: Add checks for buildVol create file src/libxl/libxl_domain.c | 3 ++- src/libxl/libxl_driver.c | 3 ++- src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_process.c | 6 +++--- src/storage/storage_backend.c | 28 ++++++++++++++++------------ src/storage/storage_backend.h | 3 +++ src/storage/storage_backend_disk.c | 3 ++- src/storage/storage_backend_fs.c | 22 +++++++++++++++++----- src/storage/storage_backend_logical.c | 3 ++- src/storage/storage_backend_rbd.c | 2 ++ src/storage/storage_backend_sheepdog.c | 2 ++ src/storage/storage_driver.c | 16 +++++++++++----- src/util/virfile.c | 23 ++++++++++++++++++----- src/util/virfile.h | 4 ++-- src/util/virstoragefile.c | 3 ++- 15 files changed, 89 insertions(+), 39 deletions(-) -- 2.1.0

2 10

[libvirt] [PATCH v4] qemu: Validate address type when attaching a disk device.
by Ruifeng Bian 08 Oct '15

08 Oct '15

Bug fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Attach-device can hotplug a virtio disk device with any address type now, it need to validate the address type before the attachment. Attaching a disk device with --config option need to check address type. Otherwise, the domain cloudn't be started normally. This patch add a basic check for address type. Detaching a disk device with --config also need to check disk options, add qemuCheckDiskConfig() method in qemuDomainDetachDeviceConfig(). Add virDomainDeviceAddressTypeIsValid method in domain_conf to check disk address type. Address type should match with disk driver, report error messages if any mismatch. Signed-off-by: Ruifeng Bian <rbian(a)redhat.com> --- src/conf/domain_conf.c | 32 ++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_hotplug.c | 22 ++++++++++++++++++++++ 6 files changed, 65 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6df1618..f86760b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3200,6 +3200,38 @@ int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, return 0; } +int virDomainDeviceAddressTypeIsValid(virDomainDiskDefPtr disk) +{ + if (disk->info.type) { + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_IDE: + case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_SATA: + case VIR_DOMAIN_DISK_BUS_FDC: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) + return 1; + break; + case VIR_DOMAIN_DISK_BUS_USB: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) + return 1; + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + return 1; + break; + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_SD: + /* no address type currently, return false if address provided */ + return 1; + } + } + return 0; +} + virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f043554..337fe51 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2543,6 +2543,7 @@ virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src, virDomainXMLOptionPtr xmlopt); int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, int type); +int virDomainDeviceAddressTypeIsValid(virDomainDiskDefPtr disk); virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device); int virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst, virDomainDeviceInfoPtr src); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5b3da83..6cd5b9e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -229,6 +229,7 @@ virDomainDefPostParse; virDomainDefSetMemoryInitial; virDomainDeleteConfig; virDomainDeviceAddressIsValid; +virDomainDeviceAddressTypeIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceDefCheckUnsupportedMemoryDevice; virDomainDeviceDefCopy; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25f57f2..56ba08d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3606,6 +3606,13 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) goto error; } } + + if (virDomainDeviceAddressTypeIsValid(disk)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + goto error; + } return 0; error: return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fcf86b6..26c1502 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8208,6 +8208,8 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; + if (qemuCheckDiskConfig(disk) < 0) + return -1; if (!(det_disk = virDomainDiskRemoveByName(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, _("no target device %s"), disk->dst); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e84a78d..6156243 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -336,6 +336,28 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!qemuCheckCCWS390AddressSupport(vm->def, disk->info, priv->qemuCaps, disk->dst)) goto cleanup; + + if (qemuDomainMachineIsS390CCW(vm->def) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid CCW address")); + goto cleanup; + } + } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid S390 address")); + goto cleanup; + } + } else if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid PCI address")); + goto cleanup; + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.3

2 2

[libvirt] [PATCH 0/8] Resolve some storage and disk backend issues
by John Ferlan 08 Oct '15

08 Oct '15

The following patches resolve a few issues either explicitly generated via a bz or seen while investigating/testing the results from bzs. Patches 1-2 were discovered while working through patch 3. I found that deleting volumes from a pool was always going through the fork processing. I neglected to recall that when the volume was placed into the pool the mode, uid, & gid values can be updated. Thus on some delete paths we may not be called with -1 values. Because we were going through the fork processing I found that the error message displayed when a volume target no longer exists was wrong - that is the caller was expecting a return of -1 and errno being set. In this case looking for ENOENT and continuing on with removal of the volume from the pool. Patch 3 stands by itself - it's certainly one of those that could be deemed don't do that, but since we do check whether the volume was removed without libvirt doing the removal, I guess we should check whether the volume exists before trying to create it and using the refresh pool is the simplest mechanism for all pools. Patches 4-7 are intertwined - the disk backend code made the assumption that the volume/device being used for the pool was "good". The normal mode of operation is to define, build, start, but there's never been a "guarantee" or check that what is "on" the volume is valid for the type of pool Patch 8 was disk backend related - so while I'm in the code, I may as well make the change as well. John Ferlan (8): virfile: Add extra check for direct delete in virFileRemove virfile: Fix error path for forked virFileRemove storage: Prior to creating a volume, refresh the pool storage: Refactor disk label checking storage: Add param to check whether we can write a disk label storage: Add additional errors/checks for disk label storage: Introduce virStorageBackendDiskStartPool storage: Adjust calculation of alloc/capacity for disk src/libvirt_private.syms | 1 + src/storage/storage_backend_disk.c | 162 ++++++++++++++++++++++++++++++------- src/storage/storage_driver.c | 9 +++ src/util/virfile.c | 11 ++- 4 files changed, 151 insertions(+), 32 deletions(-) -- 2.1.0

3 14

[libvirt] [PATCH v2 0/6] Fix some Coverity issues
by John Ferlan 08 Oct '15

08 Oct '15

This series is based off the review of patch 1 from the series: http://www.redhat.com/archives/libvir-list/2015-September/msg00841.html In review of patch 1: http://www.redhat.com/archives/libvir-list/2015-September/msg00859.html it was noted that instead of using sa_assert, the proper checks should be made. During investigation, I found that while the caller could check for a non-NULL "first" parameter that ends up being used for strtok_r, that was not "good enough" for Coverity which still needed to consider the function where the to be first param cannot be NULL. In any case, I separated out each into their own patch rather than lumping them together. Patches 1-4 should be relatively straightforward. Patch 5 is new - it's one that I had been working on and finally figured out what the issue is/was. It was a bit more complex and hidden. Patch 6 was from the original patch 1, but it's review had a comment regarding using virBitmap* instead of the open coding. This one I believe I have intoned the magic words to make it better, but since I don't use xenapi, perhaps extra care would be necessary to make sure I got it right. John Ferlan (6): openvz: Resolve Coverity FORWARD_NULL openvz: Resolve Coverity FORWARD_NULL libxl: Resolve Coverity FORWARD_NULL esx: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL xenapi: Resolve Coverity FORWARD_NULL src/esx/esx_vi.c | 5 +++++ src/libxl/libxl_conf.c | 6 ++++++ src/openvz/openvz_conf.c | 8 ++++---- src/qemu/qemu_process.c | 14 ++++++++++++-- src/xenapi/xenapi_driver.c | 12 +++++++----- src/xenapi/xenapi_utils.c | 21 --------------------- src/xenapi/xenapi_utils.h | 2 -- 7 files changed, 34 insertions(+), 34 deletions(-) -- 2.1.0

2 15

[libvirt] [PATCH] tests: eventtest: Fix coverity warning
by Cole Robinson 07 Oct '15

07 Oct '15

We can ignore the result of virtTestResult here, because failure is unconditionally reported by the callers --- tests/eventtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/eventtest.c b/tests/eventtest.c index 625be86..c4be606 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -92,7 +92,7 @@ testEventReport(const char *name, bool failed, const char *msg, ...) data.failed = failed; data.msg = str; - virtTestRun(name, testEventResultCallback, &data); + ignore_value(virtTestRun(name, testEventResultCallback, &data)); va_end(vargs); VIR_FREE(str); -- 2.5.0

2 1

[libvirt] [PATCH] virSecurityManagerNew: Turn array of booleans into flags
by Michal Privoznik 07 Oct '15

07 Oct '15

So imagine you want to crate new security manager: if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false, true))); Hard to parse, right? What about this: if (!(mgr = virSecurityManagerNew("selinux", "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED | VIR_SECURITY_MANAGER_PRIVILEGED))); Now that's better! This is what the commit does. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 14 +++++--- src/qemu/qemu_driver.c | 28 ++++++++-------- src/security/security_manager.c | 70 +++++++++++++--------------------------- src/security/security_manager.h | 25 ++++++++------ tests/qemuhotplugtest.c | 3 +- tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 4 ++- tests/securityselinuxtest.c | 4 ++- 9 files changed, 72 insertions(+), 81 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index b064919..3e5d2b4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2645,8 +2645,7 @@ int main(int argc, char *argv[]) ctrl->handshakeFd = handshakeFd; if (!(ctrl->securityManager = virSecurityManagerNew(securityDriver, - LXC_DRIVER_NAME, - false, false, false, false))) + LXC_DRIVER_NAME, 0))) goto cleanup; if (ctrl->def->seclabels) { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b408be0..1a9550e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1556,13 +1556,17 @@ static int lxcCheckNetNsSupport(void) static virSecurityManagerPtr lxcSecurityInit(virLXCDriverConfigPtr cfg) { + unsigned int flags = VIR_SECURITY_MANAGER_PRIVILEGED; + VIR_INFO("lxcSecurityInit %s", cfg->securityDriverName); + + if (cfg->securityDefaultConfined) + flags |= VIR_SECURITY_MANAGER_DEFAULT_CONFINED; + if (cfg->securityRequireConfined) + flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED; + virSecurityManagerPtr mgr = virSecurityManagerNew(cfg->securityDriverName, - LXC_DRIVER_NAME, - false, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - true); + LXC_DRIVER_NAME, flags); if (!mgr) goto error; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aff1915..598d159 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -389,6 +389,16 @@ qemuSecurityInit(virQEMUDriverPtr driver) virSecurityManagerPtr mgr = NULL; virSecurityManagerPtr stack = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + unsigned int flags = 0; + + if (cfg->allowDiskFormatProbing) + flags |= VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE; + if (cfg->securityDefaultConfined) + flags |= VIR_SECURITY_MANAGER_DEFAULT_CONFINED; + if (cfg->securityRequireConfined) + flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED; + if (virQEMUDriverIsPrivileged(driver)) + flags |= VIR_SECURITY_MANAGER_PRIVILEGED; if (cfg->securityDriverNames && cfg->securityDriverNames[0]) { @@ -396,10 +406,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) while (names && *names) { if (!(mgr = virSecurityManagerNew(*names, QEMU_DRIVER_NAME, - cfg->allowDiskFormatProbing, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - virQEMUDriverIsPrivileged(driver)))) + flags))) goto error; if (!stack) { if (!(stack = virSecurityManagerNewStack(mgr))) @@ -414,10 +421,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) } else { if (!(mgr = virSecurityManagerNew(NULL, QEMU_DRIVER_NAME, - cfg->allowDiskFormatProbing, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - virQEMUDriverIsPrivileged(driver)))) + flags))) goto error; if (!(stack = virSecurityManagerNewStack(mgr))) goto error; @@ -425,14 +429,12 @@ qemuSecurityInit(virQEMUDriverPtr driver) } if (virQEMUDriverIsPrivileged(driver)) { + if (cfg->dynamicOwnership) + flags |= VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP; if (!(mgr = virSecurityManagerNewDAC(QEMU_DRIVER_NAME, cfg->user, cfg->group, - cfg->allowDiskFormatProbing, - cfg->securityDefaultConfined, - cfg->securityRequireConfined, - cfg->dynamicOwnership, - virQEMUDriverIsPrivileged(driver), + flags, qemuSecurityChownCallback))) goto error; if (!stack) { diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 28d7dfd..46b1a25 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -37,10 +37,7 @@ struct _virSecurityManager { virObjectLockable parent; virSecurityDriverPtr drv; - bool allowDiskFormatProbing; - bool defaultConfined; - bool requireConfined; - bool privileged; + unsigned int flags; const char *virtDriver; void *privateData; }; @@ -77,10 +74,7 @@ VIR_ONCE_GLOBAL_INIT(virSecurityManager); static virSecurityManagerPtr virSecurityManagerNewDriver(virSecurityDriverPtr drv, const char *virtDriver, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool privileged) + unsigned int flags) { virSecurityManagerPtr mgr; char *privateData; @@ -88,11 +82,10 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv, if (virSecurityManagerInitialize() < 0) return NULL; - VIR_DEBUG("drv=%p (%s) virtDriver=%s allowDiskFormatProbing=%d " - "defaultConfined=%d requireConfined=%d privileged=%d", - drv, drv->name, virtDriver, - allowDiskFormatProbing, defaultConfined, - requireConfined, privileged); + VIR_DEBUG("drv=%p (%s) virtDriver=%s flags=%x", + drv, drv->name, virtDriver, flags); + + virCheckFlags(VIR_SECURITY_MANAGER_NEW_MASK, NULL); if (VIR_ALLOC_N(privateData, drv->privateDataLen) < 0) return NULL; @@ -103,10 +96,7 @@ virSecurityManagerNewDriver(virSecurityDriverPtr drv, } mgr->drv = drv; - mgr->allowDiskFormatProbing = allowDiskFormatProbing; - mgr->defaultConfined = defaultConfined; - mgr->requireConfined = requireConfined; - mgr->privileged = privileged; + mgr->flags = flags; mgr->virtDriver = virtDriver; mgr->privateData = privateData; @@ -125,10 +115,7 @@ virSecurityManagerNewStack(virSecurityManagerPtr primary) virSecurityManagerPtr mgr = virSecurityManagerNewDriver(&virSecurityDriverStack, virSecurityManagerGetDriver(primary), - virSecurityManagerGetAllowDiskFormatProbing(primary), - virSecurityManagerGetDefaultConfined(primary), - virSecurityManagerGetRequireConfined(primary), - virSecurityManagerGetPrivileged(primary)); + primary->flags); if (!mgr) return NULL; @@ -153,20 +140,13 @@ virSecurityManagerPtr virSecurityManagerNewDAC(const char *virtDriver, uid_t user, gid_t group, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool dynamicOwnership, - bool privileged, + unsigned int flags, virSecurityManagerDACChownCallback chownCallback) { virSecurityManagerPtr mgr = virSecurityManagerNewDriver(&virSecurityDriverDAC, virtDriver, - allowDiskFormatProbing, - defaultConfined, - requireConfined, - privileged); + flags & VIR_SECURITY_MANAGER_NEW_MASK); if (!mgr) return NULL; @@ -176,7 +156,7 @@ virSecurityManagerNewDAC(const char *virtDriver, return NULL; } - virSecurityDACSetDynamicOwnership(mgr, dynamicOwnership); + virSecurityDACSetDynamicOwnership(mgr, flags & VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP); virSecurityDACSetChownCallback(mgr, chownCallback); return mgr; @@ -186,10 +166,7 @@ virSecurityManagerNewDAC(const char *virtDriver, virSecurityManagerPtr virSecurityManagerNew(const char *name, const char *virtDriver, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool privileged) + unsigned int flags) { virSecurityDriverPtr drv = virSecurityDriverLookup(name, virtDriver); if (!drv) @@ -197,13 +174,13 @@ virSecurityManagerNew(const char *name, /* driver "none" needs some special handling of *Confined bools */ if (STREQ(drv->name, "none")) { - if (requireConfined) { + if (flags & VIR_SECURITY_MANAGER_REQUIRE_CONFINED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Security driver \"none\" cannot create confined guests")); return NULL; } - if (defaultConfined) { + if (flags & VIR_SECURITY_MANAGER_DEFAULT_CONFINED) { if (name != NULL) { VIR_WARN("Configured security driver \"none\" disables default" " policy to create confined guests"); @@ -211,16 +188,13 @@ virSecurityManagerNew(const char *name, VIR_DEBUG("Auto-probed security driver is \"none\";" " confined guests will not be created"); } - defaultConfined = false; + flags &= ~VIR_SECURITY_MANAGER_DEFAULT_CONFINED; } } return virSecurityManagerNewDriver(drv, virtDriver, - allowDiskFormatProbing, - defaultConfined, - requireConfined, - privileged); + flags); } @@ -323,28 +297,28 @@ virSecurityManagerGetBaseLabel(virSecurityManagerPtr mgr, bool virSecurityManagerGetAllowDiskFormatProbing(virSecurityManagerPtr mgr) { - return mgr->allowDiskFormatProbing; + return mgr->flags & VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE; } bool virSecurityManagerGetDefaultConfined(virSecurityManagerPtr mgr) { - return mgr->defaultConfined; + return mgr->flags & VIR_SECURITY_MANAGER_DEFAULT_CONFINED; } bool virSecurityManagerGetRequireConfined(virSecurityManagerPtr mgr) { - return mgr->requireConfined; + return mgr->flags & VIR_SECURITY_MANAGER_REQUIRE_CONFINED; } bool virSecurityManagerGetPrivileged(virSecurityManagerPtr mgr) { - return mgr->privileged; + return mgr->flags & VIR_SECURITY_MANAGER_PRIVILEGED; } @@ -611,7 +585,7 @@ virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } if (seclabel->type == VIR_DOMAIN_SECLABEL_DEFAULT) { - if (sec_managers[i]->defaultConfined) { + if (virSecurityManagerGetDefaultConfined(sec_managers[i])) { seclabel->type = VIR_DOMAIN_SECLABEL_DYNAMIC; } else { seclabel->type = VIR_DOMAIN_SECLABEL_NONE; @@ -620,7 +594,7 @@ virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } if (seclabel->type == VIR_DOMAIN_SECLABEL_NONE) { - if (sec_managers[i]->requireConfined) { + if (virSecurityManagerGetRequireConfined(sec_managers[i])) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unconfined guests are not allowed on this host")); goto cleanup; diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 53e56f6..e534e31 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -30,12 +30,23 @@ typedef struct _virSecurityManager virSecurityManager; typedef virSecurityManager *virSecurityManagerPtr; +typedef enum { + VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE = 1 << 0, + VIR_SECURITY_MANAGER_DEFAULT_CONFINED = 1 << 1, + VIR_SECURITY_MANAGER_REQUIRE_CONFINED = 1 << 2, + VIR_SECURITY_MANAGER_PRIVILEGED = 1 << 3, + VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP = 1 << 4, +} virSecurityManagerNewFlags; + +# define VIR_SECURITY_MANAGER_NEW_MASK \ + (VIR_SECURITY_MANAGER_ALLOW_DISK_PROBE | \ + VIR_SECURITY_MANAGER_DEFAULT_CONFINED | \ + VIR_SECURITY_MANAGER_REQUIRE_CONFINED | \ + VIR_SECURITY_MANAGER_PRIVILEGED) + virSecurityManagerPtr virSecurityManagerNew(const char *name, const char *virtDriver, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool privileged); + unsigned int flags); virSecurityManagerPtr virSecurityManagerNewStack(virSecurityManagerPtr primary); int virSecurityManagerStackAddNested(virSecurityManagerPtr stack, @@ -59,11 +70,7 @@ typedef int virSecurityManagerPtr virSecurityManagerNewDAC(const char *virtDriver, uid_t user, gid_t group, - bool allowDiskFormatProbing, - bool defaultConfined, - bool requireConfined, - bool dynamicOwnership, - bool privileged, + unsigned int flags, virSecurityManagerDACChownCallback chownCallback); int virSecurityManagerPreFork(virSecurityManagerPtr mgr); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 2135b5a..2c5c48f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -364,7 +364,8 @@ mymain(void) if (!driver.lockManager) return EXIT_FAILURE; - if (!(mgr = virSecurityManagerNew("none", "qemu", false, false, false, true))) + if (!(mgr = virSecurityManagerNew("none", "qemu", + VIR_SECURITY_MANAGER_PRIVILEGED))) return EXIT_FAILURE; if (!(driver.securityManager = virSecurityManagerNewStack(mgr))) return EXIT_FAILURE; diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index 93ddcbb..6b1e789 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -17,7 +17,7 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) if (virThreadInitialize() < 0) return EXIT_FAILURE; - mgr = virSecurityManagerNew(NULL, "QEMU", false, true, false, false); + mgr = virSecurityManagerNew(NULL, "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED); if (mgr == NULL) { fprintf(stderr, "Failed to start security driver"); return EXIT_FAILURE; diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 4b8fa6f..86660f4 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -351,7 +351,9 @@ mymain(void) if (!rc) return EXIT_AM_SKIP; - if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false, true))) { + if (!(mgr = virSecurityManagerNew("selinux", "QEMU", + VIR_SECURITY_MANAGER_DEFAULT_CONFINED | + VIR_SECURITY_MANAGER_PRIVILEGED))) { virErrorPtr err = virGetLastError(); VIR_TEST_VERBOSE("Unable to initialize security driver: %s\n", err->message); diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 3a7862f..49694f3 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -272,7 +272,9 @@ mymain(void) int ret = 0; virSecurityManagerPtr mgr; - if (!(mgr = virSecurityManagerNew("selinux", "QEMU", false, true, false, true))) { + if (!(mgr = virSecurityManagerNew("selinux", "QEMU", + VIR_SECURITY_MANAGER_DEFAULT_CONFINED | + VIR_SECURITY_MANAGER_PRIVILEGED))) { virErrorPtr err = virGetLastError(); fprintf(stderr, "Unable to initialize security driver: %s\n", err->message); -- 2.4.9

2 1

[libvirt] [PATCH 0/3] tests: Drop virtTestResult
by Cole Robinson 07 Oct '15

07 Oct '15

virtTestResult poorly duplicates logic from virtTestRun. We could fix it, but there's really only one legitimate user in eventtest.c, so drop the improper users, and opencode the legit usage. More justification in the last patch Thanks, Cole Cole Robinson (3): tests: sheepdog: Drop use of virtTestResult tests: eventtest: Open code virtTestResult testutils: Drop virtTestResult tests/eventtest.c | 57 ++++++++++++++++++++++++++++------ tests/storagebackendsheepdogtest.c | 63 ++++++++++++++++++++++++++++---------- tests/testutils.c | 38 ----------------------- tests/testutils.h | 2 -- 4 files changed, 94 insertions(+), 66 deletions(-) -- 2.5.0

3 9

[libvirt] [PATCH 0/2] tests: Add nodeinfo test data utility scripts
by Andrea Bolognani 07 Oct '15

07 Oct '15

Both scripts can be useful when adding new test cases to the nodeinfo test. Andrea Bolognani (2): tests: Add script to display nodeinfo test data tests: Add script to copy nodeinfo test data from host tests/nodeinfodata/copy-from-host.sh | 170 +++++++++++++++++++++++++++++++++++ tests/nodeinfodata/display.sh | 101 +++++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100755 tests/nodeinfodata/copy-from-host.sh create mode 100755 tests/nodeinfodata/display.sh -- 2.4.3

2 5

[libvirt] [PATCH v2] qemu: Remove explicit values from virQEMUCapsFlags
by Andrea Bolognani 07 Oct '15

07 Oct '15

This gets rid of the partially enforced alignment and makes it less likely for a bogus value to be introduced in the enumeration. Use #define for QEMU_CAPS_NET_NAME and QEMU_CAPS_HOST_NET_ADD, both of which are aliases for QEMU_CAPS_0_10. --- First attempt was [libvirt] [PATCH] qemu: Align virQEMUCapsFlags members https://www.redhat.com/archives/libvir-list/2015-October/msg00112.html Changes based on suggestions from Dan and Jirka. src/qemu/qemu_capabilities.h | 415 +++++++++++++++++++++---------------------- 1 file changed, 206 insertions(+), 209 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a1d98d0..b5b1af4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -32,217 +32,214 @@ /* Internal flags to keep track of qemu command line capabilities */ typedef enum { - QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ - QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ - QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ - QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ - QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ - QEMU_CAPS_NAME = 5, /* Is the -name flag available */ - QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ - QEMU_CAPS_VNET_HDR = 8, - QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ - QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ - QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ - QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ - QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */ - QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ - QEMU_CAPS_VGA = 15, /* Is -vga avail */ - - /* features added in qemu-0.10.0 or later */ - QEMU_CAPS_0_10 = 16, - QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ - QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ - - QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ - QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ - QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ - QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ - QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ - QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ - QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ - QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ - QEMU_CAPS_BALLOON = 25, /* -balloon available */ - QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ - QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ - QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ - QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ - QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ - QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ - QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ - QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ - QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ - QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ - QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ - QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ - QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ - QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ - QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ - QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ - QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ - QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ - QEMU_CAPS_SPICE = 46, /* Is -spice avail */ - QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ - QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ - QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ - QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ - QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ - QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ - QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ - QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ - QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ - QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ - QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ - QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ - QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ - QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ - QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ - QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ - QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ - QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ - QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ - QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ - QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ - QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ - QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ - QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ - QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ - QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ - QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ - QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ - QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ - QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ - QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ - QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ - QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ - QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ - QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ - QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ - QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ - QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ - QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ - QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ - QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ - QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ - QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ - QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ - QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ - QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ - QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ - QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ - QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ - QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ - QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */ - QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ - QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ - QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ - QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */ - QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ - QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ - QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ - QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ - QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ - QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ - QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ - QEMU_CAPS_VNC = 114, /* Is -vnc available? */ - QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ - QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ - QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ - QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ - QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ - QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ - QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ - QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ - QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device XXX - for primary video device */ - QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */ - QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */ - QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */ - QEMU_CAPS_ADD_FD = 127, /* -add-fd */ - QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */ - QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */ - QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for - virtio rng */ - QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ - QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ - QEMU_CAPS_DTB = 133, /* -dtb file */ - QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ - QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ - QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ - QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ - QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ - QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */ - QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */ - QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */ - QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */ - QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ - QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ - QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ - QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ - QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ - QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ - QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ - QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */ - QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ - QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ - QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ - QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ - QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ - QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ - QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ - QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ - QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ - QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ - QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ - QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ - QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ - QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ - QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ - QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ - QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ - QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ - QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ - QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ - QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ - QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ - QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ - QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ - QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ - QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ - QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ - QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */ - QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */ - QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ - QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ - QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ - QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ - QEMU_CAPS_AES_KEY_WRAP = 186, /* -machine aes_key_wrap */ - QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ - QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ - QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ - QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ - QEMU_CAPS_OBJECT_GPEX = 192, /* have generic PCI host controller */ - QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */ - QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */ - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */ - QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ - QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ - QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ - QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */ - - QEMU_CAPS_LAST, /* this must always be the last item */ + QEMU_CAPS_KQEMU, /* Whether KQEMU is compiled in */ + QEMU_CAPS_VNC_COLON, /* VNC takes or address + display */ + QEMU_CAPS_NO_REBOOT, /* Is the -no-reboot flag available */ + QEMU_CAPS_DRIVE, /* Is the new -drive arg available */ + QEMU_CAPS_DRIVE_BOOT, /* Does -drive support boot=on */ + QEMU_CAPS_NAME, /* Is the -name flag available */ + QEMU_CAPS_UUID, /* Is the -uuid flag available */ + QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ + QEMU_CAPS_VNET_HDR, + QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ + QEMU_CAPS_MIGRATE_QEMU_TCP, /* have qemu tcp migration */ + QEMU_CAPS_MIGRATE_QEMU_EXEC, /* have qemu exec migration */ + QEMU_CAPS_DRIVE_CACHE_V2, /* cache= flag wanting new v2 values */ + QEMU_CAPS_KVM, /* Whether KVM is enabled by default */ + QEMU_CAPS_DRIVE_FORMAT, /* Is -drive format= avail */ + QEMU_CAPS_VGA, /* Is -vga avail */ + QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */ + QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */ + QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */ + QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ + QEMU_CAPS_XEN_DOMID, /* -xen-domid */ + QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ + QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ + QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ + QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */ + QEMU_CAPS_BALLOON, /* -balloon available */ + QEMU_CAPS_DEVICE, /* Is the new -device arg available */ + QEMU_CAPS_SDL, /* Is the new -sdl arg available */ + QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ + QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */ + QEMU_CAPS_RTC, /* The -rtc flag for clock options */ + QEMU_CAPS_VHOST_NET, /* vhost-net support available */ + QEMU_CAPS_RTC_TD_HACK, /* -rtc-td-hack available */ + QEMU_CAPS_NO_HPET, /* -no-hpet flag is supported */ + QEMU_CAPS_NO_KVM_PIT, /* -no-kvm-pit-reinjection supported */ + QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ + QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ + QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ + QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */ + QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */ + QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ + QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ + QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ + QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ + QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ + QEMU_CAPS_VGA_QXL, /* The 'qxl' arg for '-vga' */ + QEMU_CAPS_SPICE, /* Is -spice avail */ + QEMU_CAPS_VGA_NONE, /* The 'none' arg for '-vga' */ + QEMU_CAPS_MIGRATE_QEMU_FD, /* -incoming fd:n */ + QEMU_CAPS_BOOTINDEX, /* -device bootindex property */ + QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ + QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */ + QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */ + QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ + QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ + QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */ + QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */ + QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ + QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */ + QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ + QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */ + QEMU_CAPS_VIRTIO_IOEVENTFD, /* virtio-{net|blk}-pci.ioeventfd=on */ + QEMU_CAPS_SGA, /* Serial Graphics Adapter */ + QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, /* virtio-blk-pci.event_idx */ + QEMU_CAPS_VIRTIO_NET_EVENT_IDX, /* virtio-net-pci.event_idx */ + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC, /* Is cache=directsync supported? */ + QEMU_CAPS_PIIX3_USB_UHCI, /* -device piix3-usb-uhci */ + QEMU_CAPS_PIIX4_USB_UHCI, /* -device piix4-usb-uhci */ + QEMU_CAPS_USB_EHCI, /* -device usb-ehci */ + QEMU_CAPS_ICH9_USB_EHCI1, /* -device ich9-usb-ehci1 and friends */ + QEMU_CAPS_VT82C686B_USB_UHCI, /* -device vt82c686b-usb-uhci */ + QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */ + QEMU_CAPS_USB_REDIR, /* -device usb-redir */ + QEMU_CAPS_USB_HUB, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ + QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */ + QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */ + QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */ + QEMU_CAPS_NO_ACPI, /* -no-acpi */ + QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */ + QEMU_CAPS_VIRTIO_BLK_SCSI, /* virtio-blk-pci.scsi */ + QEMU_CAPS_VIRTIO_BLK_SG_IO, /* SG_IO commands, since 0.11 */ + QEMU_CAPS_DRIVE_COPY_ON_READ, /* -drive copy-on-read */ + QEMU_CAPS_CPU_HOST, /* support for -cpu host */ + QEMU_CAPS_FSDEV_WRITEOUT, /* -fsdev writeout supported */ + QEMU_CAPS_DRIVE_IOTUNE, /* -drive bps= and friends */ + QEMU_CAPS_WAKEUP, /* system_wakeup monitor command */ + QEMU_CAPS_SCSI_DISK_CHANNEL, /* Is scsi-disk.channel available? */ + QEMU_CAPS_SCSI_BLOCK, /* -device scsi-block */ + QEMU_CAPS_TRANSACTION, /* transaction monitor command */ + QEMU_CAPS_BLOCKJOB_SYNC, /* old block_job_cancel, block_stream */ + QEMU_CAPS_BLOCKJOB_ASYNC, /* new block-job-cancel, block-stream */ + QEMU_CAPS_SCSI_CD, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD, /* -device ide-cd */ + QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ + QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ + QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ + QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ + QEMU_CAPS_VIRTIO_S390, /* -device virtio-*-s390 */ + QEMU_CAPS_BALLOON_EVENT, /* Async event for balloon changes */ + QEMU_CAPS_NETDEV_BRIDGE, /* bridge helper support */ + QEMU_CAPS_SCSI_LSI, /* -device lsi */ + QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ + QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ + QEMU_CAPS_DISABLE_S3, /* S3 BIOS Advertisement on/off */ + QEMU_CAPS_DISABLE_S4, /* S4 BIOS Advertisement on/off */ + QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ + QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ + QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ + QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */ + QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ + QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ + QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */ + QEMU_CAPS_BLOCK_COMMIT, /* block-commit */ + QEMU_CAPS_VNC, /* Is -vnc available? */ + QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */ + QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */ + QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */ + QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */ + QEMU_CAPS_DEVICE_QXL, /* -device qxl */ + QEMU_CAPS_DEVICE_VGA, /* -device VGA */ + QEMU_CAPS_DEVICE_CIRRUS_VGA, /* -device cirrus-vga */ + QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */ + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */ + QEMU_CAPS_SCLP_S390, /* -device sclp* */ + QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ + QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ + QEMU_CAPS_ADD_FD, /* -add-fd */ + QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ + QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ + QEMU_CAPS_OBJECT_RNG_RANDOM, /* the rng-random backend for virtio rng */ + QEMU_CAPS_OBJECT_RNG_EGD, /* EGD protocol daemon for rng */ + QEMU_CAPS_VIRTIO_CCW, /* -device virtio-*-ccw */ + QEMU_CAPS_DTB, /* -dtb file */ + QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ + QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ + QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/ + QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */ + QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */ + QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */ + QEMU_CAPS_DEVICE_NVRAM, /* -global spapr-nvram.reg=xxxx */ + QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */ + QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */ + QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */ + QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */ + QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */ + QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */ + QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */ + QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */ + QEMU_CAPS_MLOCK, /* -realtime mlock=on|off */ + QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */ + QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */ + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */ + QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */ + QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */ + QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */ + QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */ + QEMU_CAPS_DEVICE_VIRTIO_MMIO, /* -device virtio-mmio */ + QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, /* -device ich9-intel-hda */ + QEMU_CAPS_KVM_PIT_TICK_POLICY, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_BOOT_STRICT, /* -boot strict */ + QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ + QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */ + QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */ + QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */ + QEMU_CAPS_HOST_PCI_MULTIDOMAIN, /* support domain > 0 in host pci address */ + QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */ + QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */ + QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */ + QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */ + QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ + QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */ + QEMU_CAPS_OBJECT_USB_AUDIO, /* usb-audio device support */ + QEMU_CAPS_RTC_RESET_REINJECTION, /* rtc-reset-reinjection monitor command */ + QEMU_CAPS_SPLASH_TIMEOUT, /* -boot splash-time */ + QEMU_CAPS_OBJECT_IOTHREAD, /* -object iothread */ + QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */ + QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */ + QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max= and friends */ + QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */ + QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */ + QEMU_CAPS_QXL_VGAMEM, /* -device qxl.vgamem_mb */ + QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */ + QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */ + QEMU_CAPS_MACHINE_VMPORT_OPT, /* -machine xxx,vmport=on/off/auto */ + QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ + QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ + QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */ + QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */ + QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */ + QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */ + QEMU_CAPS_OBJECT_GPEX, /* have generic PCI host controller */ + QEMU_CAPS_DEVICE_IOH3420, /* -device ioh3420 */ + QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */ + QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, /* -device xio3130-downstream */ + QEMU_CAPS_DEVICE_RTL8139, /* -device rtl8139 */ + QEMU_CAPS_DEVICE_E1000, /* -device e1000 */ + QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */ + QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */ + + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; +/* Aliases for some of the capabilities defined above */ +#define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ +#define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ + typedef struct _virQEMUCaps virQEMUCaps; typedef virQEMUCaps *virQEMUCapsPtr; -- 2.4.3

3 5

[libvirt] [PATCH] qemu: Fix indentation issue
by Andrea Bolognani 07 Oct '15

07 Oct '15

Two #define lines introduced by b527aa0 did not respect the indentation rules, thus breaking syntax-check. --- Pushed as trivial. src/qemu/qemu_capabilities.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7b0e3eb..b883315 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -316,8 +316,8 @@ typedef enum { } virQEMUCapsFlags; /* Aliases for some of the capabilities defined above */ -#define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ -#define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ +# define QEMU_CAPS_NET_NAME QEMU_CAPS_0_10 /* -net ...,name=str */ +# define QEMU_CAPS_HOST_NET_ADD QEMU_CAPS_0_10 /* host_net_add command */ typedef struct _virQEMUCaps virQEMUCaps; typedef virQEMUCaps *virQEMUCapsPtr; -- 2.4.3

1 0

[libvirt] [PATCH] qemu: Align virQEMUCapsFlags members
by Andrea Bolognani 07 Oct '15

07 Oct '15

--- This pushes a lot of lines well beyond 80 columns, but then again some of the entries were already as long as 92 columns... src/qemu/qemu_capabilities.h | 412 +++++++++++++++++++++---------------------- 1 file changed, 205 insertions(+), 207 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index a1d98d0..06c928c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -32,215 +32,213 @@ /* Internal flags to keep track of qemu command line capabilities */ typedef enum { - QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ - QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ - QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ - QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ - QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ - QEMU_CAPS_NAME = 5, /* Is the -name flag available */ - QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ - QEMU_CAPS_VNET_HDR = 8, - QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ - QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ - QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ - QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ - QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */ - QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ - QEMU_CAPS_VGA = 15, /* Is -vga avail */ + QEMU_CAPS_KQEMU = 0, /* Whether KQEMU is compiled in */ + QEMU_CAPS_VNC_COLON = 1, /* VNC takes or address + display */ + QEMU_CAPS_NO_REBOOT = 2, /* Is the -no-reboot flag available */ + QEMU_CAPS_DRIVE = 3, /* Is the new -drive arg available */ + QEMU_CAPS_DRIVE_BOOT = 4, /* Does -drive support boot=on */ + QEMU_CAPS_NAME = 5, /* Is the -name flag available */ + QEMU_CAPS_UUID = 6, /* Is the -uuid flag available */ + QEMU_CAPS_DOMID = 7, /* Xenner: -domid flag available */ + QEMU_CAPS_VNET_HDR = 8, + QEMU_CAPS_MIGRATE_KVM_STDIO = 9, /* avoid kvm tcp migration bug */ + QEMU_CAPS_MIGRATE_QEMU_TCP = 10, /* have qemu tcp migration */ + QEMU_CAPS_MIGRATE_QEMU_EXEC = 11, /* have qemu exec migration */ + QEMU_CAPS_DRIVE_CACHE_V2 = 12, /* cache= flag wanting new v2 values */ + QEMU_CAPS_KVM = 13, /* Whether KVM is enabled by default */ + QEMU_CAPS_DRIVE_FORMAT = 14, /* Is -drive format= avail */ + QEMU_CAPS_VGA = 15, /* Is -vga avail */ /* features added in qemu-0.10.0 or later */ - QEMU_CAPS_0_10 = 16, - QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ - QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ - - QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ - QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ - QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ - QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ - QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ - QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ - QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ - QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ - QEMU_CAPS_BALLOON = 25, /* -balloon available */ - QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ - QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ - QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ - QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ - QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ - QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ - QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ - QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ - QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ - QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ - QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ - QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ - QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ - QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ - QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ - QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ - QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ - QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ - QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ - QEMU_CAPS_SPICE = 46, /* Is -spice avail */ - QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ - QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ - QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ - QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ - QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ - QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ - QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ - QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ - QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ - QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ - QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ - QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ - QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ - QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ - QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ - QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ - QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ - QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ - QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ - QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ - QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ - QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ - QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ - QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ - QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ - QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ - QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ - QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ - QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ - QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ - QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ - QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ - QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ - QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ - QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ - QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ - QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ - QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ - QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ - QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ - QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ - QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ - QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ - QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ - QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ - QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ - QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ - QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ - QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ - QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ - QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ - QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ - QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ - QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */ - QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ - QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ - QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ - QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */ - QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ - QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ - QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ - QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ - QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ - QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ - QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ - QEMU_CAPS_VNC = 114, /* Is -vnc available? */ - QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ - QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ - QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ - QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ - QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ - QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ - QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ - QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ - QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device XXX - for primary video device */ - QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */ - QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */ - QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */ - QEMU_CAPS_ADD_FD = 127, /* -add-fd */ - QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */ - QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */ - QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for - virtio rng */ - QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ - QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ - QEMU_CAPS_DTB = 133, /* -dtb file */ - QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ - QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ - QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ - QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ - QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ - QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */ - QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */ - QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */ - QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */ - QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ - QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ - QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ - QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ - QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ - QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ - QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ - QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */ - QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ - QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ - QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ - QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ - QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ - QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ - QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ - QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ - QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ - QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ - QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ - QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ - QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ - QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ - QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ - QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ - QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ - QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ - QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ - QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ - QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ - QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ - QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ - QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ - QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ - QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ - QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ - QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */ - QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */ - QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ - QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ - QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ - QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ - QEMU_CAPS_AES_KEY_WRAP = 186, /* -machine aes_key_wrap */ - QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ - QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ - QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ - QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ - QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ - QEMU_CAPS_OBJECT_GPEX = 192, /* have generic PCI host controller */ - QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */ - QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */ - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */ - QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ - QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ - QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ - QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */ - - QEMU_CAPS_LAST, /* this must always be the last item */ + QEMU_CAPS_0_10 = 16, + QEMU_CAPS_NET_NAME = QEMU_CAPS_0_10, /* -net ...,name=str */ + QEMU_CAPS_HOST_NET_ADD = QEMU_CAPS_0_10, /* host_net_add command */ + + QEMU_CAPS_PCIDEVICE = 17, /* PCI device assignment supported */ + QEMU_CAPS_MEM_PATH = 18, /* mmap'ped guest backing supported */ + QEMU_CAPS_DRIVE_SERIAL = 19, /* -driver serial= available */ + QEMU_CAPS_XEN_DOMID = 20, /* -xen-domid */ + QEMU_CAPS_MIGRATE_QEMU_UNIX = 21, /* qemu migration via unix sockets */ + QEMU_CAPS_CHARDEV = 22, /* Is the new -chardev arg available */ + QEMU_CAPS_ENABLE_KVM = 23, /* -enable-kvm flag */ + QEMU_CAPS_MONITOR_JSON = 24, /* JSON mode for monitor */ + QEMU_CAPS_BALLOON = 25, /* -balloon available */ + QEMU_CAPS_DEVICE = 26, /* Is the new -device arg available */ + QEMU_CAPS_SDL = 27, /* Is the new -sdl arg available */ + QEMU_CAPS_SMP_TOPOLOGY = 28, /* -smp has sockets/cores/threads */ + QEMU_CAPS_NETDEV = 29, /* -netdev flag & netdev_add/remove */ + QEMU_CAPS_RTC = 30, /* The -rtc flag for clock options */ + QEMU_CAPS_VHOST_NET = 31, /* vhost-net support available */ + QEMU_CAPS_RTC_TD_HACK = 32, /* -rtc-td-hack available */ + QEMU_CAPS_NO_HPET = 33, /* -no-hpet flag is supported */ + QEMU_CAPS_NO_KVM_PIT = 34, /* -no-kvm-pit-reinjection supported */ + QEMU_CAPS_TDF = 35, /* -tdf flag (user-mode pit catchup) */ + QEMU_CAPS_PCI_CONFIGFD = 36, /* pci-assign.configfd */ + QEMU_CAPS_NODEFCONFIG = 37, /* -nodefconfig */ + QEMU_CAPS_BOOT_MENU = 38, /* -boot menu=on support */ + QEMU_CAPS_ENABLE_KQEMU = 39, /* -enable-kqemu flag */ + QEMU_CAPS_FSDEV = 40, /* -fstype filesystem passthrough */ + QEMU_CAPS_NESTING = 41, /* -enable-nesting (SVM/VMX) */ + QEMU_CAPS_NAME_PROCESS = 42, /* Is -name process= available */ + QEMU_CAPS_DRIVE_READONLY = 43, /* -drive readonly=on|off */ + QEMU_CAPS_SMBIOS_TYPE = 44, /* Is -smbios type= available */ + QEMU_CAPS_VGA_QXL = 45, /* The 'qxl' arg for '-vga' */ + QEMU_CAPS_SPICE = 46, /* Is -spice avail */ + QEMU_CAPS_VGA_NONE = 47, /* The 'none' arg for '-vga' */ + QEMU_CAPS_MIGRATE_QEMU_FD = 48, /* -incoming fd:n */ + QEMU_CAPS_BOOTINDEX = 49, /* -device bootindex property */ + QEMU_CAPS_HDA_DUPLEX = 50, /* -device hda-duplex */ + QEMU_CAPS_DRIVE_AIO = 51, /* -drive aio= supported */ + QEMU_CAPS_PCI_MULTIBUS = 52, /* bus=pci.0 vs bus=pci */ + QEMU_CAPS_PCI_BOOTINDEX = 53, /* pci-assign.bootindex */ + QEMU_CAPS_CCID_EMULATED = 54, /* -device ccid-card-emulated */ + QEMU_CAPS_CCID_PASSTHRU = 55, /* -device ccid-card-passthru */ + QEMU_CAPS_CHARDEV_SPICEVMC = 56, /* newer -chardev spicevmc */ + QEMU_CAPS_DEVICE_SPICEVMC = 57, /* older -device spicevmc*/ + QEMU_CAPS_VIRTIO_TX_ALG = 58, /* -device virtio-net-pci,tx=string */ + QEMU_CAPS_DEVICE_QXL_VGA = 59, /* primary qxl device named qxl-vga? */ + QEMU_CAPS_PCI_MULTIFUNCTION = 60, /* -device multifunction=on|off */ + QEMU_CAPS_VIRTIO_IOEVENTFD = 61, /* virtio-{net|blk}-pci.ioeventfd=on */ + QEMU_CAPS_SGA = 62, /* Serial Graphics Adapter */ + QEMU_CAPS_VIRTIO_BLK_EVENT_IDX = 63, /* virtio-blk-pci.event_idx */ + QEMU_CAPS_VIRTIO_NET_EVENT_IDX = 64, /* virtio-net-pci.event_idx */ + QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC = 65, /* Is cache=directsync supported? */ + QEMU_CAPS_PIIX3_USB_UHCI = 66, /* -device piix3-usb-uhci */ + QEMU_CAPS_PIIX4_USB_UHCI = 67, /* -device piix4-usb-uhci */ + QEMU_CAPS_USB_EHCI = 68, /* -device usb-ehci */ + QEMU_CAPS_ICH9_USB_EHCI1 = 69, /* -device ich9-usb-ehci1 and friends */ + QEMU_CAPS_VT82C686B_USB_UHCI = 70, /* -device vt82c686b-usb-uhci */ + QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ + QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ + QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ + QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ + QEMU_CAPS_PCI_ROMBAR = 76, /* -device rombar=0|1 */ + QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ + QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ + QEMU_CAPS_FSDEV_READONLY = 79, /* -fsdev readonly supported */ + QEMU_CAPS_VIRTIO_BLK_SCSI = 80, /* virtio-blk-pci.scsi */ + QEMU_CAPS_VIRTIO_BLK_SG_IO = 81, /* SG_IO commands, since 0.11 */ + QEMU_CAPS_DRIVE_COPY_ON_READ = 82, /* -drive copy-on-read */ + QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ + QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ + QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ + QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ + QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ + QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ + QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ + QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ + QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ + QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ + QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ + QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ + QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ + QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ + QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ + QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ + QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ + QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */ + QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */ + QEMU_CAPS_VIRTIO_SCSI = 102, /* -device virtio-scsi-* */ + QEMU_CAPS_BLOCKIO = 103, /* -device ...logical_block_size & co */ + QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */ + QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */ + QEMU_CAPS_USB_REDIR_FILTER = 106, /* usb-redir.filter */ + QEMU_CAPS_IDE_DRIVE_WWN = 107, /* Is ide-drive.wwn available? */ + QEMU_CAPS_SCSI_DISK_WWN = 108, /* Is scsi-disk.wwn available? */ + QEMU_CAPS_SECCOMP_SANDBOX = 109, /* -sandbox */ + QEMU_CAPS_REBOOT_TIMEOUT = 110, /* -boot reboot-timeout */ + QEMU_CAPS_DUMP_GUEST_CORE = 111, /* dump-guest-core-parameter */ + QEMU_CAPS_SEAMLESS_MIGRATION = 112, /* seamless-migration for SPICE */ + QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ + QEMU_CAPS_VNC = 114, /* Is -vnc available? */ + QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ + QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ + QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ + QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ + QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ + QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ + QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ + QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ + QEMU_CAPS_DEVICE_VIDEO_PRIMARY = 123, /* safe to use -device for primary video device */ + QEMU_CAPS_SCLP_S390 = 124, /* -device sclp* */ + QEMU_CAPS_DEVICE_USB_SERIAL = 125, /* -device usb-serial */ + QEMU_CAPS_DEVICE_USB_NET = 126, /* -device usb-net */ + QEMU_CAPS_ADD_FD = 127, /* -add-fd */ + QEMU_CAPS_NBD_SERVER = 128, /* nbd-server-start QMP command */ + QEMU_CAPS_DEVICE_VIRTIO_RNG = 129, /* virtio-rng device */ + QEMU_CAPS_OBJECT_RNG_RANDOM = 130, /* the rng-random backend for virtio rng */ + QEMU_CAPS_OBJECT_RNG_EGD = 131, /* EGD protocol daemon for rng */ + QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ + QEMU_CAPS_DTB = 133, /* -dtb file */ + QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ + QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ + QEMU_CAPS_MACHINE_OPT = 136, /* -machine xxxx*/ + QEMU_CAPS_MACHINE_USB_OPT = 137, /* -machine xxx,usb=on/off */ + QEMU_CAPS_DEVICE_TPM_PASSTHROUGH = 138, /* -tpmdev passthrough */ + QEMU_CAPS_DEVICE_TPM_TIS = 139, /* -device tpm_tis */ + QEMU_CAPS_DEVICE_NVRAM = 140, /* -global spapr-nvram.reg=xxxx */ + QEMU_CAPS_DEVICE_PCI_BRIDGE = 141, /* -device pci-bridge */ + QEMU_CAPS_DEVICE_VFIO_PCI = 142, /* -device vfio-pci */ + QEMU_CAPS_VFIO_PCI_BOOTINDEX = 143, /* bootindex param for vfio-pci device */ + QEMU_CAPS_DEVICE_SCSI_GENERIC = 144, /* -device scsi-generic */ + QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX = 145, /* -device scsi-generic.bootindex */ + QEMU_CAPS_MEM_MERGE = 146, /* -machine mem-merge */ + QEMU_CAPS_VNC_WEBSOCKET = 147, /* -vnc x:y,websocket */ + QEMU_CAPS_DRIVE_DISCARD = 148, /* -drive discard=off(ignore)|on(unmap) */ + QEMU_CAPS_MLOCK = 149, /* -realtime mlock=on|off */ + QEMU_CAPS_VNC_SHARE_POLICY = 150, /* set display sharing policy */ + QEMU_CAPS_DEVICE_DEL_EVENT = 151, /* DEVICE_DELETED event */ + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE = 152, /* -device i82801b11-bridge */ + QEMU_CAPS_I440FX_PCI_HOLE64_SIZE = 153, /* i440FX-pcihost.pci-hole64-size */ + QEMU_CAPS_Q35_PCI_HOLE64_SIZE = 154, /* q35-pcihost.pci-hole64-size */ + QEMU_CAPS_DEVICE_USB_STORAGE = 155, /* -device usb-storage */ + QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ + QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ + QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ + QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ + QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ + QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ + QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */ + QEMU_CAPS_CHARDEV_SPICEPORT = 164, /* -chardev spiceport */ + QEMU_CAPS_DEVICE_USB_KBD = 165, /* -device usb-kbd */ + QEMU_CAPS_HOST_PCI_MULTIDOMAIN = 166, /* support domain > 0 in host pci address */ + QEMU_CAPS_MSG_TIMESTAMP = 167, /* -msg timestamp */ + QEMU_CAPS_ACTIVE_COMMIT = 168, /* block-commit works without 'top' */ + QEMU_CAPS_CHANGE_BACKING_FILE = 169, /* change name of backing file in metadata */ + QEMU_CAPS_OBJECT_MEMORY_RAM = 170, /* -object memory-backend-ram */ + QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ + QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ + QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ + QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ + QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ + QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ + QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ + QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ + QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */ + QEMU_CAPS_VGA_VGAMEM = 180, /* -device VGA.vgamem_mb */ + QEMU_CAPS_VMWARE_SVGA_VGAMEM = 181, /* -device vmware-svga.vgamem_mb */ + QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ + QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ + QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ + QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ + QEMU_CAPS_AES_KEY_WRAP = 186, /* -machine aes_key_wrap */ + QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ + QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ + QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ + QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ + QEMU_CAPS_MIGRATION_EVENT = 191, /* MIGRATION event */ + QEMU_CAPS_OBJECT_GPEX = 192, /* have generic PCI host controller */ + QEMU_CAPS_DEVICE_IOH3420 = 193, /* -device ioh3420 */ + QEMU_CAPS_DEVICE_X3130_UPSTREAM = 194, /* -device x3130-upstream */ + QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM = 195, /* -device xio3130-downstream */ + QEMU_CAPS_DEVICE_RTL8139 = 196, /* -device rtl8139 */ + QEMU_CAPS_DEVICE_E1000 = 197, /* -device e1000 */ + QEMU_CAPS_DEVICE_VIRTIO_NET = 198, /* -device virtio-net-* */ + QEMU_CAPS_MACH_VIRT_GIC_VERSION = 199, /* -machine virt,gic-version */ + + QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; typedef struct _virQEMUCaps virQEMUCaps; -- 2.4.3

3 5

[libvirt] [PATCH] storage: Fix incorrect format for <disk> <auth> XML
by John Ferlan 07 Oct '15

07 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1256999 When creating a copy of the 'authdef', need to take into account the slight variation between <disk> and <pool> before blindly copying the 'authType' field. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk>. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virstoragefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90..0b72cb3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1522,7 +1522,12 @@ virStorageAuthDefCopy(const virStorageAuthDef *src) /* Not present for storage pool, but used for disk source */ if (VIR_STRDUP(ret->secrettype, src->secrettype) < 0) goto error; - ret->authType = src->authType; + /* A <disk> uses secrettype, while a <pool> uses authType, so + * if we have a secrettype, then don't copy authType; otherwise, + * we will format the authType in <disk> + */ + if (!ret->secrettype) + ret->authType = src->authType; ret->secretType = src->secretType; if (ret->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { memcpy(ret->secret.uuid, src->secret.uuid, sizeof(ret->secret.uuid)); -- 2.1.0

2 3

[libvirt] [PATCH 0/4] qemu: Refactor and fix qemuMigrationIsAllowed for offline migration
by Peter Krempa 07 Oct '15

07 Oct '15

Note that the patches are formatted with "--patience" so that the last patch isn't that ugly. Peter Krempa (4): qemu: migration: Split source and destination migration checks qemu: migration: Drop @def from qemuMigrationIsAllowed qemu: migration: Use migration flags in qemuMigrationIsAllowed qemu: migration: Skip few checks while doing offline migration src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_migration.c | 186 ++++++++++++++++++++++++++-------------------- src/qemu/qemu_migration.h | 3 +- 3 files changed, 110 insertions(+), 87 deletions(-) -- 2.4.5

2 8

[libvirt] [PATCH 1/1] qemu: add support for multiple gluster hosts
by Prasanna Kumar Kalever 07 Oct '15

07 Oct '15

currently libvirt has the capability to parse only one host and convert that into URI formatted string, with the help of this patch libvirt will be able to parse multiple hosts from the domain xml and can convert that into JSON formatted string before: ------ example.xml: ... <disk type='network' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source protocol='gluster' name='testvol/a.qcow2'> <host name='1.2.3.4' port='24007' transport="tcp"/> </source> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> ... resultant string: file=gluster://1.2.3.4:24007/testvol/a.qcow2, \ if=none,id=drive-virtio-disk0,format=qcow2,cache=none after: ----- example.xml: ... <disk type='network' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source protocol='gluster' name='testvol/a.qcow2'> <host name='1.2.3.4' port='24009' transport="tcp"/> <host name='3.4.5.6' port="24008"/> <host name='5.6.7.8' /> </source> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> ... resultant string: -drive file=json:{ "file": { "driver": "gluster",, "volname": "testvol",, "image-path": "/a.qcow2",, "volfile-servers": [ { "server": "1.2.3.4",, "port": 24009,, "transport": "tcp" },, { "server": "3.4.5.6",, "port": 24008,, "transport": "tcp" },, { "server": "5.6.7.8",, "port": 24007,, "transport": "tcp" } ] },, "driver": "qcow2" } ,if=none,id=drive-virtio-disk0,cache=none if the number of hosts supplied is only one, then we use existing URI format for backward compatibility and if number of hosts is greater than one we switch to the new JSON format this patch requires qemu latest patch https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg07062.html Credits: Sincere thanks to Kevin Wolf <kwolf(a)redhat.com> and "Deepak C Shetty" <deepakcs(a)redhat.com> for their support Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever(a)redhat.com> --- src/qemu/qemu_command.c | 192 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 145 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb1835c..8c1bf1a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3256,16 +3256,106 @@ qemuNetworkDriveGetPort(int protocol, return -1; } +#define QEMU_DEFAULT_GLUSTER_PORT 24007 + +static virJSONValuePtr +qemuBuildGlusterDriveJSON(virStorageSourcePtr src) +{ + virJSONValuePtr parent = NULL; + virJSONValuePtr object = NULL; + virJSONValuePtr dict_array = NULL; + int port; + int i; + + if (!(parent = virJSONValueNewObject())) + return NULL; + /* 1. prepare { driver:"gluster", volname:"testvol", image-path:"/a.img"} */ + if (virJSONValueObjectAdd(parent, + "s:driver", virStorageNetProtocolTypeToString(src->protocol), + "s:volname", src->volume, + "s:image-path", src->path, + NULL) < 0) + goto cleanup; + + if (!(dict_array = virJSONValueNewArray())) + goto cleanup; + /* 2. prepare array [ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] */ + for (i = 0; i < src->nhosts; i++) { + if (!(object = virJSONValueNewObject())) + goto cleanup; + port = qemuNetworkDriveGetPort(src->protocol, src->hosts[i].port); + if (virJSONValueObjectAdd(object, "s:server", src->hosts[i].name, + "i:port", port ? port : QEMU_DEFAULT_GLUSTER_PORT , + "s:transport", + virStorageNetHostTransportTypeToString(src->hosts[i].transport), + NULL) < 0) + goto cleanup; + if (virJSONValueArrayAppend(dict_array, object) < 0) { + virJSONValueFree(object); + goto cleanup; + } + } + /* 3. append 1 and 2 + * { driver:"gluster", volname:"testvol", image-path:"/a.img", + * volfile-servers :[ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] } + */ + if (virJSONValueObjectAppend(parent, "volfile-servers", dict_array) < 0) { + virJSONValueFree(dict_array); + goto cleanup; + } + /* 4. assign key to 3 + * { file: { driver:"gluster", volname:"testvol", image-path:"/a.img", + * volfile-servers :[ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] } } + */ + if (!(object = virJSONValueNewObject())) + goto cleanup; + if (virJSONValueObjectAppend(object, "file", parent) < 0) { + virJSONValueFree(parent); + goto cleanup; + } + /* 5. append format to 4 + * { file: { driver:"gluster", volname:"testvol", image-path:"/a.img", + * volfile-servers :[ {server:"1.2.3.4", port:24007, transport:"tcp"} , + * {server:"5.6.7.8", port:24008, transport:"rdma"}, + * {}, ... ] }, driver:"qcow2" } + */ + if (virJSONValueObjectAdd(object, + "s:driver", virStorageFileFormatTypeToString(src->format), + NULL) < 0) + goto cleanup; + else + /* since we have already captured the format type, let's make it '0' to + * avoid further checks for format information + */ + src->format = 0; + + return object; + +cleanup: + virJSONValueFree(dict_array); + virJSONValueFree(parent); + virJSONValueFree(object); + return NULL; +} + #define QEMU_DEFAULT_NBD_PORT "10809" static char * -qemuBuildNetworkDriveURI(virStorageSourcePtr src, +qemuBuildNetworkDriveStr(virStorageSourcePtr src, const char *username, const char *secret) { char *ret = NULL; + char *str = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; virURIPtr uri = NULL; + virJSONValuePtr json = NULL; size_t i; switch ((virStorageNetProtocol) src->protocol) { @@ -3331,61 +3421,67 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: - if (src->nhosts != 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("protocol '%s' accepts only one host"), - virStorageNetProtocolTypeToString(src->protocol)); - goto cleanup; - } - - if (VIR_ALLOC(uri) < 0) - goto cleanup; - - if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { - if (VIR_STRDUP(uri->scheme, - virStorageNetProtocolTypeToString(src->protocol)) < 0) + if (src->nhosts == 1) { + /* URI syntax generation */ + if (VIR_ALLOC(uri) < 0) goto cleanup; - } else { - if (virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) - goto cleanup; - } - - if ((uri->port = qemuNetworkDriveGetPort(src->protocol, src->hosts->port)) < 0) - goto cleanup; - if (src->path) { - if (src->volume) { - if (virAsprintf(&uri->path, "/%s%s", - src->volume, src->path) < 0) + if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (VIR_STRDUP(uri->scheme, + virStorageNetProtocolTypeToString(src->protocol)) < 0) goto cleanup; } else { - if (virAsprintf(&uri->path, "%s%s", - src->path[0] == '/' ? "" : "/", - src->path) < 0) + if (virAsprintf(&uri->scheme, "%s+%s", + virStorageNetProtocolTypeToString(src->protocol), + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) goto cleanup; } - } - if (src->hosts->socket && - virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) - goto cleanup; + if ((uri->port = qemuNetworkDriveGetPort(src->protocol, src->hosts->port)) < 0) + goto cleanup; - if (username) { - if (secret) { - if (virAsprintf(&uri->user, "%s:%s", username, secret) < 0) - goto cleanup; - } else { - if (VIR_STRDUP(uri->user, username) < 0) - goto cleanup; + if (src->path) { + if (src->volume) { + if (virAsprintf(&uri->path, "/%s%s", + src->volume, src->path) < 0) + goto cleanup; + } else { + if (virAsprintf(&uri->path, "%s%s", + src->path[0] == '/' ? "" : "/", + src->path) < 0) + goto cleanup; + } } - } - if (VIR_STRDUP(uri->server, src->hosts->name) < 0) - goto cleanup; + if (src->hosts->socket && + virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) + goto cleanup; - ret = virURIFormat(uri); + if (username) { + if (secret) { + if (virAsprintf(&uri->user, "%s:%s", username, secret) < 0) + goto cleanup; + } else { + if (VIR_STRDUP(uri->user, username) < 0) + goto cleanup; + } + } + + if (VIR_STRDUP(uri->server, src->hosts->name) < 0) + goto cleanup; + + ret = virURIFormat(uri); + } else { + /* switch to new json formated syntax */ + if(!(json = qemuBuildGlusterDriveJSON(src))) + goto cleanup; + + if (!(str = virJSONValueToString(json, false))) + goto cleanup; + + if (virAsprintf (&ret, "json:%s", str) < 0) + goto cleanup; + } break; @@ -3472,7 +3568,9 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, } cleanup: + VIR_FREE(str); virBufferFreeAndReset(&buf); + virJSONValueFree(json); virURIFree(uri); return ret; @@ -3530,7 +3628,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, break; case VIR_STORAGE_TYPE_NETWORK: - if (!(*source = qemuBuildNetworkDriveURI(src, username, secret))) + if (!(*source = qemuBuildNetworkDriveStr(src, username, secret))) goto cleanup; break; @@ -6391,7 +6489,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virConnectPtr conn, src.nhosts = iscsisrc->nhosts; /* Rather than pull what we think we want - use the network disk code */ - source = qemuBuildNetworkDriveURI(&src, username, secret); + source = qemuBuildNetworkDriveStr(&src, username, secret); cleanup: VIR_FREE(secret); -- 2.1.0

5 15

[libvirt] [libvirt-python PATCH 00/23] Cleanup of the libvirt-python C code
by Pavel Hrdina 07 Oct '15

07 Oct '15

This patch series tries to cleanup the libvirt-python C code and also make it more readable. It also fixes places, where we didn't checked for return values and where we also returned wrong values in case of errors. There are some other minor issues, that I've found. Pavel Hrdina (23): update virDomainGetVcpus xml API description refactor the function to not override python exceptions remove useless check for NULL before Py_XDECREF drop unnecessary goto Move utils and shared code into libvirt-utils cleanup functions definition indent labels by one space fix indentation wrap lines to 80 columns Return NULL if python exception is set Return correct python object Return NULL and set an exception if allocation fails Use VIR_PY_NONE instead use Py_CLEAR instead of Py_XDECREF followed by NULL assignment all Py*_New function has to be checked for return value change the order of some statements drop unnecessary py_retval variable improve usage of cleanup paths utils: introduce new macro helpers for tuple, list and dict objects use VIR_PY_TUPLE_GOTO use VYR_PY_LIST_SET_GOTO and VIR_PY_LIST_APPEND_GOTO use VIR_PY_DICT_SET_GOTO coverity: resolve dead_error_condition libvirt-lxc-override.c | 61 +- libvirt-override-api.xml | 4 +- libvirt-override.c | 3156 +++++++++++++++++++++------------------------- libvirt-qemu-override.c | 60 +- libvirt-utils.c | 422 ++++++- libvirt-utils.h | 133 ++ typewrappers.c | 65 +- 7 files changed, 2047 insertions(+), 1854 deletions(-) -- 2.5.3

2 47

[libvirt] [PATCH] spec: Delete .git after applying patches
by Cole Robinson 06 Oct '15

06 Oct '15

I'm hitting this little annoyance in fedora's package repo: $ fedpkg prep Downloading libvirt-1.2.20.tar.gz ... + /usr/bin/gzip -dc /home/crobinso/src/fedora/libvirt/libvirt-1.2.20.tar.gz $ git clean -xdf Removing libvirt-1.2.20.tar.gz Skipping repository libvirt-1.2.20/ We git-ify the libvirt directory as part of applying patches in the spec file, but 'git clean' will ignore subfolders that appear to be standalone git repos. Let's just delete the .git directory after we're done with it. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index ed401f7..9dff994 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1256,6 +1256,7 @@ if [ $COUNT -gt 0 ]; then fi echo "Applied $COUNT patches" rm -f $PATCHLIST +rm -rf .git %build %if ! %{with_xen} -- 2.5.0

2 1

[libvirt] [PATCH 0/2] vz: remove unused network and storage drivers
by Maxim Nestratov 06 Oct '15

06 Oct '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> Maxim Nestratov (2): vz: remove network driver as never used vz: remove storage driver as never used

2 5

[libvirt] [PATCH] tests: qemu: Add aarch64 virtio pci tests
by Cole Robinson 06 Oct '15

06 Oct '15

- qemuxml2argv-aarch64-mmio-default-pci: Verify that we still default to virtio-mmio even if qemu is new enough to support PCI - qemuxml2argv-aarch64-virtio-pci: Check generated arm virtio PCI args --- .../qemuxml2argv-aarch64-mmio-default-pci.args | 17 ++++++++ .../qemuxml2argv-aarch64-mmio-default-pci.xml | 48 ++++++++++++++++++++++ .../qemuxml2argv-aarch64-virtio-pci.args | 15 +++++++ .../qemuxml2argv-aarch64-virtio-pci.xml | 43 +++++++++++++++++++ tests/qemuxml2argvtest.c | 12 ++++++ 5 files changed, 135 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args new file mode 100644 index 0000000..9720936 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args @@ -0,0 +1,17 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -cpu cortex-a53 -m 1024 -smp 1 \ +-nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -boot c \ +-kernel /aarch64.kernel -initrd /aarch64.initrd \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ +-device virtio-serial-device,id=virtio-serial0 -usb \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=objrng0,filename=/dev/random \ +-device virtio-rng-device,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.xml new file mode 100644 index 0000000..ad34615 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.xml @@ -0,0 +1,48 @@ +<domain type="qemu"> + <name>aarch64test</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <dtb>/aarch64.dtb</dtb> + <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu match='exact'> + <model>cortex-a53</model> + </cpu> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <source file='/aarch64.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args new file mode 100644 index 0000000..3ae6e34 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args @@ -0,0 +1,15 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -cpu cortex-a53 -m 1024 -smp 1 \ +-nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -boot c \ +-kernel /aarch64.kernel -initrd /aarch64.initrd \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ +-device virtio-scsi-pci,id=scsi0,bus=pcie.0,addr=0x3 \ +-usb -drive file=/aarch64.raw,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-net-pci,vlan=0,id=net0,\ +mac=52:54:00:09:a4:37,bus=pcie.0,addr=0x2 \ +-net user,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.xml new file mode 100644 index 0000000..6a44f19 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>aarch64test</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> + <dtb>/aarch64.dtb</dtb> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a53</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <source file='/aarch64.raw'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ae67779..ecfee11 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1632,6 +1632,18 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-mmio-default-pci", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE); + DO_TEST("aarch64-virtio-pci", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, -- 2.5.0

2 2

[libvirt] [PATCH] docs: domain: Show canonical pvspinlock XML
by Cole Robinson 06 Oct '15

06 Oct '15

The example pvspinlock XML is: <pvspinlock/> While this is accepted by libvirt and works correctly, it's currently always output as a tristate like <pvspinlock state='on'/> So document that format instead --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index efa485c..c88b032 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1464,7 +1464,7 @@ <kvm> <hidden state='on'/> </kvm> - <pvspinlock/> + <pvspinlock state='on'/> <gic version='2'/> </features> -- 2.5.0

2 2

[libvirt] [PATCH 0/5] qemu: Wait until destination QEMU consumes all migration data
by Jiri Denemark 06 Oct '15

06 Oct '15

Even though QEMU on the source host reports completed migration and thus we move to the Finish phase, QEMU on the destination host may still be processing migration data. Thus before we can start guest CPUs on the destination, we have to wait for a completed migration event. https://bugzilla.redhat.com/show_bug.cgi?id=1265902 Jiri Denemark (5): qemu: Always update migration times on destination qemu: Copy completed migration stats only on success qemu: Introduce flags in qemuMigrationCompleted qemu: Make updating stats in qemuMigrationCheckJobStatus optional qemu: Wait until destination QEMU consumes all migration data src/qemu/qemu_migration.c | 86 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 23 deletions(-) -- 2.6.0

2 11

[libvirt] [PATCH] tests: Check GIC-related XMLs in qemuxml2xmltest
by Martin Kletzander 06 Oct '15

06 Oct '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is based on the GIC-support series from Pavel Fedin with the fixups mentioned there as well: https://www.redhat.com/archives/libvir-list/2015-September/msg01067.html .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml | 30 +++++++++++++--------- .../qemuxml2argv-aarch64-gicv3.xml | 30 +++++++++++++--------- tests/qemuxml2xmltest.c | 3 +++ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml index 08d3d714b8c2..cb595e4a7a6b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml @@ -1,26 +1,32 @@ -<domain type="qemu"> +<domain type='qemu'> <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> - <vcpu>1</vcpu> - <features> - <acpi/> - <gic version='2'/> - </features> - <cpu match='exact'> - <model>cortex-a53</model> - </cpu> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> <os> - <type arch="aarch64" machine="virt">hvm</type> + <type arch='aarch64' machine='virt'>hvm</type> <kernel>/aarch64.kernel</kernel> <initrd>/aarch64.initrd</initrd> <cmdline>console=ttyAMA0</cmdline> + <boot dev='hd'/> </os> + <features> + <acpi/> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a53</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <interface type='user'> <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> </interface> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml index f8d63c337755..72aaaf7fe5cd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml @@ -1,26 +1,32 @@ -<domain type="qemu"> +<domain type='qemu'> <name>aarch64test</name> <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> - <vcpu>1</vcpu> - <features> - <acpi/> - <gic version='3'/> - </features> - <cpu match='exact'> - <model>cortex-a53</model> - </cpu> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> <os> - <type arch="aarch64" machine="virt">hvm</type> + <type arch='aarch64' machine='virt'>hvm</type> <kernel>/aarch64.kernel</kernel> <initrd>/aarch64.initrd</initrd> <cmdline>console=ttyAMA0</cmdline> + <boot dev='hd'/> </os> + <features> + <acpi/> + <gic version='3'/> + </features> + <cpu mode='custom' match='exact'> + <model fallback='allow'>cortex-a53</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <interface type='user'> <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> </interface> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index eae153c5e763..5a9c67df7e02 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -625,6 +625,9 @@ mymain(void) DO_TEST("smbios-multiple-type2"); DO_TEST("aarch64-aavmf-virtio-mmio"); + DO_TEST("aarch64-gic"); + DO_TEST("aarch64-gicv3"); + DO_TEST("memory-hotplug"); DO_TEST("memory-hotplug-nonuma"); DO_TEST("memory-hotplug-dimm"); -- 2.6.0

2 1

[libvirt] [PATCH] conf: Remove <metadata> elements with no namespace
by Peter Krempa 06 Oct '15

06 Oct '15

Our docs state that subelements of <metadata> shall have a namespace and the medatata APIs expect that too. To avoid inaccessible <metadata> sub-elements, just remove those that don't conform to the documentation. Apart from adding the new condition this patch renames the function and refactors the code flow to allow the changes. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1245525 --- src/conf/domain_conf.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 29e55f2..65e0d8e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3688,27 +3688,40 @@ virDomainDefRejectDuplicateControllers(virDomainDefPtr def) /** - * virDomainDefRemoveDuplicateMetadata: - * @def: Remove duplicate metadata for this def + * virDomainDefMetadataSanitize: + * @def: Sanitize metadata for this def * * This function removes metadata elements in @def that share the namespace. - * The first metadata entry of every duplicate namespace is kept. + * The first metadata entry of every duplicate namespace is kept. Additionally + * elements with no namespace are deleted. */ static void -virDomainDefRemoveDuplicateMetadata(virDomainDefPtr def) +virDomainDefMetadataSanitize(virDomainDefPtr def) { xmlNodePtr child; xmlNodePtr next; + xmlNodePtr dupl; if (!def || !def->metadata) return; - for (child = def->metadata->children; child; child = child->next) { + child = def->metadata->children; + while (child) { + /* remove metadata entries that don't have any namespace at all */ + if (!child->ns || !child->ns->href) { + dupl = child; + child = child->next; + + xmlUnlinkNode(dupl); + xmlFreeNode(dupl); + continue; + } + /* check that every other child of @root doesn't share the namespace of * the current one and delete them possibly */ next = child->next; while (next) { - xmlNodePtr dupl = NULL; + dupl = NULL; if (child->ns && next->ns && STREQ_NULLABLE((const char *) child->ns->href, @@ -3722,6 +3735,8 @@ virDomainDefRemoveDuplicateMetadata(virDomainDefPtr def) xmlFreeNode(dupl); } } + + child = child->next; } } @@ -3956,7 +3971,7 @@ virDomainDefPostParseInternal(virDomainDefPtr def, } /* clean up possibly duplicated metadata entries */ - virDomainDefRemoveDuplicateMetadata(def); + virDomainDefMetadataSanitize(def); return 0; } -- 2.4.5

2 2

[libvirt] [PATCH] apparmor: differentiate between error and unconfined profiles
by Cédric Bosdonnat 06 Oct '15

06 Oct '15

profile_status function was not making any difference between error cases and unconfined profiles. The problem with this approach is that dominfo was throwing an error on unconfined domains. --- src/security/security_apparmor.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 16b8f87..2cf333d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -66,10 +66,11 @@ struct SDPDOP { }; /* - * profile_status returns '-1' on error, '0' if loaded + * profile_status returns '-2' on error, '-1' if not loaded, '0' if loaded * - * If check_enforcing is set to '1', then returns '-1' on error, '0' if - * loaded in complain mode, and '1' if loaded in enforcing mode. + * If check_enforcing is set to '1', then returns '-2' on error, '-1' if + * not loaded, '0' if loaded in complain mode, and '1' if loaded in + * enforcing mode. */ static int profile_status(const char *str, const int check_enforcing) @@ -77,7 +78,7 @@ profile_status(const char *str, const int check_enforcing) char *content = NULL; char *tmp = NULL; char *etmp = NULL; - int rc = -1; + int rc = -2; /* create string that is '<str> \0' for accurate matching */ if (virAsprintf(&tmp, "%s ", str) == -1) @@ -100,6 +101,8 @@ profile_status(const char *str, const int check_enforcing) if (strstr(content, tmp) != NULL) rc = 0; + else + rc = -1; /* return -1 if not loaded */ if (check_enforcing != 0) { if (rc == 0 && strstr(content, etmp) != NULL) rc = 1; /* return '1' if loaded and enforcing */ @@ -262,6 +265,9 @@ use_apparmor(void) goto cleanup; rc = profile_status(libvirt_daemon, 1); + /* Error or unconfined should all result in -1*/ + if (rc < 0) + rc = -1; cleanup: VIR_FREE(libvirt_daemon); @@ -517,23 +523,29 @@ AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityLabelPtr sec) { int rc = -1; + int status; char *profile_name = NULL; if ((profile_name = get_profile_name(def)) == NULL) return rc; - if (virStrcpy(sec->label, profile_name, - VIR_SECURITY_LABEL_BUFLEN) == NULL) { + status = profile_status(profile_name, 1); + if (status < -1) { virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("error copying profile name")); + "%s", _("error getting profile status")); goto cleanup; + } else if (status == -1) { + profile_name[0] = '\0'; } - if ((sec->enforcing = profile_status(profile_name, 1)) < 0) { + if (virStrcpy(sec->label, profile_name, + VIR_SECURITY_LABEL_BUFLEN) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("error calling profile_status()")); + "%s", _("error copying profile name")); goto cleanup; } + + sec->enforcing = status == 1; rc = 0; cleanup: -- 2.1.4

2 1

Re: [libvirt] [PATCH 3/3] kvm-all: notice KVM of vcpu's TSC rate after migration
by Eduardo Habkost 06 Oct '15

06 Oct '15

On Mon, Sep 28, 2015 at 01:38:31PM +0800, Haozhong Zhang wrote: > When a vcpu is created in KVM, its TSC rate is initially identical to > the host TSC rate. If its state is migrated to a vcpu on another > machine (target machine) which may uses a different host TSC rate, QEMU > on the target machine should notice KVM of the migrated vcpu's TSC > rate. In case that KVM on the target machine supports TSC scaling, guest > programs running on the migrated vcpu will observe the same TSC rate > before and after the migration. > > Signed-off-by: Haozhong Zhang <haozhong.zhang(a)intel.com> > --- > kvm-all.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/kvm-all.c b/kvm-all.c > index 0be4615..e8de038 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -1769,6 +1769,19 @@ void kvm_cpu_synchronize_post_reset(CPUState *cpu) > static void do_kvm_cpu_synchronize_post_init(void *arg) > { > CPUState *cpu = arg; > + CPUX86State *env = &X86_CPU(cpu)->env; > + int r; > + > + /* > + * XXX: KVM_SET_TSC_KHZ must be done before kvm_arch_put_registers(). Could you explain where this requirement comes from? > + */ > + r = kvm_check_extension(cpu->kvm_state, KVM_CAP_TSC_CONTROL); > + if (r && env->tsc_khz) { > + r = kvm_vcpu_ioctl(cpu, KVM_SET_TSC_KHZ, env->tsc_khz); > + if (r < 0) { > + fprintf(stderr, "KVM_SET_TSC_KHZ failed\n"); > + } > + } This is duplicating the existing KVM_SET_TSC_KHZ call at kvm_arch_init_vcpu(). I wonder if there's a way to avoid this duplication. Should we set TSC KHz only at do_kvm_cpu_synchronize_post_init(), and remove the call from kvm_arch_init_vcpu()? Or maybe we shouldn't treat this as VM state, but as configuration, and let management configure the TSC frequency explicitly if the user really needs it to stay the same during migration. (CCing libvir-list to see if they have feedback) -- Eduardo

2 5

[libvirt] Cannot write data: Broken pipe when accesing libvirt from a forked process
by Josef Stribny 05 Oct '15

05 Oct '15

Hi all, I am trying to add vagrant-libvirt support for landrush plugin[0] and found out that libvirt fails for me with: Call to virConnectNumOfNetworks failed: Cannot write data: Broken pipe (Libvirt::RetrieveError) I created a minimal reproducer that causes this: ``` #!/usr/bin/ruby require 'libvirt' conn = Libvirt::open("qemu:///system") fork do puts conn.list_networks end puts conn.list_networks ``` This works just fine on my host, but fails on my virtualized guest (when using nested KVM). The journal shows the following lines in logs: Failed to acquire pid file '/run/user/1001/libvirt/libvirtd.pid': Resource temporarily unavailable So the forked process here tries to access not-existing libvirtd pid file for root (1001 on the VM). Is this a feature/bug? How can one avoid it? Thanks everyone Josef [0] https://github.com/phinze/landrush/pull/124

3 2

[libvirt] [sandbox v2 0/5] virt-builder source for virt-sandbox-image
by Cédric Bosdonnat 05 Oct '15

05 Oct '15

Hi all, Here is the new version of the virt-builder source with the download command removed and the format parameter too. Cédric Bosdonnat (5): virt-sandbox-image: remove the download command virt-image-sandbox: tarball extracting function to be reusable virt-sandbox-image: remove the format parameter virt-sandbox-image: automatically call create if needed virt-sandbox-image: add a virt-builder source libvirt-sandbox.spec.in | 1 + libvirt-sandbox/image/cli.py | 29 +++----- libvirt-sandbox/image/sources/DockerSource.py | 61 ++++++++-------- libvirt-sandbox/image/sources/Makefile.am | 1 + libvirt-sandbox/image/sources/Source.py | 29 ++++++-- libvirt-sandbox/image/sources/VirtBuilderSource.py | 84 ++++++++++++++++++++++ libvirt-sandbox/image/template.py | 2 + 7 files changed, 149 insertions(+), 58 deletions(-) create mode 100644 libvirt-sandbox/image/sources/VirtBuilderSource.py -- 2.1.4

3 11

[libvirt] CharUDP - Connection refused
by poma 05 Oct '15

05 Oct '15

Hi Fi With or without the patch[1] the same result - "Connection refused". UDP network console, the character device acts as a UDP netconsole service, sending and receiving packets. This is a lossy service. = HOST: virt-manager: Add New Virtual Serial Device Device Type: UDP net cosnole (udp) Host: 127.0.0.1 Port: 4555 Bind Host: Server mode (bind) Serial Device 1 (Primary Console) Device Type: udp Source host: 127.0.0.1:4555 Bind host: 127.0.0.1:4556 /etc/libvirt/qemu/domain.xml ... <serial type='udp'> <source mode='bind' host='127.0.0.1' service='4556'/> <source mode='connect' host='127.0.0.1' service='4555'/> <target port='0'/> </serial> <console type='udp'> <source mode='bind' host='127.0.0.1' service='4556'/> <source mode='connect' host='127.0.0.1' service='4555'/> <target type='serial' port='0'/> </console> qemu-system-x86_64 ... \ -chardev udp,id=charserial0,host=127.0.0.1,port=4555,localaddr=127.0.0.1,localport=4556 \ -device isa-serial,chardev=charserial0,id=serial0 # netstat -an | grep 4555 udp 0 0 127.0.0.1:4556 127.0.0.1:4555 ESTABLISHED # nc -vv -u 127.0.0.1 4555 Ncat: Version 6.47 ( http://nmap.org/ncat ) libnsock nsi_new2(): nsi_new (IOD #1) libnsock nsock_connect_udp(): UDP connection requested to 127.0.0.1:4555 (IOD #1) EID 8 libnsock nsock_trace_handler_callback(): Callback: CONNECT SUCCESS for EID 8 [127.0.0.1:4555] Ncat: Connected to 127.0.0.1:4555. libnsock nsi_new2(): nsi_new (IOD #2) libnsock nsock_read(): Read request from IOD #1 [127.0.0.1:4555] (timeout: -1ms) EID 18 libnsock nsock_readbytes(): Read request for 0 bytes from IOD #2 [peer unspecified] EID 26 libnsock nsock_trace_handler_callback(): Callback: READ SUCCESS for EID 26 [peer unspecified] (1 bytes): . libnsock nsock_trace_handler_callback(): Callback: WRITE SUCCESS for EID 35 [127.0.0.1:4555] libnsock nsock_readbytes(): Read request for 0 bytes from IOD #2 [peer unspecified] EID 42 libnsock nsock_trace_handler_callback(): Callback: READ ERROR [Connection refused (111)] for EID 18 [127.0.0.1:4555] Ncat: Connection refused. # nc -vv -u 127.0.0.1 4556 Ncat: Version 6.47 ( http://nmap.org/ncat ) libnsock nsi_new2(): nsi_new (IOD #1) libnsock nsock_connect_udp(): UDP connection requested to 127.0.0.1:4556 (IOD #1) EID 8 libnsock nsock_trace_handler_callback(): Callback: CONNECT SUCCESS for EID 8 [127.0.0.1:4556] Ncat: Connected to 127.0.0.1:4556. libnsock nsi_new2(): nsi_new (IOD #2) libnsock nsock_read(): Read request from IOD #1 [127.0.0.1:4556] (timeout: -1ms) EID 18 libnsock nsock_readbytes(): Read request for 0 bytes from IOD #2 [peer unspecified] EID 26 libnsock nsock_trace_handler_callback(): Callback: READ SUCCESS for EID 26 [peer unspecified] (1 bytes): . libnsock nsock_trace_handler_callback(): Callback: WRITE SUCCESS for EID 35 [127.0.0.1:4556] libnsock nsock_readbytes(): Read request for 0 bytes from IOD #2 [peer unspecified] EID 42 libnsock nsock_trace_handler_callback(): Callback: READ ERROR [Connection refused (111)] for EID 18 [127.0.0.1:4556] Ncat: Connection refused. # socat -d -d UDP:127.0.0.1:4555 - 2015/10/04 13:18:29 socat[5655] N opening connection to AF=2 127.0.0.1:4555 2015/10/04 13:18:29 socat[5655] N successfully connected from local address AF=2 127.0.0.1:40785 2015/10/04 13:18:29 socat[5655] N reading from and writing to stdio 2015/10/04 13:18:29 socat[5655] N starting data transfer loop with FDs [3,3] and [0,1] 2015/10/04 13:18:34 socat[5655] E read(3, 0x557184904210, 8192): Connection refused 2015/10/04 13:18:34 socat[5655] N exit(1) # socat -d -d UDP:127.0.0.1:4556 - 2015/10/04 13:18:47 socat[5658] N opening connection to AF=2 127.0.0.1:4556 2015/10/04 13:18:47 socat[5658] N successfully connected from local address AF=2 127.0.0.1:49650 2015/10/04 13:18:47 socat[5658] N reading from and writing to stdio 2015/10/04 13:18:47 socat[5658] N starting data transfer loop with FDs [3,3] and [0,1] 2015/10/04 13:18:51 socat[5658] E read(3, 0x561b414be210, 8192): Connection refused 2015/10/04 13:18:51 socat[5658] N exit(1) How is it supposed to work? = DOMAIN: $ hostnamectl status | egrep Chassis\|Virtualization Chassis: vm Virtualization: kvm $ cat /proc/cmdline BOOT_IMAGE=vmlinuz0 initrd=initrd0.img root=live:CDLABEL=Rawhide-Xfce-Live-1003 rootfstype=auto ro rd.live.image console=tty0 console=ttyS0 $ systemctl status serial-getty(a)ttyS0.service ● serial-getty(a)ttyS0.service - Serial Getty on ttyS0 Loaded: loaded (/usr/lib/systemd/system/serial-getty@.service; disabled; vendor preset: disabled) Active: active (running) since Sun 2015-10-04 09:02:06 EDT; 48s ago Docs: man:agetty(8) man:systemd-getty-generator(8) http://0pointer.de/blog/projects/serial-console.html Main PID: 1109 (agetty) CGroup: /system.slice/system-serial\x2dgetty.slice/serial-getty(a)ttyS0.service └─1109 /sbin/agetty --keep-baud 115200 38400 9600 ttyS0 vt220 Oct 04 09:02:06 localhost systemd[1]: Started Serial Getty on ttyS0. = SW VERSIONS: $ qemu-system-x86_64 -version QEMU emulator version 2.4.0.1 (qemu-2.4.0.1-2.fc24), Copyright (c) 2003-2008 Fabrice Bellard $ libvirtd --version libvirtd (libvirt) 1.2.20 $ virt-manager --version 1.2.1 $ rpm -q qemu libvirt virt-manager qemu-2.4.0.1-2.fc24.x86_64 libvirt-1.2.20-1.fc24.x86_64 virt-manager-1.2.1-3.fc24.noarch [1] char: udp chardev shouldn't require an explicit open. http://patchwork.ozlabs.org/patch/311730

2 2

[libvirt] [PATCH RESEND] Distribute only generated virkeymaps.h
by Martin Kletzander 05 Oct '15

05 Oct '15

We are distributing virkeymaps.h and all the tools needed to rebuild that file. On top of that, we are generating that file into the $(srcdir) and that sometimes fails for me when trying to do make dist in VPATH on rawhide fedora. And we don't clean the file when maintainer-clean make target is requested. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- No change since the first version, just rebased. There was a discussion about another way of doing it, but I figured that that's not the way to go and the discussion stopped there: https://www.redhat.com/archives/libvir-list/2015-September/msg00271.html src/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 07d587904f54..8ac20f491e35 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -173,15 +173,13 @@ UTIL_SOURCES = \ $(NULL) -EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ - $(srcdir)/util/virkeycode-mapgen.py - BUILT_SOURCES += util/virkeymaps.h +MAINTAINERCLEANFILES += util/virkeymaps.h util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.6.0

3 4

[libvirt] [PATCH] network: avoid existing bridges during rpm install of default network
by Laine Stump 05 Oct '15

05 Oct '15

When we install the libvirt-daemon-config-network package from an rpm, the specfile checks that the subnet used for the default network isn't already used, but blindly assumes that virbr0 is available. This is almost always the case, but there could be a situation where someone was already using virbr0 for their own network, then decided to install libvirt-daemon-config-network, leading to a failure when they tried to start the default network. This patch adds a bit to the %post script for the daemon-network-config package (in the specfile, used only for .rpm packages) that checks "ip link show" and the existing libvirt network xml files in a loop to find the lowest numbered virbrN that is currently unused by either. (note that we already check for in-use bridge devices when defining a network in libvirt's network driver, but the rpm install bypasses libvirt (which may not yet be fully functional) and creates the xml file itself). --- I found this sitting in a source tree, written a few months ago and forgotten. It is a followup to commit 37b8bc6f, which added a similar check in the network driver during virNetworkDefineXML(). I vaguely recall someone reporting this problem on IRC or maybe on one of the mailing lists (they had created a bridge manually using the name virbr0, then when they installed libvirt, it happily made a network definition using virbr0). Yes, not very common, but possible. libvirt.spec.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 78a4cc3..931c5b9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1793,8 +1793,24 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; ;; esac + # find an unused bridge device named virbrN (this assumes that the + # original name in default.xml is exactly "virbr0", so do not + # change it there without also changing orig_br). + orig_br=0 + br=${orig_br} + while ip link show virbr${br} >/dev/null 2>&1 ||\ + (grep '<bridge ' %{_sysconfdir}/libvirt/qemu/networks/*.xml |\ + grep virbr${br} >/dev/null 2>&1); do + br=$(expr ${br} + 1) + # safety to prevent an endless loop + if test ${br} -gt 256; then + break; + fi + done + UUID=`/usr/bin/uuidgen` sed -e "s/${orig_sub}/${sub}/g" \ + -e "s/virbr${orig_br}/virbr${br}/" \ -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml -- 2.4.3

2 1

[libvirt] [PATCH 0/2] rpc: Fix very old regression in libssh2 code
by Peter Krempa 05 Oct '15

05 Oct '15

Peter Krempa (2): rpc: libssh2: Add more debugging info rpc: libssh2: Fix regression in ssh host key verification src/rpc/virnetsshsession.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) -- 2.4.5

2 4

[libvirt] [PATCH v2 0/2] Check disk serial strings for uniqueness
by Peter Krempa 05 Oct '15

05 Oct '15

Peter Krempa (2): qemu: Perform the disk WWN check only on fresh starts conf: Reuse virDomainDefCheckDuplicateDiskWWN to check disk serial too src/conf/domain_conf.c | 17 ++++++++++++++--- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_process.c | 3 ++- 4 files changed, 18 insertions(+), 6 deletions(-) -- 2.4.5

2 4

[libvirt] [PATCH] libvirt.spec: fix accidental conditional inclusion of polkit docs
by Daniel P. Berrange 02 Oct '15

02 Oct '15

In previous change: commit 29b5167417483ef80f6c3fce12811b59a1e2bd55 Author: Jiri Denemark <jdenemar(a)redhat.com> Date: Tue Aug 4 14:05:52 2015 +0200 examples: Add example polkit ACL rules The polkit examples were accidentally added to the spec inside a %if %{with_network} conditional. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a trivial build fix libvirt.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 547f750..ed401f7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2038,10 +2038,9 @@ exit 0 %endif %endif # ! %{with_driver_modules} - %if %{with_network} - %doc examples/polkit/*.rules + %if %{with_network} %files daemon-config-network %defattr(-, root, root) %dir %{_datadir}/libvirt/networks/ -- 2.4.3

1 0

[libvirt] [PATCH 0/5] Fix migration from older libvirt with hugepages
by Martin Kletzander 02 Oct '15

02 Oct '15

Since libvirt is able to use memory-backend-{ram,file}, we were using it unconditionally, then we realized it might break migration from older libvirt, so we fixed the memory-backend-ram, but forgot about memory-backend-file. This series fixes the file backend as well and uses the memory-backend-file only when it is needed. Fortunately, there is no verison of libvirt that would know about such configuration and, at the same time, not use these new objects, so there is no old libvirt from which the migration would be broken from (due to this particular reason). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1266856 Martin Kletzander (5): qemu: Move simplification variable to begining of the function qemu: Move memory size detection to the top of the function qemu: Extract -mem-path building into its own function qemu: Add -mem-path even with numa qemu: Use memory-backing-file only when needed src/qemu/qemu_command.c | 166 ++++++++++++--------- .../qemuxml2argv-hugepages-numa.args | 6 +- .../qemuxml2argv-hugepages-pages6.args | 2 +- 3 files changed, 100 insertions(+), 74 deletions(-) -- 2.6.0

3 15

[libvirt] Release of libvirt-1.2.20
by Daniel Veillard 02 Oct '15

02 Oct '15

Apparently RC2 was absolutely perfect and bug-free so I tagged 1.2.20 in git and pushed signed tarball and rpms to the usual place earlier today : ftp://libvirt.org/libvirt/ This is a relatively small release with less than 150 commit but since it includes a security update people are really invited to update. Of course that's still including a decent number of bug fixes and improvements: Security: - storage: Handle failure from refreshVol (John Ferlan) - storage: Correct the 'mode' check (John Ferlan) - virfile: Introduce virFileUnlink (John Ferlan) Documentation: - docs: Add yet another libvirt based app (Michal Privoznik) - conf: Document all VIR_DOMAIN_DEF_PARSE_* flags (Peter Krempa) - Minor typo fixes in documentation (Christian Loehle) - util: Add space before comment end marker (Andrea Bolognani) - docs: Update devguide.html to point to the new Python dev guide (Daniel P. Berrange) - docs: Remove last use of double semicolon in Makefile (Martin Kletzander) Portability: - tools: Link libvirt.la and readline to libvirt_shell.a (Michal Privoznik) - util: Add win32 version of virFileUnlink (Martin Kletzander) Bug Fixes: - qemu: Fix dynamic_ownership qemu.conf setting (Cole Robinson) - virsh: Preserve startupPolicy in change-media command (Michal Privoznik) - Create a shallow copy for volume building only if supported (Ján Tomko) - Update pool allocation with new values on volume creation (Ján Tomko) - conf: Fix virtType check (John Ferlan) - qemu: Make virtType of type virDomainVirtType (Shivangi Dhir) - Use daemon log facility for journald (Guido Günther) - domain: Fix migratable XML with graphics/@listen (Jiri Denemark) - qemu: Resolve Coverity RESOURCE_LEAK (John Ferlan) - qemu: Clean up ret in qemuDomainSaveMemory and qemuDomainSaveInternal (John Ferlan) - qemu: Resolve Coverity CHECKED_RETURN (John Ferlan) - virsh: Resolve Coverity DEADCODE (John Ferlan) - tests: Resolve Coverity RESOURCE_LEAK (John Ferlan) - tests: Resolve Coverity RESOURCE_LEAK (John Ferlan) - virDomainRestore: Don't keep transient domains around (Michal Privoznik) - virDomainCreateXML: Make domain definition transient (Michal Privoznik) - virDomainCreateXML: Don't remove persistent domains on error (Michal Privoznik) - virsh: Fix job status indicator for 0 length block jobs (Peter Krempa) - qemu: Refresh memory size only on fresh starts (Peter Krempa) - client rpc: Process pending data on error (Jiri Denemark) - conf: escape string for disk driver name attribute (Luyao Huang) - Makefile: fix build fail when make rpm (Luyao Huang) - tests: Avoid use of virQEMUDriverCreateXMLConf(NULL) (Michal Privoznik) - qemuTestDriverInit: init the driver lock too (Michal Privoznik) - Revert "qemu: Fix integer/boolean logic in qemuSetUnprivSGIO" (John Ferlan) - qemu: ppc64: Align memory sizes to 256MiB blocks (Peter Krempa) - qemu: command: Align memory sizes only on fresh starts (Peter Krempa) - test driver: don't unlock pool after freeing it (David Mansfield) - qemuDomainChangeDiskLive: Allow startupPolicy change (Michal Privoznik) - qemu: Fix some corner cases in persistent migration (Jiri Denemark) - qemu: Don't report false errors in migration protocol v2 (Jiri Denemark) - qemu: Kill domain when migration finish fails (Jiri Denemark) - libxl: fix AttachDeviceConfig on hostdev type (Chunyan Liu) - qemu: Fix using guest architecture as lookup key (Andrea Bolognani) - libxl: fix compiler error introduced by commit ba25c214 (Jim Fehlig) - Ignore virtio-mmio disks in qemuAssignDevicePCISlots() (Pavel Fedin) - security_selinux: Take @privileged into account (Michal Privoznik) - qemu: Allow others to browse /var/lib/libvirt/qemu (Martin Kletzander) - qemu: hotplug: Properly clean up drive backend if frontend hotplug fails (Peter Krempa) - xen: fix race in refresh of config cache (Daniel P. Berrange) - libxl: don't end job for ephemeal domain on start failure (Ian Campbell) - qemu: Report error if per-VM directory cannot be created (Martin Kletzander) - Revert "docs: Drop unused rule for internals/%.html.tmp target" (Martin Kletzander) - conf: fix crash when parsing a unordered NUMA <cell/> (Luyao Huang) - admin: Resolve leaked reference to private data (Erik Skultety) - util: Avoid Coverity FORWARD_NULL (John Ferlan) - virfile: Avoid Coverity IDENTICAL_BRANCHES error (John Ferlan) - lxc: Avoid Coverity SIZEOF_MISMATCH (John Ferlan) - qemu: Check virGetLastError return value for migration finish failure (John Ferlan) - qemu: Need to check for machine.os when using ADDRESS_TYPE_CCW (John Ferlan) - libxl: don't overwrite error from virNetSocketNewConnectTCP() (Jim Fehlig) - util: don't use netlink to save/set mac for macvtap+passthrough+802.1Qbh (Laine Stump) - remoteClientCloseFunc: Don't mangle connection object refcount (Michal Privoznik) - vshInit: Don't leak @histsize_env (Michal Privoznik) Improvements: - conf: Add new VIR_DOMAIN_VIRT_NONE enum (Shivangi Dhir) - vsh: create a noinstall libvirt_shell library (Erik Skultety) - qemu: Move vm->persistent check into qemuDomainRemoveInactive (Michal Privoznik) - Remove redundand assignment (Martin Kletzander) - qemuDomainDeviceDefPostParse: Drop useless checks (Michal Privoznik) - qemu: Align memory module sizes to 2MiB (Peter Krempa) - virsh: Notify users about disconnects (Jiri Denemark) - client rpc: Report proper error for keepalive disconnections (Jiri Denemark) - Use VIR_DIV_UP macro where possible (Martin Kletzander) - spec: Fix some warnings with latest rpmbuild (Cole Robinson) - test: Add test to validate that memory sizes don't get updated on migration (Peter Krempa) - conf: Don't always recalculate initial memory size from NUMA size totals (Peter Krempa) - conf: Pre-calculate initial memory size instead of always calculating it (Peter Krempa) - conf: Rename max_balloon to total_memory (Peter Krempa) - conf: Split memory related post parse stuff into separate function (Peter Krempa) - conf: Add XML parser flag that will allow us to do incompatible updates (Peter Krempa) - conf: Drop VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST flag (Peter Krempa) - qemu: Make memory alignment helper more universal (Peter Krempa) - conf: Add helper to determine whether memory hotplug is enabled for a vm (Peter Krempa) - libxl: vz: Use accessor instead of direct access for max_balloon (Peter Krempa) - Removed unneeded check (Pavel Fedin) - tests: use mockup cache (Pavel Fedin) - Implement infrastracture for mocking up QEMU capabilities cache (Pavel Fedin) - tests: split out common qemu driver initialization (Pavel Fedin) - virfile: Use virProcessWait in virDirCreate (John Ferlan) - virfile: Use virProcessWait in virFileUnlink (John Ferlan) - virfile: Use virProcessWait in virFileOpenForked (John Ferlan) - virfile: Rename virFileUnlink to virFileRemove (John Ferlan) - vz: remove error logging from prlsdkUUIDParse (Maxim Nestratov) - qemuDomainDiskChangeSupported: Fill in missing checks (Michal Privoznik) - qemu: s/virDomainDiskDiffersSourceOnly/qemuDomainDiskChangeSupported/ (Michal Privoznik) - qemuDomainChangeDiskLive: rework slightly (Michal Privoznik) - qemu_domain: Introduce qemuDomainDiskSourceDiffers (Michal Privoznik) - qemu: s/qemuDomainChangeDiskMediaLive/qemuDomainChangeDiskLive/ (Michal Privoznik) - qemuDomainUpdateDeviceConfig: Allow startupPolicy update, yet again (Michal Privoznik) - qemu: Queue events in migration Finish phase ASAP (Jiri Denemark) - qemuDomainEventQueue: Check if event is non-NULL (Jiri Denemark) - qemu: Don't fail migration on save status failure (Jiri Denemark) - qemu: Simplify qemuMigrationFinish (Jiri Denemark) - qemu: Split qemuMigrationFinish (Jiri Denemark) - vmx: Expose datacenter path in domain XML (Matthias Bolte) - virfile: Check for existence of dir in virFileDeleteTree (John Ferlan) - virsh: Teach attach-interface to --print-xml (Michal Privoznik) - libxl: open libxl log stream with libvirtd log_level (Jim Fehlig) - virSecurityManager: Track if running as privileged (Michal Privoznik) - security_selinux: Replace SELinuxSCSICallbackData with proper struct (Michal Privoznik) - virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType (Michal Privoznik) - qemu: Do not allow others into per-VM subdirectories (Martin Kletzander) - qemu: command: Report stderr from qemu-bridge-helper (Cole Robinson) - tests: Don't use testutils in mock libraries (Martin Kletzander) - qemu: Try several network devices when looking for a default (Andrea Bolognani) - qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_NET (Andrea Bolognani) - qemu: Introduce QEMU_CAPS_DEVICE_E1000 (Andrea Bolognani) - qemu: Introduce QEMU_CAPS_DEVICE_RTL8139 (Andrea Bolognani) - qemu: migration: Relax enforcement of memory hotplug support (Peter Krempa) - vmx: Add handling for CDROM devices with SCSI passthru (Matthias Bolte) - vmx: The virVMXParseDisk deviceType can be NULL, add some missing checks (Matthias Bolte) - cpu: Introduce IvyBridge CPU model (Jiri Denemark) - virsh: Slightly rework cmdDomblklist (Michal Privoznik) - .gitignore: Ignore the correct rename example binary (Michal Privoznik) - examples: Add missing build data for 'rename' (Martin Kletzander) - conf: Remove need for a couple of sa_asserts (John Ferlan) - Change name of the domain upon successful rename (Martin Kletzander) - Add example that renames domain there and back (Martin Kletzander) - examples: Add example polkit ACL rules (Jiri Denemark) - qemu: Introduce qemuDomainMachineIsS390CCW (John Ferlan) - vsh: Make vshInitDebug static (Erik Skultety) - virsh: Do not make interactive mode default (Erik Skultety) - vsh: Introduce vshInitReload (Erik Skultety) - vsh: adjust vshInit signature and remove redundant error label (Erik Skultety) - domain-conf: escape string for socket attribute (Pavel Hrdina) - util: make virNetDev(Replace|Restore)MacAddress public functions (Laine Stump) - virfile: Add error for root squash change mode failure (John Ferlan) - qemu: add udp interface support (Jonathan Toppins) - Post release version bump to 1.2.20 (Ján Tomko) Cleanups: - maint: Remove control characters from LGPL license file (Andrea Bolognani) - vmx: Some whitespace cleanup (Matthias Bolte) Thanks everybody who contributed to this release, be it with code, ideas, bug reports, etc ! Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Release of libvirt-php-0.5.1
by Michal Privoznik 02 Oct '15

02 Oct '15

So, after little more than a year of development, I'm proud to announce that libvirt-php-0.5.1 is out! It can be downloaded from http://libvirt.org/sources/php/libvirt-php-0.5.1.tar.gz This is relatively small release, mostly focused on cleanups. Thanks to all who participated! Michal

1 0

[libvirt] [PATCH 0/6] Fix some Coverity issues
by John Ferlan 02 Oct '15

02 Oct '15

Newer Coverity (7.7.0) found a couple real issues and a few more false positives. There's still a few more to be resolved, but still trying to figure them out... libxlDomainMigrationPrepare - claim is args is leaked. Although it seems to be handled in libxlMigrateReceive or libxlDoMigrateReceive. Don't know the code well enough to do proper triage. qemuProcessStop - claim is usage of net->ifname in the condition (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) is using a NULL net->ifname that would have been VIR_FREE()'d when case VIR_DOMAIN_NET_TYPE_DIRECT a few lines above. qemuDomainBlockRebase - claim is overwriting 'dest' after call to qemuDomainBlockCopyCommon causes resource leak. Although reading code says otherwise, except of course if CopyCommon goes to cleanup rather than endjob. Even changing the location doesn't resolve the issue. Fix the Coverity tag for the DEADCODE... It's always a coin-flip either dead_error_begin or dead_error_condition - I gave Jiri bad advice as to which one to use it seems. John Ferlan (6): Avoid Coverity FORWARD_NULL prior to strtok_r calls tests: Resolve Coverity RESOURCE_LEAK tests: Resolve Coverity RESOURCE_LEAK virsh: Resolve Coverity DEADCODE qemu: Resolve Coverity CHECKED_RETURN qemu: Resolve Coverity RESOURCE_LEAK src/esx/esx_vi.c | 1 + src/libxl/libxl_conf.c | 1 + src/openvz/openvz_conf.c | 2 ++ src/qemu/qemu_driver.c | 24 +++++++++++------------- src/qemu/qemu_process.c | 6 +++--- src/xenapi/xenapi_utils.c | 1 + tests/qemucaps2xmltest.c | 1 + tests/virnetdaemontest.c | 2 ++ tools/virsh.c | 2 +- 9 files changed, 23 insertions(+), 17 deletions(-) -- 2.1.0

3 16

[libvirt] [PATCH] qemu: Add conditions for qemu-kvm use on ppc64
by Andrea Bolognani 01 Oct '15

01 Oct '15

qemu-kvm can be used to run ppc64 guests on ppc64le hosts and vice versa, since the hardware is actually the same and the endianness is chosen by the guest kernel. Up until now, however, libvirt didn't allow the use of qemu-kvm to run guests if their endianness didn't match the host's. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1267882 --- src/qemu/qemu_capabilities.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index eb2edf5..8253398 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -768,7 +768,7 @@ virQEMUCapsInitGuest(virCapsPtr caps, char *binary = NULL; virQEMUCapsPtr qemubinCaps = NULL; virQEMUCapsPtr kvmbinCaps = NULL; - bool native_kvm, x86_32on64_kvm, arm_32on64_kvm; + bool native_kvm, x86_32on64_kvm, arm_32on64_kvm, ppc64_kvm; int ret = -1; /* Check for existence of base emulator, or alternate base @@ -788,14 +788,16 @@ virQEMUCapsInitGuest(virCapsPtr caps, * - host & guest arches match * - hostarch is x86_64 and guest arch is i686 (needs -cpu qemu32) * - hostarch is aarch64 and guest arch is armv7l (needs -cpu aarch64=off) + * - hostarch and guestarch are both ppc64* */ native_kvm = (hostarch == guestarch); x86_32on64_kvm = (hostarch == VIR_ARCH_X86_64 && guestarch == VIR_ARCH_I686); arm_32on64_kvm = (hostarch == VIR_ARCH_AARCH64 && guestarch == VIR_ARCH_ARMV7L); + ppc64_kvm = (ARCH_IS_PPC64(hostarch) && ARCH_IS_PPC64(guestarch)); - if (native_kvm || x86_32on64_kvm || arm_32on64_kvm) { + if (native_kvm || x86_32on64_kvm || arm_32on64_kvm || ppc64_kvm) { const char *kvmbins[] = { "/usr/libexec/qemu-kvm", /* RHEL */ "qemu-kvm", /* Fedora */ -- 2.4.3

2 2

[libvirt] nested HVM in libxl againagain.
by Alvin Starr 01 Oct '15

01 Oct '15

A while back I posted a patch to add nested HVM to libvirt and libxl. Something made me think the patch got accepted and incorporated into libvirt(It must have been the sleep deprivation). I noticed that the latest still does not support nested hvm(under xen). Should I try posting a patch again or just live with keeping my own copy? -- Alvin Starr || voice: (905)513-7688 Netvel Inc. || Cell: (416)806-0133 alvin(a)netvel.net ||

2 2

[libvirt] [PATCH v3 0/14] migration: support all toURI and proto combos
by Nikolay Shirokovskiy 01 Oct '15

01 Oct '15

Current implementation of 'toURI' migration interfaces does not support all combinations of interface versions and protocol versions. For example 'toURI2' with p2p flag will not migrate if driver supports only v3params proto. This is not convinient as drivers that starts to support migration have to manually support older versions of protocol. I guess this should be done in one place, namely here. Another issue is that there are a lot of code duplication in implementation of toURI interfaces and it is not obvious from code how are they related. This implementation uses extensible parameters as intermediate parameters representation. This is possible as interfaces are done backward compatible in terms of parameters and later versions supports all parameters of former versions. = Changes from version2 1. fix misc typos and overall english in commit messages 2. fix misc style issues 3. add 2 new patches 1. migration: refactor: rename uri parameter to miguri 2. migration: check dconnuri in p2p mode 4. rework succession of 2 patches 1. migration: refactor: prepare to reuse flag vs feature checks 2. migration: reuse flags vs features checks in toURI family into 1. migration: refactor: introduce parameter checking function 2. migration: reuse parameters check in toURI2 and toURI3 5. rearrange functions as suggested by reviwer to make better diffs The overall diff as compared to the previous patchset is really small. src/libvirt-domain.c | 531 ++++++++++++++++++++++--------------------------- 1 files changed, 238 insertions(+), 293 deletions(-)

3 35

[libvirt] [PATCH] docs: Add Cuckoo Sandbox into apps.html
by Martin Kletzander 01 Oct '15

01 Oct '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/apps.html.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 86b301660df3..2ee24bb382f9 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -441,5 +441,19 @@ </dd> </dl> + <h2><a name="other">Other</a></h2> + + <dl> + <dt><a href="http://cuckoosandbox.org/">Cuckoo Sandbox</a></dt> + <dd> + Cuckoo Sandbox is a malware analysis system. You can throw + any suspicious file at it and in a matter of seconds Cuckoo + will provide you back some detailed results outlining what + such file did when executed inside an isolated environment. + And it's this isolated environment that libvirt, amongsth + other backends, can be used. + </dd> + </dl> + </body> </html> -- 2.6.0

2 3

[libvirt] [libvirt-php] free xml resources in get_string_from_xpath
by Vasiliy Tolstov 01 Oct '15

01 Oct '15

free as much as possible on return from get_string_from_xpath Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/libvirt-php.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 8588128..18499a6 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -2597,6 +2597,7 @@ char *get_string_from_xpath(char *xml, char *xpath, zval **val, int *retVal) if (!doc) { if (retVal) *retVal = -2; + xmlFreeParserCtxt(xp); xmlCleanupParser(); return NULL; } @@ -2605,6 +2606,8 @@ char *get_string_from_xpath(char *xml, char *xpath, zval **val, int *retVal) if (!context) { if (retVal) *retVal = -3; + xmlFreeDoc(doc); + xmlFreeParserCtxt(xp); xmlCleanupParser(); return NULL; } @@ -2614,6 +2617,8 @@ char *get_string_from_xpath(char *xml, char *xpath, zval **val, int *retVal) if (retVal) *retVal = -4; xmlXPathFreeContext(context); + xmlFreeParserCtxt(xp); + xmlFreeDoc(doc); xmlCleanupParser(); return NULL; } @@ -2621,6 +2626,8 @@ char *get_string_from_xpath(char *xml, char *xpath, zval **val, int *retVal) if(xmlXPathNodeSetIsEmpty(result->nodesetval)){ xmlXPathFreeObject(result); xmlXPathFreeContext(context); + xmlFreeParserCtxt(xp); + xmlFreeDoc(doc); xmlCleanupParser(); if (retVal) *retVal = 0; @@ -2632,8 +2639,9 @@ char *get_string_from_xpath(char *xml, char *xpath, zval **val, int *retVal) if (ret == 0) { xmlXPathFreeObject(result); - xmlFreeDoc(doc); xmlXPathFreeContext(context); + xmlFreeParserCtxt(xp); + xmlFreeDoc(doc); xmlCleanupParser(); if (retVal) *retVal = 0; @@ -2658,8 +2666,9 @@ char *get_string_from_xpath(char *xml, char *xpath, zval **val, int *retVal) value = (char *)xmlNodeListGetString(doc, nodeset->nodeTab[0]->xmlChildrenNode, 1); } - xmlXPathFreeContext(context); xmlXPathFreeObject(result); + xmlXPathFreeContext(context); + xmlFreeParserCtxt(xp); xmlFreeDoc(doc); xmlCleanupParser(); -- 2.5.0

2 3

[libvirt] [libvirt-php][PATCH 0/8] Couple of mem leak fixes
by Michal Privoznik 01 Oct '15

01 Oct '15

So, after I reviewed [1] I realized how big memory leaks we have there... 1: https://www.redhat.com/archives/libvir-list/2015-September/msg01045.html Since there is nobody to review, I'm pushing this. Michal Privoznik (8): libvirt_network_get_information: Be more tolerant to missing info examples: Resolve some warnings examples: Rework a bit to resolve some warnings Don't free() in RECREATE_STRING_WITH_E LONGLONG_INIT: Reformat virConnectGetHostname: free returned value virDomainGetXMLDesc: Free returned value virNodeDeviceGetXMLDesc: Free returned value examples/index.php | 90 +++--- examples/libvirt.php | 44 +-- src/libvirt-php.c | 900 +++++++++++++++++++++++++-------------------------- 3 files changed, 504 insertions(+), 530 deletions(-) -- 2.4.9

1 8

[libvirt] [PATCH v2 0/3] Add support for gic-version machine option
by Pavel Fedin 01 Oct '15

01 Oct '15

qemu now supports gic-version option for the virt machine. This patchset allows to use it in libvirt. v1 => v2: - Added capability flag Pavel Fedin (3): qemu: Introduce QEMU_CAPS_MACH_VIRT_GIC_VERSION capability qemu: Add support for gic-version machine option qemu: Add test cases for gic-version option src/qemu/qemu_capabilities.c | 5 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 43 +++++++++++++++------- .../qemuxml2argv-aarch64-gicv3.args | 6 +++ .../qemuxml2argv-aarch64-gicv3.xml | 26 +++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 6 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml -- 2.1.4

3 12

[libvirt] [PATCH] qemuDomainAttachDeviceLive: Check provided disk address
by Michal Privoznik 30 Sep '15

30 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Imagine an user who is trying to attach a disk to a domain with the following XML: <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/sr0'/> <target dev='vde' bus='virtio'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> The XML is obviously wrong. It's trying to attach a virtio disk onto non-PCI bus. We should forbid that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index afc5408..fc8e21b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -336,6 +336,13 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!qemuCheckCCWS390AddressSupport(vm->def, disk->info, priv->qemuCaps, disk->dst)) goto cleanup; + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("virtio disks must have PCI or CCW address")); + goto cleanup; + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.9

3 10

[libvirt] Entreing freeze for libvirt-1.2.20
by Daniel Veillard 30 Sep '15

30 Sep '15

I'm afraid I forgot to warn about this last week, but we are close to the end of the month and it's time ! I have tagged the git tree and pushed release candidate 1 signed tarball and rpms at the usual place: ftp://libvirt.org/libvirt/ I didn't really had time to give it a bit of testing, at least it compiles and build fine <grin/>, so it may be broken, check it ! Plan is to have an rc2 probably on Wednesday, and final release on Friday. Hope that works for everyone ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] Fwd: [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad bhat 30 Sep '15

30 Sep '15

On Tue, Sep 29, 2015 at 2:33 AM, John Ferlan <jferlan(a)redhat.com> wrote: > > > On 09/28/2015 11:02 AM, Shivaprasad bhat wrote: >> Hi Jon, >> >> Thanks a lot for attaching the patch. Replies inline. >> >> On Thu, Sep 24, 2015 at 1:52 AM, John Ferlan <jferlan(a)redhat.com> wrote: >>> >>> >>> On 09/22/2015 07:21 AM, Shivaprasad bhat wrote: >>>> On Mon, Sep 21, 2015 at 8:04 PM, John Ferlan <jferlan(a)redhat.com> wrote: >>>>> >>>>> >>>>> On 09/21/2015 05:09 AM, Shivaprasad bhat wrote: >>>>>> Thanks John for the comments. >>>>>> >>>>>> >>>>>> On Fri, Sep 18, 2015 at 10:34 PM, John Ferlan <jferlan(a)redhat.com> wrote: >>>>>>> >>>>>>> >>>>>>> On 09/14/2015 10:44 AM, Shivaprasad G Bhat wrote: >>>>>>>> Tunnelled migration can hang if the destination qemu exits despite all the >>>>>>>> ABI checks. This happens whenever the destination qemu exits before the >>>>>>>> complete transfer is noticed by source qemu. The savevm state checks at >>>>>>>> runtime can fail at destination and cause qemu to error out. >>>>>>>> The source qemu cant notice it as the EPIPE is not propogated to it. >>>>>>>> The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() >>>>>>>> and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would >>>>>>>> never get to 100% transfer completion. >>>>>>>> The qemuMigrationWaitForCompletion() never breaks out as well since >>>>>>>> the ssh connection to destination is healthy, and the source qemu also thinks >>>>>>>> the migration is ongoing as the Fd to which it transfers, is never >>>>>>>> closed or broken. So, the migration will hang forever. Even Ctrl-C on the >>>>>>>> virsh migrate wouldn't be honoured. Close the source side FD when there is >>>>>>>> an error in the stream. That way, the source qemu updates itself and >>>>>>>> qemuMigrationWaitForCompletion() notices the failure. >>>>>>>> >>>>>>>> Close the FD for all kinds of errors to be sure. The error message is not >>>>>>>> copied for EPIPE so that the destination error is copied instead later. >>>>>>>> >>>>>>>> Note: >>>>>>>> Reproducible with repeated migrations between Power hosts running in different >>>>>>>> subcores-per-core modes. >>>>>>>> >>>>>>>> Changes from v1 -> v2: >>>>>>>> VIR_FORCE_CLOSE() was called twice for this use case which would log >>>>>>>> unneccessary warnings. So, move the fd close to qemuMigrationIOFunc >>>>>>>> so that there are no unnecessary duplicate attempts.(Would this trigger >>>>>>>> a Coverity error? I don't have a setup to check.) >>>>>>>> >>>>>>>> Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> >>>>>>>> --- >>>>>>>> src/qemu/qemu_migration.c | 8 ++++++-- >>>>>>>> 1 file changed, 6 insertions(+), 2 deletions(-) >>>>>>>> >>>>>>>> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c >>>>>>>> index ff89ab5..9602fb2 100644 >>>>>>>> --- a/src/qemu/qemu_migration.c >>>>>>>> +++ b/src/qemu/qemu_migration.c >>>>>>>> @@ -4012,6 +4012,7 @@ static void qemuMigrationIOFunc(void *arg) >>>>>>>> if (virStreamFinish(data->st) < 0) >>>>>>>> goto error; >>>>>>>> >>>>>>>> + VIR_FORCE_CLOSE(data->sock); >>>>>>>> VIR_FREE(buffer); >>>>>>>> >>>>>>>> return; >>>>>>>> @@ -4029,7 +4030,11 @@ static void qemuMigrationIOFunc(void *arg) >>>>>>>> } >>>>>>>> >>>>>>>> error: >>>>>>>> - virCopyLastError(&data->err); >>>>>>>> + /* Let the source qemu know that the transfer cant continue anymore. >>>>>>>> + * Don't copy the error for EPIPE as destination has the actual error. */ >>>>>>>> + VIR_FORCE_CLOSE(data->sock); >>>>>>>> + if (!virLastErrorIsSystemErrno(EPIPE)) >>>>>>>> + virCopyLastError(&data->err); >>>>>>>> virResetLastError(); >>>>>>>> VIR_FREE(buffer); >>>>>>>> } >>>>>>>> @@ -4397,7 +4402,6 @@ qemuMigrationRun(virQEMUDriverPtr driver, >>>>>>>> if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0) >>>>>>>> ret = -1; >>>>>>>> } >>>>>>>> - VIR_FORCE_CLOSE(fd); >>>>>>> >>>>>>> ^^^ >>>>>>> >>>>>>> This causes Coverity to claim a RESOURCE_LEAK >>>>>>> >>>>>>> Feels like this was a mistake edit... >>>>>>> >>>>>> >>>>>> The VIR_FORCE_CLOSE() inside qemuMigrationIOFunc() alone is sufficient. >>>>>> Having this again here would lead to Warning in the logs. I too thought coverity >>>>>> would complain. Is there a way to force ignore a coverity warning? >>>>>> >>>>> >>>>> Typically a marker of sorts, such as >>>>> >>>>> /* coverity[leaked_handle] <some extra comment explaining why> */ >>>>> >>>>> Although I'm not sure that's the best way to handle this either. >>>>> >>>>> The problem I see though is this is an "error path" issue and when >>>>> perhaps it's safe/required to close fd/io->sock/data->sock. >>>>> >>>>> Your commit comment notes that the issue is seen on a fairly specific >>>>> event (virStreamSend failure) for a specific type of migration. >>>> >>>> I believe the failure can be seen for all types of migration with savestate >>>> mismatch. >>>> >>> >>> My thoughts were based mostly on your commit message comments: >>> >>> "The qemuMigrationIOFunc() notices the stream being broken from >>> virStreamSend() and it cleans up the stream alone. The >>> qemuMigrationWaitForCompletion() would never get to 100% transfer >>> completion." >>> >>> and the belief that the core issue you described is there's no way for >>> qemuMigrationCompleted to know the qemuMigrationIOFunc thread failed and >>> thus that's what caused the hang. Since we can pass the iothread "io" >>> object to the Completion function, I figured we could also use that to >>> check the status of the thread in the list of things already checked. I >>> guess it's not clear to me why your test fails below. Maybe it'll help >>> to attach/show you my thoughts in a patch format. I just took your >>> changes and "adjusted" them, merging the differences. So you could 'git >>> am' to top of trunk in order to compare my thoughts. >> >> I tried your patch. Gave migrations in a while loop. Hit the hang in 7th run >> itlsef. I feel the small time window is not very negligible. >> > > Perhaps I should clarify my query-migrate has no timeout comment... It > seems based on what I've read so far, the 'query-migrate' command > started successfully, because if it hadn't we would have received a > failure (as shown below). Thus libvirt has sent the command via the > monitor and is waiting for a response (e.g. the virCondWait after the > qemuMonitorSend in the trace below). The response isn't coming because > either "A" qemu didn't send it back or "B" libvirt missed it - that > should be determinable. > > There's a way to turn on debugging so the monitor dialog can be seen - > via changes to /etc/libvirt/libvirtd.conf. I use : > > log_level = 1 > log_filters="3:remote 4:event 3:json 3:rpc" > log_outputs="1:file:/var/log/libvirt/libvirtd.log" > > But you may need to remove the "3:json" in order to see the dialog since > that where it "feels like" the issue might be. Then start libvirtd in > the debugger again. Once it's hung - you should be able to scan (eg, > edit) the libvirtd.log file and search for the "query-migrate" command > being sent and then follow the copious output looking for the presence > of a returned command. If there is none, then something in qemu isn't > returning the failure correctly and it would need to be fixed there I > would think as opposed to throwing down the big hammer of closing the fd. Had a chance to run with your log settings. The query-migrate doesn't seem to have a corresponding "return" in the logs. So as you say, there may be a qemu bug that is not returning a response when the fd is still open(as libvirt didnt close it) but no read actually happening there. I felt qemu can't sense the failure as the fd is open, so posted this patch. Though, the qemu should return with the current state of migration as it sees instead of not returning at all. Hope we are on the same page. Mailer refused my reply as the attached logs with the mail crossed 300KB. Not attaching the logs for now. Please let me know if you want to me check anything specific. Thanks, Shivaprasad > > I think you've hit some edge/error "timing" condition - one of the more > difficult to debug. Finding the root cause of the problem could be > beneficial especially if it could be considered some more "common" type > problem for other similar migrate commands. > > John >>> >>> I'm not opposed to the chosen method, although perhaps Dan or Jiri who >>> understand more of the inner workings of migration than I do can provide >>> some comments. Changing where the fd is closed could have some corner >>> race condition I'm not aware of... >>> >>> One issue that needs to be resolved with your patch is what happens to >>> the 'fd' when qemuMigrationIOFunc isn't involved? IOW: if "fwdType == >>> MIGRATION_FWD_DIRECT", then qemuMigrationStartTunnel isn't called and >>> thus qemuMigrationIOFunc won't be closing the 'fd' in the form of >>> data->sock. That's perhaps a path Coverity was considering (and I hadn't >>> considered initially). >>> >>> I think to resolve this the following should be added to your patch (I >>> tried it, Coverity is happy too)... >>> >>> if (spec->fwdType != MIGRATION_FWD_DIRECT) { >>> if (!(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd))) >>> goto cancel; >>> /* If we've created a tunnel, then the 'fd' will be closed in the >>> * qemuMigrationIOFunc as data->sock >>> */ >>> fd = -1; >>> } >>> >>> and restore the VIR_FORCE_CLOSE(fd); >>> >> >> I agree. Let me know if we should go with this approach. I'll spin >> the next version with the above corrections. I am copying Jiri on this >> patch for his opinion as well. >> >>> >>>>> As I >>>>> read the code, that failure jumps to error (as does virStreamFinish). So >>>>> now you have a fairly specific set of instances which perhaps would >>>>> cause qemuMigrationWaitForCompletion to need to fail. The fix you have >>>>> proposed is to close the data->sock (io->sock, fd). However, your >>>>> proposal is a larger hammer. I assume closure of data->sock causes >>>>> WaitForCompletion to fail (perhaps differently) and that's why you chose it. >>>>> >>>>> Going back to the beginning of qemuMigrationRun, setting the 'fd' and >>>>> using StartTunnel seems to rely on MIGRATION_FWD_DIRECT, but if a tunnel >>>>> is created an (ugh) 'iothread' variable is NON-NULL. What if 'iothread' >>>>> were passed to qemuMigrationWaitForCompletion? Then again passed to >>>>> qemuMigrationCompleted which would check if iothread non-NULL and for >>>>> some new flag that could be created in _qemuMigrationIOThread, being >>>>> true. If it were true, then that would cause failure so that >>>>> WaitForCompletion would return error status. The only way the flag is >>>>> set to true is in qemuMigrationIOFunc when the code jumps to error. >>>>> (e.g. add bool stream_abort and data->stream_abort = true in "error:", >>>>> then check iothread && iothread->stream_abort, force error). >>>>> >>>> >>>> I tried this. Until the fd is closed, the 'info migrate' wouldn't >>>> return from the >>>> qemu. So, the migration hangs. Checking the stream status before/after >>>> fetching the job status would still leave a race. So, having it in a different >>>> thread (qemuMigrationIOFunc) here seems inevitable to me. >>> >>> Although perhaps susceptible to a smaller "timing" window, if we move >>> the iothread check to before the CheckJobStatus call in Completed, then >>> that'll work better? >>> >>> It seems the "query-migrate" command has no timeout... I assume qemu >>> would indicate that if you call it when the migration pipe had an error, >>> then you unpredictable results (only a guess - I didn't look at that >>> code as well). Perhaps that means libvirt needs some code to handle the >>> condition where the command doesn't finish in a timely manner. >>> >> >> No, If the pipe was broken, the query-migrate returns "failed". This is >> anyway handled in a generic way in libvirt. >> >> 90.408 > 0x3fff80007410 {"execute":"query-migrate","id":"libvirt-725"} >> 90.408 < 0x3fff80007410 {"return": {"status": "failed"}, "id": "libvirt-725"} >> >> Thanks and Regards, >> Shiva >> >>> Perhaps worth a shot... I did change my attached patch to reflect this >>> thought.. >>> >>> John >>>> >>>> #1 0x00003fff83ff593c in virCondWait (c=<optimized out>, m=<optimized out>) >>>> at util/virthread.c:154 >>>> #2 0x00003fff76235544 in qemuMonitorSend (mon=0x3fff54003970, >>>> msg=<optimized out>) at qemu/qemu_monitor.c:1035 >>>> #3 0x00003fff7624fb30 in qemuMonitorJSONCommandWithFd (mon=0x3fff54003970, >>>> cmd=0x3fff5c001420, scm_fd=-1, reply=0x3fff79fbd388) >>>> at qemu/qemu_monitor_json.c:293 >>>> #4 0x00003fff76254b90 in qemuMonitorJSONCommand (reply=0x3fff79fbd388, >>>> cmd=0x3fff5c001420, mon=0x3fff54003970) at qemu/qemu_monitor_json.c:323 >>>> #5 qemuMonitorJSONGetMigrationStatus (mon=0x3fff54003970, >>>> status=0x3fff79fbd538) at qemu/qemu_monitor_json.c:2620 >>>> #6 0x00003fff7623a664 in qemuMonitorGetMigrationStatus (mon=<optimized out>, >>>> status=<optimized out>) at qemu/qemu_monitor.c:2134 >>>> #7 0x00003fff76228e6c in qemuMigrationFetchJobStatus (driver=0x3fff6c118d80, >>>> vm=0x3fff6c27faf0, asyncJob=<optimized out>, jobInfo=0x3fff79fbd4f0) >>>> at qemu/qemu_migration.c:2528 >>>> #8 0x00003fff76228fb4 in qemuMigrationUpdateJobStatus (driver=0x3fff6c118d80, >>>> vm=0x3fff6c27faf0, asyncJob=QEMU_ASYNC_JOB_MIGRATION_OUT) >>>> at qemu/qemu_migration.c:2565 >>>> #9 0x00003fff76229200 in qemuMigrationCheckJobStatus (driver=0x3fff6c118d80, >>>> vm=0x3fff6c27faf0, asyncJob=QEMU_ASYNC_JOB_MIGRATION_OUT) >>>> ---Type <return> to continue, or q <return> to quit---cont >>>> at qemu/qemu_migration.c:2585 >>>> #10 0x00003fff76229408 in qemuMigrationCompleted (iothread=<optimized out>, >>>> >>>>> The only question then in my mind then is would this also be something >>>>> that should be done for the virStreamFinish failure path which also >>>>> jumps to error? >>>>> >>>> >>>> Yes, I too am not sure if its appropriate for virStreamFinish failure >>>> case. But, given >>>> this an error path, I feel we can safely go ahead and close the >>>> data->sock. >>>> >>>>> Doing this means you shouldn't need the VIR_FILE_CLOSE(data->sock) for >>>>> either the normal or error path. Does this seem to be a reasonable >>>>> approach and solve the issue you're facing? >>>>> >>>>> John >>>>>> Thanks and Regards, >>>>>> Shivaprasad >>>>>> >>>>>>> The rest of the patch looks reasonable; however, I'm far from the expert >>>>>>> in these matters. >>>>>>> >>>>>>> John >>>>>>>> >>>>>>>> if (priv->job.completed) { >>>>>>>> qemuDomainJobInfoUpdateTime(priv->job.completed); >>>>>>>> >>>>>>>> -- >>>>>>>> libvir-list mailing list >>>>>>>> libvir-list(a)redhat.com >>>>>>>> https://www.redhat.com/mailman/listinfo/libvir-list >>>>>>>>

1 0

[libvirt] [PATCH] testutils: Add coloring to verbose PASS/FAILED output
by Cole Robinson 30 Sep '15

30 Sep '15

Helps to visually track down test failures if debugging the test suite. The colors match what 'make check' does for pass/fail/skip --- tests/testutils.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 89026c6..bd4ff73 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -91,6 +91,11 @@ bool virtTestOOMActive(void) return testOOMActive; } +static int virtTestUseTerminalColors(void) +{ + return isatty(STDIN_FILENO); +} + static unsigned int virTestGetFlag(const char *name) { @@ -217,11 +222,20 @@ virtTestRun(const char *title, if (virTestGetVerbose()) { if (ret == 0) - fprintf(stderr, "OK\n"); + if (virtTestUseTerminalColors()) + fprintf(stderr, "\e[32mOK\e[0m\n"); /* green */ + else + fprintf(stderr, "OK\n"); else if (ret == EXIT_AM_SKIP) - fprintf(stderr, "SKIP\n"); + if (virtTestUseTerminalColors()) + fprintf(stderr, "\e[34m\e[1mSKIP\e[0m\n"); /* bold blue */ + else + fprintf(stderr, "SKIP\n"); else - fprintf(stderr, "FAILED\n"); + if (virtTestUseTerminalColors()) + fprintf(stderr, "\e[31m\e[1mFAILED\e[0m\n"); /* bold red */ + else + fprintf(stderr, "FAILED\n"); } else { if (testCounter != 1 && !((testCounter-1) % 40)) { -- 2.5.0

2 1

[libvirt] [PATCH 0/2] Check disk serial strings for uniqueness
by Peter Krempa 29 Sep '15

29 Sep '15

Peter Krempa (2): qemu: Perform the disk WWN check only on fresh starts conf: Reuse virDomainDefCheckDuplicateDiskWWN to check disk serial too src/conf/domain_conf.c | 15 ++++++++++++++- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_process.c | 3 ++- 4 files changed, 18 insertions(+), 4 deletions(-) -- 2.4.5

2 5

[libvirt] [PATCH tck 0/5] Getting the TCK to run against opensuse images
by Cédric Bosdonnat 29 Sep '15

29 Sep '15

Hi all, Here are a few patches to get the TCK run properly against opensuse image. The patch adding the opensuse images to virt-builder is still pending, but the main issues were: * Waiting for 30 seconds for the guest to be started is pretty fragile. For the tests pinging the guest, wait for domifstats to report 10 sent packets. * The first boot of the opensuse image runs dracut and takes quite a long time. We need to wait for the first boot to complete before shutting down the guest to avoid inconsistent states. * Yum isn't in all distros by default you know ;) Cédric Bosdonnat (5): Ping test: use domifstats to wait for dhcp to be setup in guest Create has_disk_image from code of get_virt_builder_disk Add DomainBuilder->rminterface function. Make sure the image has been started properly started the first time. 240-no-arp-spoofing.t: get virt-builder install dsniff lib/Sys/Virt/TCK.pm | 54 +++++++++++++++++++++++++++++-- lib/Sys/Virt/TCK/DomainBuilder.pm | 7 ++++ scripts/nwfilter/100-ping-still-working.t | 13 ++++++-- scripts/nwfilter/210-no-mac-spoofing.t | 13 ++++++-- scripts/nwfilter/230-no-mac-broadcast.t | 13 ++++++-- scripts/nwfilter/240-no-arp-spoofing.t | 14 ++++++-- 6 files changed, 103 insertions(+), 11 deletions(-) -- 2.1.4

3 7

[libvirt] [PATCH tck v2 0/5] Getting the TCK to run against opensuse images
by Cédric Bosdonnat 29 Sep '15

29 Sep '15

Hi all, Here are a few patches to get the TCK run properly against opensuse image. The patch adding the opensuse images to virt-builder is still pending, but the main issues were: * Waiting for 30 seconds for the guest to be started is pretty fragile. For the tests pinging the guest, wait for domifstats to report 10 sent packets. * The first boot of the opensuse image runs dracut and takes quite a long time. We need to wait for the first boot to complete before shutting down the guest to avoid inconsistent states. * Yum isn't in all distros by default you know ;) diff to v1: * set the proper email address Cédric Bosdonnat (5): Ping test: use domifstats to wait for dhcp to be setup in guest Create has_disk_image from code of get_virt_builder_disk Add DomainBuilder->rminterface function. Make sure the image has been started properly started the first time. 240-no-arp-spoofing.t: get virt-builder install dsniff lib/Sys/Virt/TCK.pm | 54 +++++++++++++++++++++++++++++-- lib/Sys/Virt/TCK/DomainBuilder.pm | 7 ++++ scripts/nwfilter/100-ping-still-working.t | 13 ++++++-- scripts/nwfilter/210-no-mac-spoofing.t | 13 ++++++-- scripts/nwfilter/230-no-mac-broadcast.t | 13 ++++++-- scripts/nwfilter/240-no-arp-spoofing.t | 14 ++++++-- 6 files changed, 103 insertions(+), 11 deletions(-) -- 2.1.4

1 5

[libvirt] [PATCH] qemu: Fix dynamic_ownership qemu.conf setting
by Cole Robinson 29 Sep '15

29 Sep '15

Commit 307fb904 (Sep 10) added a 'privileged' variable when creating the DAC driver: @@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver, bool defaultConfined, bool requireConfined, bool dynamicOwnership, + bool privileged, virSecurityManagerDACChownCallback chownCallback) But argument order is mixed up at the caller, swapping dynamicOwnership and privileged values. This corrects the argument order https://bugzilla.redhat.com/show_bug.cgi?id=1266628 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7025c51..aff1915 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -431,8 +431,8 @@ qemuSecurityInit(virQEMUDriverPtr driver) cfg->allowDiskFormatProbing, cfg->securityDefaultConfined, cfg->securityRequireConfined, - virQEMUDriverIsPrivileged(driver), cfg->dynamicOwnership, + virQEMUDriverIsPrivileged(driver), qemuSecurityChownCallback))) goto error; if (!stack) { -- 2.5.0

2 2

[libvirt] [PATCH] conf: Fix virtType check
by John Ferlan 29 Sep '15

29 Sep '15

Commit id '7383b8cc' changed virDomainDef 'virtType' to an enum, that caused a build failure on some archs due to comparing an unsigned value to < 0. Adjust the fetch of 'type' to be into temporary 'int virtType' and then assign that virtType to the def->virtType Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as build breaker src/conf/domain_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cdafb14..393ece7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14640,7 +14640,7 @@ virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; - int n; + int n, virtType; long id = -1; virDomainDefPtr def; bool uuid_generated = false; @@ -14678,11 +14678,12 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) { + if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain type %s"), tmp); goto error; } + def->virtType = virtType; VIR_FREE(tmp); def->os.bootloader = virXPathString("string(./bootloader)", ctxt); -- 2.1.0

2 1

[libvirt] [PATCH 0/4] improve virConnectListAllInterfaces()
by Laine Stump 29 Sep '15

29 Sep '15

There's a bit of background about this here: https://www.redhat.com/archives/augeas-devel/2015-September/msg00001.html In short, virt-manager is calling the virInterface APIs and that ties up a libvirt thread (and CPU core) for a very long time on hosts that have a large number of interfaces. These patches don't cure the problem (I don't know that there really is a cure other than "Don't DO that!"), but they do fix a couple of bugs I found while investigating, and make a substantial improvement in the amount of time used by virConnectListAllInterfaces(). One thing that I wondered about while investigating this - a big use of CPU by virConnectListAllInterfaces() comes from the need to retrieve the MAC address of every interface. The MAC addresses are both 1) returned to the caller in the interface objects and 2) sent to the policykit ACL checking to decide which interfaces to include in the list. I'm 90% confident that 1) most callers don't really care that they're getting the MAC address along with interface name (virt-manager, for example, follows up with a virInterfaceGetXMLDesc() anyway)), and 2) there is not even a single host *anywhere* that is using libvirt policykit ACLs to limit the list of host interfaces viewable by a client. So we could add a flag to not return MAC addresses, which would allow cutting down the time to list all devices to something < 1 second). But this would be at the expense of no longer having the possibility to limit the list with policykit according to MAC address. Since all host interface information is available to all users via the file system, for example, I don't see this as a huge issue, but it would change behavior, so I don't feel comfortable doing it. I don't like the idea of a single API call taking > 1 minute to return either, though. Does anyone have an opinion about this? Laine Stump (4): interface: fail on OOM from virGetInterface() interface: report correct interface count when not returning list interface: re-use name and mac address rather than re-retrieving interface: let netcf pre-filter for active vs. inactive src/interface/interface_backend_netcf.c | 56 +++++++++++++++------------------ 1 file changed, 25 insertions(+), 31 deletions(-) -- 2.4.3

4 15

[libvirt] [PATCH 0/2] Add support for gic-version machine option
by Pavel Fedin 29 Sep '15

29 Sep '15

qemu now supports gic-version option for the virt machine. This patch allows to use it in libvirt. I decided not to add a new capability because qemu correctly complains by itself if it does not have this option. Pavel Fedin (2): qemu: Add support for gic-version machine option qemu: Add test case for gic-version option src/qemu/qemu_command.c | 22 ++++++++---------- .../qemuxml2argv-aarch64-gicv3.args | 6 +++++ .../qemuxml2argv-aarch64-gicv3.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml -- 2.1.4

2 5

[libvirt] [libvirt-test-API] [PATCH] Add test cases for API defineXMLFlags
by Shanzhi Yu 29 Sep '15

29 Sep '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 22 +++++++++ repos/domain/definewithflags.py | 104 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 repos/domain/definewithflags.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 6315613..7dd9062 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -214,6 +214,28 @@ domain:define macaddr 54:52:00:45:c3:8a +domain:undefine + guestname + $defaultname + +domain:definewithflags + guestname + $defaultname + diskpath + /var/lib/libvirt/images/libvirt-test-api + vcpu + 1 + memory + 1048576 + hddriver + virtio + nicdriver + virtio + macaddr + 54:52:00:45:c3:8a + flags + validate + domain:start guestname $defaultname diff --git a/repos/domain/definewithflags.py b/repos/domain/definewithflags.py new file mode 100644 index 0000000..01a4f15 --- /dev/null +++ b/repos/domain/definewithflags.py @@ -0,0 +1,104 @@ +#!/usr/bin/evn python + +import os +import re +import sys +import commands +import string +import pexpect + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'diskpath', 'flags',) +optional_params = {'memory': 1048576, + 'vcpu': 1, + 'imageformat' : 'raw', + 'hddriver' : 'virtio', + 'nicdriver': 'virtio', + 'macaddr': '52:54:00:97:e4:28', + 'uuid' : '05867c1a-afeb-300e-e55e-2673391ae080', + 'username': None, + 'password': None, + 'virt_type': 'kvm', + 'xml': 'xmls/kvm_guest_define.xml', + 'guestarch': 'x86_64', + 'guestmachine': 'pc', + } + +def check_define_domain(guestname, virt_type, hostname, username, \ + password, logger): + """Check define domain result, if define domain is successful, + guestname.xml will exist under /etc/libvirt/qemu/ + and can use virt-xml-validate tool to check the file validity + """ + if "kvm" in virt_type: + path = "/etc/libvirt/qemu/%s.xml" % guestname + elif "xen" in virt_type: + path = "/etc/xen/%s" % guestname + else: + logger.error("unknown virt type") + + if hostname: + cmd = "ls %s" % path + ret, output = utils.remote_exec_pexpect(hostname, username, \ + password, cmd) + if ret: + logger.error("guest %s xml file doesn't exsits" % guestname) + return False + else: + return True + else: + if os.access(path, os.R_OK): + return True + else: + return False + +def definewithflags(params): + """Define a domain from xml""" + logger = params['logger'] + guestname = params['guestname'] + + xmlstr = params['xml'] + logger.debug("domain xml:\n%s" % xmlstr) + + conn = sharedmod.libvirtobj['conn'] + uri = conn.getURI() + + hostname = utils.parse_uri(uri)[1] + username = params.get('username', '') + password = params.get('password', '') + virt_type = params.get('virt_type', 'kvm') + + flags = params['flags'] + logger.info("The flags are %s" % flags) + flags_string = flags.split("|") + flags = 0 + + logger.info("define domain on %s" % uri) + + for flag in flags_string: + if flag == 'validate': + flags |= libvirt.VIR_DOMAIN_DEFINE_VALIDATE + else: + logger.error("unknow flags") + return 1 + + # Define domain from xml + try: + conn.defineXMLFlags(xmlstr, flags) + if check_define_domain(guestname, virt_type, hostname, \ + username, password, logger): + logger.info("define a domain from xml is successful") + else: + logger.error("fail to check define domain") + return 1 + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.8.3.1

1 0

[libvirt] [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat 28 Sep '15

28 Sep '15

Tunnelled migration can hang if the destination qemu exits despite all the ABI checks. This happens whenever the destination qemu exits before the complete transfer is noticed by source qemu. The savevm state checks at runtime can fail at destination and cause qemu to error out. The source qemu cant notice it as the EPIPE is not propogated to it. The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would never get to 100% transfer completion. The qemuMigrationWaitForCompletion() never breaks out as well since the ssh connection to destination is healthy, and the source qemu also thinks the migration is ongoing as the Fd to which it transfers, is never closed or broken. So, the migration will hang forever. Even Ctrl-C on the virsh migrate wouldn't be honoured. Close the source side FD when there is an error in the stream. That way, the source qemu updates itself and qemuMigrationWaitForCompletion() notices the failure. Close the FD for all kinds of errors to be sure. The error message is not copied for EPIPE so that the destination error is copied instead later. Note: Reproducible with repeated migrations between Power hosts running in different subcores-per-core modes. Changes from v1 -> v2: VIR_FORCE_CLOSE() was called twice for this use case which would log unneccessary warnings. So, move the fd close to qemuMigrationIOFunc so that there are no unnecessary duplicate attempts.(Would this trigger a Coverity error? I don't have a setup to check.) Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ff89ab5..9602fb2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4012,6 +4012,7 @@ static void qemuMigrationIOFunc(void *arg) if (virStreamFinish(data->st) < 0) goto error; + VIR_FORCE_CLOSE(data->sock); VIR_FREE(buffer); return; @@ -4029,7 +4030,11 @@ static void qemuMigrationIOFunc(void *arg) } error: - virCopyLastError(&data->err); + /* Let the source qemu know that the transfer cant continue anymore. + * Don't copy the error for EPIPE as destination has the actual error. */ + VIR_FORCE_CLOSE(data->sock); + if (!virLastErrorIsSystemErrno(EPIPE)) + virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); } @@ -4397,7 +4402,6 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0) ret = -1; } - VIR_FORCE_CLOSE(fd); if (priv->job.completed) { qemuDomainJobInfoUpdateTime(priv->job.completed);

3 7

[libvirt] [PATCH] virDomainDiskDef: Turn @device into enum
by Michal Privoznik 28 Sep '15

28 Sep '15

It's used as enum everywhere, so why store its value in an int? Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 9 +++------ src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 ++ src/vmx/vmx.c | 6 +++--- src/vmx/vmx.h | 2 +- src/xenconfig/xen_sxpr.c | 4 +++- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6df1618..8ccce89 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7211,11 +7211,13 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, device = virXMLPropString(node, "device"); if (device) { - if ((def->device = virDomainDiskDeviceTypeFromString(device)) < 0) { + int dev = virDomainDiskDeviceTypeFromString(device); + if (dev < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk device '%s'"), device); goto error; } + def->device = dev; } else { def->device = VIR_DOMAIN_DISK_DEVICE_DISK; } @@ -18944,11 +18946,6 @@ virDomainDiskDefFormat(virBufferPtr buf, _("unexpected disk type %d"), def->src->type); return -1; } - if (!device) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk device %d"), def->device); - return -1; - } if (!bus) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected disk bus %d"), def->bus); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f043554..fe16c78 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -686,7 +686,7 @@ struct _virDomainDiskDef { virObjectPtr privateData; - int device; /* enum virDomainDiskDevice */ + virDomainDiskDevice device; int bus; /* enum virDomainDiskBus */ char *dst; int tray_status; /* enum virDomainDiskTray */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25f57f2..781fc4a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10135,6 +10135,8 @@ qemuBuildCommandLine(virConnectPtr conn, bootindex = bootDisk; bootDisk = 0; break; + case VIR_DOMAIN_DISK_DEVICE_LAST: + break; } virCommandAddArg(cmd, "-drive"); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 70cda2a..6d519b3 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1926,8 +1926,8 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr conf, - int device, int busType, int controllerOrBus, int unit, - virDomainDiskDefPtr *def, virDomainDefPtr vmdef) + virDomainDiskDevice device, int busType, int controllerOrBus, + int unit, virDomainDiskDefPtr *def, virDomainDefPtr vmdef) { /* * device = {VIR_DOMAIN_DISK_DEVICE_DISK, @@ -3251,7 +3251,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe break; - default: + case VIR_DOMAIN_DISK_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported disk device type '%s'"), virDomainDiskDeviceTypeToString(def->disks[i]->device)); diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index e986124..16b616b 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -88,7 +88,7 @@ int virVMXParseSCSIController(virConfPtr conf, int controller, bool *present, int *virtualDev); int virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, - virConfPtr conf, int device, int busType, + virConfPtr conf, virDomainDiskDevice device, int busType, int controllerOrBus, int unit, virDomainDiskDefPtr *def, virDomainDefPtr vmdef); diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 1d43ec1..1b2ddc6 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2357,7 +2357,9 @@ xenFormatSxpr(virConnectPtr conn, virBufferEscapeSexpr(&buf, "'%s')", src); break; - default: + case VIR_DOMAIN_DISK_DEVICE_DISK: + case VIR_DOMAIN_DISK_DEVICE_LUN: + case VIR_DOMAIN_DISK_DEVICE_LAST: break; } } -- 2.4.6

4 3

[libvirt] Use of 'detach' flag with QMP command `migrate` in qemuMonitorJSONMigrate()
by Kashyap Chamarthy 28 Sep '15

28 Sep '15

The qmp-commands.hx file from QEMU says[1]: "The user Monitor's "detach" argument is invalid in QMP and should not be used" However, when live block migration is performed, I still see that libvirt sets the 'detach' boolean to 'true': [. . .] 2015-04-09 11:20:54.160+0000: 12152: debug : qemuMonitorJSONCommandWithFd:290 : Send command '{"execute":"migrate","arguments":{"detach":true,"blk":true,"inc":false,"uri":"fd:migrate"},"id":"libvirt-18"}' for write with FD -1 [. . .] Where 'detach' means: "not wait for completion" (reading hmp-commands.hx in QEMU source) or 'QEMU_MONITOR_MIGRATE_BACKGROUND' (reading qemuMonitorJSONMigrate() from qemu_monitor_json.c in libvirt source). Two questions: - Should the 'detach' flag be not passed in this case, because the documentation says it's not valid in QMP case? - _What_ exactly is setting the 'detach' flag explicitly in this case? Or is it default when using 'inc' flag ('--copy-storage-inc' in `virsh` parlance)? Contextual libvirtd.log from source, with log_filter for 'qemu' set[2]. Note that in the above case, live block migration _did_ succeed, I'm just asking this to educate myself. PS: If you're wondering why am I not using the new 'drive-mirror' based approach above, I performed this block migration via OpenStack Nova. Currently in Nova's case, live block migration falls back to the old approach of QMP `migrate` command (with 'inc' flag set to true -- it explicitly set by OpenStack Nova) via qemuMonitorJsonMigrate(), and not the new way of qemuMonitorJSONDriveMirror(). I was testing with: - libvirt-daemon-driver-qemu-1.2.13.1-2.fc22.x86_64 - qemu-system-x86-2.3.1-1.fc22.x86_64 [1] http://git.qemu.org/?p=qemu.git;a=blob;f=qmp-commands.hx#l643 [2] https://kashyapc.fedorapeople.org/virt/temp/live-blk-migration-libvirt-debu… -- /kashyap

2 2

[libvirt] [libvirt-test-API] [PATCH] change some cases order in conf file linux_domain.conf
by Shanzhi Yu 28 Sep '15

28 Sep '15

Some cases need guest agent running in domain, change some cases order to avoid the failure. Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 100 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 5b216f9..6315613 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -78,6 +78,56 @@ domain:get_guest_network_info flags agent +domain:domain_fsfreeze + guestname + $defaultname + +domain:domain_fsthaw + guestname + $defaultname + +domain:domain_fsfreeze + guestname + $defaultname + mountpoint + / + +domain:domain_fsthaw + guestname + $defaultname + +domain:fsinfo + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + flags + encrypted + virconn:connection_getAllDomainStats stats state|cpu|balloon|vcpu|interface|block @@ -259,24 +309,6 @@ domain:open_graphicsfd flags skipauth -domain:domain_fsfreeze - guestname - $defaultname - -domain:domain_fsthaw - guestname - $defaultname - -domain:domain_fsfreeze - guestname - $defaultname - mountpoint - / - -domain:domain_fsthaw - guestname - $defaultname - virconn:connection_security_model guestname $defaultname @@ -311,38 +343,6 @@ domain:info_iothread conn qemu:///system -domain:fsinfo - guestname - $defaultname - username - $username - userpassword - $password - conn - qemu:///system - -domain:set_user_passwd - guestname - $defaultname - username - $username - userpassword - $password - conn - qemu:///system - -domain:set_user_passwd - guestname - $defaultname - username - $username - userpassword - $password - conn - qemu:///system - flags - encrypted - domain:destroy guestname $defaultname -- 1.8.3.1

1 0

[libvirt] [PATCH] Remove unused variables.
by Martin Kletzander 25 Sep '15

25 Sep '15

I was playing with coccinelle tool the other day and just for the fun of it, I tried removing some useless things from our code. And look what came up. No functional change, and we're down in the number of lines by about a hundred. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/remote.c | 5 +--- src/bhyve/bhyve_driver.c | 38 +++++++++++-------------------- src/conf/storage_conf.c | 9 +++----- src/libxl/libxl_driver.c | 36 ++++++++++------------------- src/lxc/lxc_driver.c | 36 ++++++++++------------------- src/lxc/lxc_native.c | 5 +--- src/network/bridge_driver.c | 38 +++++++++---------------------- src/nwfilter/nwfilter_ebiptables_driver.c | 21 ++++++++--------- src/qemu/qemu_command.c | 19 ++++++---------- src/qemu/qemu_driver.c | 14 ++++-------- src/qemu/qemu_migration.c | 9 +++----- src/qemu/qemu_process.c | 18 ++++----------- src/storage/storage_backend_iscsi.c | 5 +--- src/test/test_driver.c | 30 ++++++++---------------- src/util/virdbus.c | 5 +--- src/util/virfile.c | 4 +--- src/util/virhashcode.c | 4 +--- src/util/virstoragefile.c | 1 - src/vbox/vbox_storage.c | 8 ++----- src/vz/vz_network.c | 24 +++++++------------ src/xen/xen_hypervisor.c | 5 +--- src/xen/xend_internal.c | 6 +---- 22 files changed, 107 insertions(+), 233 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 3a3eb0913088..289454315aca 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -6703,10 +6703,7 @@ get_nonnull_storage_pool(virConnectPtr conn, remote_nonnull_storage_pool pool) static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol) { - virStorageVolPtr ret; - ret = virGetStorageVol(conn, vol.pool, vol.name, vol.key, - NULL, NULL); - return ret; + return virGetStorageVol(conn, vol.pool, vol.name, vol.key, NULL, NULL); } static virSecretPtr diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 7f365b1f2446..5e1b9cb0c1ed 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -608,30 +608,24 @@ static int bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids) { bhyveConnPtr privconn = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, + virConnectListDomainsCheckACL, conn); } static int bhyveConnectNumOfDomains(virConnectPtr conn) { bhyveConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int @@ -639,31 +633,28 @@ bhyveConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { bhyveConnPtr privconn = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; memset(names, 0, sizeof(*names) * maxnames); - n = virDomainObjListGetInactiveNames(privconn->domains, names, - maxnames, virConnectListDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(privconn->domains, names, + maxnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int bhyveConnectNumOfDefinedDomains(virConnectPtr conn) { bhyveConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->domains, false, - virConnectNumOfDefinedDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static char * @@ -730,17 +721,14 @@ bhyveConnectListAllDomains(virConnectPtr conn, unsigned int flags) { bhyveConnPtr privconn = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(privconn->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(privconn->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } static virDomainPtr diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9dae1a39bb5b..b17f38399d22 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1995,14 +1995,11 @@ static int virStoragePoolSaveXML(const char *path, const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - int ret = -1; virUUIDFormat(def->uuid, uuidstr); - ret = virXMLSaveFile(path, - virXMLPickShellSafeComment(def->name, uuidstr), - "pool-edit", xml); - - return ret; + return virXMLSaveFile(path, + virXMLPickShellSafeComment(def->name, uuidstr), + "pool-edit", xml); } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 504895754170..c941e8ef065e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -922,30 +922,24 @@ static int libxlConnectListDomains(virConnectPtr conn, int *ids, int nids) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int libxlConnectNumOfDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static virDomainPtr @@ -2677,29 +2671,26 @@ libxlConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, conn); - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int libxlConnectNumOfDefinedDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static int @@ -4689,17 +4680,14 @@ libxlConnectListAllDomains(virConnectPtr conn, unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } /* Which features are supported by this driver? */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a9f0005f55b3..30ebd8c25e21 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -387,59 +387,49 @@ static int lxcDomainIsUpdated(virDomainPtr dom) static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int lxcConnectNumOfDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int lxcConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } @@ -3596,16 +3586,14 @@ lxcConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virLXCDriverPtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 2f9559735a46..39e5261c6583 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -646,7 +646,6 @@ static int lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) { int status; - int result = -1; size_t i; lxcNetworkParseData data = {def, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, @@ -670,9 +669,7 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) /* When no network type is provided LXC only adds loopback */ def->features[VIR_DOMAIN_FEATURE_PRIVNET] = VIR_TRISTATE_SWITCH_ON; } - result = 0; - - return result; + return 0; error: for (i = 0; i < data.nips; i++) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c343e5bdd2dd..34decaba0a78 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2604,17 +2604,13 @@ static virNetworkPtr networkLookupByName(virConnectPtr conn, static int networkConnectNumOfNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver = networkGetDriver(); - int nactive; if (virConnectNumOfNetworksEnsureACL(conn) < 0) return -1; - nactive = virNetworkObjListNumOfNetworks(driver->networks, - true, - virConnectNumOfNetworksCheckACL, - conn); - - return nactive; + return virNetworkObjListNumOfNetworks(driver->networks, true, + virConnectNumOfNetworksCheckACL, + conn); } static int networkConnectListNetworks(virConnectPtr conn, @@ -2622,48 +2618,36 @@ static int networkConnectListNetworks(virConnectPtr conn, int nnames) { virNetworkDriverStatePtr driver = networkGetDriver(); - int got = 0; if (virConnectListNetworksEnsureACL(conn) < 0) return -1; - got = virNetworkObjListGetNames(driver->networks, - true, names, nnames, - virConnectListNetworksCheckACL, - conn); - - return got; + return virNetworkObjListGetNames(driver->networks, true, names, nnames, + virConnectListNetworksCheckACL, conn); } static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver = networkGetDriver(); - int ninactive = 0; if (virConnectNumOfDefinedNetworksEnsureACL(conn) < 0) return -1; - ninactive = virNetworkObjListNumOfNetworks(driver->networks, - false, - virConnectNumOfDefinedNetworksCheckACL, - conn); - - return ninactive; + return virNetworkObjListNumOfNetworks(driver->networks, false, + virConnectNumOfDefinedNetworksCheckACL, + conn); } static int networkConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { virNetworkDriverStatePtr driver = networkGetDriver(); - int got = 0; if (virConnectListDefinedNetworksEnsureACL(conn) < 0) return -1; - got = virNetworkObjListGetNames(driver->networks, - false, names, nnames, - virConnectListDefinedNetworksCheckACL, - conn); - return got; + return virNetworkObjListGetNames(driver->networks, false, names, nnames, + virConnectListDefinedNetworksCheckACL, + conn); } static int diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 423d069e1b26..04783576b661 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1770,18 +1770,17 @@ iptablesCreateRuleInstance(virFirewallPtr fw, chainPrefix[0] = 'H'; chainPrefix[1] = CHAINPREFIX_HOST_IN_TEMP; - rc = _iptablesCreateRuleInstance(fw, - layer, - directionIn, - chainPrefix, - rule, - ifname, - vars, - matchState, true, - "RETURN", - maySkipICMP); - return rc; + return _iptablesCreateRuleInstance(fw, + layer, + directionIn, + chainPrefix, + rule, + ifname, + vars, + matchState, true, + "RETURN", + maySkipICMP); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb1835c2f5f1..9c96531a0ce7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6349,14 +6349,11 @@ qemuBuildSCSIHostHostdevDrvStr(virDomainHostdevDefPtr dev, { virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; - char *sg = NULL; - sg = (callbacks->qemuGetSCSIDeviceSgName)(NULL, - scsihostsrc->adapter, - scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit); - return sg; + return (callbacks->qemuGetSCSIDeviceSgName)(NULL, scsihostsrc->adapter, + scsihostsrc->bus, + scsihostsrc->target, + scsihostsrc->unit); } static char * @@ -8961,17 +8958,15 @@ char * qemuBuildShmemBackendStr(virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - char *devstr = NULL; - if (!shmem->server.chr.data.nix.path && virAsprintf(&shmem->server.chr.data.nix.path, "/var/lib/libvirt/shmem-%s-sock", shmem->name) < 0) return NULL; - devstr = qemuBuildChrChardevStr(&shmem->server.chr, shmem->info.alias, qemuCaps); - - return devstr; + return qemuBuildChrChardevStr(&shmem->server.chr, + shmem->info.alias, + qemuCaps); } static int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2387cf3f9699..ab6b5cb2ee76 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1646,29 +1646,23 @@ static char *qemuConnectGetHostname(virConnectPtr conn) static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { virQEMUDriverPtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int qemuConnectNumOfDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3dd3718d0974..ea2f8d35ec6e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3520,8 +3520,6 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, const char *origname, unsigned long flags) { - int ret; - VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, " "origname=%s, flags=%lx", @@ -3534,10 +3532,9 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, return -1; } - ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, - cookieout, cookieoutlen, def, origname, - st, NULL, 0, false, NULL, 0, NULL, flags); - return ret; + return qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, + cookieout, cookieoutlen, def, origname, st, + NULL, 0, false, NULL, 0, NULL, flags); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b961f400af1c..5e32d3cabe31 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2498,7 +2498,6 @@ qemuProcessSetEmulatorAffinity(virDomainObjPtr vm) { virBitmapPtr cpumask; virDomainDefPtr def = vm->def; - int ret = -1; if (def->cputune.emulatorpin) cpumask = def->cputune.emulatorpin; @@ -2507,8 +2506,7 @@ qemuProcessSetEmulatorAffinity(virDomainObjPtr vm) else return 0; - ret = virProcessSetAffinity(vm->pid, cpumask); - return ret; + return virProcessSetAffinity(vm->pid, cpumask); } /* Set CPU affinities for IOThreads threads. */ @@ -5113,8 +5111,6 @@ int qemuProcessStart(virConnectPtr conn, int qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { - int ret; - VIR_DEBUG("vm=%p name=%s pid=%llu flags=%x", vm, vm->def->name, (unsigned long long)vm->pid, flags); @@ -5133,10 +5129,8 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) return 0; } - ret = virProcessKillPainfully(vm->pid, - !!(flags & VIR_QEMU_PROCESS_KILL_FORCE)); - - return ret; + return virProcessKillPainfully(vm->pid, + !!(flags & VIR_QEMU_PROCESS_KILL_FORCE)); } @@ -5772,11 +5766,9 @@ int qemuProcessAutoDestroyAdd(virQEMUDriverPtr driver, int qemuProcessAutoDestroyRemove(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret; VIR_DEBUG("vm=%s", vm->def->name); - ret = virCloseCallbacksUnset(driver->closeCallbacks, vm, - qemuProcessAutoDestroy); - return ret; + return virCloseCallbacksUnset(driver->closeCallbacks, vm, + qemuProcessAutoDestroy); } bool qemuProcessAutoDestroyActive(virQEMUDriverPtr driver, diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 9e2d01e457fb..ba1cff2d87c0 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -241,7 +241,6 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, bool *isActive) { char *session = NULL; - int ret = -1; *isActive = false; @@ -268,9 +267,7 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, *isActive = true; VIR_FREE(session); } - ret = 0; - - return ret; + return 0; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index d11cda1f7212..db5090bc1026 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1517,13 +1517,9 @@ testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned int ncpus, unsigned int flags) { - char *cpu; - virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL); - cpu = cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); - - return cpu; + return cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); } static int testNodeGetInfo(virConnectPtr conn, @@ -3110,39 +3106,31 @@ static virNetworkPtr testNetworkLookupByName(virConnectPtr conn, static int testConnectNumOfNetworks(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - int numActive; - numActive = virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return numActive; + return virNetworkObjListNumOfNetworks(privconn->networks, true, NULL, + conn); } static int testConnectListNetworks(virConnectPtr conn, char **const names, int nnames) { testDriverPtr privconn = conn->privateData; - int n; - n = virNetworkObjListGetNames(privconn->networks, - true, names, nnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, true, names, nnames, + NULL, conn); } static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - int numInactive; - numInactive = virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return numInactive; + return virNetworkObjListNumOfNetworks(privconn->networks, false, NULL, + conn); } static int testConnectListDefinedNetworks(virConnectPtr conn, char **const names, int nnames) { testDriverPtr privconn = conn->privateData; - int n; - n = virNetworkObjListGetNames(privconn->networks, - false, names, nnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, false, names, nnames, + NULL, conn); } static int diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 78fb7953dca2..41c7e3f95bb1 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1179,15 +1179,12 @@ virDBusMessageEncodeArgs(DBusMessage* msg, va_list args) { DBusMessageIter iter; - int ret = -1; memset(&iter, 0, sizeof(iter)); dbus_message_iter_init_append(msg, &iter); - ret = virDBusMessageIterEncode(&iter, types, args); - - return ret; + return virDBusMessageIterEncode(&iter, types, args); } diff --git a/src/util/virfile.c b/src/util/virfile.c index 2332589d0c4b..147215379c29 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -688,9 +688,7 @@ static int virFileLoopDeviceOpen(char **dev_name) # endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ /* Without the loop control device we just use the old technique. */ - loop_fd = virFileLoopDeviceOpenSearch(dev_name); - - return loop_fd; + return virFileLoopDeviceOpenSearch(dev_name); } int virFileLoopDeviceAssociate(const char *file, diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index 357c05fe246a..10633a99feb3 100644 --- a/src/util/virhashcode.c +++ b/src/util/virhashcode.c @@ -115,7 +115,5 @@ uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) /* finalization */ h1 ^= len; - h1 = fmix(h1); - - return h1; + return fmix(h1); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90d6581..36fca68bccc3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1104,7 +1104,6 @@ virStorageFileResize(const char *path, { int fd = -1; int ret = -1; - int rc ATTRIBUTE_UNUSED; off_t offset ATTRIBUTE_UNUSED; off_t len ATTRIBUTE_UNUSED; diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 4367009f04f6..92a5a4a5691f 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -119,9 +119,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret = hardDiskAccessible; - - return ret; + return hardDiskAccessible; } static int @@ -175,9 +173,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname } gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret = numActive; - - return ret; + return numActive; } static virStorageVolPtr diff --git a/src/vz/vz_network.c b/src/vz/vz_network.c index 8c978124eddb..083d9b204659 100644 --- a/src/vz/vz_network.c +++ b/src/vz/vz_network.c @@ -364,12 +364,10 @@ int vzNetworkClose(virConnectPtr conn) static int vzConnectNumOfNetworks(virConnectPtr conn) { - int nactive; vzConnPtr privconn = conn->privateData; - nactive = virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return nactive; + return virNetworkObjListNumOfNetworks(privconn->networks, true, NULL, + conn); } static int vzConnectListNetworks(virConnectPtr conn, @@ -377,21 +375,17 @@ static int vzConnectListNetworks(virConnectPtr conn, int nnames) { vzConnPtr privconn = conn->privateData; - int got; - got = virNetworkObjListGetNames(privconn->networks, - true, names, nnames, NULL, conn); - return got; + return virNetworkObjListGetNames(privconn->networks, true, names, nnames, + NULL, conn); } static int vzConnectNumOfDefinedNetworks(virConnectPtr conn) { - int ninactive; vzConnPtr privconn = conn->privateData; - ninactive = virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return ninactive; + return virNetworkObjListNumOfNetworks(privconn->networks, false, NULL, + conn); } static int vzConnectListDefinedNetworks(virConnectPtr conn, @@ -399,11 +393,9 @@ static int vzConnectListDefinedNetworks(virConnectPtr conn, int nnames) { vzConnPtr privconn = conn->privateData; - int got; - got = virNetworkObjListGetNames(privconn->networks, - false, names, nnames, NULL, conn); - return got; + return virNetworkObjListGetNames(privconn->networks, false, names, nnames, + NULL, conn); } static int vzConnectListAllNetworks(virConnectPtr conn, diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 431c47abdf17..61e58e470e53 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2285,7 +2285,6 @@ xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn) { struct guest_arch guest_arches[32]; size_t i = 0; - virCapsPtr caps = NULL; int pae, longmode; const char *hvm; @@ -2326,12 +2325,10 @@ xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn) } } - caps = xenHypervisorBuildCapabilities(conn, + return xenHypervisorBuildCapabilities(conn, virArchFromHost(), pae, hvm, guest_arches, i); - - return caps; } #endif /* __sun */ diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b81c0b743644..b8c31380636f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -809,11 +809,7 @@ xenDaemonListDomainsOld(virConnectPtr xend) int xenDaemonDomainCreateXML(virConnectPtr xend, const char *sexpr) { - int ret; - - ret = xend_op(xend, "", "op", "create", "config", sexpr, NULL); - - return ret; + return xend_op(xend, "", "op", "create", "config", sexpr, NULL); } -- 2.5.3

4 4

[libvirt] [PATCH] virsh: Preserve startupPolicy in change-media command
by Michal Privoznik 25 Sep '15

25 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1250331 Even after my rework of startupPolicy handling, one command slipped my attention. The change-media command has a very unique approach to constructing disk XML. However, it will not preserve startupPolicy attribute. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fb138d5..456e273 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11534,6 +11534,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, xmlNodePtr source = NULL; char *device_type = NULL; char *ret = NULL; + char *startupPolicy = NULL; if (!disk_node) return NULL; @@ -11567,13 +11568,15 @@ virshUpdateDiskXML(xmlNodePtr disk_node, goto cleanup; } - if (type == VIRSH_UPDATE_DISK_XML_INSERT && source) { - vshError(NULL, _("The disk device '%s' already has media"), target); - goto cleanup; - } - - /* remove current source */ if (source) { + if (type == VIRSH_UPDATE_DISK_XML_INSERT) { + vshError(NULL, _("The disk device '%s' already has media"), target); + goto cleanup; + } + + startupPolicy = virXMLPropString(source, "startupPolicy"); + + /* remove current source */ xmlUnlinkNode(source); xmlFreeNode(source); source = NULL; @@ -11597,6 +11600,8 @@ virshUpdateDiskXML(xmlNodePtr disk_node, else xmlNewProp(source, BAD_CAST "file", BAD_CAST new_source); + if (startupPolicy) + xmlNewProp(source, BAD_CAST "startupPolicy", BAD_CAST startupPolicy); xmlAddChild(disk_node, source); } @@ -11607,6 +11612,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, cleanup: VIR_FREE(device_type); + VIR_FREE(startupPolicy); return ret; } -- 2.4.9

2 1

[libvirt] [PATCH 0/2] Update pool allocation with new values on volume creation
by Ján Tomko 25 Sep '15

25 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1163091 Ján Tomko (2): Update pool allocation with new values on volume creation Create a shallow copy for volume building only if supported src/storage/storage_driver.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) -- 2.4.6

2 3

[libvirt] [PATCH 0/3] Introduce new virtType enum item
by Shivangi Dhir 25 Sep '15

25 Sep '15

These patches solve a BiteSizedTask - Introduce new virtType enum item[0] [0] http://wiki.libvirt.org/page/BiteSizedTasks#Introduce_new_virtType_enum_item Shivangi Dhir (3): conf: Add new VIR_DOMAIN_VIRT_NONE enum qemu: Make virtType of type virDomainVirtType conf: Change the description of virCapabilitiesDomainDataLookup() src/conf/capabilities.c | 6 +++--- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 3 ++- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_monitor_text.c | 2 +- src/qemu/qemu_monitor_text.h | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/vircapstest.c | 32 ++++++++++++++++---------------- 11 files changed, 30 insertions(+), 28 deletions(-) -- 1.9.1

3 8

[libvirt] [PATCH] Use daemon log facility for journald
by Guido Günther 25 Sep '15

25 Sep '15

otherwise messages end up in /var/log/kern.log if journald forwards to syslog. Closes: #799633 --- src/util/virlog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virlog.c b/src/util/virlog.c index b45ee91..627f4cb 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -920,6 +920,7 @@ virLogOutputToJournald(virLogSourcePtr source, journalAddString(&state, "MESSAGE", rawstr); journalAddInt(&state, "PRIORITY", virLogPrioritySyslog(priority)); + journalAddInt(&state, "SYSLOG_FACILITY", LOG_DAEMON); journalAddString(&state, "LIBVIRT_SOURCE", source->name); if (filename) journalAddString(&state, "CODE_FILE", filename); -- 2.1.4

2 2

[libvirt] [PATCH 1/3] cpu_map.xml: add cmt feature to x86
by Qiaowei Ren 25 Sep '15

25 Sep '15

Some Intel processor families (e.g. the Intel Xeon processor E5 v3 family) introduced CMT (Cache Monitoring Technology) to measure the usage of cache by applications running on the platform. This patch add it into x86 part of cpu_map.xml. Signed-off-by: Qiaowei Ren <qiaowei.ren(a)intel.com> --- .gnulib | 2 +- src/cpu/cpu_map.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index f39477d..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit f39477dba778e99392948dd3dd19ec0d46aee932 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index b9e95cf..14ccbd8 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -317,6 +317,9 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='cmt'> + <cpuid function='0x00000007' ebx='0x00001000'/> + </feature> <feature name='rdseed'> <cpuid function='0x00000007' ebx='0x00040000'/> </feature> -- 1.9.1

4 15

Re: [libvirt] [FIRST-PATCH] updated the negation STREQ to STRNEQ
by Lasya Venneti 25 Sep '15

25 Sep '15

Dear Sir, The cfg.mk link isn't working for me sir.. >From what I understand Makefile will have the following: target: dependency1 dependency2 ... [TAB] action1 [TAB] action2 Does the syntax-check rule have to be in place of 'actions' in the form of a shell command, and then raise an error whenever the shell command returns occurrences of the string !STREQ or !STRNEQ ? Request you to please elaborate a little. Sincerely, Lasya V On 21 September 2015 at 16:35, Michal Privoznik <mprivozn(a)redhat.com> wrote: > [You've got the wrong list. This is a libvirt patch and as such it > should have been sent to the libvir-list(a)redhat.com] > > On 19.09.2015 16:59, Lasya wrote: > > Hi, > > This is my first patch in QEMU. I have solved a bite-sized bug. I have > updated the !STREQ with STRNEQ in the following files. Thanks. > > > > --- > > src/bhyve/bhyve_driver.c | 2 +- > > src/conf/network_conf.c | 4 ++-- > > src/conf/nwfilter_conf.c | 2 +- > > src/conf/nwfilter_params.c | 2 +- > > src/conf/storage_conf.c | 2 +- > > src/lxc/lxc_fuse.c | 4 ++-- > > src/openvz/openvz_driver.c | 2 +- > > src/qemu/qemu_command.c | 6 +++--- > > src/qemu/qemu_domain.c | 2 +- > > src/qemu/qemu_hotplug.c | 2 +- > > src/security/security_manager.c | 2 +- > > src/security/security_selinux.c | 12 ++++++------ > > src/storage/storage_backend_logical.c | 2 +- > > src/util/virfile.c | 2 +- > > src/util/virsystemd.c | 2 +- > > src/vz/vz_driver.c | 2 +- > > src/vz/vz_sdk.c | 2 +- > > src/xen/xend_internal.c | 2 +- > > src/xenconfig/xen_sxpr.c | 2 +- > > tests/commandtest.c | 10 +++++----- > > tests/securityselinuxlabeltest.c | 2 +- > > tests/virauthconfigtest.c | 2 +- > > tests/virbitmaptest.c | 12 ++++++------ > > tests/vircgrouptest.c | 2 +- > > tests/virkeyfiletest.c | 8 ++++---- > > tests/virnetsockettest.c | 2 +- > > tests/virtypedparamtest.c | 2 +- > > tests/viruritest.c | 16 ++++++++-------- > > 28 files changed, 56 insertions(+), 56 deletions(-) > > Okay, you've got all the occurrences. However, the syntax-check rule is > missing. You may want to look at cfg.mk for some examples. syntax-check > is our make target that checks the code if it complies with our coding > standards. After this patch we want a rule that forbids !STREQ or !STRNEQ. > > Otherwise looking very good. Looking forward to v2. > > Michal >

2 1

[libvirt] [PATCH] tools: Link libvirt.la to libvirt_shell.a
by Michal Privoznik 25 Sep '15

25 Sep '15

So, our mingw build is broken. It's because while libvirt_shell library is using some of our internal APIs, e.g. virStrndup, it's not being linked with libvirt.la. Only subsequent users of the library, like virsh, do link to libvirt.la. In fact, I'm surprised Linux linker doesn't care, because how can it make a static library with missing symbols is mystery to me. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0a00cee..3cf70db 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -143,6 +143,7 @@ libvirt_shell_la_LDFLAGS = \ $(NULL) libvirt_shell_la_LIBADD = \ $(LIBXML_LIBS) \ + ../src/libvirt.la \ ../gnulib/lib/libgnu.la \ $(NULL) libvirt_shell_la_SOURCES = vsh.c vsh.h @@ -220,7 +221,6 @@ virsh_LDFLAGS = \ virsh_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ - ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ libvirt_shell.la \ -- 2.4.9

2 1

[libvirt] [PATCH] add compress stream support
by Vasiliy Tolstov 25 Sep '15

25 Sep '15

Some libvirt functions use streams, this patch add compress stream support. So VolumeDownload/VolumeUpload can greatly speedup by using compressed streams to save network bandtwidth and don't transfer zero bytes (in case of raw disk format) Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 2 ++ daemon/Makefile.am | 3 +++ include/libvirt/libvirt-stream.h | 3 +++ m4/virt-archive.m4 | 29 ++++++++++++++++++++++++++ src/Makefile.am | 17 +++++++++++----- src/datatypes.h | 7 +++++++ src/fdstream.c | 44 ++++++++++++++++++++++++++++++++++++++++ src/libvirt-stream.c | 15 ++++++++++++++ tools/Makefile.am | 17 ++++++++++++++-- 9 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 m4/virt-archive.m4 diff --git a/configure.ac b/configure.ac index 03463b0..58a15bb 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,7 @@ LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_SSH2 +LIBVIRT_CHECK_LIBARCHIVE LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_WIRESHARK @@ -2892,6 +2893,7 @@ LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 +LIBVIRT_RESULT_LIBARCHIVE LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_WIRESHARK diff --git a/daemon/Makefile.am b/daemon/Makefile.am index be1b5a9..a4d63eb 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -177,17 +177,20 @@ libvirtd_CFLAGS = \ $(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \ $(WARN_CFLAGS) $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" libvirtd_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ $(NULL) libvirtd_LDADD = \ $(LIBXML_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ $(DBUS_LIBS) \ diff --git a/include/libvirt/libvirt-stream.h b/include/libvirt/libvirt-stream.h index 831640d..c75f03e 100644 --- a/include/libvirt/libvirt-stream.h +++ b/include/libvirt/libvirt-stream.h @@ -31,10 +31,13 @@ typedef enum { VIR_STREAM_NONBLOCK = (1 << 0), + VIR_STREAM_COMPRESS_GZIP = (1 << 1), + VIR_STREAM_COMPRESS_XZ = (1 << 2), } virStreamFlags; virStreamPtr virStreamNew(virConnectPtr conn, unsigned int flags); + int virStreamRef(virStreamPtr st); int virStreamSend(virStreamPtr st, diff --git a/m4/virt-archive.m4 b/m4/virt-archive.m4 new file mode 100644 index 0000000..9770732 --- /dev/null +++ b/m4/virt-archive.m4 @@ -0,0 +1,29 @@ +dnl The libarchive.so library +dnl +dnl Copyright (C) 2012-2013 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_CHECK_LIBARCHIVE],[ + LIBVIRT_CHECK_PKG([LIBARCHIVE], [libarchive], [3.1.2]) + AC_SUBST(LIBARCHIVE_CFLAGS) + AC_SUBST(LIBARCHIVE_LIBS) + AC_SUBST(LIBARCHIVE_LDFLAGS) +]) + +AC_DEFUN([LIBVIRT_RESULT_LIBARCHIVE],[ + LIBVIRT_RESULT_LIB([LIBARCHIVE]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index 060abe8..429c2c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,11 +25,11 @@ abs_topsrcdir = $(shell cd $(top_srcdir) && pwd) # No libraries with the exception of LIBXML should be listed # here. List them against the individual XXX_la_CFLAGS targets # that actually use them. Also keep GETTEXT_CPPFLAGS at the end. -INCLUDES = -I../gnulib/lib \ +INCLUDES = -I../gnulib/lib \ -I$(top_srcdir)/gnulib/lib \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ -I../include \ - -I$(top_srcdir)/include \ + -I$(top_srcdir)/include \ -I$(srcdir)/util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ @@ -37,14 +37,16 @@ INCLUDES = -I../gnulib/lib \ $(GETTEXT_CPPFLAGS) AM_CFLAGS = $(LIBXML_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ + $(LOCK_CHECKING_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) EXTRA_DIST = $(conf_DATA) util/keymaps.csv @@ -1051,11 +1053,13 @@ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ $(SYSTEMD_DAEMON_CFLAGS) $(POLKIT_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ -I$(srcdir)/conf libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) \ $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(SYSTEMD_DAEMON_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(POLKIT_LIBS) @@ -2214,6 +2218,7 @@ libvirt_lxc_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ $(MINGW_EXTRA_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) libvirt_lxc_la_CFLAGS = $(AM_CFLAGS) libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) @@ -2292,13 +2297,15 @@ libvirt_setuid_rpc_client_la_SOURCES = \ libvirt_setuid_rpc_client_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(LIBXML_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(SECDRIVER_LIBS) \ $(NULL) libvirt_setuid_rpc_client_la_CFLAGS = \ -DLIBVIRT_SETUID_RPC_CLIENT \ -I$(srcdir)/conf \ - -I$(srcdir)/rpc \ + -I$(srcdir)/rpc \ $(AM_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(SECDRIVER_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) diff --git a/src/datatypes.h b/src/datatypes.h index be108fe..4c0c10d 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -29,6 +29,10 @@ # include "virobject.h" # include "viruuid.h" +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; extern virClassPtr virDomainSnapshotClass; @@ -520,6 +524,9 @@ struct _virStream { virStreamDriverPtr driver; void *privateData; +#ifdef WITH_LIBARCHIVE + struct archive *archive; +#endif }; /** diff --git a/src/fdstream.c b/src/fdstream.c index b8ea86e..9a71a9f 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -33,6 +33,10 @@ #include <netinet/in.h> #include <termios.h> +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + #include "fdstream.h" #include "virerror.h" #include "datatypes.h" @@ -319,6 +323,12 @@ virFDStreamCloseInt(virStreamPtr st, bool streamAbort) if (VIR_CLOSE(fdst->errfd) < 0) VIR_DEBUG("ignoring failed close on fd %d", fdst->errfd); +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + archive_write_free(st->archive); + archive_read_free(st->archive); + } +#endif st->privateData = NULL; /* call the internal stream closing callback */ @@ -385,7 +395,16 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) } retry: +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + archive_write_open_fd(st->archive, fdst->fd); + ret = archive_write_data(st->archive, bytes, nbytes); + } else { + ret = write(fdst->fd, bytes, nbytes); + } +#else ret = write(fdst->fd, bytes, nbytes); +#endif if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { ret = -2; @@ -397,7 +416,15 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) _("cannot write to stream")); } } else if (fdst->length) { +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + fdst->offset += nbytes; + } else { + fdst->offset += ret; + } +#else fdst->offset += ret; +#endif } virMutexUnlock(&fdst->lock); @@ -435,7 +462,16 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) } retry: +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + archive_read_open_fd(st->archive, fdst->fd, 4096); + ret = archive_read_data(st->archive, bytes, nbytes); + } else { + ret = read(fdst->fd, bytes, nbytes); + } +#else ret = read(fdst->fd, bytes, nbytes); +#endif if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { ret = -2; @@ -447,7 +483,15 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) _("cannot read from stream")); } } else if (fdst->length) { +#ifdef WITH_LIBARCHIVE + if (st->archive != NULL) { + fdst->offset += nbytes; + } else { + fdst->offset += ret; + } +#else fdst->offset += ret; +#endif } virMutexUnlock(&fdst->lock); diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index c16f586..0f09d9d 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -24,6 +24,10 @@ #include "viralloc.h" #include "virlog.h" +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + VIR_LOG_INIT("libvirt.stream"); #define VIR_FROM_THIS VIR_FROM_STREAMS @@ -45,6 +49,7 @@ VIR_LOG_INIT("libvirt.stream"); * * If a non-blocking data stream is required passed * VIR_STREAM_NONBLOCK for flags, otherwise pass 0. + * VIR_STREAM_COMPRESS_GZIP or VIR_STREAM_COMPRESS_XZ * * Returns the new stream, or NULL upon error */ @@ -66,6 +71,16 @@ virStreamNew(virConnectPtr conn, else virDispatchError(conn); + if ((flags & VIR_STREAM_COMPRESS_GZIP) || (flags & VIR_STREAM_COMPRESS_XZ)) { + st->archive = archive_write_new(); + + if (flags & VIR_STREAM_COMPRESS_GZIP) + archive_write_add_filter(st->archive, ARCHIVE_FILTER_GZIP); + + if (flags & VIR_STREAM_COMPRESS_XZ) + archive_write_add_filter(st->archive, ARCHIVE_FILTER_XZ); + } + return st; } diff --git a/tools/Makefile.am b/tools/Makefile.am index 03e9339..fa19a20 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,8 +25,12 @@ INCLUDES = \ AM_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) +AM_CFLAGS = \ + $(LIBARCHIVE_CFLAGS) + POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" ICON_FILES = \ @@ -140,15 +144,18 @@ virt_host_validate_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) virt_host_validate_LDADD = \ ../src/libvirt.la \ - ../gnulib/lib/libgnu.la \ + ../gnulib/lib/libgnu.la \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) virt_host_validate_CFLAGS = \ $(LIBXML_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ @@ -165,15 +172,18 @@ virt_login_shell_SOURCES = \ virt_login_shell_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARHCIVE_LDFLAGS) \ $(NULL) virt_login_shell_LDADD = \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ ../src/libvirt-setuid-rpc-client.la \ + $(LIBARCHIVE_LDFLAGS) \ ../gnulib/lib/libgnu.la virt_login_shell_CFLAGS = \ -DLIBVIRT_SETUID_RPC_CLIENT \ + $(LIBARCHIVE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ @@ -202,6 +212,7 @@ virsh_SOURCES = \ virsh_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ + $(LIBARCHIVE_LDFLAGS) \ $(NULL) virsh_LDADD = \ $(STATIC_BINARIES) \ @@ -209,14 +220,16 @@ virsh_LDADD = \ ../src/libvirt.la \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ - ../gnulib/lib/libgnu.la \ + ../gnulib/lib/libgnu.la \ $(LIBXML_LIBS) \ + $(LIBARCHIVE_LIBS) \ $(VIRSH_LIBS) virsh_CFLAGS = \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(LIBXML_CFLAGS) \ + $(LIBARCHIVE_CFLAGS) \ $(READLINE_CFLAGS) BUILT_SOURCES = -- 2.5.0

2 8

[libvirt] [PATCH] maint: Remove control characters from LGPL license file
by Andrea Bolognani 25 Sep '15

25 Sep '15

--- COPYING.LESSER | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/COPYING.LESSER b/COPYING.LESSER index 4362b49..e5ab03e 100644 --- a/COPYING.LESSER +++ b/COPYING.LESSER @@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -267,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -422,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest -- 2.4.2

2 2

[libvirt] [PATCH] domain: Fix migratable XML with graphics/@listen
by Jiri Denemark 24 Sep '15

24 Sep '15

As of commit 6992994, we set graphics/@listen attribute according to the first listen child element even if that element is of type='network'. This was done for backward compatibility with applications which only support the original listen attribute. However, by doing so we broke migration to older libvirt which tried to check that the listen attribute matches one of the listen child elements but which did not take type='network' elements into account. We are not concerned about compatibility with old applications when formatting domain XML for migration for two reasons. The XML is consumed only by libvirtd and the IP address associated with type='network' listen address on the source host is just useless on the destination host. Thus, we can safely avoid propagating the type='network' IP address to graphics/@listen attribute when creating migratable XML. https://bugzilla.redhat.com/show_bug.cgi?id=1265111 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c890977..033ae46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21020,19 +21020,17 @@ virDomainGraphicsDefFormat(virBufferPtr buf, * <graphics>. This is done to improve backward compatibility. */ for (i = 0; i < def->nListens; i++) { - virDomainGraphicsListenType listenType; - if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && def->listens[i].fromConfig) continue; - listenType = virDomainGraphicsListenGetType(def, i); - if (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || - (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && - !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { - if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) - break; - } + if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && + flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE | + VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) + continue; + + if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) + break; } virBufferAsprintf(buf, "<graphics type='%s'", type); -- 2.5.3

2 2

[libvirt] [PATCH] vsh: create a noinstall libvirt_shell library
by Erik Skultety 24 Sep '15

24 Sep '15

Instead of referencing vsh sources in all relevant client targets, create a library that the client can link against. --- tools/Makefile.am | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 03e9339..08aebec 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -129,6 +129,24 @@ virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(top_srcdir)/configure.ac && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi +noinst_LTLIBRARIES = libvirt_shell.la +libvirt_shell_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(READLINE_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(NULL) +libvirt_shell_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + $(NULL) +libvirt_shell_la_LIBADD = \ + $(LIBXML_LIBS) \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_shell_la_SOURCES = vsh.c vsh.h + virt_host_validate_SOURCES = \ virt-host-validate.c \ virt-host-validate-common.c virt-host-validate-common.h \ @@ -179,11 +197,7 @@ virt_login_shell_CFLAGS = \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) -virt_shell_SOURCES = \ - vsh.c vsh.h - virsh_SOURCES = \ - $(virt_shell_SOURCES) \ virsh.c virsh.h \ virsh-console.c virsh-console.h \ virsh-domain.c virsh-domain.h \ @@ -210,14 +224,13 @@ virsh_LDADD = \ ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ ../gnulib/lib/libgnu.la \ - $(LIBXML_LIBS) \ + libvirt_shell.la \ $(VIRSH_LIBS) virsh_CFLAGS = \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(READLINE_CFLAGS) + $(LIBXML_CFLAGS) BUILT_SOURCES = if WITH_WIN_ICON -- 2.4.3

2 2

[libvirt] [libvirt-test-api][PATCHv2] Add new test case for allocPages API
by Luyao Huang 24 Sep '15

24 Sep '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/test_connection.conf | 10 ++++ repos/virconn/connection_allocPages.py | 84 ++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 repos/virconn/connection_allocPages.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index 336b1ad..a4406bf 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -77,3 +77,13 @@ virconn:connection_getMemoryParameters virconn:connection_getMemoryStats conn qemu:///system + +virconn:connection_allocPages + conn + qemu:///system + +virconn:connection_allocPages + conn + qemu:///system + flags + pageset diff --git a/repos/virconn/connection_allocPages.py b/repos/virconn/connection_allocPages.py new file mode 100644 index 0000000..de3c071 --- /dev/null +++ b/repos/virconn/connection_allocPages.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = () +optional_params = {'conn': '', 'flags': ''} + +HOST_HUGEPAGE = '/sys/devices/system/node/node%d/hugepages/hugepages-%dkB/nr_hugepages' + +def get_host_pagesize(conn): + ret = [] + tree = lxml.etree.fromstring(conn.getCapabilities()) + + set = tree.xpath("/capabilities/host/cpu/pages") + for n in set: + ret.append(int(n.attrib['size'])) + + return ret + +def get_host_pagecount(pagesize): + try: + return int(open(HOST_HUGEPAGE % (0, pagesize)).read()) + except IOError: + return -1 + +def connection_allocPages(params): + """ + test API for allocPages in class virConnect + """ + logger = params['logger'] + fail=0 + + if 'flags' in params: + if params['flags'] == 'pageset': + flags = libvirt.VIR_NODE_ALLOC_PAGES_SET + else: + logger.error("Unknown flags name: %s" % params['flags']) + return 1 + else: + flags = 0 + + try: + if 'conn' in params: + conn=libvirt.open(params['conn']) + else: + conn=libvirt.open(optional_params['conn']) + logger.info("get connection to libvirtd") + list1 = get_host_pagesize(conn) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + for i in list1: + logger.info("test hugepage size %d" % i) + + if get_host_pagecount(i) == -1: + logger.info("Skip system page size %d" % i) + continue + + try: + cur_count = get_host_pagecount(i) + if flags == libvirt.VIR_NODE_ALLOC_PAGES_SET: + conn.allocPages({i : cur_count + 1}, 0, 1, flags) + else: + conn.allocPages({i : 1}, 0, 1, flags) + if get_host_pagecount(i) != cur_count + 1: + logger.error("libvirt set a wrong page count to %dKiB hugepage" % i) + fail = 1 + except libvirtError, e: + if "Allocated only" in e.message: + tmp_count = int(e.message.split()[-1]) + + if tmp_count != get_host_pagecount(i): + logger.error("libvirt output %dKiB hugepage count is not right" % i) + fail = 1 + else: + logger.error("API error message: %s" % e.message) + return 1 + + return fail -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH] Add a new test case for setUserPassword
by Luyao Huang 24 Sep '15

24 Sep '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/linux_domain.conf | 22 ++++++++ repos/domain/set_user_passwd.py | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 repos/domain/set_user_passwd.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 19daded..9a65cf3 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -299,6 +299,28 @@ domain:info_iothread conn qemu:///system +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + flags + encrypted + domain:destroy guestname $defaultname diff --git a/repos/domain/set_user_passwd.py b/repos/domain/set_user_passwd.py new file mode 100644 index 0000000..bf9bd06 --- /dev/null +++ b/repos/domain/set_user_passwd.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree +import crypt +from utils import utils + +required_params = ('guestname', 'username', 'userpassword',) +optional_params = {'conn': 'qemu:///system', 'flags': '',} + +def get_guest_mac(vm): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + set = tree.xpath("/domain/devices/interface/mac") + + for n in set: + return n.attrib['address'] + + return False + + +def check_agent_status(vm): + """ make sure agent is okay to use """ + + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + + set = tree.xpath("//channel[@type='unix']/target[@name='org.qemu.guest_agent.0']") + for n in set: + if n.attrib['state'] == 'connected': + return True + + return False + +def create_new_user(ipaddr, newusername, username, userpasswd, logger): + cmd = "useradd %s" % newusername + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + if ret == 0 or "already exists" in retinfo: + return 0 + else: + logger.error("Fail: cannot create a new user: %s" % retinfo) + return 1 + +def verify_cur_user(ipaddr, username, userpasswd): + cmd = "whoami" + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + + return ret + +def set_user_passwd(params): + """ + test API for setUserPassword in class virDomain + """ + + logger = params['logger'] + guest = params['guestname'] + username = params['username'] + userpasswd = params['userpassword'] + + if 'flags' in params: + if params['flags'] == 'encrypted': + flags = libvirt.VIR_DOMAIN_PASSWORD_ENCRYPTED + else: + flags = 0 + else: + flags = 0 + + try: + if 'conn' in params: + conn = libvirt.open(params['conn']) + else: + conn = libvirt.open(optional_params['conn']) + + logger.info("get connection to libvirtd") + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + if not check_agent_status(vm): + logger.error("guest agent is not connected") + return 1 + + mac = get_guest_mac(vm) + if not mac: + logger.error("cannot get guest interface mac") + return 1 + + ipaddr = utils.mac_to_ip(mac, 180) + if not ipaddr: + logger.error("cannot get guest IP") + return 1 + + if flags > 0: + passwd = crypt.crypt("123456", crypt.mksalt(crypt.METHOD_SHA512)) + else: + passwd = "123456" + + + if create_new_user(ipaddr, "usertestapi", username, userpasswd, logger) != 0: + return 1 + + vm.setUserPassword("usertestapi", passwd, flags) + + if verify_cur_user(ipaddr, "usertestapi", "123456") != 0: + logger.error("cannot login guest via new user") + return 1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + return 0 -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH 1/2] introduce a new helper to parse mountinfo
by Luyao Huang 24 Sep '15

24 Sep '15

And will return list like this : [{'devminor': '25', 'mountdir': '/sys/fs/cgroup/cpuset', 'devmajor': '0', 'mounttype': 'cgroup'},...] Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- utils/utils.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/utils/utils.py b/utils/utils.py index a6e6965..6909fed 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -925,3 +925,40 @@ def param_to_tuple_nolength(paramlist): lengh = max(d) return param_to_tuple(paramlist, int(lengh) + 1) + +def parse_mountinfo(string): + """a helper to parse mountinfo in /proc/self/mountinfo + and return a list contains multiple dict + """ + + ret = [] + mount_list = string.split("\n") + for n in mount_list: + mount_dict = {} + if n.find("/") > 0: + tmp = n[:n.find("/")] + if len(tmp.split()) != 3: + continue + + if tmp.split()[2].find(":") < 0: + continue + + mount_dict['devmajor'] = tmp.split()[2].split(":")[0] + mount_dict['devminor'] = tmp.split()[2].split(":")[1] + + tmp = n[n.find("/") + 1:] + + mount_dict['mountdir'] = tmp.split()[0] + + if tmp.find(" - ") < 0: + continue + + tmp = tmp.split(" - ")[1] + + mount_dict['mounttype'] = tmp.split()[0] + if tmp.split()[1].find("/") > 0: + mount_dict['sourcedir'] = tmp.split()[1] + + ret.append(mount_dict) + + return ret -- 1.8.3.1

2 2

[libvirt] [libvirt-sandbox][PATCH] configure: Get static libs for static linking
by Michal Privoznik 24 Sep '15

24 Sep '15

So you wanna build libvirt-sandbox, right? And you think you have everything you need. Dang, you don't! Because we check for libz and liblzma for dynamic linking. However, libvirt-sandbox-init-qemu is linked statically. Therefore, we need to ask pkg-config to fetch us the list of libs for static linking. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Okay, I admit that this may be not as serious as I made it in the commit message. The only difference after this patch is -pthread added to LZMA libs: configure: Configuration summary configure: ===================== configure: configure: configure: Libraries: configure: configure: LZMA: -llzma -pthread configure: ZLIB: -lz configure: GOBJECT: -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -lgobject-2.0 -lglib-2.0 configure: LIBVIRT_GOBJECT: -pthread -I/usr/include/libvirt-gobject-1.0 -I/usr/include/libvirt-gconfig-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libxml2 -lvirt-gobject-1.0 -lgio-2.0 -lvirt-gconfig-1.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lvir configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 92d65f4..00c2d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,8 @@ AC_ARG_WITH([zlib], [add ZLIB support @<:@default=yes@:>@])]) m4_divert_text([DEFAULTS], [with_zlib=yes]) +orig_pkg_config="$PKG_CONFIG" +PKG_CONFIG="$PKG_CONFIG --static" if test "$with_zlib" = "yes" ; then PKG_CHECK_MODULES(ZLIB, zlib >= $ZLIB_REQUIRED) AC_DEFINE([WITH_ZLIB], [1], [Whether ZLIB support was enabled]) @@ -100,6 +102,7 @@ if test "$with_lzma" = "yes" ; then PKG_CHECK_MODULES(LZMA, liblzma >= $LZMA_REQUIRED) AC_DEFINE([WITH_LZMA], [1], [Whether LZMA support was enabled]) fi +PKG_CONFIG="$orig_pkg_config" LIBVIRT_SANDBOX_CAPNG LIBVIRT_SANDBOX_GETTEXT -- 2.4.9

2 1

[libvirt] [PATCH v2 0/4] Couple of 'virsh create' fixes
by Michal Privoznik 24 Sep '15

24 Sep '15

And this time 'virsh restore' too. The diff to v1 is that more drivers is fixed. Michal Privoznik (4): virDomainCreateXML: Don't remove persistent domains on error virDomainCreateXML: Make domain definition transient qemu: Move vm->persistent check into qemuDomainRemoveInactive virDomainRestore: Don't keep transient domains around src/bhyve/bhyve_driver.c | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 7 +++++-- src/openvz/openvz_driver.c | 1 + src/qemu/qemu_domain.c | 9 ++++++++- src/qemu/qemu_driver.c | 39 ++++++++++++++++----------------------- src/qemu/qemu_migration.c | 14 +++++--------- src/qemu/qemu_process.c | 12 ++++-------- src/test/test_driver.c | 15 +++++++++++++-- src/uml/uml_driver.c | 8 +++++--- src/vmware/vmware_driver.c | 7 +++++-- 11 files changed, 64 insertions(+), 50 deletions(-) -- 2.4.9

2 7

[libvirt] [PATCH] Remove redundand assignment
by Martin Kletzander 24 Sep '15

24 Sep '15

I initially added this in order to keep the code more error-prone to following additions, but it seems it's still frowned upon. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as really, really trivial. src/qemu/qemu_domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b57b9954b33f..12cc447180b5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -831,7 +831,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, goto error; } virObjectUnref(caps); - caps = NULL; VIR_FREE(tmp); return 0; -- 2.5.3

1 0

[libvirt] [PATCH] docs: Add yet another libvirt based app
by Michal Privoznik 24 Sep '15

24 Sep '15

As announced on the list [1], Cherrypop is a management application based on libvirt. It's a decentralized cloud software with nice scaling ability. 1: https://www.redhat.com/archives/libvir-list/2015-September/msg00670.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- @Gustav: I've used the description from the github repo, if that's okay. docs/apps.html.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index fd45189..86b3016 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -262,6 +262,16 @@ using a dashboard. Compute part uses libvirt to manage VM life-cycle, monitoring and so on. </dd> + + <dt><a href="https://github.com/gustavfranssonnyvell/cherrypop">Cherrypop</a></dt> + <dd> + A cloud software with no masters or central points. Nodes + autodetect other nodes and autodistribute virtual + machines and autodivide up the workload. Also there is no + minimum limit for hosts, well, one might be nice. It's + perfect for setting up low-end servers in a cloud or a + cloud where you want the most bang for the bucks. + </dd> </dl> <h2><a name="libraries">Libraries</a></h2> -- 2.4.9

2 1

[libvirt] by libvirt api(virStoragePoolRefresh) to refresh pool, discovered the connection is very slow
by 饶俊明 24 Sep '15

24 Sep '15

Hello In ours project,use libvirt(libvirt-0.10.2-46.el6) to manage storage pool(the type of pool is ceph rbd), by libvirt api(virStoragePoolRefresh) to refresh pool, discovered the connection(libvirt to ceph) is very slow libvirt is how to deal with pool refresh. tks!!! Jason rao -----邮件原件----- 发件人: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] 代表 libvir-list-request(a)redhat.com 发送时间: 2015年9月24日 7:19 收件人: libvir-list(a)redhat.com 主题: libvir-list Digest, Vol 118, Issue 146 Send libvir-list mailing list submissions to libvir-list(a)redhat.com To subscribe or unsubscribe via the World Wide Web, visit https://www.redhat.com/mailman/listinfo/libvir-list or, via email, send a message with subject or body 'help' to libvir-list-request(a)redhat.com You can reach the person managing the list at libvir-list-owner(a)redhat.com When replying, please edit your Subject line so it is more specific than "Re: Contents of libvir-list digest..." Today's Topics: 1. [PATCH] domain: Fix migratable XML with graphics/@listen (Jiri Denemark) 2. [PATCH] storage: Fix incorrect format for <disk> <auth> XML (John Ferlan) 3. Re: [PATCH v2] qemuDomainDeviceDefPostParse: Drop useless checks (John Ferlan) 4. Re: [PATCH RFC 4/7] libxl: implement virDomainBlockStats (Jim Fehlig) 5. [PATCH 0/6] Fix some Coverity issues (John Ferlan) ---------------------------------------------------------------------- Message: 1 Date: Wed, 23 Sep 2015 22:48:14 +0200 From: Jiri Denemark <jdenemar(a)redhat.com> To: libvir-list(a)redhat.com Subject: [libvirt] [PATCH] domain: Fix migratable XML with graphics/@listen Message-ID: <1e763711f268f0f5d09f6a70aab87bf13dd459f9.1443041294.git.jdenemar(a)redhat.com> As of commit 6992994, we set graphics/@listen attribute according to the first listen child element even if that element is of type='network'. This was done for backward compatibility with applications which only support the original listen attribute. However, by doing so we broke migration to older libvirt which tried to check that the listen attribute matches one of the listen child elements but which did not take type='network' elements into account. We are not concerned about compatibility with old applications when formatting domain XML for migration for two reasons. The XML is consumed only by libvirtd and the IP address associated with type='network' listen address on the source host is just useless on the destination host. Thus, we can safely avoid propagating the type='network' IP address to graphics/@listen attribute when creating migratable XML. https://bugzilla.redhat.com/show_bug.cgi?id=1265111 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c890977..033ae46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21020,19 +21020,17 @@ virDomainGraphicsDefFormat(virBufferPtr buf, * <graphics>. This is done to improve backward compatibility. */ for (i = 0; i < def->nListens; i++) { - virDomainGraphicsListenType listenType; - if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && def->listens[i].fromConfig) continue; - listenType = virDomainGraphicsListenGetType(def, i); - if (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS || - (listenType == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && - !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { - if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) - break; - } + if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && + flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE | + VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) + continue; + + if ((listenAddr = virDomainGraphicsListenGetAddress(def, i))) + break; } virBufferAsprintf(buf, "<graphics type='%s'", type); -- 2.5.3 ------------------------------ Message: 2 Date: Wed, 23 Sep 2015 16:54:35 -0400 From: John Ferlan <jferlan(a)redhat.com> To: libvir-list(a)redhat.com Subject: [libvirt] [PATCH] storage: Fix incorrect format for <disk> <auth> XML Message-ID: <1443041675-19738-1-git-send-email-jferlan(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=1256999 When creating a copy of the 'authdef', need to take into account the slight variation between <disk> and <pool> before blindly copying the 'authType' field. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk>. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virstoragefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90..0b72cb3 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1522,7 +1522,12 @@ virStorageAuthDefCopy(const virStorageAuthDef *src) /* Not present for storage pool, but used for disk source */ if (VIR_STRDUP(ret->secrettype, src->secrettype) < 0) goto error; - ret->authType = src->authType; + /* A <disk> uses secrettype, while a <pool> uses authType, so + * if we have a secrettype, then don't copy authType; otherwise, + * we will format the authType in <disk> + */ + if (!ret->secrettype) + ret->authType = src->authType; ret->secretType = src->secretType; if (ret->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { memcpy(ret->secret.uuid, src->secret.uuid, sizeof(ret->secret.uuid)); -- 2.1.0 ------------------------------ Message: 3 Date: Wed, 23 Sep 2015 18:03:47 -0400 From: John Ferlan <jferlan(a)redhat.com> To: Michal Privoznik <mprivozn(a)redhat.com>, libvir-list(a)redhat.com Subject: Re: [libvirt] [PATCH v2] qemuDomainDeviceDefPostParse: Drop useless checks Message-ID: <560321C3.1000808(a)redhat.com> Content-Type: text/plain; charset=windows-1252 On 09/23/2015 07:19 AM, Michal Privoznik wrote: > Now that virQEMUDriverCreateXMLConf is never called with NULL > (after 086f37e97aab) we can safely drop useless check in > qemuDomainDeviceDefPostParse as we are guaranteed to be always > called with the driver initialized. Therefore checking if driver > is NULL makes no sense. Moreover, if we mix it with direct driver > dereference. And after that, we are sure that nor @cfg will be > NULL, therefore we can drop checks for that too. > > Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> > --- > > diff to v1: > - drop checks for !cfg too > > src/qemu/qemu_domain.c | 64 ++++++++++++++++++++------------------------------ > 1 file changed, 26 insertions(+), 38 deletions(-) > ACK John Coverity error goes away too. ------------------------------ Message: 4 Date: Wed, 23 Sep 2015 16:24:30 -0600 From: Jim Fehlig <jfehlig(a)suse.com> To: Joao Martins <joao.m.martins(a)oracle.com> Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] [PATCH RFC 4/7] libxl: implement virDomainBlockStats Message-ID: <5603269E.6090101(a)suse.com> Content-Type: text/plain; charset=ISO-8859-1 Joao Martins wrote: > Introduce initial support for domainBlockStats API call that > allow us to query block device statistics. openstack nova > uses this API call to query block statistics, alongside > virDomainMemoryStats and virDomainInterfaceStats. Note that > this patch only introduces it for VBD for starters. QDisk > will come in a separate patch series. > > A new statistics data structure is introduced to fit common > statistics among others specific to the underlying block > backends. For the VBD statistics on linux these are exported > via sysfs on the path: > > "/sys/bus/xen-backend/devices/vbd-<domid>-<devid>/statistics" > > To calculate the block devid two libxl functions were ported > (libxlDiskPathMatches and libxlDiskPathParse) to libvirt to > make sure the devid is calculate in the same way as libxl. > Each backend implements its own function to extract statistics > and let there be handled the different platforms. An alternative > would be to reuse libvirt xen driver function. > > VBD stats are exposed in reqs and number of sectors from > blkback, and it's up to us to convert it to sector sizes. > The sector size is gathered through xenstore in the device > backend entry "physical-sector-size". This adds up an extra > dependency namely of xenstore for doing the xs_read. > > BlockStatsFlags variant is also implemented which has the > added benefit of getting the number of flush requests. > > Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> > --- > configure.ac | 2 +- > src/libxl/libxl_driver.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 421 insertions(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index ef7fbdb..56fb266 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -896,7 +896,7 @@ if test "$with_libxl" != "no" ; then > LIBS="$LIBS $LIBXL_LIBS" > AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ > with_libxl=yes > - LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl" > + LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl -lxenstore" > ],[ > if test "$with_libxl" = "yes"; then > fail=1 > diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c > index dc83083..fd952a3 100644 > --- a/src/libxl/libxl_driver.c > +++ b/src/libxl/libxl_driver.c > @@ -59,6 +59,7 @@ > #include "network/bridge_driver.h" > #include "locking/domain_lock.h" > #include "virstats.h" > +#include <xenstore.h> > > #define VIR_FROM_THIS VIR_FROM_LIBXL > > @@ -75,6 +76,7 @@ VIR_LOG_INIT("libxl.libxl_driver"); > #define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr" > > #define LIBXL_NB_TOTAL_CPU_STAT_PARAM 1 > +#define LIBXL_NB_TOTAL_BLK_STAT_PARAM 6 > > #define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities" > #define HYPERVISOR_XENSTORED "/dev/xen/xenstored" > @@ -103,6 +105,25 @@ struct _libxlOSEventHookInfo { > int id; > }; > > +/* Object used to store disk statistics across multiple xen backends */ > +typedef struct _libxlBlockStats libxlBlockStats; > +typedef libxlBlockStats *libxlBlockStatsPtr; > +struct _libxlBlockStats { > + long long rd_req; > + long long rd_bytes; > + long long wr_req; > + long long wr_bytes; > + long long f_req; > + > + char *backend; > + union { > + struct { > + long long ds_req; > + long long oo_req; > + } vbd; > + } u; > +}; > + > /* Function declarations */ > static int > libxlDomainManagedSaveLoad(virDomainObjPtr vm, > @@ -4641,6 +4662,403 @@ libxlDomainIsUpdated(virDomainPtr dom) > } > > static int > +libxlDiskPathMatches(const char *virtpath, const char *devtype, > + int *index_r, int max_index, > + int *partition_r, int max_partition) > +{ > + const char *p; > + char *ep; > + int tl, c; > + long pl; > + > + tl = strlen(devtype); > + if (memcmp(virtpath, devtype, tl)) > + return 0; > + > + /* We decode the drive letter as if it were in base 52 > + * with digits a-zA-Z, more or less */ > + *index_r = -1; > + p = virtpath + tl; > + for (;;) { > + c = *p++; > + if (c >= 'a' && c <= 'z') { > + c -= 'a'; > + } else { > + --p; > + break; > + } > + (*index_r)++; > + (*index_r) *= 26; > + (*index_r) += c; > + > + if (*index_r > max_index) > + return 0; > + } > + > + if (!*p) { > + *partition_r = 0; > + return 1; > + } > + > + if (*p == '0') > + return 0; /* leading zeroes not permitted in partition number */ > + > + if (virStrToLong_l(p, &ep, 10, &pl) < 0) > + return 0; > + > + if (pl > max_partition || *ep) > + return 0; > + > + *partition_r = pl; > + return 1; > +} > + > +static int > +libxlDiskPathParse(const char *virtpath, int *pdisk, int *ppartition) > +{ > + int disk, partition; > + char *ep; > + unsigned long ul; > + int chrused; > + > + chrused = -1; > + if ((sscanf(virtpath, "d%ip%i%n", &disk, &partition, &chrused) >= 2 > + && chrused == strlen(virtpath) && disk < (1<<20) && partition < 256) > + || > + libxlDiskPathMatches(virtpath, "xvd", > + &disk, (1<<20)-1, > + &partition, 255)) { > + if (pdisk) *pdisk = disk; > + if (ppartition) *ppartition = partition; > + if (disk <= 15 && partition <= 15) > + return (202 << 8) | (disk << 4) | partition; > + else > + return (1 << 28) | (disk << 8) | partition; > + } > + > + errno = virStrToLong_ul(virtpath, &ep, 0, &ul); > + if (!errno && !*ep && ul <= INT_MAX) { > + /* FIXME: should parse ul to determine these. */ > + if (pdisk || ppartition) > + return -1; > + return ul; > + } > + > + if (libxlDiskPathMatches(virtpath, "hd", > + &disk, 3, > + &partition, 63)) { > + if (pdisk) *pdisk = disk; > + if (ppartition) *ppartition = partition; > + return ((disk<2 ? 3 : 22) << 8) | ((disk & 1) << 6) | partition; > + } > + if (libxlDiskPathMatches(virtpath, "sd", > + &disk, 15, > + &partition, 15)) { > + if (pdisk) *pdisk = disk; > + if (ppartition) *ppartition = partition; > + return (8 << 8) | (disk << 4) | partition; > + } > + return -1; > +} > + > +#define LIBXL_VBD_SECTOR_SIZE 512 > + > +static int > +libxlDiskSectorSize(int domid, int devno) > +{ > + char *path, *val; > + struct xs_handle *handle; > + int ret = LIBXL_VBD_SECTOR_SIZE; > + unsigned int len; > + > + handle = xs_daemon_open_readonly(); > + if (!handle) { > + virReportError(VIR_ERR_INTERNAL_ERROR, > + "%s", _("cannot read sector size")); > + return ret; > + } > + > + if (virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", > + domid, devno) < 0) > Indentation looks off. > + goto close; > + > + if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) > + goto cleanup; > + > + VIR_FREE(path); > + if (virAsprintf(&path, "%s/physical-sector-size", val) < 0) { > + VIR_FREE(val); > + goto close; > + } > + > + VIR_FREE(val); > + if ((val = xs_read(handle, XBT_NULL, path, &len)) == NULL) > + goto cleanup; > + > + if (sscanf(val, "%d", &ret) != 1) > + ret = -1; > Should ret be set back to LIBXL_VBD_SECTOR_SIZE? '-1' wouldn't be a good value for the calling function. > + > + VIR_FREE(val); > + > + cleanup: > + VIR_FREE(path); > + close: > + xs_daemon_close(handle); > + return ret; > +} > + > +static int > +libxlDomainBlockStatsVBD(virDomainObjPtr vm, > + const char *dev, > + libxlBlockStatsPtr stats) > +{ > + int ret = -1; > + int devno = libxlDiskPathParse(dev, NULL, NULL); > + int size = libxlDiskSectorSize(vm->def->id, devno); > +#ifdef __linux__ > + char *path, *name, *val; > + unsigned long long stat; > + > + if (VIR_STRDUP(stats->backend, "vbd") < 0) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("cannot set backend")); > VIR_STRDUP() already reports OOM error, which is about the only one it can encounter. > + return -1; > + } > + > + ret = virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", > + vm->def->id, devno); > The usual pattern is 'if (virAsprintf(...) < 0)'. > + > + if (!virFileExists(path)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("cannot open bus path")); > I think the error should be VIR_ERR_OPERATION_FAILED. > + goto cleanup; > + } > + > +#define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ > Indentation is off here. Fails 'make syntax-check' with cppi installed. > + if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \ > + (virFileReadAll(name, 256, &val) < 0) || \ > + (sscanf(val, "%llu", &stat) != 1)) { \ > + virReportError(VIR_ERR_OPERATION_INVALID, \ > + _("cannot read %s"), name); \ > VIR_ERR_OPERATION_FAILED? > + goto cleanup; \ > + } \ > + VAR += (stat * MUL); \ > + VIR_FREE(name); \ > + VIR_FREE(val); > + > + LIBXL_SET_VBDSTAT("f_req", stats->f_req, 1) > + LIBXL_SET_VBDSTAT("wr_req", stats->wr_req, 1) > + LIBXL_SET_VBDSTAT("rd_req", stats->rd_req, 1) > + LIBXL_SET_VBDSTAT("wr_sect", stats->wr_bytes, size) > + LIBXL_SET_VBDSTAT("rd_sect", stats->rd_bytes, size) > + > + LIBXL_SET_VBDSTAT("ds_req", stats->u.vbd.ds_req, size) > + LIBXL_SET_VBDSTAT("oo_req", stats->u.vbd.oo_req, 1) > + ret = 0; > + > + cleanup: > + VIR_FREE(name); > + VIR_FREE(path); > + VIR_FREE(val); > This will only cleanup 'name' and 'val' from the last invocation of the LIBXL_SET_VBDSTAT macro. 'name' and 'val' from the prior invocations will be leaked. > + > +#undef LIBXL_SET_VBDSTAT > Another case of failing 'make syntax-check' with cppi installed. Regards, Jim > + > +#else > + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, > + "%s", _("platform unsupported")); > +#endif > + return ret; > +} > + > +static int > +libxlDomainBlockStatsGatherSingle(virDomainObjPtr vm, > + const char *path, > + libxlBlockStatsPtr stats) > +{ > + virDomainDiskDefPtr disk; > + const char *disk_drv; > + int ret = -1, disk_fmt; > + > + if (!(disk = virDomainDiskByName(vm->def, path, false))) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + _("invalid path: %s"), path); > + return ret; > + } > + > + disk_fmt = virDomainDiskGetFormat(disk); > + if (!(disk_drv = virDomainDiskGetDriver(disk))) > + disk_drv = "qemu"; > + > + if (STREQ(disk_drv, "phy")) { > + if (disk_fmt != VIR_STORAGE_FILE_RAW && > + disk_fmt != VIR_STORAGE_FILE_NONE) { > + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, > + _("unsupported format %s"), > + virStorageFileFormatTypeToString(disk_fmt)); > + return ret; > + } > + > + ret = libxlDomainBlockStatsVBD(vm, path, stats); > + } else { > + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, > + _("unsupported disk driver %s"), > + disk_drv); > + return ret; > + } > + return ret; > +} > + > +static int > +libxlDomainBlockStatsGather(virDomainObjPtr vm, > + const char *path, > + libxlBlockStatsPtr stats) > +{ > + int ret = -1; > + if (*path) { > + if (libxlDomainBlockStatsGatherSingle(vm, path, stats) < 0) > + return ret; > + } else { > + size_t i; > + for (i = 0; i < vm->def->ndisks; ++i) { > + if (libxlDomainBlockStatsGatherSingle(vm, vm->def->disks[i]->dst, > + stats) < 0) > + return ret; > + } > + } > + return 0; > +} > + > +static int > +libxlDomainBlockStats(virDomainPtr dom, > + const char *path, > + virDomainBlockStatsPtr stats) > +{ > + libxlDriverPrivatePtr driver = dom->conn->privateData; > + virDomainObjPtr vm; > + libxlBlockStats blkstats; > + int ret = -1; > + > + if (!(vm = libxlDomObjFromDomain(dom))) > + goto cleanup; > + > + if (virDomainBlockStatsEnsureACL(dom->conn, vm->def) < 0) > + goto cleanup; > + > + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) > + goto cleanup; > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("domain is not running")); > + goto endjob; > + } > + > + memset(&blkstats, 0, sizeof(libxlBlockStats)); > + if ((ret = libxlDomainBlockStatsGather(vm, path, &blkstats)) < 0) > + goto endjob; > + > + stats->rd_req = blkstats.rd_req; > + stats->rd_bytes = blkstats.rd_bytes; > + stats->wr_req = blkstats.wr_req; > + stats->wr_bytes = blkstats.wr_bytes; > + if (STREQ_NULLABLE(blkstats.backend, "vbd")) > + stats->errs = blkstats.u.vbd.oo_req; > + else > + stats->errs = -1; > + > + endjob: > + if (!libxlDomainObjEndJob(driver, vm)) { > + virObjectUnlock(vm); > + vm = NULL; > + } > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static int > +libxlDomainBlockStatsFlags(virDomainPtr dom, > + const char *path, > + virTypedParameterPtr params, > + int *nparams, > + unsigned int flags) > +{ > + libxlDriverPrivatePtr driver = dom->conn->privateData; > + virDomainObjPtr vm; > + libxlBlockStats blkstats; > + int nstats; > + int ret = -1; > + > + virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); > + > + flags &= ~VIR_TYPED_PARAM_STRING_OKAY; > + > + if (!(vm = libxlDomObjFromDomain(dom))) > + goto cleanup; > + > + if (virDomainBlockStatsFlagsEnsureACL(dom->conn, vm->def) < 0) > + goto cleanup; > + > + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) > + goto cleanup; > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("domain is not running")); > + goto endjob; > + } > + > + /* return count of supported stats */ > + if (*nparams == 0) { > + *nparams = LIBXL_NB_TOTAL_BLK_STAT_PARAM; > + ret = 0; > + goto endjob; > + } > + > + memset(&blkstats, 0, sizeof(libxlBlockStats)); > + if ((ret = libxlDomainBlockStatsGather(vm, path, &blkstats)) < 0) > + goto endjob; > + > + nstats = 0; > + > +#define LIBXL_BLKSTAT_ASSIGN_PARAM(VAR, NAME) \ > + if (nstats < *nparams && (blkstats.VAR) != -1) { \ > + if (virTypedParameterAssign(params + nstats, NAME, \ > + VIR_TYPED_PARAM_LLONG, (blkstats.VAR)) < 0) \ > + goto endjob; \ > + nstats++; \ > + } > + > + LIBXL_BLKSTAT_ASSIGN_PARAM(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES); > + LIBXL_BLKSTAT_ASSIGN_PARAM(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ); > + > + LIBXL_BLKSTAT_ASSIGN_PARAM(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES); > + LIBXL_BLKSTAT_ASSIGN_PARAM(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ); > + > + LIBXL_BLKSTAT_ASSIGN_PARAM(f_req, VIR_DOMAIN_BLOCK_STATS_FLUSH_REQ); > + > + if (STREQ_NULLABLE(blkstats.backend, "vbd")) > + LIBXL_BLKSTAT_ASSIGN_PARAM(u.vbd.oo_req, VIR_DOMAIN_BLOCK_STATS_ERRS); > + > + *nparams = nstats; > + > +#undef LIBXL_BLKSTAT_ASSIGN_PARAM > + > + endjob: > + if (!libxlDomainObjEndJob(driver, vm)) { > + virObjectUnlock(vm); > + vm = NULL; > + } > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static int > libxlDomainInterfaceStats(virDomainPtr dom, > const char *path, > virDomainInterfaceStatsPtr stats) > @@ -5459,6 +5877,8 @@ static virHypervisorDriver libxlHypervisorDriver = { > #endif > .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ > .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ > + .domainBlockStats = libxlDomainBlockStats, /* 1.2.20 */ > + .domainBlockStatsFlags = libxlDomainBlockStatsFlags, /* 1.2.20 */ > .domainInterfaceStats = libxlDomainInterfaceStats, /* 1.2.20 */ > .domainMemoryStats = libxlDomainMemoryStats, /* 1.2.20 */ > .domainGetCPUStats = libxlDomainGetCPUStats, /* 1.2.20 */ > ------------------------------ Message: 5 Date: Wed, 23 Sep 2015 19:18:27 -0400 From: John Ferlan <jferlan(a)redhat.com> To: libvir-list(a)redhat.com Subject: [libvirt] [PATCH 0/6] Fix some Coverity issues Message-ID: <1443050313-15412-1-git-send-email-jferlan(a)redhat.com> Newer Coverity (7.7.0) found a couple real issues and a few more false positives. There's still a few more to be resolved, but still trying to figure them out... libxlDomainMigrationPrepare - claim is args is leaked. Although it seems to be handled in libxlMigrateReceive or libxlDoMigrateReceive. Don't know the code well enough to do proper triage. qemuProcessStop - claim is usage of net->ifname in the condition (vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) is using a NULL net->ifname that would have been VIR_FREE()'d when case VIR_DOMAIN_NET_TYPE_DIRECT a few lines above. qemuDomainBlockRebase - claim is overwriting 'dest' after call to qemuDomainBlockCopyCommon causes resource leak. Although reading code says otherwise, except of course if CopyCommon goes to cleanup rather than endjob. Even changing the location doesn't resolve the issue. Fix the Coverity tag for the DEADCODE... It's always a coin-flip either dead_error_begin or dead_error_condition - I gave Jiri bad advice as to which one to use it seems. John Ferlan (6): Avoid Coverity FORWARD_NULL prior to strtok_r calls tests: Resolve Coverity RESOURCE_LEAK tests: Resolve Coverity RESOURCE_LEAK virsh: Resolve Coverity DEADCODE qemu: Resolve Coverity CHECKED_RETURN qemu: Resolve Coverity RESOURCE_LEAK src/esx/esx_vi.c | 1 + src/libxl/libxl_conf.c | 1 + src/openvz/openvz_conf.c | 2 ++ src/qemu/qemu_driver.c | 24 +++++++++++------------- src/qemu/qemu_process.c | 6 +++--- src/xenapi/xenapi_utils.c | 1 + tests/qemucaps2xmltest.c | 1 + tests/virnetdaemontest.c | 2 ++ tools/virsh.c | 2 +- 9 files changed, 23 insertions(+), 17 deletions(-) -- 2.1.0 ------------------------------ -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list End of libvir-list Digest, Vol 118, Issue 146 ********************************************* ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. �跺��欢��娉ㄦ�锛��浠跺�淇��淇℃�锛��璇��浠讹�璇峰�蹇��ュ��汉骞剁��ュ��伙�涓��浣跨��澶��浠躲� 杩��欢��版��浠跺��藉��淇��涪澶便�琚��璁＄��虹�姣��涓��ㄦ��点� ********************************************************************************************************************************

1 0

[libvirt] [PATCH v2] qemuDomainDeviceDefPostParse: Drop useless checks
by Michal Privoznik 24 Sep '15

24 Sep '15

Now that virQEMUDriverCreateXMLConf is never called with NULL (after 086f37e97aab) we can safely drop useless check in qemuDomainDeviceDefPostParse as we are guaranteed to be always called with the driver initialized. Therefore checking if driver is NULL makes no sense. Moreover, if we mix it with direct driver dereference. And after that, we are sure that nor @cfg will be NULL, therefore we can drop checks for that too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - drop checks for !cfg too src/qemu/qemu_domain.c | 64 ++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7d92f3a..78f305f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1233,12 +1233,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, { virQEMUDriverPtr driver = opaque; virQEMUCapsPtr qemuCaps = NULL; - virQEMUDriverConfigPtr cfg = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - if (driver) - cfg = virQEMUDriverGetConfig(driver); - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); if (dev->type == VIR_DOMAIN_DEVICE_NET && @@ -1253,37 +1250,34 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (dev->type == VIR_DOMAIN_DEVICE_DISK) { virDomainDiskDefPtr disk = dev->data.disk; - /* both of these require data from the driver config */ - if (cfg) { - /* assign default storage format and driver according to config */ - if (cfg->allowDiskFormatProbing) { - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); + /* assign default storage format and driver according to config */ + if (cfg->allowDiskFormatProbing) { + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_AUTO; - } else { - /* default driver if probing is forbidden */ - if (!virDomainDiskGetDriver(disk) && - virDomainDiskSetDriver(disk, "qemu") < 0) - goto cleanup; + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_AUTO; + } else { + /* default driver if probing is forbidden */ + if (!virDomainDiskGetDriver(disk) && + virDomainDiskSetDriver(disk, "qemu") < 0) + goto cleanup; - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && - (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format == VIR_STORAGE_FILE_NONE) - disk->mirror->format = VIR_STORAGE_FILE_RAW; - } + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format == VIR_STORAGE_FILE_NONE) + disk->mirror->format = VIR_STORAGE_FILE_RAW; } } @@ -1315,12 +1309,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && !dev->data.chr->source.data.nix.path) { - if (!cfg) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("cannot generate UNIX socket path")); - goto cleanup; - } - if (virAsprintf(&dev->data.chr->source.data.nix.path, "%s/domain-%s/%s", cfg->channelTargetDir, def->name, -- 2.4.9

2 1

[libvirt] [libvirt-glib] gobject: Correct docs for gvir_storage_pool_get_info()
by Zeeshan Ali (Khattak) 23 Sep '15

23 Sep '15

The returned GVirStoragePoolInfo pointer is not a GObject so it must not be unrefed using g_object_unref(). Since gvir_storage_pool_info_free() is private function, callers must either use g_slice_free() or g_boxed_free(). --- Perhaps we should just make gvir_storage_pool_info_free() public instead? libvirt-gobject/libvirt-gobject-storage-pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 7f26b1b..f015efa 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -277,8 +277,8 @@ GVirConfigStoragePool *gvir_storage_pool_get_config(GVirStoragePool *pool, * @pool: the storage_pool * @err: Place-holder for possible errors * - * Returns: (transfer full): the info. The returned object should be - * unreffed with g_object_unref() when no longer needed. + * Returns: (transfer full): the info. The returned pointer should be + * freed using either #g_slice_free() or #g_boxed_free() when no longer needed. */ GVirStoragePoolInfo *gvir_storage_pool_get_info(GVirStoragePool *pool, GError **err) -- 2.4.3

2 4