- Devel - libvirt List Archives

[libvirt] [PATCH] [libvirt-snmp] List inactive domains
by Jorge Boncompte [DTI2] 16 Oct '12

16 Oct '12

From: "Jorge Boncompte [DTI2]" <jorge(a)dti2.net> Monitoring app can't otherwise differentiate between a stopped domain or a nonexistent one. Signed-off-by: Jorge Boncompte [DTI2] <jorge(a)dti2.net> --- src/libvirtSnmp.c | 186 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 123 insertions(+), 63 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index a9fa185..2bd8f01 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -113,6 +113,82 @@ out: return; } + +static int +insertGuest(netsnmp_container *container, virDomainPtr domain) +{ + int ret = 0; + virDomainInfo info; + libvirtGuestTable_rowreq_ctx *row_ctx = NULL; + const char *name = NULL; + unsigned char uuid[16]; + + if (-1 == virDomainGetInfo(domain, &info)) { + printf("Failed to get domain info\n"); + showError(conn); + ret = -1; + goto out; + } + + /* create new row in the container */ + row_ctx = libvirtGuestTable_allocate_rowreq_ctx(NULL); + if (!row_ctx) { + snmp_log(LOG_ERR, "Error creating row"); + ret = -1; + goto out; + } + + /* set the index of the row */ + ret = virDomainGetUUID(domain, uuid); + if (ret) { + snmp_log(LOG_ERR, "Cannot get UUID"); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + if (MFD_SUCCESS != libvirtGuestTable_indexes_set(row_ctx, (char*) uuid, + sizeof(uuid))) { + snmp_log(LOG_ERR, "Error setting row index"); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + + /* set the data */ + name = virDomainGetName(domain); + if (name) + row_ctx->data.libvirtGuestName = strdup(name); + else + row_ctx->data.libvirtGuestName = strdup(""); + if (!row_ctx->data.libvirtGuestName) { + snmp_log(LOG_ERR, "Not enough memory for domain name '%s'", name); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + + row_ctx->data.libvirtGuestState = info.state; + row_ctx->data.libvirtGuestCpuCount = info.nrVirtCpu; + /* convert the memory to MiB */ + row_ctx->data.libvirtGuestMemoryCurrent = info.memory / 1024; + row_ctx->data.libvirtGuestMemoryLimit = info.maxMem / 1024; + row_ctx->data.libvirtGuestCpuTime.high = info.cpuTime >> 32; + row_ctx->data.libvirtGuestCpuTime.low = info.cpuTime & 0xFFFFFFFF; + + row_ctx->data.libvirtGuestRowStatus = ROWSTATUS_ACTIVE; + + ret = CONTAINER_INSERT(container, row_ctx); + if (ret) { + snmp_log(LOG_ERR, "Cannot insert domain '%s' to container", name); + libvirtGuestTable_release_rowreq_ctx(row_ctx); + ret = -1; + goto out; + } + +out: + return ret; +} + /* * Populate libvirtGuestTable into given container. */ @@ -120,11 +196,10 @@ int libvirtSnmpLoadGuests(netsnmp_container *container) { int ret = 0, i, numIds, numActiveDomains; + int numNames, numDefinedDomains; int *idList = NULL; + char **nameList = NULL; virDomainPtr domain = NULL; - virDomainInfo info; - libvirtGuestTable_rowreq_ctx *row_ctx = NULL; - const char *name = NULL; numActiveDomains = virConnectNumOfDomains(conn); if (-1 == numActiveDomains) { @@ -154,8 +229,6 @@ libvirtSnmpLoadGuests(netsnmp_container *container) } for (i = 0 ; i < numIds ; i++) { - unsigned char uuid[16]; - domain = virDomainLookupByID(conn, *(idList + i)); if (NULL == domain) { printf("Failed to lookup domain\n"); @@ -164,74 +237,61 @@ libvirtSnmpLoadGuests(netsnmp_container *container) goto out; } - if (-1 == virDomainGetInfo(domain, &info)) { - printf("Failed to get domain info\n"); - showError(conn); - virDomainFree(domain); - ret = -1; + ret = insertGuest(container, domain); + + virDomainFree(domain); + + if (-1 == ret) goto out; - } + } - /* create new row in the container */ - row_ctx = libvirtGuestTable_allocate_rowreq_ctx(NULL); - if (!row_ctx) { - virDomainFree(domain); - snmp_log(LOG_ERR, "Error creating row"); - ret = -1; - goto out; - } - /* set the index of the row */ - ret = virDomainGetUUID(domain, uuid); - if (ret) { - virDomainFree(domain); - snmp_log(LOG_ERR, "Cannot get UUID"); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; - } - if (MFD_SUCCESS != libvirtGuestTable_indexes_set(row_ctx, (char*) uuid, - sizeof(uuid))) { - virDomainFree(domain); - snmp_log(LOG_ERR, "Error setting row index"); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; - } + /* Inactive domains */ + numDefinedDomains = virConnectNumOfDefinedDomains(conn); + if (-1 == numDefinedDomains) { + ret = -1; + printf("Failed to get number of defined domains\n"); + showError(conn); + goto out; + } - /* set the data */ - name = virDomainGetName(domain); - if (name) - row_ctx->data.libvirtGuestName = strdup(name); - else - row_ctx->data.libvirtGuestName = strdup(""); - if (!row_ctx->data.libvirtGuestName) { - snmp_log(LOG_ERR, "Not enough memory for domain name '%s'", name); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; + nameList = malloc(sizeof(*nameList) * numDefinedDomains); + + if (NULL == nameList) { + ret = -1; + printf("Could not allocate memory for list of defined domains\n"); + goto out_inact; + } + + numNames = virConnectListDefinedDomains(conn, + nameList, + numDefinedDomains); + + if (-1 == numNames) { + ret = -1; + printf("Could not get list of defined domains from hypervisor\n"); + showError(conn); + goto out_inact; + } + + for (i = 0 ; i < numNames ; i++) { + domain = virDomainLookupByName(conn, *(nameList + i)); + if (NULL == domain) { + printf("Failed to lookup domain\n"); + showError(conn); + ret = -1; + goto out_inact; } - row_ctx->data.libvirtGuestState = info.state; - row_ctx->data.libvirtGuestCpuCount = info.nrVirtCpu; - /* convert the memory to MiB */ - row_ctx->data.libvirtGuestMemoryCurrent = info.memory / 1024; - row_ctx->data.libvirtGuestMemoryLimit = info.maxMem / 1024; - row_ctx->data.libvirtGuestCpuTime.high = info.cpuTime >> 32; - row_ctx->data.libvirtGuestCpuTime.low = info.cpuTime & 0xFFFFFFFF; + ret = insertGuest(container, domain); - row_ctx->data.libvirtGuestRowStatus = ROWSTATUS_ACTIVE; virDomainFree(domain); - ret = CONTAINER_INSERT(container, row_ctx); - if (ret) { - snmp_log(LOG_ERR, "Cannot insert domain '%s' to container", name); - libvirtGuestTable_release_rowreq_ctx(row_ctx); - ret = -1; - goto out; - } - + if (-1 == ret) + goto out_inact; } +out_inact: + free(nameList); out: free(idList); return ret; -- 1.7.10.4

2 1

[libvirt] [PATCH] tests: Fix domain-events python test
by Martin Kletzander 16 Oct '12

16 Oct '12

There was a missing method in python implementation of domain-events test and this patch adds that. --- examples/domain-events/events-python/event-test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 813b1c2..2bb5195 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -492,6 +492,9 @@ def myDomainEventPMSuspendCallback(conn, dom, reason, opaque): dom.name(), dom.ID()) def myDomainEventBalloonChangeCallback(conn, dom, utcoffset, actual): print "myDomainEventBalloonChangeCallback: Domain %s(%s) %d" % (dom.name(), dom.ID(), actual) +def myDomainEventPMSuspendDiskCallback(conn, dom, reason, opaque): + print "myDomainEventPMSuspendDiskCallback: Domain %s(%s) system pmsuspend_disk" % ( + dom.name(), dom.ID()) def usage(out=sys.stderr): print >>out, "usage: "+os.path.basename(sys.argv[0])+" [-hdl] [uri]" print >>out, " uri will default to qemu:///system" -- 1.7.12.3

