- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/6] Move secret object command line building helpers
by John Ferlan 01 Jun '16

01 Jun '16

v1: http://www.redhat.com/archives/libvir-list/2016-May/msg02017.html Changes in v2: Patch 1 - Move function to a new src/util/virqemu.c with adjustments to other affected areas Patches 2-4 - Similarly adjust the flow/name of the patches with an adjustment so that patch 2 is just the new code in virqemu.c and patch 3 shows how the master secret code would use the same function to build it's command line. Patch 4 just follows suit... Patch 5 was reviewed/ACK'd - this patch just shows the changes to remove the "virSecretPtr secret = NULL;" and "virObjectUnref(secret);" Patch 6 is unchanged John Ferlan (6): qemu: Move and rename qemuBuildObjectCommandlineFromJSON util: Introduce virQEMUBuildSecretObjectProps qemu: Use virQEMUBuildSecretObjectProps to build secret objects qemu: Rework secinfo command line building storage: Use virSecretGetSecretString secret: Move virStorageSecretType to secret_util and rename cfg.mk | 2 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 5 + src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_command.c | 219 +++++---------------- src/qemu/qemu_command.h | 4 - src/qemu/qemu_domain.c | 4 +- src/secret/secret_util.c | 18 +- src/secret/secret_util.h | 22 ++- src/storage/storage_backend_iscsi.c | 55 +----- src/storage/storage_backend_rbd.c | 49 +---- src/util/virqemu.c | 211 ++++++++++++++++++++ src/util/virqemu.h | 42 ++++ src/util/virstoragefile.c | 33 ++-- src/util/virstoragefile.h | 17 +- tests/qemuargv2xmltest.c | 4 +- tests/qemucommandutiltest.c | 9 +- ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-master-key.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 3 +- 21 files changed, 380 insertions(+), 328 deletions(-) create mode 100644 src/util/virqemu.c create mode 100644 src/util/virqemu.h -- 2.5.5

1 7

[libvirt] RFC: turn cpu 'host-model' into 'custom' for active config on domain start
by Nikolay Shirokovskiy 01 Jun '16

01 Jun '16

Hi, everyone. Cpu mode 'host-model' is not convinient for migration in current form. Consider migration from less capable host to more capable one - it is possible. But then migration backwards is impossible despite the fact that qemu process on destination is running with the same model and features as on source because migration does not update 'host-model' cpu upon migration on destination. The problem is that on migrating back instead of taking current cpu config 'host-model' is expanded again and gain extra features of destination and migration failed by source (new destination) side. What if we change cpu for active config from 'host-model' into 'custom' in the starting process? Then this issue will be fixed. It is quite reasonable from my POV - 'host-model' is effectively about taking active domain cpu from host on start, after that active domain cpu is on its own. Persistent config stays 'host-model' so migrating of active domain and restarting it gains extra features of new host as before. Nikolay

3 2

[libvirt] NFS over AF_VSOCK in <filesystem>
by Stefan Hajnoczi 01 Jun '16

01 Jun '16

virtio-vsock support has been added to the nfs-ganesha NFS server. I'm currently working on upstreaming virtio-vsock into Linux and QEMU. I also have patches for the Linux NFS client and server. Users wishing to share a file system with the guest will need to configure the NFS server. Perhaps libvirt could handle that given that it already has <filesystem> syntax. The basic task is setting up either the kernel nfsd or nfs-ganesha for the VM to access the NFS export(s). When the VM is destroy the NFS server can be shut down. Does this sound like a responsibility that libvirt should handle? Stefan

4 11

[libvirt] [PATCH 0/3] bhyve: virConnectDomainXMLFromNative
by Fabian Freyer 01 Jun '16

01 Jun '16

The following series of patches implement virConnectDomainXMLFromNative. This is mostly some boiler plate code generating argv-lists from the native command string, and two getopt-based argument parsers for the /usr/sbin/bhyve and /usr/sbin/bhyveload commands. Since there is quite some string handling involved especially in the first patch that I am not 100% sure about, I'd appreciate a thorough review. Fabian Freyer (3): bhyve: implement virConnectDomainXMLFromNative bhyve: implement bhyve argument parser bhyve: implement argument parser for loader po/POTFILES.in | 1 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 42 ++ src/bhyve/bhyve_parse_command.c | 869 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_parse_command.h | 30 ++ 5 files changed, 944 insertions(+) create mode 100644 src/bhyve/bhyve_parse_command.c create mode 100644 src/bhyve/bhyve_parse_command.h -- 2.7.0

1 4

Re: [libvirt] [ovs-dev] [PATCH v2 2/2] netdev-dpdk: Support user-defined socket attribs
by Ansis Atteka 01 Jun '16

01 Jun '16

On Mon, May 30, 2016 at 12:29 AM, Christian Ehrhardt <christian.ehrhardt(a)canonical.com> wrote: > On Tue, May 24, 2016 at 4:10 PM, Aaron Conole <aconole(a)redhat.com> wrote: > >> Daniele Di Proietto <diproiettod(a)vmware.com> writes: >> >> > Hi Aaron, >> > >> > I'm still a little bit nervous about calling chown on a (partially) >> > user controlled file name. >> >> I agree, that always seems scary. >> >> > Before moving forward I wanted to discuss a couple of other options: >> > >> > * Ansis (in CC) suggested using -runas parameter in qemu. This way >> > qemu can open the socket as root and drop privileges before starting >> > guest execution. >> >> I'm not sure how to do this with libvirt, or via the OpenStack Neutron >> plugin. I also don't know if it would be an acceptable workaround for >> users. Additionally, I recall there being something of a "don't even >> know if this works" around it. Maybe Christian or Ansis (both in CC) >> can expound on it. >> Cross-posting to libvirt mailing list to hear opinion from libvirt developers. In short - the problem is that libvirtd process starts qemu process under non-root user. Since qemu starts under non-root process, then qemu can't connect to DPDK unix domain sockets created by ovs-vswitcd process that runs under "root". There are two solutions to this problem: 1. let ovs-vswitchd process to chown its socket from "root" to "libvirt" group and/or user (this is what Aarons patch proposes) 2. make libvirtd process to start qemu process under "root" but then let qemu to downgrade via "-run-as" flag after qemu has opened the Unix Domain socket. Regarding solution #2. I think the necessary changes roughly would be to: 1. invoke virCommandAddArgPair(cmd, "-runas", "libvirt") before starting qemu process; AND 2. revert virCommandSetUID() that automatically downgrades user from "root" to "libvirt" even before qemu starts. I would like to hear feasibility of such solution from libvirt developers? Or maybe there is even a better solution that I am missing? Regarding solution #1. There have already been precedents that other daemons are chowning their sockets so that non-privileged daemons could connect to them. IMHO this is not elegant from security perspective but will at least get the job done if Linux Distribution maintainers (Aaron and Christian) need to ship something out ASAP . The thing I am concerned about this solutions is that ovs-vswitchd could be used to chown() arbitrary files and sockets on file system if there happens to be a bug. Also, this socket is not created by ovs-vswitchd code base itself but rather from Intel DPDK library where ovs-vswitchd calls into. > Hi, > IIRC we kind of agree that long term a proper MAC will be much better but > most involved people needed something to get it working like "now". > Since they are complementary (other than the fix removing a bit of the > urgency for more MAC) it was kind of the least bad option. > > You have to be aware that I brought up the discussion on dev(a)dpdk.org - see > [1] and [2]: > But this will take time and eventually still be the applications task to > "do something" - no matter if via API or via the chmod's right now. > So Aaron is trying to get something that works now until the long term > things are in place, which I appreciate. > > FYI - I was even more in a hurry as it was clear that OVS-2.5 won't get > this in time I run with [3] for now. > I never intended to suggest that, but with the discussion in place, one > could ask if you (Aaron) want to pick up that instead. > That would keep OVS free for now until DPDK made up the API (see [2]) for > socket ownership control and this then could be implemented in OVS? > > (I hope) In some months/years we will all be happy to drop this bunch of > interim solutions, never the less we need it for now. > > [1]: http://dpdk.org/dev/patchwork/patch/12222/ > [2]: http://dpdk.org/ml/archives/dev/2015-December/030326.html > [3]: > https://git.launchpad.net/~ubuntu-server/dpdk/commit/?h=ubuntu-xenial-to-dp… > > [...] > > >> I think originally we quickly discussed 4 possible solutions (and >> hopefully I captured them correctly): >> >> 1. OVS downgrades to the ovs user, and kvm runs under the ovs >> group. I don't actually like this solution because kvm could then >> pollute the ovs database. >> >> 2. OVS runs as some user and sets the user/group ownership of the socket >> via chown/chmod where permissions come from the database (the >> original context had ovs running as root - but as I described above >> it doesn't need to be root provided ovs+DPDK can start without root). >> >> 3. OVS runs as some user, kvm starts as root, opens the socket and >> downgrades. IIRC, this doesn't actually work, or it may have >> implications on other projects. I don't remember exactly what was >> not as great about this solution, TBH. >> >> 4. OVS and KVM run as whatever users; MAC is used to enforce the >> layering between them. >> >> I think solution 2 and solution 4 don't actually interfere with each >> other, and can be used to a complementary effect (if implemented >> properly) so that the MAC layer enforces access, but even without MAC, >> the DAC layer can provide appropriate whitelisting behavior. >> > > I also remember several complex changes needed for the #1 and #3 that > always would end up with huge effort and a high risk not being accepted. > Probably that is what you refer to with "implications on other projects". > > Also keep in mind the position of dpdk out of the last few discussions > which I'd like to summarize as "dpdk got this path from an app, so this app > OWNS that path". > _______________________________________________ > dev mailing list > dev(a)openvswitch.org > http://openvswitch.org/mailman/listinfo/dev