2 2

[libvirt] [PATCH] maint: prepare for next release number
by Eric Blake 16 Oct '12

16 Oct '12

Given Daniel's announcement[1], code targetting the next release will be in 1.0.0, not 0.10.3. Changed mechanically with: for f in $(git grep -l '0$.$10\13\b') ; do sed -i -e 's/0$.$10\13/1\10\10/g' $f done [1]https://www.redhat.com/archives/libvir-list/2012-October/msg00403.html * docs/formatdomain.html.in: Use 1.0.0 for next release. * src/interface/interface_backend_udev.c: Likewise. --- Any objections? docs/formatdomain.html.in | 4 ++-- src/interface/interface_backend_udev.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1ae8cf4..ad8a41b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -989,7 +989,7 @@ The <code>on_lockfailure</code> element (since - 0.10.3) may be used to configure what action should be + 1.0.0) may be used to configure what action should be taken when a lock manager loses resource locks. The following actions are recognized by libvirt, although not all of them need to be supported by individual lock managers. When no action is @@ -2140,7 +2140,7 @@ address on the hosts using the <code>address</code> element. PCI devices on the other hand can only be described by their <code>address</code>. - Since 0.10.3, the <code>source</code> element + Since 1.0.0, the <code>source</code> element of USB devices may contain <code>startupPolicy</code> attribute which can be used to define policy what to do if the specified host USB device is not found. The attribute accepts the following values: diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1cb6dfe..0cb344e 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -520,16 +520,16 @@ cleanup: static virInterfaceDriver udevIfaceDriver = { "udev", - .open = udevIfaceOpenInterface, /* 0.10.3 */ - .close = udevIfaceCloseInterface, /* 0.10.3 */ - .numOfInterfaces = udevIfaceNumOfInterfaces, /* 0.10.3 */ - .listInterfaces = udevIfaceListInterfaces, /* 0.10.3 */ - .numOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 0.10.3 */ - .listDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 0.10.3 */ - .listAllInterfaces = udevIfaceListAllInterfaces, /* 0.10.3 */ - .interfaceLookupByName = udevIfaceLookupByName, /* 0.10.3 */ - .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 0.10.3 */ - .interfaceIsActive = udevIfaceIsActive, /* 0.10.3 */ + .open = udevIfaceOpenInterface, /* 1.0.0 */ + .close = udevIfaceCloseInterface, /* 1.0.0 */ + .numOfInterfaces = udevIfaceNumOfInterfaces, /* 1.0.0 */ + .listInterfaces = udevIfaceListInterfaces, /* 1.0.0 */ + .numOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 1.0.0 */ + .listDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 1.0.0 */ + .listAllInterfaces = udevIfaceListAllInterfaces, /* 1.0.0 */ + .interfaceLookupByName = udevIfaceLookupByName, /* 1.0.0 */ + .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 1.0.0 */ + .interfaceIsActive = udevIfaceIsActive, /* 1.0.0 */ }; int -- 1.7.11.7

2 2

[libvirt] [PATCH] maint: fix license on polkit script
by Eric Blake 16 Oct '12

16 Oct '12

As approved here: https://www.redhat.com/archives/libvir-list/2012-October/msg00701.html * daemon/libvirtd.policy.in: Use LGPLv2+ license. --- I'm waiting for an ack on this one - even though the change is only to comments, I am taking due caution to ensure no one was trying to use this in an exact LGPLv2.0 setup, where changing to LGPLv2.1+ to match the rest of libvirt would hurt them. daemon/libvirtd.policy.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.policy.in b/daemon/libvirtd.policy.in index 000c17e..2ec7716 100644 --- a/daemon/libvirtd.policy.in +++ b/daemon/libvirtd.policy.in @@ -6,10 +6,22 @@  <policyconfig> -- 1.7.11.7

2 2

[libvirt] [PATCH 00/12]
by Daniel P. Berrange 16 Oct '12

16 Oct '12

An update of https://www.redhat.com/archives/libvir-list/2012-August/msg00618.html Mostly this is a rebase to latest GIT. Alot of the questions raised with review last time bogged down on whether the APIs were design in the right way. I think I clarified their intended usage, so hopefully we can do code review this time :-) There are still a few more patches to add on to this - Serialize the tx/rx message queues so we don't loose partially sent/received messages across re-exec() - Make fcntl driver more configurable in its behaviour - Add support for leases based on LVM UUID and SCSI WWN

2 26

[libvirt] [PATCH] conf: add test for boot dev and order
by Martin Kletzander 16 Oct '12

16 Oct '12

Add test for 280b8c9e7c94db1decdca08d169c88554c09fa19. --- .../qemuxml2argv-boot-dev+order.xml | 56 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 2 files changed, 59 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml new file mode 100644 index 0000000..ad3d88c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml @@ -0,0 +1,56 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + <boot dev='cdrom'/> + <boot dev='network'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <boot order='1'/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='sheepdog' name='image'> + <host name='example.org' port='6000'/> + </source> + <target dev='vda' bus='virtio'/> + <boot order='3'/> + </disk> + <disk type='file' device='floppy'> + <driver name='qemu' type='raw'/> + <source file='/dev/null'/> + <target dev='fdb' bus='fdc'/> + <boot order='4'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='fdc' index='0'/> + <interface type='user'> + <mac address='00:11:22:33:44:55'/> + <model type='virtio'/> + <boot order='2'/> + </interface> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7732ae1..3ecd957 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -375,6 +375,9 @@ mymain(void) DO_TEST("boot-menu-disable-drive-bootindex", QEMU_CAPS_BOOT_MENU, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX); + DO_TEST_PARSE_ERROR("boot-dev+order", + QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, + QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); DO_TEST("boot-order", QEMU_CAPS_BOOTINDEX, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); -- 1.7.12.3

2 2

[libvirt] [RFC][PATCH] change the meaning of vnc port in xml
by Hu Tao 16 Oct '12

16 Oct '12

Now the vnc port in xml file reflects the REAL port hypervisor will listen on for vnc connection. But vnc ports usually start from 5900, it's common to say 0 for 5900, 1 for 5901, and so on. This patch forbids negative vnc port number in xml, and maps port number below 5900 to 5900+port, but no change to those greater than 5900. --- I have no idea whether this behaviour is sane or not. But my vnc client(vinagre) has the same behaviour, i.e., treats port 0 as 5900, 1 as 5901, but 5900 as 5900, 5901 as 5901. src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0cea8eb..b3cbc34 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6423,6 +6423,12 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if (flags & VIR_DOMAIN_XML_INACTIVE) def->data.vnc.port = 0; def->data.vnc.autoport = 1; + } else if (def->data.vnc.port < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid vnc port %s"), port); + goto error; + } else if (def->data.vnc.port < 5900) { + def->data.vnc.port += 5900; } } else { def->data.vnc.port = 0; -- 1.7.10.2

3 2

[libvirt] [PATCH] conf: Fix crash with cleanup
by Martin Kletzander 16 Oct '12

16 Oct '12