3 4

[libvirt] [PATCH] Removed function virDomainDefNewFull.
by Tomáš Ryšavý 31 May '16

31 May '16

The function virDomainDefNewFull() in src/conf/domain_conf.c was a thin wrapper around virDomainDefNew() that was only used in a few places in the code. The function was removed and the callers were re-implemented. --- src/conf/domain_conf.c | 22 ---------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - src/vz/vz_utils.c | 8 +++++++- src/xen/xen_hypervisor.c | 26 ++++++++++++++++++-------- src/xen/xend_internal.c | 23 +++++++++++++++++++---- src/xen/xm_internal.c | 24 ++++++++++++++++++++++-- 7 files changed, 66 insertions(+), 41 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fb05bf7..5721800 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2754,28 +2754,6 @@ virDomainDefNew(void) } -virDomainDefPtr -virDomainDefNewFull(const char *name, - const unsigned char *uuid, - int id) -{ - virDomainDefPtr def; - - if (!(def = virDomainDefNew())) - return NULL; - - if (VIR_STRDUP(def->name, name) < 0) { - VIR_FREE(def); - return NULL; - } - - memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); - def->id = id; - - return def; -} - - void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, bool live, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 82e581b..afb722c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2507,9 +2507,6 @@ void virDomainDefFree(virDomainDefPtr vm); virDomainChrDefPtr virDomainChrDefNew(void); virDomainDefPtr virDomainDefNew(void); -virDomainDefPtr virDomainDefNewFull(const char *name, - const unsigned char *uuid, - int id); void virDomainObjAssignDef(virDomainObjPtr domain, virDomainDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb5b419..1a09a95 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -234,7 +234,6 @@ virDomainDefMaybeAddController; virDomainDefMaybeAddInput; virDomainDefNeedsPlacementAdvice; virDomainDefNew; -virDomainDefNewFull; virDomainDefParseFile; virDomainDefParseNode; virDomainDefParseString; diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 5427314..0e98a39 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -166,9 +166,15 @@ vzNewDomain(vzDriverPtr driver, const char *name, const unsigned char *uuid) virDomainObjPtr dom = NULL; vzDomObjPtr pdom = NULL; - if (!(def = virDomainDefNewFull(name, uuid, -1))) + if (!(def = virDomainDefNew())) goto error; + if (VIR_STRDUP(def->name, name) < 0) + goto error; + + memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); + def->id = -1; + if (VIR_ALLOC(pdom) < 0) goto error; diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index fc9e1c6..1b9d2e1 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2634,10 +2634,15 @@ xenHypervisorLookupDomainByID(virConnectPtr conn, int id) if (!name) return NULL; - ret = virDomainDefNewFull(name, - XEN_GETDOMAININFO_UUID(dominfo), - id); - VIR_FREE(name); + if (!(ret = virDomainDefNew())) { + VIR_FREE(name); + return NULL; + } + + ret->name = name; + memcpy(ret->uuid, XEN_GETDOMAININFO_UUID(dominfo), VIR_UUID_BUFLEN); + ret->id = id; + return ret; } @@ -2699,10 +2704,15 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid) if (!name) return NULL; - ret = virDomainDefNewFull(name, uuid, id); - if (ret) - ret->id = id; - VIR_FREE(name); + if (!(ret = virDomainDefNew())) { + VIR_FREE(name); + return NULL; + } + + ret->name = name; + memcpy(ret->uuid, uuid, VIR_UUID_BUFLEN); + ret->id = id; + return ret; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 4dd6b41..2ba5459 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -1111,12 +1111,21 @@ sexpr_to_domain(virConnectPtr conn ATTRIBUTE_UNUSED, const struct sexpr *root) if (sexpr_node(root, "domain/domid")) id = sexpr_int(root, "domain/domid"); - return virDomainDefNewFull(name, uuid, id); + if (!(ret = virDomainDefNew())) + goto error; + + if (VIR_STRDUP(ret->name, name) < 0) + goto error; + + memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); + def->id = id; + + return ret; error: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse Xend domain information")); - virObjectUnref(ret); + virDomainDevFree(ret); return NULL; } @@ -2003,9 +2012,15 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (name == NULL) return NULL; - ret = virDomainDefNewFull(name, uuid, id); + if (!(ret = virDomainDefNew())) { + VIR_FREE(name); + return NULL; + } + + ret->name = name; + memcpy(ret->uuid, uuid, VIR_UUID_BUFLEN); + ret->id = id; - VIR_FREE(name); return ret; } diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index ef1a460..ca4577f 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -848,7 +848,17 @@ xenXMDomainLookupByName(virConnectPtr conn, const char *domname) if (!(entry = virHashLookup(priv->configCache, filename))) goto cleanup; - ret = virDomainDefNewFull(domname, entry->def->uuid, -1); + if (!(ret = virDomainDefNew())) + goto cleanup; + + if (VIR_STRDUP(ret->name, domname) < 0) { + virDomainDevFree(ret); + ret = NULL; + goto cleanup; + } + + memcpy(def->uuid, entry->def->uuid, VIR_UUID_BUFLEN); + def->id = -1; cleanup: xenUnifiedUnlock(priv); @@ -891,7 +901,17 @@ xenXMDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (!(entry = virHashSearch(priv->configCache, xenXMDomainSearchForUUID, (const void *)uuid))) goto cleanup; - ret = virDomainDefNewFull(entry->def->name, uuid, -1); + if (!(ret = virDomainDefNew())) + goto cleanup; + + if (VIR_STRDUP(ret->name, entry->def->name) < 0) { + virDomainDevFree(ret); + ret = NULL; + goto cleanup; + } + + memcpy(def->uuid, uuid, VIR_UUID_BUFLEN); + def->id = -1; cleanup: xenUnifiedUnlock(priv); -- 2.5.5

3 2

[libvirt] [PATCH] network: restart dnsmasq after adding/removing txt and srv records
by Laine Stump 31 May '16

31 May '16

Although dns host records are stored in a separate configuration file that is reread by dnsmasq when it receives a SIGHUP, the txt and srv records are directly in the dnsmasq .conf file which can't be reread after initial dnsmasq startup. This means that if an srv or txt record is modified in a network config, libvirt needs to restart the dnsmasq process rather than just sending a SIGHUP. This was pointed out in a question in https://bugzilla.redhat.com/show_bug.cgi?id=988718 , but no separate BZ was filed. --- src/network/bridge_driver.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0fd2095..7c8d2cc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3404,9 +3404,14 @@ networkUpdate(virNetworkPtr net, if (section == VIR_NETWORK_SECTION_BRIDGE || section == VIR_NETWORK_SECTION_DOMAIN || section == VIR_NETWORK_SECTION_IP || - section == VIR_NETWORK_SECTION_IP_DHCP_RANGE) { - /* these sections all change things on the dnsmasq commandline, - * so we need to kill and restart dnsmasq. + section == VIR_NETWORK_SECTION_IP_DHCP_RANGE || + section == VIR_NETWORK_SECTION_DNS_TXT || + section == VIR_NETWORK_SECTION_DNS_SRV) { + /* these sections all change things on the dnsmasq + * commandline (i.e. in the .conf file), so we need to + * kill and restart dnsmasq, because dnsmasq sets its uid + * to "nobody" after it starts, and is unable to re-read + * the conf file (owned by root, mode 600) */ if (networkRestartDhcpDaemon(driver, network) < 0) goto cleanup; @@ -3434,12 +3439,10 @@ networkUpdate(virNetworkPtr net, goto cleanup; } - } else if (section == VIR_NETWORK_SECTION_DNS_HOST || - section == VIR_NETWORK_SECTION_DNS_TXT || - section == VIR_NETWORK_SECTION_DNS_SRV) { - /* these sections only change things in config files, so we - * can just update the config files and send SIGHUP to - * dnsmasq. + } else if (section == VIR_NETWORK_SECTION_DNS_HOST) { + /* this section only changes data in an external file + * (not the .conf file) so we can just update the config + * files and send SIGHUP to dnsmasq. */ if (networkRefreshDhcpDaemon(driver, network) < 0) goto cleanup; -- 2.5.5