There was a crash possible when both <boot dev... and <boot order... were specified due to virDomainDefParseBootXML() erroring out before setting *tmp (which was free'd in cleanup). As a fix, I created this cleanup that uses one pointer for all the temporary stored XPath strings and values, plus this pointer is correctly initialized to NULL. --- src/conf/domain_conf.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0cea8eb..f0c5d50 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8242,8 +8242,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, { xmlNodePtr *nodes = NULL; int i, n; - char *bootstr, *tmp; - char *useserial = NULL; + char *tmp = NULL; int ret = -1; unsigned long deviceBoot, serialPorts; @@ -8290,23 +8289,23 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK; } - bootstr = virXPathString("string(./os/bootmenu[1]/@enable)", ctxt); - if (bootstr) { - def->os.bootmenu = virDomainBootMenuTypeFromString(bootstr); + tmp = virXPathString("string(./os/bootmenu[1]/@enable)", ctxt); + if (tmp) { + def->os.bootmenu = virDomainBootMenuTypeFromString(tmp); if (def->os.bootmenu <= 0) { /* In order not to break misconfigured machines, this * should not emit an error, but rather set the bootmenu * to disabled */ VIR_WARN("disabling bootmenu due to unknown option '%s'", - bootstr); + tmp); def->os.bootmenu = VIR_DOMAIN_BOOT_MENU_DISABLED; } - VIR_FREE(bootstr); + VIR_FREE(tmp); } - useserial = virXPathString("string(./os/bios[1]/@useserial)", ctxt); - if (useserial) { - if (STREQ(useserial, "yes")) { + tmp = virXPathString("string(./os/bios[1]/@useserial)", ctxt); + if (tmp) { + if (STREQ(tmp, "yes")) { if (virXPathULong("count(./devices/serial)", ctxt, &serialPorts) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -8318,6 +8317,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, } else { def->os.bios.useserial = VIR_DOMAIN_BIOS_USESERIAL_NO; } + VIR_FREE(tmp); } tmp = virXPathString("string(./os/bios[1]/@rebootTimeout)", ctxt); @@ -8339,7 +8339,6 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, cleanup: VIR_FREE(tmp); - VIR_FREE(useserial); VIR_FREE(nodes); return ret; } -- 1.7.12.3

3 4

[libvirt] Problems using netdev_del+netdev_add w/o corresponding device_del+device_add
by Laine Stump 16 Oct '12

16 Oct '12

I am attempting to enhance libvirt's virDomainUpdateDeviceFlags() API to support changing "just about anything" about the host side of a PCI network device without actually detaching the PCI device from the guest. Here is a patch I sent to the libvirt mailing list that I had thought would accomplish this task: https://www.redhat.com/archives/libvir-list/2012-October/msg00546.html I am using qemu-kvm-1.2-0.1.20120806git3e430569.fc17.x86_64 on Fedora 17 for my testing. Since the host side and guest side are created (and deleted) with separate monitor commands ("netdev_(add|del)" vs. "device_(add|del)", we had thought that it would be possible to use netdev_del to disconnect everything from the host side, [*not disconnect the guest side*], then create a new tap device and connect it with netdev_add(). And, actually, the netdev_del+netdev_add sequence does complete without error; unfortunately, no traffic is visible on the tap device (looking from the host with tcpdump). When I modify the patch above to also include the device_del and device_add monitor calls (with a 3 second delay in between to allow for the guest's PCI detach to complete), then the device does work properly. Of course in this case (1) the guest sees the device completely disappear for a period, then reappear, which is more disruption than I want, and (2) because qemu has no asynchronous event to notify libvirt when the guest's PCI detach has actually completed, I have to stick in an arbitrary call to sleep() which is generally *way* too long, but may be too short in some cases of extremely high load. The only comment I got from IRC on Friday afternoon (I know - not a good time to be looking for people) was that they would be "surprised if it did work". So, I have the following questions: 1) Should this work? If it's supposed to work now: 2) can you give hints (aside from watching the qemu monitor commands and responses with stap) on what I might need to change, or how to further debug my problem within qemu? (I'm pretty well convinced that the libvirt code is doing the tap device creation/etc correctly). 3) alternately can you verify that this is a known bug? Is fixing it on anyone's todo list? If it's not supposed to work now: 4) Does it sound like a reasonable thing for qemu to support? 5) Is there some other formal way to request addition of this functionality (aside from figuring it out myself and posting a patch)? ******************************************** For reference, here is the sequence of qemu monitor commands sent by libvirt to fully detach, then fully reattach a network device. Note that fd is a newly opened TAP device. Also note the 3 second interval between the netdev_del and the next command: 96.671 > 0x7f8e20000c90 {"execute":"device_del","arguments":{"id":"net0"},"id":"libvirt-25"} 96.673 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-25"} 96.674 > 0x7f8e20000c90 {"execute":"netdev_del","arguments":{"id":"hostnet0"},"id":"libvirt-26"} 96.695 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-26"} 99.777 > 0x7f8e20000c90 {"execute":"getfd","arguments":{"fdname":"fd-net0"},"id":"libvirt-27"} (fd=27) 99.777 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-27"} 99.778 > 0x7f8e20000c90 {"execute":"netdev_add","arguments":{"type":"tap","fd":"fd-net0","id":"hostnet0"},"id":"libvirt-28"} 99.778 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-28"} 99.779 > 0x7f8e20000c90 {"execute":"device_add","arguments":{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:d8:bd:b9","bus":"pci.0","addr":"0x4"},"id":"libvirt-29"} 99.780 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-29"} After this sequence is done, the guest network device is fully functioning. Here is the sequence sent to disconnect only the host side, then reconnect it with a new tap device. (although the fd is the same, this is because the old tap device had already been closed, so the number is just being used - the same thing happens when doing sequential full detach/attach cycles, and they all work with no problems): 168.750 > 0x7f8e20000c90 {"execute":"netdev_del","arguments":{"id":"hostnet0"},"id":"libvirt-30"} 168.762 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-30"} 168.800 > 0x7f8e20000c90 {"execute":"getfd","arguments":{"fdname":"fd-net0"},"id":"libvirt-31"} (fd=27) 168.801 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-31"} 168.801 > 0x7f8e20000c90 {"execute":"netdev_add","arguments":{"type":"tap","fd":"fd-net0","id":"hostnet0"},"id":"libvirt-32"} 168.802 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-32"} 168.802 > 0x7f8e20000c90 {"execute":"set_link","arguments":{"name":"net0","up":true},"id":"libvirt-33"} 168.803 < 0x7f8e20000c90 {"return": {}, "id": "libvirt-33"} After this sequence is done, everything about the network device *appears* normal on both the guest and host (at least the things I know to look at), but no traffic from the host shows up in a tcpdump of the interface on the guest, and no traffic from the guest shows up in a tcpdump of the tap device on the host. Oh - the extra "set_link" command at the end is because I noticed that the flags shown in ifconfig in the guest switched from: UP BROADCAST RUNNING MULTICAST to UP BROADCAST MULTICAST when reconnecting in this way, so I was hoping that forcing the interface up would solve my problems. It didn't :-/ (Another note: I also tried adding a delay after the netdev_del, and that also did nothing.)

4 7

[libvirt] [PATCHv2 0/9] New API to retrieve host node CPU map
by Viktor Mihajlovski 16 Oct '12

16 Oct '12

V2 Changes: Added python binding for virNodeGetCPUMapFlags. Removed RFC stanza. --- Viktor Mihajlovski (9): virNodeGetCPUMapFlags: Define public API. virNodeGetCPUMapFlags: Define driver API. virNodeGetCPUMapFlags: Implement public API. virNodeGetCPUMapFlags: Implement wire protocol. libvirt.h.in: Add new cpumap macro VIR_CPU_USED virNodeGetCPUMapFlags: Implement virsh support. virNodeGetCPUMapFlags: Implement support function in nodeinfo virNodeGetCPUMapFlags: Implement driver support virNodeGetCPUMapFlags: Add python binding daemon/remote.c | 44 ++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 28 ++++++++++++++++--- python/generator.py | 1 + python/libvirt-override-api.xml | 6 ++++ python/libvirt-override.c | 56 +++++++++++++++++++++++++++++++++++++++ src/driver.h | 7 +++++ src/libvirt.c | 56 +++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 +++ src/nodeinfo.c | 49 ++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 6 ++++ src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 49 ++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 13 ++++++++- src/remote_protocol-structs | 12 ++++++++ src/test/test_driver.c | 30 +++++++++++++++++++++ tools/virsh-host.c | 41 ++++++++++++++++++++++++++++ tools/virsh.pod | 5 +++ 18 files changed, 405 insertions(+), 5 deletions(-)

1 9

[libvirt] [PATCH] spec: Add runtime requirement for libssh2
by Peter Krempa 16 Oct '12

16 Oct '12

libssh2 unfortunately doesn't support symbol versioning so RPM can't figure out what version is needed for the currently installed libvirt package. This patch adds a runtime requirement, so that the correct version of libssh2 can be installed along with libvirt. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 75623eb..bc6a1af 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -500,6 +500,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0 %if %{with_phyp} || %{with_libssh2_transport} %if %{with_libssh2_transport} BuildRequires: libssh2-devel >= 1.3.0 +Requires: libssh2 >= 1.3.0 %else BuildRequires: libssh2-devel %endif -- 1.7.12.3

2 1

[libvirt] [PATCH] selinux: Use raw contexts 2
by Martin Kletzander 16 Oct '12

16 Oct '12

In commit 9674f2c637114fa6ac0680fe5658a41a62bb34a8, I forgot to change selabel_lookup with the other functions, so this one-liner does exactly that. --- src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 10135ed..e6fba21 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -861,7 +861,7 @@ getContext(const char *newpath, mode_t mode, security_context_t *fcon) if (handle == NULL) return -1; - ret = selabel_lookup(handle, fcon, newpath, mode); + ret = selabel_lookup_raw(handle, fcon, newpath, mode); selabel_close(handle); return ret; #else -- 1.7.12.3

2 2

[libvirt] Connection using Java
by Felipe Oliveira Gutierrez 16 Oct '12

16 Oct '12

Hi, I am using java to connect to the xen, but my class is throwing a exception. Does anyone know what is happening? public class TestConnection { public static void main(String[] args) { Connect conn = null; try { conn = new Connect("xen+ssh://root@192.XXX.XXX.XX/", true); libvir: RPC error : End of file while reading data: nc: invalid option -- 'U' nc -h for help: Input/output error exception caught:org.libvirt.LibvirtException: End of file while reading data: nc: invalid option -- 'U' nc -h for help: Input/output error level:VIR_ERR_ERROR code:VIR_ERR_SYSTEM_ERROR domain:VIR_FROM_RPC hasConn:false hasDom:false hasNet:false message:End of file while reading data: nc: invalid option -- 'U' nc -h for help: Input/output error str1:%s str2:End of file while reading data: nc: invalid option -- 'U' nc -h for help: Input/output error str3:null int1:-1 int2:-1 Thanks, Felipe -- *-- Felipe Oliveira Gutierrez* *-- **lipe.82(a)gmail.com* <lipe.82(a)gmail.com> *-- https://sites.google.com/site/lipe82/Home/diaadia*

3 3

[libvirt] CPU utilization between physical CPU and virtual CPU in KVM
by Dennis Chen 16 Oct '12

16 Oct '12

Hi All, I am confused by the following observed scenario: In my 4-CPU (KVM supported, 2 core with 2 thread for each) host machine box, I create only one VM with 3-vCPU through virsh/libvirt tools and also I pin this VM process to the physical processor 3. I guess the CPU utilization for the processor 3 will not exceed 100%, then I create 3 process (dead loop-- while(1);) and bind each of them to vCPU[0-2] respectively, through the "top -c" command in VM environment, I can see the CPU utilization for each of the vCPU is about 100%, but interesting, I found that the CPU utilization of processor 3 in the host machine is about 300% with "toc -c" command. why does a single process bound to a CPU can get ~300% cpu bandwidth in this case, does the kernel scheduler dispatch the idle cycle capacity of the CPUs to the virtual CPU of the VM, other word, the scheduler knows the vCPU info in the VM process? For the same case, if I create another 4 new dead-loop processes and bind them to the physical CPU[0-3] equally, then I find the vCPU0/1 in VM will not be 100%, eg. 32%, (I think the scheduler in the guest OS doesn't know it's running in a virtual environment, so the utilization of the vCPU will not change to adapt to the physical processor utilization, but it did, why? -org-gnu

1 1

[libvirt] necessary to limit container's network bandwidth when use physical nic in container?
by Gao feng 16 Oct '12

16 Oct '12

we can use tc to limit container's network bandwidth when the container uses veth device. because one of the veth devices will be seen in the host.so we can set tc rules on this device on the host. I want to know if it's necessary to limit container's network bandwidth when the container uses a physical nic device. because this nic device is only used by this container. And if this is necessary,Be there any good idea? Thanks!

3 4

[libvirt] Proposed libguestfs API for implementing libvirt virConnectOpenAuth
by Richard W.M. Jones 15 Oct '12

15 Oct '12

As in the example code below. static void do_auth (guestfs_h *g, void *opaque, uint64_t event, int event_handle, int flags, const char *buf, size_t buf_len, const uint64_t *array, size_t array_len) { char **creds; size_t i; char *prompt; char *reply; size_t replylen; // buf will be the libvirt URI. It is always \0-terminated so // buf_len can be ignored in this case. printf ("Authentication required for libvirt connection '%s'\n", buf); // Ask libguestfs what credentials libvirt is demanding. creds = guestfs_get_libvirt_requested_credentials (g); // Now ask the user for answers. for (i = 0; creds[i] != NULL; ++i) { if (strcmp (creds[i], "authname") == 0 || strcmp (creds[i], "passphrase") == 0) { prompt = guestfs_get_libvirt_requested_credential_prompt (g, i); printf ("%s: ", prompt); free (prompt); // ... // Input from user is in 'reply', length 'replylen' (bytes). guestfs_set_libvirt_requested_credential (g, i, reply, replylen); } free (creds[i]); } free (creds); // On return from this function (libguestfs event), the libvirt // event returns too. } // ... { guestfs_h *g; char *creds[] = { "authname", "passphrase", NULL }; g = guestfs_create (); guestfs_set_libvirt_supported_credentials (g, creds); guestfs_set_event_callback (g, do_auth, GUESTFS_EVENT_LIBVIRT_AUTH, 0, NULL); // An example of a function that would open a libvirt connection: guestfs_add_domain (g, "dom", GUESTFS_ADD_DOMAIN_LIBVIRTURI, "qemu:///system", -1); } ---------------------------------------------------------------------- By the way, some of the virt tools can open multiple connections to libvirt, and it is architecturally hard to change this: https://www.redhat.com/archives/libguestfs/2012-October/msg00065.html Does libvirt (or policy kit?) provide any mechanism for caching these credentials within the same process, so that we don't have to provide the same creds back to libvirt for multiple connections? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

3 5

[libvirt] [PATCH V1] qemu-attach: Calculate index value if not already specified
by Supriya Kannery 15 Oct '12

15 Oct '12

virsh qemu-attach fails if user has not specified values for index/unit/bus for a drive in qemu commandline. Set default values instead of returning error. Signed-off-by: Supriya Kannery <supriyak(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 09f412e..8ba67a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7130,16 +7130,6 @@ qemuParseCommandLineDisk(virCapsPtr caps, def->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) idx = nvirtiodisk; - if (idx == -1 && - unitid == -1 && - busid == -1) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing index/unit/bus parameter in drive '%s'"), val); - virDomainDiskDefFree(def); - def = NULL; - goto cleanup; - } - if (idx == -1) { if (unitid == -1) unitid = 0;

1 0

[libvirt] [PATCH] (failed) virConnectOpenAuth: Add VIR_CONNECT_NO_DEFAULT_ERROR_HANDLER flag.
by Richard W.M. Jones 15 Oct '12

15 Oct '12

Well, it was a good idea, but the patch doesn't work. Apparently along their open paths, drivers don't set errors in the newly created handle, but in the global handler instead (hence the errors still get printed to stderr). How much I hate virterror ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org

3 4

[libvirt] [PATCH] maint: drop spurious semicolons
by Eric Blake 15 Oct '12

15 Oct '12

Detected with: git grep ';;$' -- '**/*.[ch]' * src/network/bridge_driver.c (networkRadvdConfContents): Fix harmless typo. * src/phyp/phyp_driver.c (phypUUIDTable_Pull): Likewise. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDriveDel): Likewise. --- Pushing under the trivial rule. src/network/bridge_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0c4b0b0..5578373 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -981,7 +981,7 @@ networkRestartDhcpDaemon(virNetworkObjPtr network) static int networkRadvdConfContents(virNetworkObjPtr network, char **configstr) { - virBuffer configbuf = VIR_BUFFER_INITIALIZER;; + virBuffer configbuf = VIR_BUFFER_INITIALIZER; int ret = -1, ii; virNetworkIpDefPtr ipdef; bool v6present = false; diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index a1724ca..a3885a7 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -736,7 +736,7 @@ phypUUIDTable_Pull(virConnectPtr conn) if (!channel) { if (libssh2_session_last_errno(session) != LIBSSH2_ERROR_EAGAIN) { - goto err;; + goto err; } else { waitsocket(sock, session); } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c35948e..2daf8ea 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3068,7 +3068,7 @@ int qemuMonitorJSONDriveDel(qemuMonitorPtr mon, _("deleting disk is not supported. " "This may leak data if disk is reassigned")); ret = 1; - virResetLastError();; + virResetLastError(); } } } else if (qemuMonitorJSONHasError(reply, "DeviceNotFound")) { -- 1.7.11.7

1 0

[libvirt] [PATCH 3/3] Take the forwarding family into account
by Benjamin Cama 15 Oct '12

15 Oct '12

Only add iptables rules for this family, and also only check for forwarding for this family. --- src/network/bridge_driver.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e3e8dc2..6bd4217 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1788,7 +1788,9 @@ networkAddIptablesRules(struct network_driver *driver, return -1; for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); + (ipdef = virNetworkDefGetIpByIndex(network->def, + network->def->forwardFamily, + ii)); ii++) { /* Add address-specific iptables rules */ if (networkAddIpSpecificIptablesRules(driver, network, ipdef) < 0) { @@ -1803,7 +1805,9 @@ err: * added for previous IP addresses. */ while ((--ii >= 0) && - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii))) { + (ipdef = virNetworkDefGetIpByIndex(network->def, + network->def->forwardFamily, + ii))) { networkRemoveIpSpecificIptablesRules(driver, network, ipdef); } networkRemoveGeneralIptablesRules(driver, network); @@ -1819,7 +1823,9 @@ networkRemoveIptablesRules(struct network_driver *driver, virNetworkIpDefPtr ipdef; for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); + (ipdef = virNetworkDefGetIpByIndex(network->def, + network->def->forwardFamily, + ii)); ii++) { networkRemoveIpSpecificIptablesRules(driver, network, ipdef); } @@ -2173,9 +2179,18 @@ networkStartNetworkVirtual(struct network_driver *driver, goto err2; /* If forwardType != NONE, check for IP forwarding */ - if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE && - networkCheckIpForwarding(v4present, v6present) < 0) { - goto err3; + if (network->def->forwardType != VIR_NETWORK_FORWARD_NONE) { + if (network->def->forwardFamily) { + /* if forwardFamily is set, we have at least a corresponding + * family's address + */ + if (networkCheckIpForwarding(network->def->forwardFamily == AF_INET, + network->def->forwardFamily == AF_INET6) < 0) + goto err3; + } else { + if (networkCheckIpForwarding(v4present, v6present) < 0) + goto err3; + } } -- 1.7.2.5

2 1

[libvirt] [PATCH 0/8] RFC New API to retrieve host node CPU map
by Viktor Mihajlovski 15 Oct '12

15 Oct '12

Rationale: In order to use the APIs listed below it is necessary for a client to know the maximum number of node CPUs which is passed via the maplen argument. virDomainGetEmulatorPinInfo virDomainGetVcpuPinInfo virDomainGetVcpus virDomainPinEmulator virDomainPinVcpu virDomainPinVcpuFlags The current approach uses virNodeGetInfo to determine the maximum CPU number. This can lead to incorrect results if not all node CPUs are online. The maximum CPU number should always be the number of CPUs present on the host, regardless of their online/offline state. The following example illustrates the issue: Host has 3 logical CPUs, 1 socket, 3 cores, 1 thread. Guest has 1 virtual CPU and is started while all 3 host CPUs are online. $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.4s CPU Affinity: yyy $ echo 0 > /sys/devices/system/cpu/cpu1/online $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.5s CPU Affinity: y- The correct display for CPU affinity would have been y-y, as the guest continues to use CPUs 0 and 2. This is not a display problem only, because it is also not possible to explicitly pin the virtual CPU to host CPUs 0 and 2, due to the truncated CPU mask. PROPOSAL: To help solve the issue above I suggest a new public API: int virNodeGetCPUMapFlags(virConnectPtr conn, unsigned char **cpumap, unsigned int *online, unsigned int flags); The function will return the number of CPUs present on the host or -1 on failure; If cpumap is non-NULL virNodeGetCPUMapFlags will allocate an array containing a bit map representation of the online CPUs. It's the callers responsibility to deallocate cpumap using free(). If online is non-NULL, the variable pointed to will contain the number of online host node CPUs. The variable flags has been added to support future extensions and must be set to 0. Clients can use virNodeGetCPUMapFlags to properly determine the maximum number of node CPUs and their online/offline state. Remarks: This series implements the QEMU and test drivers. This series doesn't introduce changes to the existing vcpu pinning, which I would submit as a succeeding patch set. No python binding yet. Viktor Mihajlovski (8): virNodeGetCPUMapFlags: Define public API. virNodeGetCPUMapFlags: Define driver API. virNodeGetCPUMapFlags: Implement public API. virNodeGetCPUMapFlags: Implement wire protocol. libvirt.h.in: Add new cpumap macro VIR_CPU_USED virNodeGetCPUMapFlags: Implement virsh support. virNodeGetCPUMapFlags: Implement support function in nodeinfo virNodeGetCPUMapFlags: Implement driver support daemon/remote.c | 44 +++++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 28 ++++++++++++++++++--- python/generator.py | 1 + src/driver.h | 7 +++++ src/libvirt.c | 56 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 +++ src/nodeinfo.c | 49 ++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 6 ++++ src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 49 ++++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 13 +++++++++- src/remote_protocol-structs | 12 +++++++++ src/test/test_driver.c | 30 ++++++++++++++++++++++ tools/virsh-host.c | 41 ++++++++++++++++++++++++++++++ tools/virsh.pod | 5 +++ 16 files changed, 343 insertions(+), 5 deletions(-)

1 8

[libvirt] [PATCH] RFC: Clarify the relationship between <vcpu>, <vcpupin>, and <emulatorpin>
by Osier Yang 15 Oct '12

15 Oct '12

These 3 elements conflicts with each other in either the doc or the underlying codes are. This is to propse a solution. Before writing any codes, I want to see if the principle is correct, any advise is welcomed. Current problems: Problem 1: The doc shouldn't simply say "These settings are superseded by CPU tuning. " for element <vcpu>. As except the tuning, <vcpu> allows to specify the current, maxmum vcpu number. Apart from that, <vcpu> also allows to specify the placement as "auto", which binds the domain process to the advisory nodeset from numad. Problem 2: Doc for <vcpu> says its "cpuset" specify the physical CPUs that the vcpus can be pinned. But it's not the truth, as actually it only pin domain process to the specified physical CPUs. So either it's a document bug, or code bug. Problem 3: Doc for <vcpupin> says it supersed "cpuset" of <vcpu>, it's not quite correct, as each <vcpupin> specify the pinning policy only for one vcpu. How about the ones which doesn't have <vcpupin> specified? it says the vcpu will be pinned to all available physical CPUs, but what's the meaning of attribute "cpuset" of <vcpu> then? Problem 4: Doc for <emulatorpin> says it pin the emulator threads (domain process in other context, perhaps another follow up patch to cleanup the inconsistency is needed) to the physical CPUs specified its attribute "cpuset". Which conflicts with <vcpu>'s "cpuset". And actually in the underlying codes, it set the affinity for domain process twice if both "cpuset" for <vcpu> and <emulatorpin> are specified, and <emulatorpin>'s pinning will override <vcpu>'s. Problem 5: When "placement" of <vcpu> is "auto" (I.e. uses numad to get the advisory nodeset to which the domain process is pinned to), it will also be overridden by <emulatorpin>, This patch is trying to sort out the conflicts or bugs by: 1) Don't say <vcpu> is superseded by <cputune> 2) Keep the semanteme for "cpuset" of <vcpu> (I.e. Still says it specify the physical CPUs the virtual CPUs). But modifying it to mention it also set the pinning policy for domain process, and the CPU placement of domain process specified by "cpuset" of <vcpu> will be ingored if <emulatorpin> specified, and similary, the CPU placement of vcpu thread will be ignored if it has <vcpupin> specified, for vcpu which doesn't have <vcpupin> specified, it inherits "cpuset" of <vcpu>. 3) Don't say <vcpu> is supersed by <vcpupin>. If neither <vcpupin> nor "cpuset" of <vcpu> is specified, the vcpu will be pinned to all available pCPUs. 4) If neither <emulatorpin> nor "cpuset" of <vcpu> is specified, the domain process (emulator threads in the context) will be pinned to all available pCPUs. 5) If "placement" of <vcpu> is "auto", <emulatorpin> is not allowed. 6) hotplugged vcpus will also inherit "cpuset" of <vcpu> Codes changes above document changes will cause: 1) Inherit def->cpumask for each vcpu which doesn't have <vcpupin> specified, during parsing. 2) ping the vcpu which doesn't have <vcpupin> specified to def->cpumask either by cgroup for sched_setaffinity(2), which is actually done by 1). 3) Error out if "placement" == "auto", and <emulatorpin> is specified. Otherwise, <emulatorpin> is honored, and "cpuset" of <cpuset> is ignored. 4) Setup cgroup for each hotplugged vcpu, and setup the pinning policy by either cgroup or sched_setaffinity(2). 5) Remove cgroup and <vcpupin> for each hot unplugged vcpu. --- docs/formatdomain.html.in | 42 +++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d664e7e..1ae8cf4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -357,8 +357,18 @@ the maximum supported by the hypervisor. Since 0.4.4, this element can contain an optional <code>cpuset</code> attribute, which is a comma-separated - list of physical CPU numbers that virtual CPUs can be pinned - to. Each element in that list is either a single CPU number, + list of physical CPU numbers that domain process and virtual CPUs + can be pinned to by default. (NB: The pinning policy of domain + process and virtual CPUs can be specified separately by + <code>cputune</code>. If attribute <code>emulatorpin</code> + of <code>cputune</code> is specified, <code>cpuset</code> + specified by <code>vcpu</code> here will be ingored; Similarly, + For virtual CPUs which has <code>vcpupin</code> specified, + <code>cpuset</code> specified by <code>cpuset</code> here + will be ignored; For virtual CPUs which doesn't have + <code>vcpupin</code> specified, it will be pinned to the physical + CPUs specified by <code>cpuset</code> here). + Each element in that list is either a single CPU number, a range of CPU numbers, or a caret followed by a CPU number to be excluded from a previous range. Since 0.8.5, the optional attribute <code>current</code> can @@ -374,8 +384,7 @@ if it's specified. If both <code>cpuset</code> and <code>placement</code> are not specified, or if <code>placement</code> is "static", but no <code>cpuset</code> is specified, the domain process will be pinned to - all the available physical CPUs. These settings are superseded - by <a href="#elementsCPUTuning">CPU tuning</a>. + all the available physical CPUs. </dd> </dl> @@ -411,23 +420,26 @@ <dt><code>vcpupin</code></dt> <dd> The optional <code>vcpupin</code> element specifies which of host's - physical CPUs the domain VCPU will be pinned to. This setting supersedes - previous VCPU placement specified in <a href="#elementsCPUAllocation">CPU - Allocation</a> using <code>vcpu</code> element. If this is omitted, - each VCPU is pinned to all the physical CPUs by default. It contains two - required attributes, the attribute <code>vcpu</code> specifies vcpu id, - and the attribute <code>cpuset</code> is same as - attribute <code>cpuset</code> - of element <code>vcpu</code>. (NB: Only qemu driver support) + physical CPUs the domain VCPU will be pinned to. If this is omitted, + and attribute <code>cpuset</code> of element <code>vcpu</code> is + not specified, the vCPU is pinned to all the physical CPUs by default. + It contains two required attributes, the attribute <code>vcpu</code> + specifies vcpu id, and the attribute <code>cpuset</code> is same as + attribute <code>cpuset</code> of element <code>vcpu</code>. + (NB: Only qemu driver support) Since 0.9.0 </dd> <dt><code>emulatorpin</code></dt> <dd> The optional <code>emulatorpin</code> element specifies which of host physical CPUs the "emulator", a subset of a domain not including vcpu, - will be pinned to. If this is omitted, "emulator" is pinned to all - the physical CPUs by default. It contains one required attribute - <code>cpuset</code> specifying which physical CPUs to pin to. + will be pinned to. If this is omitted, and attribute + <code>cpuset</code> of element <code>vcpu</code> is not specified, + "emulator" is pinned to all the physical CPUs by default. It contains + one required attribute <code>cpuset</code> specifying which physical + CPUs to pin to. NB, <code>emulatorpin</code> is not allowed if + attribute <code>placement</code> of element <code>vcpu</code> is + "auto". </dd> <dt><code>shares</code></dt> <dd> -- 1.7.7.6

4 4

[libvirt] Some questions about virConnectAuthCallbackPtr
by Richard W.M. Jones 15 Oct '12

15 Oct '12

Some questions which seem to be left ambigious by the documentation for virConnectAuthCallbackPtr: http://libvirt.org/html/libvirt-libvirt.html#virConnectAuthCallbackPtr (1) For a single open, can this be called multiple times? I'm thinking, some authentication methods might give the user N attempts at typing the password, which might result in N callbacks here. (2) The documentation says: "Returns: 0 if all interactions were filled, or -1 upon error". However it also says "If an interaction cannot be filled, fill in NULL and 0". Does that mean it's OK (not an error, return 0) if a result field is set to NULL? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

3 9

[libvirt] [PATCH 0/3] Add option to selectively enable IPv4/v6 forwarding
by Benjamin Cama 15 Oct '12

15 Oct '12

Hi, Currently, when IP forwarding is enabled in a network element, libvirt enables forwarding for IPv4/v6 on the OS if the bridge has some IP address of that family. In some circumstances, one could only want forwarding for one family and not the other, even if both address families are present; for example, forwarding only IPv6 but still have some RFC1918 addresses on the “local” network as a backup stack, or playing with IPv6 using (not forwarded) ULA addresses, having some IPv4 NATed forwarding, without loosing IPv6 connectivity because enabling it will disable auto-configuration (my case). This patch adds a new optional "family" attribute to the "forward" element, allowing selective forwarding: it can be set to "ipv4" or "ipv6". If not present, the usual behavior of libvirt is kept, forwarding trafic for whichever family there is an address on the bridge. The first patch also remove libvirt's ability to set forwarding; I think it should only check for it, letting the administrator enable it the usual way (/etc/sysctl.conf or wathever) if he really wants it. In my case, this behavior caused me to loose IPv6 connectivity when adding some ULA addresse to my VMs bridge, because IPv6 forwarding was enabled in my back. Regards, Benjamin Cama (3): Only check for IP forwarding, do not enable it Add a "forward family" option Take the forwarding family into account src/conf/network_conf.c | 58 ++++++++++++++++++++++++++++++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 81 +++++++++++++++++++++++++++++++++--------- 3 files changed, 121 insertions(+), 19 deletions(-) -- 1.7.2.5

1 0

[libvirt] [PATCHv3] Add support for SUSPEND_DISK event
by Martin Kletzander 15 Oct '12

15 Oct '12

This patch adds support for SUSPEND_DISK event; both lifecycle and separated. The support is added for QEMU, machines are changed to PMSUSPENDED, but as QEMU sends SHUTDOWN afterwards, the state changes to shut-off. This and much more needs to be done in order for libvirt to work with transient devices, wake-ups etc. This patch is not aiming for that functionality. --- daemon/remote.c | 25 +++++++++++ examples/domain-events/events-c/event-test.c | 22 +++++++++- examples/domain-events/events-python/event-test.py | 3 +- include/libvirt/libvirt.h.in | 29 +++++++++++++ python/libvirt-override-virConnect.py | 9 ++++ python/libvirt-override.c | 50 ++++++++++++++++++++++ src/conf/domain_event.c | 30 ++++++++++++- src/conf/domain_event.h | 4 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_monitor.c | 10 +++++ src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 9 ++++ src/qemu/qemu_process.c | 47 ++++++++++++++++++++ src/remote/remote_driver.c | 31 ++++++++++++++ src/remote/remote_protocol.x | 7 ++- src/remote_protocol-structs | 4 ++ 16 files changed, 281 insertions(+), 4 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index e7fe128..2d3f401 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -608,6 +608,30 @@ remoteRelayDomainEventBalloonChange(virConnectPtr conn ATTRIBUTE_UNUSED, } +static int remoteRelayDomainEventPMSuspendDisk(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int reason ATTRIBUTE_UNUSED, + void *opaque) { + virNetServerClientPtr client = opaque; + remote_domain_event_pmsuspend_disk_msg data; + + if (!client) + return -1; + + VIR_DEBUG("Relaying domain %s %d system suspend-disk", dom->name, dom->id); + + /* build return data */ + memset(&data, 0, sizeof(data)); + make_nonnull_domain(&data.dom, dom); + + remoteDispatchDomainEventSend(client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK, + (xdrproc_t)xdr_remote_domain_event_pmsuspend_disk_msg, &data); + + return 0; +} + + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventReboot), @@ -623,6 +647,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventPMWakeup), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventPMSuspend), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBalloonChange), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventPMSuspendDisk), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index cde60fb..94104a0 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -201,6 +201,9 @@ static const char *eventDetailToString(int event, int detail) { case VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY: ret = "Memory"; break; + case VIR_DOMAIN_EVENT_PMSUSPENDED_DISK: + ret = "Disk"; + break; } break; } @@ -402,6 +405,16 @@ static int myDomainEventPMSuspendCallback(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } +static int myDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int reason ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + printf("%s EVENT: Domain %s(%d) system suspend-disk\n", + __func__, virDomainGetName(dom), virDomainGetID(dom)); + return 0; +} + static void myFreeFunc(void *opaque) { char *str = opaque; @@ -440,6 +453,7 @@ int main(int argc, char **argv) int callback11ret = -1; int callback12ret = -1; int callback13ret = -1; + int callback14ret = -1; struct sigaction action_stop; memset(&action_stop, 0, sizeof(action_stop)); @@ -533,6 +547,11 @@ int main(int argc, char **argv) VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(myDomainEventBalloonChangeCallback), strdup("callback balloonchange"), myFreeFunc); + callback14ret = virConnectDomainEventRegisterAny(dconn, + NULL, + VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK, + VIR_DOMAIN_EVENT_CALLBACK(myDomainEventPMSuspendDiskCallback), + strdup("suspend-disk"), myFreeFunc); if ((callback1ret != -1) && (callback2ret != -1) && (callback3ret != -1) && @@ -544,7 +563,8 @@ int main(int argc, char **argv) (callback10ret != -1) && (callback11ret != -1) && (callback12ret != -1) && - (callback13ret != -1)) { + (callback13ret != -1) && + (callback14ret != -1)) { if (virConnectSetKeepAlive(dconn, 5, 3) < 0) { virErrorPtr err = virGetLastError(); fprintf(stderr, "Failed to start keepalive protocol: %s\n", diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 27e74c4..813b1c2 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -449,7 +449,7 @@ def detailToString(event, detail): ( "Unpaused", "Migrated", "Snapshot" ), ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot"), ( "Finished", ), - ( "Memory", ) + ( "Memory", "Disk" ) ) return eventStrings[event][detail] @@ -554,6 +554,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_PMWAKEUP, myDomainEventPMWakeupCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_PMSUSPEND, myDomainEventPMSuspendCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE, myDomainEventBalloonChangeCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK, myDomainEventPMSuspendDiskCallback, None) vc.setKeepAlive(5, 3) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a4e8ca9..5858c44 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -225,6 +225,14 @@ typedef enum { #endif } virDomainPMSuspendedReason; +typedef enum { + VIR_DOMAIN_PMSUSPENDED_DISK_UNKNOWN = 0, + +#ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_PMSUSPENDED_DISK_LAST +#endif +} virDomainPMSuspendedDiskReason; + /** * virDomainControlState: * @@ -3114,6 +3122,7 @@ typedef enum { */ typedef enum { VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY = 0, /* Guest was PM suspended to memory */ + VIR_DOMAIN_EVENT_PMSUSPENDED_DISK = 1, /* Guest was PM suspended to disk */ #ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_PMSUSPENDED_LAST @@ -4164,6 +4173,25 @@ typedef void (*virConnectDomainEventBalloonChangeCallback)(virConnectPtr conn, void *opaque); /** + * virConnectDomainEventPMSuspendDiskCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @reason: reason why the callback was called, unused currently, + * always passes 0 + * @opaque: application specified data + * + * This callback occurs when the guest is suspended to disk. + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK with virConnectDomainEventRegisterAny() + */ +typedef void (*virConnectDomainEventPMSuspendDiskCallback)(virConnectPtr conn, + virDomainPtr dom, + int reason, + void *opaque); + + +/** * VIR_DOMAIN_EVENT_CALLBACK: * * Used to cast the event specific callback into the generic one @@ -4187,6 +4215,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_PMWAKEUP = 11, /* virConnectDomainEventPMWakeupCallback */ VIR_DOMAIN_EVENT_ID_PMSUSPEND = 12, /* virConnectDomainEventPMSuspendCallback */ VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE = 13, /* virConnectDomainEventBalloonChangeCallback */ + VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK = 14, /* virConnectDomainEventPMSuspendDiskCallback */ #ifdef VIR_ENUM_SENTINELS /* diff --git a/python/libvirt-override-virConnect.py b/python/libvirt-override-virConnect.py index 6bec66d..00bfcaf 100644 --- a/python/libvirt-override-virConnect.py +++ b/python/libvirt-override-virConnect.py @@ -170,6 +170,15 @@ cb(self, virDomain(self, _obj=dom), actual, opaque) return 0 + def _dispatchDomainEventPMSuspendDiskCallback(self, dom, reason, cbData): + """Dispatches event to python user domain suspend-disk event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), reason, opaque) + return 0; + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 81099b1..83dc925 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -5812,6 +5812,53 @@ libvirt_virConnectDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_ return ret; } +static int +libvirt_virConnectDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int reason, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + + pyobj_dom = libvirt_virDomainPtrWrap(dom); + Py_INCREF(pyobj_cbData); + + dictKey = libvirt_constcharPtrWrap("conn"); + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventPMSuspendDiskCallback", + (char*)"OiO", + pyobj_dom, + reason, + pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + if(!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} + static PyObject * libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) @@ -5884,6 +5931,9 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self, case VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE: cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventBalloonChangeCallback); break; + case VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventPMSuspendDiskCallback); + break; } if (!cb) { diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 7da4a1e..062752a 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1,7 +1,7 @@ /* * domain_event.c: domain event queue processing helpers * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * * This library is free software; you can redistribute it and/or @@ -1125,6 +1125,30 @@ virDomainEventPMSuspendNewFromDom(virDomainPtr dom) return virDomainEventPMSuspendNew(dom->id, dom->name, dom->uuid); } +static virDomainEventPtr +virDomainEventPMSuspendDiskNew(int id, const char *name, + unsigned char *uuid) +{ + virDomainEventPtr ev = + virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK, + id, name, uuid); + return ev; +} + +virDomainEventPtr +virDomainEventPMSuspendDiskNewFromObj(virDomainObjPtr obj) +{ + return virDomainEventPMSuspendDiskNew(obj->def->id, + obj->def->name, + obj->def->uuid); +} + +virDomainEventPtr +virDomainEventPMSuspendDiskNewFromDom(virDomainPtr dom) +{ + return virDomainEventPMSuspendDiskNew(dom->id, dom->name, dom->uuid); +} + virDomainEventPtr virDomainEventBalloonChangeNewFromDom(virDomainPtr dom, unsigned long long actual) { @@ -1294,6 +1318,10 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); break; + case VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK: + ((virConnectDomainEventPMSuspendDiskCallback)cb)(conn, dom, 0, cbopaque); + break; + default: VIR_WARN("Unexpected event ID %d", event->eventID); break; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 995b655..5f64a47 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -1,6 +1,7 @@ /* * domain_event.h: domain event queue processing helpers * + * Copyright (C) 2012 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * * This library is free software; you can redistribute it and/or @@ -128,6 +129,9 @@ virDomainEventPtr virDomainEventPMSuspendNewFromDom(virDomainPtr dom); virDomainEventPtr virDomainEventBalloonChangeNewFromDom(virDomainPtr dom, unsigned long long actual); virDomainEventPtr virDomainEventBalloonChangeNewFromObj(virDomainObjPtr obj, unsigned long long actual); +virDomainEventPtr virDomainEventPMSuspendDiskNewFromObj(virDomainObjPtr obj); +virDomainEventPtr virDomainEventPMSuspendDiskNewFromDom(virDomainPtr dom); + void virDomainEventFree(virDomainEventPtr event); void virDomainEventStateFree(virDomainEventStatePtr state); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fe31bbe..fdf4b8b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -585,6 +585,8 @@ virDomainEventStateRegisterID; virDomainEventStateFree; virDomainEventStateNew; virDomainEventStateQueue; +virDomainEventPMSuspendDiskNewFromDom; +virDomainEventPMSuspendDiskNewFromObj; virDomainEventTrayChangeNewFromDom; virDomainEventTrayChangeNewFromObj; virDomainEventWatchdogNewFromDom; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 85b0bc2..4313451 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1111,6 +1111,16 @@ int qemuMonitorEmitPMSuspend(qemuMonitorPtr mon) return ret; } +int qemuMonitorEmitPMSuspendDisk(qemuMonitorPtr mon) +{ + int ret = -1; + VIR_DEBUG("mon=%p", mon); + + QEMU_MONITOR_CALLBACK(mon, ret, domainPMSuspendDisk, mon->vm); + + return ret; +} + int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, const char *diskAlias, int type, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 54b3a99..f33b94c 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -136,6 +136,8 @@ struct _qemuMonitorCallbacks { int (*domainBalloonChange)(qemuMonitorPtr mon, virDomainObjPtr vm, unsigned long long actual); + int (*domainPMSuspendDisk)(qemuMonitorPtr mon, + virDomainObjPtr vm); }; char *qemuMonitorEscapeArg(const char *in); @@ -213,6 +215,7 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, int status); int qemuMonitorEmitBalloonChange(qemuMonitorPtr mon, unsigned long long actual); +int qemuMonitorEmitPMSuspendDisk(qemuMonitorPtr mon); int qemuMonitorStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index bd52ce4..c35948e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -70,6 +70,7 @@ static void qemuMonitorJSONHandlePMSuspend(qemuMonitorPtr mon, virJSONValuePtr d static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJobCanceled(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBalloonChange(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandlePMSuspendDisk(qemuMonitorPtr mon, virJSONValuePtr data); typedef struct { const char *type; @@ -91,6 +92,7 @@ static qemuEventHandler eventHandlers[] = { { "SPICE_INITIALIZED", qemuMonitorJSONHandleSPICEInitialize, }, { "STOP", qemuMonitorJSONHandleStop, }, { "SUSPEND", qemuMonitorJSONHandlePMSuspend, }, + { "SUSPEND_DISK", qemuMonitorJSONHandlePMSuspendDisk, }, { "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, }, { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, @@ -891,6 +893,13 @@ qemuMonitorJSONHandleBalloonChange(qemuMonitorPtr mon, qemuMonitorEmitBalloonChange(mon, actual); } +static void +qemuMonitorJSONHandlePMSuspendDisk(qemuMonitorPtr mon, + virJSONValuePtr data ATTRIBUTE_UNUSED) +{ + qemuMonitorEmitPMSuspendDisk(mon); +} + int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, const char *cmd_str, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f8a2bfd..4c6c7d7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1178,6 +1178,52 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, return 0; } +static int +qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + struct qemud_driver *driver = qemu_driver; + virDomainEventPtr event = NULL; + virDomainEventPtr lifecycleEvent = NULL; + + virDomainObjLock(vm); + event = virDomainEventPMSuspendDiskNewFromObj(vm); + + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { + qemuDomainObjPrivatePtr priv = vm->privateData; + VIR_DEBUG("Transitioned guest %s to pmsuspended state due to " + "QMP suspend_disk event", vm->def->name); + + virDomainObjSetState(vm, VIR_DOMAIN_PMSUSPENDED, + VIR_DOMAIN_PMSUSPENDED_UNKNOWN); + lifecycleEvent = + virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_PMSUSPENDED, + VIR_DOMAIN_EVENT_PMSUSPENDED_DISK); + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after suspend event", + vm->def->name); + } + + if (priv->agent) + qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SUSPEND); + } + + virDomainObjUnlock(vm); + + if (event || lifecycleEvent) { + qemuDriverLock(driver); + if (event) + qemuDomainEventQueue(driver, event); + if (lifecycleEvent) + qemuDomainEventQueue(driver, lifecycleEvent); + qemuDriverUnlock(driver); + } + + return 0; +} + static qemuMonitorCallbacks monitorCallbacks = { .destroy = qemuProcessHandleMonitorDestroy, @@ -1196,6 +1242,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .domainPMWakeup = qemuProcessHandlePMWakeup, .domainPMSuspend = qemuProcessHandlePMSuspend, .domainBalloonChange = qemuProcessHandleBalloonChange, + .domainPMSuspendDisk = qemuProcessHandlePMSuspendDisk, }; static int diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fc4c696..3253de7 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -253,6 +253,10 @@ static void remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog, virNetClientPtr client, void *evdata, void *opaque); +static void +remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); static virNetClientProgramEvent remoteDomainEvents[] = { { REMOTE_PROC_DOMAIN_EVENT_RTC_CHANGE, @@ -311,6 +315,10 @@ static virNetClientProgramEvent remoteDomainEvents[] = { remoteDomainBuildEventBalloonChange, sizeof(remote_domain_event_balloon_change_msg), (xdrproc_t)xdr_remote_domain_event_balloon_change_msg }, + { REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK, + remoteDomainBuildEventPMSuspendDisk, + sizeof(remote_domain_event_pmsuspend_disk_msg), + (xdrproc_t)xdr_remote_domain_event_pmsuspend_disk_msg }, }; enum virDrvOpenRemoteFlags { @@ -4575,6 +4583,29 @@ remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED } +static void +remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + struct private_data *priv = conn->privateData; + remote_domain_event_pmsuspend_disk_msg *msg = evdata; + virDomainPtr dom; + virDomainEventPtr event = NULL; + + dom = get_nonnull_domain(conn, msg->dom); + if (!dom) + return; + + event = virDomainEventPMSuspendDiskNewFromDom(dom); + + virDomainFree(dom); + + remoteDomainEventQueue(priv, event); +} + + static virDrvOpenStatus ATTRIBUTE_NONNULL (1) remoteSecretOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b0b530c..4359c82 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2259,6 +2259,10 @@ struct remote_domain_event_balloon_change_msg { unsigned hyper actual; }; +struct remote_domain_event_pmsuspend_disk_msg { + remote_nonnull_domain dom; +}; + struct remote_domain_managed_save_args { remote_nonnull_domain dom; unsigned int flags; @@ -3008,7 +3012,8 @@ enum remote_procedure { REMOTE_PROC_NODE_GET_MEMORY_PARAMETERS = 289, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_BLOCK_COMMIT = 290, /* autogen autogen */ - REMOTE_PROC_NETWORK_UPDATE = 291 /* autogen autogen priority:high */ + REMOTE_PROC_NETWORK_UPDATE = 291, /* autogen autogen priority:high */ + REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK = 292 /* autogen autogen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4d2627a..0c0a317 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1718,6 +1718,9 @@ struct remote_domain_event_balloon_change_msg { remote_nonnull_domain dom; uint64_t actual; }; +struct remote_domain_event_pmsuspend_disk_msg { + remote_nonnull_domain dom; +}; struct remote_domain_managed_save_args { remote_nonnull_domain dom; u_int flags; @@ -2415,4 +2418,5 @@ enum remote_procedure { REMOTE_PROC_NODE_GET_MEMORY_PARAMETERS = 289, REMOTE_PROC_DOMAIN_BLOCK_COMMIT = 290, REMOTE_PROC_NETWORK_UPDATE = 291, + REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK = 292, }; -- 1.7.12.3

2 2