2 1

[libvirt] [PATCH 0/2] qemu: expand domain memory statistics
by Derbyshev Dmitriy 31 May '16

31 May '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp and available along with other memory statistics. This information was not saved into domain statistics. Derbyshev Dmitry (2): qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp include/libvirt/libvirt-domain.h | 12 +++++++++++- src/libvirt-domain.c | 5 +++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++---------- tools/virsh-domain-monitor.c | 4 ++++ 4 files changed, 33 insertions(+), 11 deletions(-) -- 1.9.5.msysgit.0

2 3

[libvirt] [PATCH] qemu: expand domain memory statistics with 'last-update' timestamp
by Derbyshev Dmitriy 31 May '16

31 May '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp along with other memory statistics, but this information is not saved into domain statistics. It could be useful to determine if the data reported is fresh or not. Balloon statistics are not reported in hrf, so no modifications are made in qemu_monitor_text.c. --- include/libvirt/libvirt-domain.h | 6 +++++- src/libvirt-domain.c | 2 ++ src/qemu/qemu_monitor_json.c | 21 +++++++++++---------- tools/virsh-domain-monitor.c | 2 ++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index e1d9a0d..51f9785 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -603,11 +603,15 @@ typedef enum { * is in kB */ VIR_DOMAIN_MEMORY_STAT_RSS = 7, + + /* Timestamp of the last update of statistics */ + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE = 8, + /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 8, + VIR_DOMAIN_MEMORY_STAT_NR = 9, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_MEMORY_STAT_LAST = VIR_DOMAIN_MEMORY_STAT_NR diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3e144b6..b1c7d73 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -5988,6 +5988,8 @@ virDomainGetInterfaceParameters(virDomainPtr domain, * The total amount of memory available to the domain's OS (in kb). * VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON: * Current balloon value (in kb). + * VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE + * Timestamp of the last statistic * * Returns: The number of stats provided or -1 in case of failure. */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e767414..175ef10 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1602,10 +1602,10 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, * rates and/or whether data has been collected since a previous cycle. * It's currently unused. */ -#define GET_BALLOON_STATS(FIELD, TAG, DIVISOR) \ - if (virJSONValueObjectHasKey(statsdata, FIELD) && \ +#define GET_BALLOON_STATS(OBJECT, FIELD, TAG, DIVISOR) \ + if (virJSONValueObjectHasKey(OBJECT, FIELD) && \ (got < nr_stats)) { \ - if (virJSONValueObjectGetNumberUlong(statsdata, FIELD, &mem) < 0) { \ + if (virJSONValueObjectGetNumberUlong(OBJECT, FIELD, &mem) < 0) { \ VIR_DEBUG("Failed to get '%s' value", FIELD); \ } else { \ /* Not being collected? No point in providing bad data */ \ @@ -1676,19 +1676,20 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; } - GET_BALLOON_STATS("stat-swap-in", + GET_BALLOON_STATS(statsdata, "stat-swap-in", VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 1024); - GET_BALLOON_STATS("stat-swap-out", + GET_BALLOON_STATS(statsdata, "stat-swap-out", VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 1024); - GET_BALLOON_STATS("stat-major-faults", + GET_BALLOON_STATS(statsdata, "stat-major-faults", VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 1); - GET_BALLOON_STATS("stat-minor-faults", + GET_BALLOON_STATS(statsdata, "stat-minor-faults", VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 1); - GET_BALLOON_STATS("stat-free-memory", + GET_BALLOON_STATS(statsdata, "stat-free-memory", VIR_DOMAIN_MEMORY_STAT_UNUSED, 1024); - GET_BALLOON_STATS("stat-total-memory", + GET_BALLOON_STATS(statsdata, "stat-total-memory", VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 1024); - + GET_BALLOON_STATS(data, "last-update", + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 1); cleanup: virJSONValueFree(cmd); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 0a93949..3893b90 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -373,6 +373,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "actual %llu\n", stats[i].val); if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_RSS) vshPrint(ctl, "rss %llu\n", stats[i].val); + if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE) + vshPrint(ctl, "last_update %llu\n", stats[i].val); } ret = true; -- 1.9.5.msysgit.0

2 1

[libvirt] [PATCH 0/3] Do not check for domain liveness in virDomainObjSetDefTransient
by Ján Tomko 31 May '16

31 May '16

virDomainObjSetDefTransient has an unintuitive attribute 'live': when set to 'true', it ignores the virDomainObjIsActive test. The most common usage is on domain startup, where most of the callers want to create a transient definition even though the domain is not yet active. The only place where live=false is still required is virDomainObjGetPersistentDef (and its usage could possibly be cleaned up too, since it's only called in the drivers that already do SetDefTransient on domain startup). Split out the virDomainObjIsActive check into virDomainObjGetPersistentDef and remove it for the rest of the callers along with the 'live' attribute. Ján Tomko (3): Clean up redundant usage of virDomainObjSetDefTransient Check if the domain is active in virDomainObjGetPersistentDef Do not check for domain liveness in virDomainObjSetDefTransient src/conf/domain_conf.c | 15 ++++----------- src/conf/domain_conf.h | 3 +-- src/libxl/libxl_domain.c | 3 +-- src/lxc/lxc_process.c | 6 +----- src/qemu/qemu_process.c | 4 ++-- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 5 ++--- 7 files changed, 12 insertions(+), 26 deletions(-) -- 2.7.3

2 6