- Devel - libvirt List Archives

[libvirt] [PATCH 1/5] Interface pools and passthrough mode patches: Moving the declaration of _pciDevice and _pciDeviceList to pci.h
by Shradha Shah 25 Nov '11

25 Nov '11

Interface Pools and Passthrough mode: Current Method: The passthrough mode uses a macvtap “direct” connection to connect each guest to the network. The physical interface to be used is picked from among those listed in <interface> sub elements of the <forward> element. The current specification for <forward> extends to allow 0 or more <interface> sub-elements: Example: <forward mode='passthrough' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth12'/> <interface dev='eth18'/> <interface dev='eth20'/> </forward> However with an ethernet card with 64 VF's or more, the above method gets tedious on the system. On the other hand, just parameterizing a string (eth%d) is inadequate, eg, when there are multiple non-contiguous ranges. Proposed Method: The 5 patches provided along with this introductory e-mail i) Introduce a structure to store the state of all the virtual functions attached to each physical function ii) Find a free virtual function given the physical function. The forward specification will hence only mention the physical function as the interface sub element: Example: <forward mode='passthrough' dev='eth2'/> <interface dev='eth2'/> </forward> --- src/util/pci.c | 35 ----------------------------------- src/util/pci.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index cd82b43..857078d 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -45,45 +45,10 @@ # define MODPROBE "modprobe" #endif -#define PCI_SYSFS "/sys/bus/pci/" -#define PCI_ID_LEN 10 /* "XXXX XXXX" */ -#define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ - #define SRIOV_FOUND 0 #define SRIOV_NOT_FOUND 1 #define SRIOV_ERROR -1 -struct _pciDevice { - unsigned domain; - unsigned bus; - unsigned slot; - unsigned function; - - char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ - char id[PCI_ID_LEN]; /* product vendor */ - char *path; - const char *used_by; /* The domain which uses the device */ - int fd; - - unsigned initted; - unsigned pcie_cap_pos; - unsigned pci_pm_cap_pos; - unsigned has_flr : 1; - unsigned has_pm_reset : 1; - unsigned managed : 1; - - /* used by reattach function */ - unsigned unbind_from_stub : 1; - unsigned remove_slot : 1; - unsigned reprobe : 1; -}; - -struct _pciDeviceList { - unsigned count; - pciDevice **devs; -}; - - /* For virReportOOMError() and virReportSystemError() */ #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/pci.h b/src/util/pci.h index 76e37e3..8e47fc2 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -24,9 +24,43 @@ # include "internal.h" +#define PCI_SYSFS "/sys/bus/pci/" +#define PCI_ID_LEN 10 /* "XXXX XXXX" */ +#define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ + typedef struct _pciDevice pciDevice; typedef struct _pciDeviceList pciDeviceList; +struct _pciDevice { + unsigned domain; + unsigned bus; + unsigned slot; + unsigned function; + + char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ + char id[PCI_ID_LEN]; /* product vendor */ + char *path; + const char *used_by; /* The domain which uses the device */ + int fd; + + unsigned initted; + unsigned pcie_cap_pos; + unsigned pci_pm_cap_pos; + unsigned has_flr : 1; + unsigned has_pm_reset : 1; + unsigned managed : 1; + + /* used by reattach function */ + unsigned unbind_from_stub : 1; + unsigned remove_slot : 1; + unsigned reprobe : 1; +}; + +struct _pciDeviceList { + unsigned count; + pciDevice **devs; +}; + struct pci_config_address { unsigned int domain; unsigned int bus; -- 1.7.4.4

1 0

[libvirt] [PATCH] util: fix thinko in runIO
by Paolo Bonzini 25 Nov '11

25 Nov '11

When aligning you need to clear the bits in the mask and leave the others aside. Likely this code has never run, and will never run. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/util/iohelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 9e7bbde..93154f8 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -98,7 +98,7 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) goto cleanup; } base = buf; - buf = (char *) (((intptr_t) base + alignMask) & alignMask); + buf = (char *) (((intptr_t) base + alignMask) & ~alignMask); #endif switch (oflags & O_ACCMODE) { -- 1.7.7.1

3 4

[libvirt] [PATCH] storage: Skip socket and fifo on pool-start
by Michal Privoznik 25 Nov '11

25 Nov '11

If pool directory contains special files like FIFO or sockets we want to skip those on pool-start or pool-refresh otherwise open() will get an error. --- src/storage/storage_backend.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 93c98d6..d30829d 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1013,9 +1013,24 @@ virStorageBackendVolOpenCheckMode(const char *path, unsigned int flags) struct stat sb; char *base = last_component(path); + if (lstat(path, &sb) < 0) { + virReportSystemError(errno, + _("cannot stat file '%s'"), + path); + return -1; + } + + if (S_ISFIFO(sb.st_mode)) { + VIR_WARN("ignoring FIFO '%s'", path); + return -2; + } else if (S_ISSOCK(sb.st_mode)) { + VIR_WARN("ignoring socket '%s'", path); + return -2; + } + if ((fd = open(path, O_RDONLY|O_NONBLOCK|O_NOCTTY)) < 0) { if ((errno == ENOENT || errno == ELOOP) && - lstat(path, &sb) == 0) { + S_ISLNK(sb.st_mode)) { VIR_WARN("ignoring dangling symlink '%s'", path); return -2; } @@ -1026,14 +1041,6 @@ virStorageBackendVolOpenCheckMode(const char *path, unsigned int flags) return -1; } - if (fstat(fd, &sb) < 0) { - virReportSystemError(errno, - _("cannot stat file '%s'"), - path); - VIR_FORCE_CLOSE(fd); - return -1; - } - if (S_ISREG(sb.st_mode)) mode = VIR_STORAGE_VOL_OPEN_REG; else if (S_ISCHR(sb.st_mode)) -- 1.7.3.4

3 3

[libvirt] ACLs for libvirt
by Michal Privoznik 25 Nov '11

25 Nov '11

Hi all, I'd like to implement this new feature for libvirt. However, I think we should settle down on design first. My biggest concern is choosing the right level on on which ACLs will be implemented. Should be interested only in (user, API), or with more granularity (user, API, API's parameters)? Or should we take the RBAC path? How should we even identify and authorize users? My initial though is to create framework which can be used then to implement ACLs on any level we want. What's our opinion? Michal

4 8

[libvirt] [PATCH] conf: Don't drop console definition on domain restart
by Michal Privoznik 25 Nov '11

25 Nov '11

One of my latest patches 2e37bf42d28d8bb5d045b206587c64643c64d02a copy serial console definition. On domain shutdown we save this info into state XML. However, later on the daemon start we simply drop this info and since we are not re-reading qemu log, vm->def->consoles[0] does not get populated with copy. Therefore we need to avoid dropping console definition if it is just alias for serial console. --- src/conf/domain_conf.c | 76 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 69 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d365cee..f04e477 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1042,6 +1042,57 @@ void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def) VIR_FREE(def); } +/* virDomainChrSourceDefIsEqual: + * @src: Source + * @tgt: Target + * + * Compares source and target if they contain + * the same information. + */ +static bool +virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, + const virDomainChrSourceDef *tgt) +{ + if (tgt->type != src->type) + return false; + + switch (src->type) { + case VIR_DOMAIN_CHR_TYPE_PTY: + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_PIPE: + return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); + break; + case VIR_DOMAIN_CHR_TYPE_UDP: + return STREQ_NULLABLE(src->data.udp.bindHost, tgt->data.udp.bindHost) && + STREQ_NULLABLE(src->data.udp.bindService, tgt->data.udp.bindService) && + STREQ_NULLABLE(src->data.udp.connectHost, tgt->data.udp.connectHost) && + STREQ_NULLABLE(src->data.udp.connectService, tgt->data.udp.connectService); + break; + case VIR_DOMAIN_CHR_TYPE_TCP: + return src->data.tcp.listen == tgt->data.tcp.listen && + src->data.tcp.protocol == tgt->data.tcp.protocol && + STREQ_NULLABLE(src->data.tcp.host, tgt->data.tcp.host) && + STREQ_NULLABLE(src->data.tcp.service, tgt->data.tcp.service); + break; + case VIR_DOMAIN_CHR_TYPE_UNIX: + return src->data.nix.listen == tgt->data.nix.listen && + STREQ_NULLABLE(src->data.nix.path, tgt->data.nix.path); + break; + + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_STDIO: + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + /* nada */ + return true; + } + + /* This should happen only on new, + * yet unhandled type */ + + return false; +} + void virDomainChrDefFree(virDomainChrDefPtr def) { if (!def) @@ -7308,6 +7359,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, goto no_memory; for (i = 0 ; i < n ; i++) { + bool create_stub = true; virDomainChrDefPtr chr = virDomainChrDefParseXML(caps, def, nodes[i], @@ -7325,7 +7377,9 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, * So if we see that this console device should * be a serial device, then we move the config * over to def->serials[0] (or discard it if - * that already exists + * that already exists). However, given console + * can already be filled with aliased data of + * def->serials[0]. Keep it then. * * We then fill def->consoles[0] with a stub * just so we get sequencing correct for consoles @@ -7341,7 +7395,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, /* Either discard or move this chr to the serial config */ if (def->nserials != 0) { - virDomainChrDefFree(chr); + if (virDomainChrSourceDefIsEqual(&def->serials[0]->source, + &chr->source)) { + /* Alias to def->serial[0]. Skip it */ + create_stub = false; + } else { + virDomainChrDefFree(chr); + } } else { if (VIR_ALLOC_N(def->serials, 1) < 0) { virDomainChrDefFree(chr); @@ -7353,11 +7413,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, chr->target.port = 0; } - /* And create a stub placeholder */ - if (VIR_ALLOC(chr) < 0) - goto no_memory; - chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; - chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; + if (create_stub) { + /* And create a stub placeholder */ + if (VIR_ALLOC(chr) < 0) + goto no_memory; + chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; + chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; + } } chr->target.port = i; -- 1.7.3.4

2 2

[libvirt] [PATCH] examples: Use virConnectOpenAuth in events-c
by Jiri Denemark 24 Nov '11

24 Nov '11

--- examples/domain-events/events-c/event-test.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 7c99222..cb1b568 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -353,7 +353,9 @@ int main(int argc, char **argv) virEventRegisterDefaultImpl(); virConnectPtr dconn = NULL; - dconn = virConnectOpenReadOnly (argv[1] ? argv[1] : NULL); + dconn = virConnectOpenAuth(argc > 1 ? argv[1] : NULL, + virConnectAuthPtrDefault, + VIR_CONNECT_RO); if (!dconn) { printf("error opening\n"); return -1; -- 1.7.8.rc3

2 2

[libvirt] [PATCH] build: Properly generate and check virkeepaliveprotocol-structs
by Jiri Denemark 24 Nov '11

24 Nov '11

This fixes make dist broken by recent keepalive series --- src/Makefile.am | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e8f20de..33a32a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -247,14 +247,15 @@ EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \ # The alternation of the following regexps matches both cases. r1 = /\* \d+ \*/ r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/ +struct_prefix = (remote_|qemu_|virNet|keepalive_) PDWTAGS = \ $(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then \ pdwtags --verbose $(<:.lo=.$(OBJEXT)) \ | perl -0777 -n \ -e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \ - -e ' if ($$p =~ /^(struct|enum) (remote_|qemu_|virNet)/ ||' \ - -e ' $$p =~ /^enum {/) {' \ + -e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/ ||' \ + -e ' $$p =~ /^enum {/) {' \ -e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \ -e ' $$p =~ s!\s+\n!\n!sg;' \ -e ' $$p =~ s!\s+$$!!;' \ @@ -267,7 +268,7 @@ PDWTAGS = \ -e ' print "/* -*- c -*- */\n";' \ -e '}' \ -e 'END {' \ - -e ' if ($$n < 3) {' \ + -e ' if ($$n < 1) {' \ -e ' warn "WARNING: your pdwtags program is too old\n";' \ -e ' warn "WARNING: skipping the $@ test\n";' \ -e ' warn "WARNING: install dwarves-1.3 or newer\n";' \ @@ -295,6 +296,7 @@ $(srcdir)/%_protocol-structs: libvirt_driver_remote_la-%_protocol.lo $(srcdir)/virnetprotocol-structs: libvirt_net_rpc_la-virnetprotocol.lo $(PDWTAGS) $(srcdir)/virkeepaliveprotocol-structs: libvirt_net_rpc_la-virkeepaliveprotocol.lo + $(PDWTAGS) else !WITH_REMOTE # These generated files must live in git, because they cannot be re-generated # when configured --without-remote. -- 1.7.8.rc3

4 5

[libvirt] [PATCH] Fix version numbers for isAlive and setKeepAlive driver APIs
by Jiri Denemark 24 Nov '11

24 Nov '11

--- Pushed as trivial. src/esx/esx_driver.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_driver.c | 4 ++-- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 0b39ef1..f8b3c7a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -5013,7 +5013,7 @@ static virDriver esxDriver = { .domainSnapshotCurrent = esxDomainSnapshotCurrent, /* 0.8.0 */ .domainRevertToSnapshot = esxDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ - .isAlive = esxIsAlive, /* 0.9.7 */ + .isAlive = esxIsAlive, /* 0.9.8 */ }; diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 7665a76..27c8747 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1293,7 +1293,7 @@ static virDriver hypervDriver = { .domainManagedSave = hypervDomainManagedSave, /* 0.9.5 */ .domainHasManagedSaveImage = hypervDomainHasManagedSaveImage, /* 0.9.5 */ .domainManagedSaveRemove = hypervDomainManagedSaveRemove, /* 0.9.5 */ - .isAlive = hypervIsAlive, /* 0.9.7 */ + .isAlive = hypervIsAlive, /* 0.9.8 */ }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f21afe1..7cc32ad 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3957,7 +3957,7 @@ static virDriver libxlDriver = { .domainIsUpdated = libxlDomainIsUpdated, /* 0.9.0 */ .domainEventRegisterAny = libxlDomainEventRegisterAny, /* 0.9.0 */ .domainEventDeregisterAny = libxlDomainEventDeregisterAny, /* 0.9.0 */ - .isAlive = libxlIsAlive, /* 0.9.7 */ + .isAlive = libxlIsAlive, /* 0.9.8 */ }; static virStateDriver libxlStateDriver = { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 30305d8..a219539 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3279,7 +3279,7 @@ static virDriver lxcDriver = { .domainEventRegisterAny = lxcDomainEventRegisterAny, /* 0.8.0 */ .domainEventDeregisterAny = lxcDomainEventDeregisterAny, /* 0.8.0 */ .domainOpenConsole = lxcDomainOpenConsole, /* 0.8.6 */ - .isAlive = lxcIsAlive, /* 0.9.7 */ + .isAlive = lxcIsAlive, /* 0.9.8 */ }; static virStateDriver lxcStateDriver = { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 7872c0b..03bf21a 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1718,7 +1718,7 @@ static virDriver openvzDriver = { .domainIsActive = openvzDomainIsActive, /* 0.7.3 */ .domainIsPersistent = openvzDomainIsPersistent, /* 0.7.3 */ .domainIsUpdated = openvzDomainIsUpdated, /* 0.8.6 */ - .isAlive = openvzIsAlive, /* 0.9.7 */ + .isAlive = openvzIsAlive, /* 0.9.8 */ }; int openvzRegister(void) { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index cab2812..e08b1b6 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3812,7 +3812,7 @@ static virDriver phypDriver = { .isEncrypted = phypIsEncrypted, /* 0.7.3 */ .isSecure = phypIsSecure, /* 0.7.3 */ .domainIsUpdated = phypIsUpdated, /* 0.8.6 */ - .isAlive = phypIsAlive, /* 0.9.7 */ + .isAlive = phypIsAlive, /* 0.9.8 */ }; static virStorageDriver phypStorageDriver = { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 375cf89..6cfdd1d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10912,7 +10912,7 @@ static virDriver qemuDriver = { .domainGetBlockJobInfo = qemuDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = qemuDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = qemuDomainBlockPull, /* 0.9.4 */ - .isAlive = qemuIsAlive, /* 0.9.7 */ + .isAlive = qemuIsAlive, /* 0.9.8 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 915b02f..cc8f580 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4616,8 +4616,8 @@ static virDriver remote_driver = { .domainGetBlockJobInfo = remoteDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = remoteDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = remoteDomainBlockPull, /* 0.9.4 */ - .setKeepAlive = remoteSetKeepAlive, /* 0.9.7 */ - .isAlive = remoteIsAlive, /* 0.9.7 */ + .setKeepAlive = remoteSetKeepAlive, /* 0.9.8 */ + .isAlive = remoteIsAlive, /* 0.9.8 */ }; static virNetworkDriver network_driver = { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 180f365..ce94a17 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5629,7 +5629,7 @@ static virDriver testDriver = { .domainIsUpdated = testDomainIsUpdated, /* 0.8.6 */ .domainEventRegisterAny = testDomainEventRegisterAny, /* 0.8.0 */ .domainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ - .isAlive = testIsAlive, /* 0.9.7 */ + .isAlive = testIsAlive, /* 0.9.8 */ }; static virNetworkDriver testNetworkDriver = { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index aedf650..30c2086 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2603,7 +2603,7 @@ static virDriver umlDriver = { .domainEventRegisterAny = umlDomainEventRegisterAny, /* 0.9.4 */ .domainEventDeregisterAny = umlDomainEventDeregisterAny, /* 0.9.4 */ .domainOpenConsole = umlDomainOpenConsole, /* 0.8.6 */ - .isAlive = umlIsAlive, /* 0.9.7 */ + .isAlive = umlIsAlive, /* 0.9.8 */ }; static int diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 58c8af6..9b74a7b 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -9199,7 +9199,7 @@ virDriver NAME(Driver) = { .domainSnapshotCurrent = vboxDomainSnapshotCurrent, /* 0.8.0 */ .domainRevertToSnapshot = vboxDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = vboxDomainSnapshotDelete, /* 0.8.0 */ - .isAlive = vboxIsAlive, /* 0.9.7 */ + .isAlive = vboxIsAlive, /* 0.9.8 */ }; virNetworkDriver NAME(NetworkDriver) = { diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 987a7a8..a9873ba 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -996,7 +996,7 @@ static virDriver vmwareDriver = { .domainUndefineFlags = vmwareDomainUndefineFlags, /* 0.9.4 */ .domainIsActive = vmwareDomainIsActive, /* 0.8.7 */ .domainIsPersistent = vmwareDomainIsPersistent, /* 0.8.7 */ - .isAlive = vmwareIsAlive, /* 0.9.7 */ + .isAlive = vmwareIsAlive, /* 0.9.8 */ }; int diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 6b54a65..c0d4505 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2256,7 +2256,7 @@ static virDriver xenUnifiedDriver = { .domainEventRegisterAny = xenUnifiedDomainEventRegisterAny, /* 0.8.0 */ .domainEventDeregisterAny = xenUnifiedDomainEventDeregisterAny, /* 0.8.0 */ .domainOpenConsole = xenUnifiedDomainOpenConsole, /* 0.8.6 */ - .isAlive = xenUnifiedIsAlive, /* 0.9.7 */ + .isAlive = xenUnifiedIsAlive, /* 0.9.8 */ }; /** diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 8017894..78137d4 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1956,7 +1956,7 @@ static virDriver xenapiDriver = { .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, /* 0.8.0 */ .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */ .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */ - .isAlive = xenapiIsAlive, /* 0.9.7 */ + .isAlive = xenapiIsAlive, /* 0.9.8 */ }; /** -- 1.7.8.rc3

1 0

[libvirt] 'savevm/loadvm' monitor command sequence losing mouse state across a VM restore
by Vincent Passaro 24 Nov '11

24 Nov '11

All eblake on #virt requested that I ask the question here before posting on bugzilla, so I wanted to check if anyone has seen this issue. I create a vm snapshot (with F16) using virsh snapshot-create I then restore the vm with virsh snapshot-restore After the restore succeeds I loose the ability to interact with the vm via mouse. Keyboard remains functioning, I can send commands to it via the Spice Console (CTRL-DEL), etc. I have tired killing X and restarting the machine with no success. To restore keyboard functionality I have had to restart libvirtd. Thoughts? R/ Vince

2 1

[libvirt] [PATCH] redefine pool after pool creation failure
by Wen Ruo Lv 24 Nov '11

24 Nov '11

Redefine pool after pool creation failure,give out err msg for non-exsisted vg when starting pool. ref: http://www.redhat.com/archives/libvir-list/2011-November/msg01152.html http://www.redhat.com/archives/libvir-list/2011-November/msg01152.html src/storage/storage_backend_logical.c:just give out err msg for non-exsisted vg,not combine pool-build in pool-create ,since undo build for kinds of pool(iscsi,multipath) when err occours cause a lot of trouble. src/storage/storage_driver.c:add redefinition of pool,pool may change in pool-start,redefine it after free the pool Signed-off-by: Wen Ruo Lv <lvroyce(a)linux.vnet.ibm.com> --- src/storage/storage_backend_logical.c | 10 ++++++++++ src/storage/storage_driver.c | 29 +++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 3c3e736..994c792 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -50,6 +50,16 @@ virStorageBackendLogicalSetActive(virStoragePoolObjPtr pool, { const char *cmdargv[4]; + cmdargv[0] = VGS; + cmdargv[1] = pool->def->source.name; + cmdargv[2] = NULL; + + if (virRun(cmdargv, NULL) < 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("vg '%s' does not exsist,try pool-build"), pool->def->source.name); + return -1; + } + cmdargv[0] = VGCHANGE; cmdargv[1] = on ? "-ay" : "-an"; cmdargv[2] = pool->def->source.name; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 8c2d6e1..a5cbafe 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -526,6 +526,7 @@ storagePoolCreate(virConnectPtr conn, virStoragePoolObjPtr pool = NULL; virStoragePoolPtr ret = NULL; virStorageBackendPtr backend; + int duppool; virCheckFlags(0, NULL); @@ -533,7 +534,7 @@ storagePoolCreate(virConnectPtr conn, if (!(def = virStoragePoolDefParseString(xml))) goto cleanup; - if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1) < 0) + if ((duppool = virStoragePoolObjIsDuplicate(&driver->pools, def, 1)) < 0) goto cleanup; if (virStoragePoolSourceFindDuplicate(&driver->pools, def) < 0) @@ -544,26 +545,46 @@ storagePoolCreate(virConnectPtr conn, if (!(pool = virStoragePoolObjAssignDef(&driver->pools, def))) goto cleanup; - def = NULL; if (backend->startPool && backend->startPool(conn, pool) < 0) { virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; + + if (duppool) { + if (!(def = virStoragePoolDefParseString(xml))) + goto cleanup; + + pool = virStoragePoolObjAssignDef(&driver->pools, def); + } + else + pool = NULL; + + def = NULL; goto cleanup; } if (backend->refreshPool(conn, pool) < 0) { if (backend->stopPool) backend->stopPool(conn, pool); + virStoragePoolObjRemove(&driver->pools, pool); - pool = NULL; + + if (duppool) { + if (!(def = virStoragePoolDefParseString(xml))) + goto cleanup; + pool = virStoragePoolObjAssignDef(&driver->pools, def); + } + else + pool = NULL; + + def = NULL; goto cleanup; } VIR_INFO("Creating storage pool '%s'", pool->def->name); pool->active = 1; ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); + def = NULL; cleanup: virStoragePoolDefFree(def); -- 1.7.4.1

3 2

[libvirt] [PATCH v4 00/13] Implement keepalive protocol for libvirt RPC
by Jiri Denemark 24 Nov '11

24 Nov '11

This patchset can also be found at https://gitorious.org/~jirka/libvirt/jirka-staging/commits/keepalive This allows us to detect broken connections between server and client without waiting for TCP timeout and dead deamon/client. By default a connection is considered broken after about 30 seconds of no messages received from remote party. After that period, the connection is automatically closed. The main reason for implementing this is that peer-to-peer migration can now be canceled when a connection between source and target breaks. Although this will really work only after qemu fixes migrate_cancel command so that it doesn't block when outgoing TCP buffers are full. Version 4 addresses comments from Daniel and Matthias. Although most of the patches were already (conditionally) acked, I'm sending all of them to provide a complete picture of the change. Patches that were already acked are explicitly marked so in the Notes section so anyone can just skip them if they like. Jiri Denemark (13): Define keepalive protocol Implement common keepalive handling Introduce virConnectSetKeepAlive virsh: Always run event loop Implement keepalive protocol in libvirt daemon Add support for non-blocking calls in client RPC Add support for async close of client RPC socket Implement keepalive protocol in remote driver Introduce virConnectIsAlive API Implement virConnectIsAlive in all drivers Add keepalive support into domain-events examples qemu: Add support for keepalive messages during p2p migration qemu: Cancel p2p migration when connection breaks .gitignore | 1 + daemon/libvirtd.aug | 5 + daemon/libvirtd.c | 15 + daemon/libvirtd.conf | 25 ++ daemon/libvirtd.h | 1 + daemon/remote.c | 48 ++- examples/domain-events/events-c/event-test.c | 9 +- examples/domain-events/events-python/event-test.py | 4 +- include/libvirt/libvirt.h.in | 5 + po/POTFILES.in | 1 + src/Makefile.am | 20 +- src/driver.h | 8 + src/esx/esx_driver.c | 18 + src/hyperv/hyperv_driver.c | 18 + src/libvirt.c | 93 ++++ src/libvirt_internal.h | 10 +- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/libxl/libxl_driver.c | 8 + src/lxc/lxc_driver.c | 7 + src/openvz/openvz_driver.c | 7 + src/phyp/phyp_driver.c | 18 + src/probes.d | 12 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 22 + src/qemu/qemu_conf.c | 11 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_migration.c | 43 ++- src/qemu/test_libvirtd_qemu.aug | 6 + src/remote/remote_driver.c | 70 +++ src/remote/remote_protocol.x | 2 +- src/rpc/virkeepalive.c | 448 ++++++++++++++++++++ src/rpc/virkeepalive.h | 56 +++ src/rpc/virkeepaliveprotocol.x | 7 + src/rpc/virnetclient.c | 428 ++++++++++++++++--- src/rpc/virnetclient.h | 6 + src/rpc/virnetserver.c | 22 + src/rpc/virnetserver.h | 5 + src/rpc/virnetserverclient.c | 143 ++++++- src/rpc/virnetserverclient.h | 7 + src/test/test_driver.c | 6 + src/uml/uml_driver.c | 7 + src/util/event.c | 6 +- src/vbox/vbox_tmpl.c | 6 + src/vmware/vmware_driver.c | 7 + src/xen/xen_driver.c | 8 + src/xenapi/xenapi_driver.c | 12 + tools/console.c | 17 +- tools/virsh.c | 31 ++ 50 files changed, 1621 insertions(+), 103 deletions(-) create mode 100644 src/rpc/virkeepalive.c create mode 100644 src/rpc/virkeepalive.h create mode 100644 src/rpc/virkeepaliveprotocol.x -- 1.7.7.1

2 30

[libvirt] [PATCH v3 0/2] API to invoke S3/S4 on a host and also resume from within libvirt
by Srivatsa S. Bhat 24 Nov '11

24 Nov '11

(This patch is positioned to go in after the patch that exports the host power management capabilities as XML, posted in [4]) This patch adds a new API to put a host to a suspended state (either Suspend-to-RAM or Suspend-to-Disk) and setup a timed resume to get the host back online, from within libvirt. This uses the RTC wakeup mechanism to set up a timer alarm before suspending the host, so that in-band resume is facilitated by the firing of the RTC alarm, which wakes up the host. The decision to use the RTC Wakeup mechanism to resume the host from sleep was taken in [1]. An initial API was discussed in [2]. Some design ideas for the asynchronous mechanism implementation was discussed in [3]. v3: * Rebased to libvirt 0.9.7 * Added a check to see if alarmTime (suspend duration) is within an acceptable range. v2: * Added an init function which finds out if S3/S4 is supported by the host, upon the first request to suspend/hibernate. * Added synchronization/locking to ensure that only one suspend operation is active at a time. v1: http://www.redhat.com/archives/libvir-list/2011-September/msg00830.html v2: http://comments.gmane.org/gmane.comp.emulators.libvirt/46729 References: [1]. http://www.redhat.com/archives/libvir-list/2011-August/msg00327.html [2]. http://www.redhat.com/archives/libvir-list/2011-August/msg00248.html [3]. http://www.redhat.com/archives/libvir-list/2011-September/msg00438.html [4]. http://www.redhat.com/archives/libvir-list/2011-November/msg00378.html Srivatsa S. Bhat (2): Implement the asynchronous suspend and RTC wakeup Make the API public include/libvirt/libvirt.h.in | 9 ++ src/driver.h | 5 + src/libvirt.c | 48 +++++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 1 src/nodeinfo.c | 220 ++++++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 14 +++ src/qemu/qemu_driver.c | 6 + src/remote/remote_driver.c | 1 src/remote/remote_protocol.x | 12 ++ src/util/threads-pthread.c | 17 +++ src/util/threads.h | 1 12 files changed, 339 insertions(+), 2 deletions(-)

4 16

[libvirt] Release schedule for libvirt 0.9.8
by Daniel Veillard 24 Nov '11

24 Nov '11

To try to keep the monthly release schedule, I would suggest the following: - enter freeze in a week from now i.e. Dec 1st - try to push the release on Dec 6 or 7 Which means that we have one week to push the new APIs under review (S3/S4 support, various block io changes, ...), maybe with a bit of luck we can get the PPC KVM support in too. So let's focuse on reviewing, finalizing and pushing the existing patch sets :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

Re: [libvirt] Block I/O throttle support to libvirt
by Lynn 24 Nov '11

24 Nov '11

Reply to: https://www.redhat.com/archives/libvir-list/2011-November/msg01388.html Hi Eric, There are some problems with my mail lilei(a)linux.ibm.com, so I can not reply in time. I am sorry for that I didn't do the syntax check. :-[ Many thanks for your meticulous check! I will keep it in my mind. -- Lynn

1 0

[libvirt] [PATCH 6/8] Docs: Add description and validation for blkdeviotune
by Lei Li 23 Nov '11

23 Nov '11

Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 31 +++++++++++++++++++++++++++++++ docs/schemas/domaincommon.rng | 24 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index cbad196..733062d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -893,6 +893,14 @@ <driver name="tap" type="aio" cache="default"/> <source file='/var/lib/xen/images/fv0'/ startupPolicy='optional'> <target dev='hda' bus='ide'/> + <iotune> + <total_bytes_sec>n</total_bytes_sec> + <read_bytes_sec>n</read_bytes_sec> + <write_bytes_sec>n</write_bytes_sec> + <total_iops_sec>n</total_iops_sec> + <read_bytes_sec>n</read_bytes_sec> + <write_bytes_sec>n</write_bytes_sec> + </iotune> <boot order='2'/> <encryption type='...'> ... @@ -1010,6 +1018,29 @@ <span class="since">Since 0.0.3; <code>bus</code> attribute since 0.4.3; "usb" attribute value since after 0.4.4; "sata" attribute value since 0.9.7</span></dd> + <dt><code>iotune</code></dt> + <dd>The optional <code>iotune</code> element provides the ability + to set or get block I/O throttling for the device. Block I/O + throtting be implemented by qemu, is specified per-disk and can + vary across multiple disks.</dd> + <dt><code>total_bytes_sec</code></dt> + <dd>The optinal <code>total_bytes_sec</code> element is the total throughput + limit in bytes per second.</dd> + <dt><code>read_bytes_sec</code></dt> + <dd>The optinal <code>read_bytes_sec</code> element is the read throughput + limit in bytes per second.</dd> + <dt><code>write_bytes_sec</code</dt> + <dd>The optinal <code>write_bytes_sec</code> element is the write throughput + limit in bytes per second.</dd> + <dt><code>total_iops_sec</code></dt> + <dd>The optional <code>total_iops_sec</code> element is the total I/O operations + per second.</dd> + <dt><code>read_iops_sec</code></dt> + <dd>The optional <code>read_iops_sec</code> element is the read I/O operations + per second.</dd> + <dt><code>write_iops_sec</code></dt> + <dd>The optional <code>write_iops_sec</code> element is the write I/O operations + per second.</dd> <dt><code>driver</code></dt> <dd> The optional driver element allows specifying further details diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b6f858e..c6873a0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -698,6 +698,30 @@ <optional> <ref name="snapshot"/> </optional> + <optional> + <element name="iotune"> + <choice> + <element name="total_bytes_sec"> + <ref name="unsignedLongLong"> + </element> + <element name="read_bytes_sec"> + <ref name="unsignedLongLong"> + </element> + <element name="write_bytes_sec"> + <ref name="unsignedLongLong"> + </element> + <element name="total_iops_sec"> + <ref name="unsignedLongLong"> + </element> + <element name="read_iops_sec"> + <ref name="unsignedLongLong"> + </element> + <element name="write_iopw_sec"> + <ref name="unsignedLongLong"> + </emement> + </choice> + </element> + </optional> <choice> <group> <attribute name="type"> -- 1.7.1

2 2

[libvirt] [PATCH] nwfilter: Fix return value of virNWFilterHashTablePut
by Michal Privoznik 23 Nov '11

23 Nov '11

In libvirt it is common to return value <0 on error not vice versa. --- src/conf/nwfilter_params.c | 16 ++++++++-------- src/nwfilter/nwfilter_gentech_driver.c | 4 ++-- src/nwfilter/nwfilter_learnipaddr.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 12c6524..ba41972 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -490,7 +490,7 @@ hashDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) * @val: The value associated with the key * @freeName: Whether the name must be freed on table destruction * - * Returns 0 on success, 1 on failure. + * Returns 0 on success, -1 on failure. * * Put an entry into the hashmap replacing and freeing an existing entry * if one existed. @@ -505,11 +505,11 @@ virNWFilterHashTablePut(virNWFilterHashTablePtr table, if (copyName) { name = strdup(name); if (!name) - return 1; + return -1; if (VIR_REALLOC_N(table->names, table->nNames + 1) < 0) { VIR_FREE(name); - return 1; + return -1; } table->names[table->nNames++] = (char *)name; } @@ -519,11 +519,11 @@ virNWFilterHashTablePut(virNWFilterHashTablePtr table, VIR_FREE(name); table->nNames--; } - return 1; + return -1; } } else { if (virHashUpdateEntry(table->hashTable, name, val) != 0) { - return 1; + return -1; } } return 0; @@ -614,7 +614,7 @@ addToTable(void *payload, const void *name, void *data) return; } - if (virNWFilterHashTablePut(atts->target, (const char *)name, val, 1) != 0) { + if (virNWFilterHashTablePut(atts->target, (const char *)name, val, 1) < 0) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Could not put variable '%s' into hashmap"), (const char *)name); @@ -640,7 +640,7 @@ virNWFilterHashTablePutAll(virNWFilterHashTablePtr src, return 0; err_exit: - return 1; + return -1; } @@ -700,7 +700,7 @@ virNWFilterParseParamAttributes(xmlNodePtr cur) value = virNWFilterParseVarValue(val); if (!value) goto skip_entry; - if (virNWFilterHashTablePut(table, nam, value, 1)) + if (virNWFilterHashTablePut(table, nam, value, 1) < 0) goto err_exit; } value = NULL; diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 84a959b..946ed14 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -343,10 +343,10 @@ virNWFilterCreateVarsFrom(virNWFilterHashTablePtr vars1, return NULL; } - if (virNWFilterHashTablePutAll(vars1, res)) + if (virNWFilterHashTablePutAll(vars1, res) < 0) goto err_exit; - if (virNWFilterHashTablePutAll(vars2, res)) + if (virNWFilterHashTablePutAll(vars2, res) < 0) goto err_exit; return res; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 2e373a6..425e8a2 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -800,7 +800,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, goto err_free_req; } - if (virNWFilterHashTablePutAll(filterparams, ht)) + if (virNWFilterHashTablePutAll(filterparams, ht) < 0) goto err_free_ht; req->filtername = strdup(filtername); -- 1.7.3.4

3 4

[libvirt] [PATCH 8/8] Add tests for blkdeviotune
by Lei Li 23 Nov '11

23 Nov '11

Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- .../qemuxml2argv-blkdeviotune.args | 4 ++ .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 36 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 4 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args new file mode 100644 index 0000000..6f34698 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor, \ +server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml new file mode 100644 index 0000000..1fceef8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </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' snapshot='internal'> + <driver name='qemu' type='qcow2' cache='none'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <iotune> + <total_bytes_sec>5000</total_bytes_sec> + <total_iops_sec>6000</total_iops_sec> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <disk type='block' device='cdrom' snapshot='no'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d9a6e8d..1ebb950 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -585,6 +585,7 @@ mymain(void) DO_TEST("blkiotune", false, QEMU_CAPS_NAME); DO_TEST("cputune", false, QEMU_CAPS_NAME); DO_TEST("numatune-memory", false, NONE); + DO_TEST("blkdeviotune", false, QEMU_CAPS_NAME); DO_TEST("multifunction-pci-device", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3f37520..2e6b5c7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -191,6 +191,7 @@ mymain(void) DO_TEST("event_idx"); DO_TEST("usb-redir"); + DO_TEST("blkdeviotune"); /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); -- 1.7.1

2 1

[libvirt] [PATCH 7/8] Support virDomain{Set, Get}BlockIoTune in the python API
by Lei Li 23 Nov '11

23 Nov '11

Python support for both setting and getting block I/O throttle. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- python/generator.py | 2 + python/libvirt-override-api.xml | 16 ++++ python/libvirt-override.c | 178 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 0 deletions(-) diff --git a/python/generator.py b/python/generator.py index 71afdb7..88c52b9 100755 --- a/python/generator.py +++ b/python/generator.py @@ -414,6 +414,8 @@ skip_impl = ( 'virDomainGetBlockJobInfo', 'virDomainMigrateGetMaxSpeed', 'virDomainBlockStatsFlags', + 'virDomainSetBlockIoTune', + 'virDomainGetBlockIoTune', ) qemu_skip_impl = ( diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ef02f34..a05da3c 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -375,5 +375,21 @@ <arg name='flags' type='unsigned int' info='flags, currently unused, pass 0.'/> <return type='unsigned long' info='current max migration speed, or None in case of error'/> </function> + <function name='virDomainSetBlockIoTune' file='python'> + <info>Change the I/O throttle for a block device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='disk' type='const char *' info='disk name'/> + <arg name='params' type='virTypedParameterPtr' info='Pointer to blkio throttle params object'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='int' info='0 in case of success, -1 in case of failure'/> + </function> + <function name='virDomainGetBlockIoTune' file='python'> + <info>Get the I/O throttle a block device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='disk' type='const char *' info='disk name'/> + <arg name='params' type='virTypedParameterPtr' info='Pointer to blkio throttle params object'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='int' info='0 in case of success, -1 in case of failure'/> + </function> </symbols> </api> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 1759bae..be76d87 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -3195,6 +3195,182 @@ LIBVIRT_END_ALLOW_THREADS; return ret; } +static PyObject * +libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *pyinfo; + const char *disk; + unsigned int flags; + virTypedParameterPtr params; + int nparams = 0, i; + int c_ret; + + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainSetBlockIoTune", + &pyobj_domain, &disk, &pyinfo, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) + return VIR_PY_INT_FAIL; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_INT_FAIL; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + /* convert to a Python tuple of long objects */ + for (i = 0; i < nparams; i++) { + PyObject *key, *val; + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(pyinfo, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + params[i].value.i = (int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_UINT: + params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); + break; + + case VIR_TYPED_PARAM_LLONG: + params[i].value.l = (long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_ULLONG: + params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); + break; + + case VIR_TYPED_PARAM_DOUBLE: + params[i].value.d = (double)PyFloat_AsDouble(val); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + { + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1: 0; + Py_DECREF(hacktrue); + } + break; + + default: + free(params); + return VIR_PY_INT_FAIL; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainSetMemoryParameters(domain, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) { + free(params); + return VIR_PY_INT_FAIL; + } + + free(params); + return VIR_PY_INT_SUCCESS; +} + +static PyObject * +libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *pyreply; + const char *disk; + int nparams = 0, i; + unsigned int flags; + virTypedParameterPtr params; + int c_ret; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetBlockIoTune", + &pyobj_domain, &disk, &flags)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) + return VIR_PY_NONE; + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_NONE; + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_ret = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_ret < 0) { + free(params); + return VIR_PY_NONE; + } + + /* convert to a Python tuple of long objects */ + if ((pyreply = PyDict_New()) == NULL) { + free(params); + return VIR_PY_NONE; + } + for (i = 0 ; i < nparams ; i++) { + PyObject *key, *val; + + switch (params[i].type) { + case VIR_TYPED_PARAM_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_TYPED_PARAM_UINT: + val = PyInt_FromLong((long)params[i].value.ui); + break; + + case VIR_TYPED_PARAM_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_TYPED_PARAM_ULLONG: + val = PyLong_FromLongLong((unsigned long long)params[i].value.ul); + break; + + case VIR_TYPED_PARAM_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_TYPED_PARAM_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + default: + free(params); + Py_DECREF(pyreply); + return VIR_PY_NONE; + } + + key = libvirt_constcharPtrWrap(params[i].field); + PyDict_SetItem(pyreply, key, val); + } + free(params); + return(pyreply); +} + /******************************************* * Helper functions to avoid importing modules * for every callback @@ -4837,6 +5013,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, {(char *) "virDomainRevertToSnapshot", libvirt_virDomainRevertToSnapshot, METH_VARARGS, NULL}, {(char *) "virDomainGetBlockJobInfo", libvirt_virDomainGetBlockJobInfo, METH_VARARGS, NULL}, + {(char *) "virDomainSetBlockIoTune", libvirt_virDomainSetBlockIoTune, METH_VARARGS, NULL}, + {(char *) "virDomainGetBlockIoTune", libvirt_virDomainGetBlockIoTune, METH_VARARGS, NULL}, {(char *) "virDomainSendKey", libvirt_virDomainSendKey, METH_VARARGS, NULL}, {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} -- 1.7.1

2 1

[libvirt] [PATCH 5/8] Enable the blkdeviotune command in virsh
by Lei Li 23 Nov '11

23 Nov '11

Support virsh command blkdeviotune. Can set or query a block disk I/O throttle setting. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- tools/virsh.c | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 23 +++++ 2 files changed, 263 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 83dc3c7..9eec68e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6074,6 +6074,245 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) } /* + * "blkdeviotune" command + */ +static const vshCmdInfo info_blkdeviotune[] = { + {"help", N_("Set or query a block disk I/O throttle setting.")}, + {"desc", N_("Set or query a block disk I/O throttle setting.\n" \ + " To query the block disk I/O throttle setting use the following" \ + " command: \n\n" \ + " virsh # blkdeviotune <domain> <device>")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_blkdeviotune[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"total_bytes_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("total throughput limit in bytes per second")}, + {"read_bytes_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("read throughput limit in bytes per second")}, + {"write_bytes_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("write throughput limit in bytes per second")}, + {"total_iops_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("total I/O operations limit per second")}, + {"read_iops_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("read I/O operations limit per second")}, + {"write_iops_sec", VSH_OT_INT, VSH_OFLAG_NONE, N_("write I/O operations limit per second")}, + {"config", VSH_OT_BOOL, 0, N_("affect next boot")}, + {"live", VSH_OT_BOOL, 0, N_("affect running domain")}, + {"current", VSH_OT_BOOL, 0, N_("affect current domain")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + const char *name, *disk; + unsigned long long total_bytes_sec = 0, read_bytes_sec = 0, write_bytes_sec = 0; + unsigned long long total_iops_sec = 0, read_iops_sec = 0, write_iops_sec = 0; + int nparams = 0; + virTypedParameterPtr params = NULL, temp = NULL; + unsigned int flags = 0, i = 0; + int rv = 0; + int current = vshCommandOptBool(cmd, "current"); + int config = vshCommandOptBool(cmd, "config"); + int live = vshCommandOptBool(cmd, "live"); + + if (current) { + if (live || config) { + vshError(ctl, "%s", _("--current must be specified exclusively")); + return false; + } + flags = VIR_DOMAIN_AFFECT_CURRENT; + } else { + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } + + if (!vshConnectionUsability(ctl, ctl->conn)) + goto out; + + if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) + goto out; + + if (vshCommandOptString(cmd, "device", &disk) < 0) + goto out; + + if ((rv = vshCommandOptULongLong(cmd, "total_bytes_sec", &total_bytes_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + nparams++; + } + + if ((rv = vshCommandOptULongLong(cmd, "read_bytes_sec", &read_bytes_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + nparams++; + } + + if ((rv = vshCommandOptULongLong(cmd, "write_bytes_sec", &write_bytes_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + nparams++; + } + + if ((rv = vshCommandOptULongLong(cmd, "total_iops_sec", &total_iops_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + nparams++; + } + + if ((rv = vshCommandOptULongLong(cmd, "read_iops_sec", &read_iops_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + nparams++; + } + + if ((rv = vshCommandOptULongLong(cmd, "write_iops_sec", &write_iops_sec)) < 0) { + vshError(ctl, "%s", + _("Unable to parse integer parameter")); + goto out; + } else if (rv > 0) { + nparams++; + } + + if (nparams == 0) { + + if ((virDomainGetBlockIoTune(dom, disk, NULL, &nparams, flags)) != 0) { + vshError(ctl, "%s", + _("Unable to get number of block I/O throttle parameters")); + goto out; + } + + if (nparams == 0) { + virDomainFree(dom); + return true; + } + + params = vshCalloc(ctl, nparams, sizeof(*params)); + + if ((virDomainGetBlockIoTune(dom, disk, params, &nparams, flags)) != 0) { + vshError(ctl, "%s", + _("Unable to get block I/O throttle parameters")); + goto out; + } + + for (i = 0; i < nparams; i++) { + switch(params[i].type) { + case VIR_TYPED_PARAM_INT: + vshPrint(ctl, "%-15s: %d\n", params[i].field, + params[i].value.i); + break; + case VIR_TYPED_PARAM_UINT: + vshPrint(ctl, "%-15s: %u\n", params[i].field, + params[i].value.ui); + break; + case VIR_TYPED_PARAM_LLONG: + vshPrint(ctl, "%-15s: %lld\n", params[i].field, + params[i].value.l); + break; + case VIR_TYPED_PARAM_ULLONG: + vshPrint(ctl, "%-15s: %llu\n", params[i].field, + params[i].value.ul); + break; + case VIR_TYPED_PARAM_DOUBLE: + vshPrint(ctl, "%-15s: %f\n", params[i].field, + params[i].value.d); + break; + case VIR_TYPED_PARAM_BOOLEAN: + vshPrint(ctl, "%-15s: %d\n", params[i].field, + params[i].value.b); + break; + default: + vshPrint(ctl, "unimplemented block I/O throttle parameter type\n"); + } + } + + virDomainFree(dom); + return true; + } else { + /* Set the block I/O throttle, match by opt since parameters can be 0 */ + params = vshCalloc(ctl, nparams, sizeof(*params)); + i = 0; + + if ((i < nparams) && (vshCommandOptBool(cmd, "total_bytes_sec"))) { + temp = &params[i]; + temp->type = VIR_TYPED_PARAM_ULLONG; + strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, + sizeof(temp->field)); + temp->value.ul = total_bytes_sec; + i++; + } + + if ((i < nparams) && (vshCommandOptBool(cmd, "read_bytes_sec"))) { + temp = &params[i]; + temp->type = VIR_TYPED_PARAM_ULLONG; + strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, + sizeof(temp->field)); + temp->value.ul = read_bytes_sec; + i++; + } + + if ((i < nparams) && (vshCommandOptBool(cmd, "write_bytes_sec"))) { + temp = &params[i]; + temp->type = VIR_TYPED_PARAM_ULLONG; + strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, + sizeof(temp->field)); + temp->value.ul = write_bytes_sec; + i++; + } + + if ((i < nparams) && (vshCommandOptBool(cmd, "total_iops_sec"))) { + temp = &params[i]; + temp->type = VIR_TYPED_PARAM_ULLONG; + strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, + sizeof(temp->field)); + temp->value.ul = total_iops_sec; + i++; + } + + if ((i < nparams) && (vshCommandOptBool(cmd, "read_iops_sec"))) { + temp = &params[i]; + temp->type = VIR_TYPED_PARAM_ULLONG; + strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, + sizeof(temp->field)); + temp->value.ul = read_iops_sec; + i++; + } + + if ((i < nparams) && (vshCommandOptBool(cmd, "write_iops_sec"))) { + temp = &params[i]; + temp->type = VIR_TYPED_PARAM_ULLONG; + strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, + sizeof(temp->field)); + temp->value.ul = write_iops_sec; + } + + if ((virDomainSetBlockIoTune(dom, disk, params, nparams, flags)) != 0) { + vshError(ctl, "%s", + _("Unable to change block I/O throttle")); + goto out; + } else { + virDomainFree(dom); + return true; + } + } + +out: + virDomainFree(dom); + return false; +} + +/* * "net-create" command */ static const vshCmdInfo info_network_create[] = { @@ -14023,6 +14262,7 @@ static const vshCmdDef domManagementCmds[] = { {"blkiotune", cmdBlkiotune, opts_blkiotune, info_blkiotune, 0}, {"blockpull", cmdBlockPull, opts_block_pull, info_block_pull, 0}, {"blockjob", cmdBlockJob, opts_block_job, info_block_job, 0}, + {"blkdeviotune", cmdBlkdeviotune, opts_blkdeviotune, info_blkdeviotune, 0}, #ifndef WIN32 {"console", cmdConsole, opts_console, info_console, 0}, #endif diff --git a/tools/virsh.pod b/tools/virsh.pod index 775d302..85927d5 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -572,6 +572,29 @@ operation can be checked with B<blockjob>. I<path> specifies fully-qualified path of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. +=item B<blkdeviotune> I<domain> I<device> [[I<--total_bytes_sec> B<total_bytes_sec>] +| [[I<--read_bytes_sec> B<read_bytes_sec>] [I<--write_bytes_sec> B<write_bytes_sec>]] +[[I<--total_iops_sec> B<total_iops_sec>] | [[I<--read_iops_sec> B<read_iops_sec>] +[I<--write_iops_sec> B<write_iops_sec>]] [[I<--config>] [I<--live>] | [I<--current>]] + +Set or query the block disk io limits settting. +I<path> specifies block disk name. +I<--total_bytes_sec> specifies total throughput limit in bytes per second. +I<--read_bytes_sec> specifies read throughput limit in bytes per second. +I<--write_bytes_sec> specifies write throughput limit in bytes per second. +I<--total_iops_sec> specifies total I/O operations limit per second. +I<--read_iops_sec> specifies read I/O operations limit per second. +I<--write_iops_sec> specifies write I/O operations limit per second. + +If I<--live> is specified, affect a running guest. +If I<--config> is specified, affect the next boot of a persistent guest. +If I<--current> is specified, affect the current guest state. +Both I<--live> and I<--current> flags may be given, but I<--current> is +exclusive. If no flag is specified, behavior is different depending +on hypervisor. + +If no limit is specified, it will query current I/O limits setting. + =item B<blockjob> I<domain> I<path> [I<--abort>] [I<--info>] [I<bandwidth>] Manage active block operations. -- 1.7.1

2 1

[libvirt] [PATCH] qemu: Avoid dereference of NULL pointer
by Peter Krempa 23 Nov '11

23 Nov '11

If something fails while initializing qemu job object in qemuDomainObjPrivateAlloc(), memory to the private pointer is freed, but after that, the pointer is still dereferenced, which may result in a segfault. * qemuDomainObjPrivateAlloc() - Don't dereference NULL pointer. --- I added the label and jump with future expansions in mind, as I've found this bug while modifying said function. src/qemu/qemu_domain.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3e755d7..d33d1d9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -214,11 +214,15 @@ static void *qemuDomainObjPrivateAlloc(void) return NULL; if (qemuDomainObjInitJob(priv) < 0) - VIR_FREE(priv); + goto error; priv->migMaxBandwidth = QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX; return priv; + +error: + VIR_FREE(priv); + return NULL; } static void qemuDomainObjPrivateFree(void *data) -- 1.7.3.4

2 2

[libvirt] libvirt-gconfig patches
by Christophe Fergeau 23 Nov '11

23 Nov '11

Here is the 3rd version of my libvirt-gconfig patches, I did the renaming to put all the new classes it introduces in the GVirConfigDomain namespace. GVirConfigDomainSnapshot looks a bit out of place now though... Apart from this, I fixed the other issues that were reported, and rearranged a bit the patches introducing GVirConfigDomainInterfaceNetwork. I've also pushed the first 5 patches that were in v2 since they've already been ack'ed Christophe

2 54

[libvirt] [PATCH] qemu: fix a const-correctness issue
by Eric Blake 23 Nov '11

23 Nov '11

Generally, functions which return malloc'd strings should be typed as 'char *', not 'const char *', to make it obvious that the caller is responsible to free things. free(const char *) fails to compile, and although we have a cast embedded in VIR_FREE to work around poor code that frees const char *, it's better to not rely on that hack. * src/qemu/qemu_driver.c (qemuDiskPathToAlias): Change return type. (qemuDomainBlockJobImpl): Update callers. --- Pushing under the trivial rule. src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 98ce695..94fbe94 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10565,8 +10565,9 @@ cleanup: return ret; } -static const char * -qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) { +static char * +qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) +{ int i; char *ret = NULL; virDomainDiskDefPtr disk; @@ -10605,7 +10606,7 @@ qemuDomainBlockJobImpl(virDomainPtr dom, const char *path, virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; char uuidstr[VIR_UUID_STRING_BUFLEN]; - const char *device = NULL; + char *device = NULL; int ret = -1; qemuDriverLock(driver); -- 1.7.7.3

1 0

[libvirt] [PATCH 4/8] Support block I/O throtte in XML
by Lei Li 23 Nov '11

23 Nov '11

Enable block I/O throttle for per-disk in XML. Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 12 ++++++ src/qemu/qemu_command.c | 33 +++++++++++++++ src/util/xml.h | 2 + 4 files changed, 145 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 58f4d0f..a157b80 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2318,7 +2318,8 @@ static virDomainDiskDefPtr virDomainDiskDefParseXML(virCapsPtr caps, xmlNodePtr node, virBitmapPtr bootMap, - unsigned int flags) + unsigned int flags, + xmlXPathContextPtr ctxt) { virDomainDiskDefPtr def; xmlNodePtr cur, child; @@ -2517,6 +2518,62 @@ virDomainDiskDefParseXML(virCapsPtr caps, } child = child->next; } + } else if (xmlStrEqual(cur->name, BAD_CAST "iotune")) { + if (virXPathULongLong("string(./devices/disk/iotune/total_bytes_sec)", + ctxt, &def->blkdeviotune.total_bytes_sec) < 0) { + def->blkdeviotune.total_bytes_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/read_bytes_sec)", + ctxt, &def->blkdeviotune.read_bytes_sec) < 0) { + def->blkdeviotune.read_bytes_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/write_bytes_sec)", + ctxt, &def->blkdeviotune.write_bytes_sec) < 0) { + def->blkdeviotune.write_bytes_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/total_iops_sec)", + ctxt, &def->blkdeviotune.total_iops_sec) < 0) { + def->blkdeviotune.total_iops_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/read_iops_sec)", + ctxt, &def->blkdeviotune.read_iops_sec) < 0) { + def->blkdeviotune.read_iops_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if (virXPathULongLong("string(./devices/disk/iotune/write_iops_sec)", + ctxt, &def->blkdeviotune.write_iops_sec) < 0) { + def->blkdeviotune.write_iops_sec = 0; + } else { + def->blkdeviotune.mark = 1; + } + + if ((def->blkdeviotune.total_bytes_sec && def->blkdeviotune.read_bytes_sec) + || (def->blkdeviotune.total_bytes_sec && def->blkdeviotune.write_bytes_sec)) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("total and read/write bytes_sec cannot be set at the same time")); + goto error; + } + + if ((def->blkdeviotune.total_iops_sec && def->blkdeviotune.read_iops_sec) + || (def->blkdeviotune.total_iops_sec && def->blkdeviotune.write_iops_sec)) { + virDomainReportError(VIR_ERR_XML_ERROR, + _("total and read/write iops_sec cannot be set at the same time")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -6003,7 +6060,7 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, if (xmlStrEqual(node->name, BAD_CAST "disk")) { dev->type = VIR_DOMAIN_DEVICE_DISK; if (!(dev->data.disk = virDomainDiskDefParseXML(caps, node, - NULL, flags))) + NULL, flags, NULL))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "lease")) { dev->type = VIR_DOMAIN_DEVICE_LEASE; @@ -7076,7 +7133,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, virDomainDiskDefPtr disk = virDomainDiskDefParseXML(caps, nodes[i], bootMap, - flags); + flags, + ctxt); if (!disk) goto error; @@ -9511,6 +9569,43 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkdeviotune.mark) { + virBufferAddLit(buf, " <iotune>\n"); + if (def->blkdeviotune.total_bytes_sec) { + virBufferAsprintf(buf, " <total_bytes_sec>%llu</total_bytes_sec>\n", + def->blkdeviotune.total_bytes_sec); + } + + if (def->blkdeviotune.read_bytes_sec) { + virBufferAsprintf(buf, " <read_bytes_sec>%llu</read_bytes_sec>\n", + def->blkdeviotune.read_bytes_sec); + + } + + if (def->blkdeviotune.write_bytes_sec) { + virBufferAsprintf(buf, " <write_bytes_sec>%llu</write_bytes_sec>\n", + def->blkdeviotune.write_bytes_sec); + } + + if (def->blkdeviotune.total_iops_sec) { + virBufferAsprintf(buf, " <total_iops_sec>%llu</total_iops_sec>\n", + def->blkdeviotune.total_iops_sec); + } + + if (def->blkdeviotune.read_iops_sec) { + virBufferAsprintf(buf, " <read_iops_sec>%llu</read_iops_sec>", + def->blkdeviotune.read_iops_sec); + } + + if (def->blkdeviotune.write_iops_sec) { + virBufferAsprintf(buf, " <write_iops_sec>%llu</write_iops_sec>", + def->blkdeviotune.write_iops_sec); + } + + virBufferAddLit(buf, " </iotune>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a3cb834..d95e239 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -333,6 +333,18 @@ struct _virDomainDiskDef { } auth; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long total_bytes_sec; + unsigned long long read_bytes_sec; + unsigned long long write_bytes_sec; + unsigned long long total_iops_sec; + unsigned long long read_iops_sec; + unsigned long long write_iops_sec; + unsigned int mark; + } blkdeviotune; + char *serial; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2fbf691..91c6508 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1690,6 +1690,39 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } } + /*block I/O throttling*/ + if (disk->blkdeviotune.mark) { + if (disk->blkdeviotune.total_bytes_sec) { + virBufferAsprintf(&opt, ",bps=%llu", + disk->blkdeviotune.total_bytes_sec); + } + + if (disk->blkdeviotune.read_bytes_sec) { + virBufferAsprintf(&opt, ",bps_rd=%llu", + disk->blkdeviotune.read_bytes_sec); + } + + if (disk->blkdeviotune.write_bytes_sec) { + virBufferAsprintf(&opt, ",bps_wr=%llu", + disk->blkdeviotune.write_bytes_sec); + } + + if (disk->blkdeviotune.total_iops_sec) { + virBufferAsprintf(&opt, ",iops=%llu", + disk->blkdeviotune.total_iops_sec); + } + + if (disk->blkdeviotune.read_iops_sec) { + virBufferAsprintf(&opt, ",iops_rd=%llu", + disk->blkdeviotune.read_iops_sec); + } + + if (disk->blkdeviotune.write_iops_sec) { + virBufferAsprintf(&opt, ",iops_wr=%llu", + disk->blkdeviotune.write_iops_sec); + } + } + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/xml.h b/src/util/xml.h index c492063..5742f19 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -50,6 +50,8 @@ xmlNodePtr virXPathNode(const char *xpath, int virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt, xmlNodePtr **list); +int virXMLStringToULongLong (const char *stringval, + unsigned long long *value); char * virXMLPropString(xmlNodePtr node, const char *name); -- 1.7.1

2 2

[libvirt] [PATCH] nwfilter: remove virConnectPtr from internal API calls
by Stefan Berger 23 Nov '11

23 Nov '11

Remove the virConnectPtr from the nwfilter's internal API calls as far as possible. --- src/conf/nwfilter_conf.h | 18 ++----- src/nwfilter/nwfilter_ebiptables_driver.c | 34 ++++---------- src/nwfilter/nwfilter_gentech_driver.c | 72 ++++++++++-------------------- src/nwfilter/nwfilter_gentech_driver.h | 9 +-- src/nwfilter/nwfilter_learnipaddr.c | 3 - 5 files changed, 45 insertions(+), 91 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -592,27 +592,22 @@ typedef void (*virNWFilterTechDrvShutdow enum virDomainNetType; -typedef int (*virNWFilterRuleCreateInstance)(virConnectPtr conn, - enum virDomainNetType nettype, +typedef int (*virNWFilterRuleCreateInstance)(enum virDomainNetType nettype, virNWFilterDefPtr filter, virNWFilterRuleDefPtr rule, const char *ifname, virNWFilterHashTablePtr vars, virNWFilterRuleInstPtr res); -typedef int (*virNWFilterRuleApplyNewRules)(virConnectPtr conn, - const char *ifname, +typedef int (*virNWFilterRuleApplyNewRules)(const char *ifname, int nruleInstances, void **_inst); -typedef int (*virNWFilterRuleTeardownNewRules)(virConnectPtr conn, - const char *ifname); +typedef int (*virNWFilterRuleTeardownNewRules)(const char *ifname); -typedef int (*virNWFilterRuleTeardownOldRules)(virConnectPtr conn, - const char *ifname); +typedef int (*virNWFilterRuleTeardownOldRules)(const char *ifname); -typedef int (*virNWFilterRuleRemoveRules)(virConnectPtr conn, - const char *ifname, +typedef int (*virNWFilterRuleRemoveRules)(const char *ifname, int nruleInstances, void **_inst); @@ -620,8 +615,7 @@ typedef int (*virNWFilterRuleAllTeardown typedef int (*virNWFilterRuleFreeInstanceData)(void * _inst); -typedef int (*virNWFilterRuleDisplayInstanceData)(virConnectPtr conn, - void *_inst); +typedef int (*virNWFilterRuleDisplayInstanceData)(void *_inst); typedef int (*virNWFilterCanApplyBasicRules)(void); Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1188,8 +1188,7 @@ iptablesEnforceDirection(int directionIn * Convert a single rule into its representation for later instantiation * * Returns 0 in case of success with the result stored in the data structure - * pointed to by res, != 0 otherwise with the error message stored in the - * virConnect object. + * pointed to by res, != 0 otherwise. */ static int _iptablesCreateRuleInstance(int directionIn, @@ -1917,8 +1916,7 @@ iptablesCreateRuleInstance(virNWFilterDe * Convert a single rule into its representation for later instantiation * * Returns 0 in case of success with the result stored in the data structure - * pointed to by res, != 0 otherwise with the error message stored in the - * virConnect object. + * pointed to by res, != 0 otherwise. */ static int ebtablesCreateRuleInstance(char chainPrefix, @@ -2503,7 +2501,6 @@ err_exit: /* * ebiptablesCreateRuleInstance: - * @conn : Pointer to a virConnect object * @nwfilter : The filter * @rule: The rule of the filter to convert * @ifname : The name of the interface to apply the rule to @@ -2513,12 +2510,10 @@ err_exit: * Convert a single rule into its representation for later instantiation * * Returns 0 in case of success with the result stored in the data structure - * pointed to by res, != 0 otherwise with the error message stored in the - * virConnect object. + * pointed to by res, != 0 otherwise. */ static int -ebiptablesCreateRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, - enum virDomainNetType nettype ATTRIBUTE_UNUSED, +ebiptablesCreateRuleInstance(enum virDomainNetType nettype ATTRIBUTE_UNUSED, virNWFilterDefPtr nwfilter, virNWFilterRuleDefPtr rule, const char *ifname, @@ -2610,7 +2605,6 @@ ebiptablesCreateRuleInstance(virConnectP static int ebiptablesCreateRuleInstanceIterate( - virConnectPtr conn ATTRIBUTE_UNUSED, enum virDomainNetType nettype ATTRIBUTE_UNUSED, virNWFilterDefPtr nwfilter, virNWFilterRuleDefPtr rule, @@ -2630,8 +2624,7 @@ ebiptablesCreateRuleInstanceIterate( return 1; do { - rc = ebiptablesCreateRuleInstance(conn, - nettype, + rc = ebiptablesCreateRuleInstance(nettype, nwfilter, rule, ifname, @@ -2656,8 +2649,7 @@ ebiptablesFreeRuleInstance(void *_inst) static int -ebiptablesDisplayRuleInstance(virConnectPtr conn ATTRIBUTE_UNUSED, - void *_inst) +ebiptablesDisplayRuleInstance(void *_inst) { ebiptablesRuleInstPtr inst = (ebiptablesRuleInstPtr)_inst; VIR_INFO("Command Template: '%s', Needed protocol: '%s'", @@ -3096,7 +3088,6 @@ ebiptablesCanApplyBasicRules(void) { /** * ebtablesApplyBasicRules * - * @conn: virConnect object * @ifname: name of the backend-interface to which to apply the rules * @macaddr: MAC address the VM is using in packets sent through the * interface @@ -3552,8 +3543,7 @@ ebtablesCreateTmpRootAndSubChains(virBuf } static int -ebiptablesApplyNewRules(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *ifname, +ebiptablesApplyNewRules(const char *ifname, int nruleInstances, void **_inst) { @@ -3824,8 +3814,7 @@ exit_free_sets: static int -ebiptablesTearNewRules(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *ifname) +ebiptablesTearNewRules(const char *ifname) { int cli_status; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -3862,8 +3851,7 @@ ebiptablesTearNewRules(virConnectPtr con static int -ebiptablesTearOldRules(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *ifname) +ebiptablesTearOldRules(const char *ifname) { int cli_status; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -3911,7 +3899,6 @@ ebiptablesTearOldRules(virConnectPtr con /** * ebiptablesRemoveRules: - * @conn : pointer to virConnect object * @ifname : the name of the interface to which the rules apply * @nRuleInstance : the number of given rules * @_inst : array of rule instantiation data @@ -3922,8 +3909,7 @@ ebiptablesTearOldRules(virConnectPtr con * commands failed. */ static int -ebiptablesRemoveRules(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, +ebiptablesRemoveRules(const char *ifname ATTRIBUTE_UNUSED, int nruleInstances, void **_inst) { Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.c @@ -98,8 +98,7 @@ virNWFilterTechDriverForName(const char * for bidirectional traffic and data needs to be added to the incoming * and outgoing chains. * - * Returns 0 in case of success, 1 in case of an error with the error - * message attached to the virConnect object. + * Returns 0 in case of success, 1 in case of an error. */ int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, @@ -190,8 +189,7 @@ virNWFilterVarHashmapAddStdValues(virNWF * Create a hashmap used for evaluating the firewall rules. Initializes * it with the standard variable 'MAC' and 'IP' if provided. * - * Returns pointer to hashmap, NULL if an error occcurred and error message - * is attached to the virConnect object. + * Returns pointer to hashmap, NULL if an error occcurred. */ virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr, @@ -274,7 +272,6 @@ virNWFilterPrintVars(virHashTablePtr var /** * virNWFilterRuleInstantiate: - * @conn: pointer to virConnect object * @techdriver: the driver to use for instantiation * @filter: The filter the rule is part of * @rule : The rule that is to be instantiated @@ -289,8 +286,7 @@ virNWFilterPrintVars(virHashTablePtr var * from the instantiation. Returns NULL on error with error reported. */ static virNWFilterRuleInstPtr -virNWFilterRuleInstantiate(virConnectPtr conn, - virNWFilterTechDriverPtr techdriver, +virNWFilterRuleInstantiate(virNWFilterTechDriverPtr techdriver, enum virDomainNetType nettype, virNWFilterDefPtr filter, virNWFilterRuleDefPtr rule, @@ -308,7 +304,7 @@ virNWFilterRuleInstantiate(virConnectPtr ret->techdriver = techdriver; - rc = techdriver->createRuleInstance(conn, nettype, filter, + rc = techdriver->createRuleInstance(nettype, filter, rule, ifname, vars, ret); if (rc) { @@ -359,7 +355,6 @@ err_exit: /** * _virNWFilterInstantiateRec: - * @conn: pointer to virConnect object * @techdriver: The driver to use for instantiation * @filter: The filter to instantiate * @ifname: The name of the interface to apply the rules to @@ -382,8 +377,7 @@ err_exit: * resolved -- among other reasons. */ static int -_virNWFilterInstantiateRec(virConnectPtr conn, - virNWFilterTechDriverPtr techdriver, +_virNWFilterInstantiateRec(virNWFilterTechDriverPtr techdriver, enum virDomainNetType nettype, virNWFilterDefPtr filter, const char *ifname, @@ -403,8 +397,7 @@ _virNWFilterInstantiateRec(virConnectPtr virNWFilterRuleDefPtr rule = filter->filterEntries[i]->rule; virNWFilterIncludeDefPtr inc = filter->filterEntries[i]->include; if (rule) { - inst = virNWFilterRuleInstantiate(conn, - techdriver, + inst = virNWFilterRuleInstantiate(techdriver, nettype, filter, rule, @@ -461,8 +454,7 @@ _virNWFilterInstantiateRec(virConnectPtr break; } - rc = _virNWFilterInstantiateRec(conn, - techdriver, + rc = _virNWFilterInstantiateRec(techdriver, nettype, next_filter, ifname, @@ -491,8 +483,7 @@ _virNWFilterInstantiateRec(virConnectPtr static int -virNWFilterDetermineMissingVarsRec(virConnectPtr conn, - virNWFilterDefPtr filter, +virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, virNWFilterHashTablePtr vars, virNWFilterHashTablePtr missing_vars, int useNewFilter, @@ -559,8 +550,7 @@ virNWFilterDetermineMissingVarsRec(virCo break; } - rc = virNWFilterDetermineMissingVarsRec(conn, - next_filter, + rc = virNWFilterDetermineMissingVarsRec(next_filter, tmpvars, missing_vars, useNewFilter, @@ -617,7 +607,6 @@ virNWFilterRuleInstancesToArray(int nEnt /** * virNWFilterInstantiate: - * @conn: pointer to virConnect object * @techdriver: The driver to use for instantiation * @filter: The filter to instantiate * @ifname: The name of the interface to apply the rules to @@ -636,8 +625,7 @@ virNWFilterRuleInstancesToArray(int nEnt * Call this function while holding the NWFilter filter update lock */ static int -virNWFilterInstantiate(virConnectPtr conn, - virNWFilterTechDriverPtr techdriver, +virNWFilterInstantiate(virNWFilterTechDriverPtr techdriver, enum virDomainNetType nettype, virNWFilterDefPtr filter, const char *ifname, @@ -665,8 +653,7 @@ virNWFilterInstantiate(virConnectPtr con goto err_exit; } - rc = virNWFilterDetermineMissingVarsRec(conn, - filter, + rc = virNWFilterDetermineMissingVarsRec(filter, vars, missing_vars, useNewFilter, @@ -697,8 +684,7 @@ virNWFilterInstantiate(virConnectPtr con goto err_exit; } - rc = _virNWFilterInstantiateRec(conn, - techdriver, + rc = _virNWFilterInstantiateRec(techdriver, nettype, filter, ifname, @@ -729,10 +715,10 @@ virNWFilterInstantiate(virConnectPtr con if (virNWFilterLockIface(ifname)) goto err_exit; - rc = techdriver->applyNewRules(conn, ifname, nptrs, ptrs); + rc = techdriver->applyNewRules(ifname, nptrs, ptrs); if (teardownOld && rc == 0) - techdriver->tearOldRules(conn, ifname); + techdriver->tearOldRules(ifname); if (rc == 0 && (virNetDevValidateConfig(ifname, NULL, ifindex) <= 0)) { virResetLastError(); @@ -775,8 +761,7 @@ err_unresolvable_vars: * Call this function while holding the NWFilter filter update lock */ static int -__virNWFilterInstantiateFilter(virConnectPtr conn, - bool teardownOld, +__virNWFilterInstantiateFilter(bool teardownOld, const char *ifname, int ifindex, const char *linkdev, @@ -868,8 +853,7 @@ __virNWFilterInstantiateFilter(virConnec break; } - rc = virNWFilterInstantiate(conn, - techdriver, + rc = virNWFilterInstantiate(techdriver, nettype, filter, ifname, @@ -924,8 +908,7 @@ _virNWFilterInstantiateFilter(virConnect goto cleanup; } - rc = __virNWFilterInstantiateFilter(conn, - teardownOld, + rc = __virNWFilterInstantiateFilter(teardownOld, net->ifname, ifindex, linkdev, @@ -946,8 +929,7 @@ cleanup: int -virNWFilterInstantiateFilterLate(virConnectPtr conn, - const char *ifname, +virNWFilterInstantiateFilterLate(const char *ifname, int ifindex, const char *linkdev, enum virDomainNetType nettype, @@ -961,8 +943,7 @@ virNWFilterInstantiateFilterLate(virConn virNWFilterLockFilterUpdates(); - rc = __virNWFilterInstantiateFilter(conn, - 1, + rc = __virNWFilterInstantiateFilter(true, ifname, ifindex, linkdev, @@ -1019,8 +1000,7 @@ virNWFilterUpdateInstantiateFilter(virCo return rc; } -int virNWFilterRollbackUpdateFilter(virConnectPtr conn, - const virDomainNetDefPtr net) +int virNWFilterRollbackUpdateFilter(const virDomainNetDefPtr net) { const char *drvname = EBIPTABLES_DRIVER_ID; int ifindex; @@ -1041,13 +1021,12 @@ int virNWFilterRollbackUpdateFilter(virC else if (virNWFilterLookupLearnReq(ifindex) != NULL) return 0; - return techdriver->tearNewRules(conn, net->ifname); + return techdriver->tearNewRules(net->ifname); } int -virNWFilterTearOldFilter(virConnectPtr conn, - virDomainNetDefPtr net) +virNWFilterTearOldFilter(virDomainNetDefPtr net) { const char *drvname = EBIPTABLES_DRIVER_ID; int ifindex; @@ -1068,7 +1047,7 @@ virNWFilterTearOldFilter(virConnectPtr c else if (virNWFilterLookupLearnReq(ifindex) != NULL) return 0; - return techdriver->tearOldRules(conn, net->ifname); + return techdriver->tearOldRules(net->ifname); } @@ -1141,14 +1120,13 @@ virNWFilterDomainFWUpdateCB(void *payloa case STEP_TEAR_NEW: if ( !virHashLookup(cb->skipInterfaces, net->ifname)) { - cb->err = virNWFilterRollbackUpdateFilter(cb->conn, - net); + cb->err = virNWFilterRollbackUpdateFilter(net); } break; case STEP_TEAR_OLD: if ( !virHashLookup(cb->skipInterfaces, net->ifname)) { - cb->err = virNWFilterTearOldFilter(cb->conn, net); + cb->err = virNWFilterTearOldFilter(net); } break; } Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -42,14 +42,11 @@ int virNWFilterInstantiateFilter(virConn int virNWFilterUpdateInstantiateFilter(virConnectPtr conn, const virDomainNetDefPtr net, bool *skipIface); -int virNWFilterRollbackUpdateFilter(virConnectPtr conn, - const virDomainNetDefPtr net); +int virNWFilterRollbackUpdateFilter(const virDomainNetDefPtr net); -int virNWFilterTearOldFilter(virConnectPtr conn, - const virDomainNetDefPtr net); +int virNWFilterTearOldFilter(const virDomainNetDefPtr net); -int virNWFilterInstantiateFilterLate(virConnectPtr conn, - const char *ifname, +int virNWFilterInstantiateFilterLate(const char *ifname, int ifindex, const char *linkdev, enum virDomainNetType nettype, Index: libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_learnipaddr.c +++ libvirt-acl/src/nwfilter/nwfilter_learnipaddr.c @@ -702,8 +702,7 @@ learnIPAddressThread(void *arg) "cache for interface %s"), inetaddr, req->ifname); } - ret = virNWFilterInstantiateFilterLate(NULL, - req->ifname, + ret = virNWFilterInstantiateFilterLate(req->ifname, req->ifindex, req->linkdev, req->nettype,

2 1

[libvirt] [PATCH] blockstats: support lookup by path in blockstats
by Eric Blake 23 Nov '11

23 Nov '11

Commit 89b6284f made it possible to pass either a source name or the target device to most API demanding a disk designation, but forgot to update the documentation. It also failed to update virDomainBlockStats to take both forms. This patch fixes both the documentation and the remaining function. Xen continues to use just device shorthand (that is, I did not implement path lookup there, since xen does not track a domain_conf to quickly tie a path back to the device shorthand). * src/libvirt.c (virDomainBlockStats, virDomainBlockStatsFlags) (virDomainGetBlockInfo, virDomainBlockPeek) (virDomainBlockJobAbort, virDomainGetBlockJobInfo) (virDomainBlockJobSetSpeed, virDomainBlockPull): Document acceptable disk naming conventions. * src/qemu/qemu_driver.c (qemuDomainBlockStats) (qemuDomainBlockStatsFlags): Allow lookup by source name. * src/test/test_driver.c (testDomainBlockStats): Likewise. --- I would like to apply this prior to patch 1/8 in Lei's series: https://www.redhat.com/archives/libvir-list/2011-November/msg01145.html since that patch should be using the same copy-and-paste documentation. src/libvirt.c | 82 ++++++++++++++++++++++++++++++++++++----------- src/qemu/qemu_driver.c | 20 ++--------- src/test/test_driver.c | 11 +----- 3 files changed, 69 insertions(+), 44 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 17e073e..811dde6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -6659,16 +6659,19 @@ error: /** * virDomainBlockStats: * @dom: pointer to the domain object - * @path: path to the block device + * @path: path to the block device, or device shorthand * @stats: block device stats (returned) * @size: size of stats structure * * This function returns block device (disk) stats for block * devices attached to the domain. * - * The path parameter is the name of the block device. Get this - * by calling virDomainGetXMLDesc and finding the <target dev='...'> - * attribute within //domain/devices/disk. (For example, "xvda"). + * The @path parameter is either the device target shorthand (the + * <target dev='...'/> sub-element, such as "xvda"), or (since 0.9.8) + * an unambiguous source name of the block device (the <source + * file='...'/> sub-element, such as "/path/to/image"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. * * Domains may have more than one block device. To get stats for * each you should make multiple calls to this function. @@ -6719,7 +6722,7 @@ error: /** * virDomainBlockStatsFlags: * @dom: pointer to domain object - * @path: path to the block device + * @path: path to the block device, or device shorthand * @params: pointer to block stats parameter object * (return value) * @nparams: pointer to number of block stats; input and output @@ -6728,9 +6731,12 @@ error: * This function is to get block stats parameters for block * devices attached to the domain. * - * The @path is the name of the block device. Get this - * by calling virDomainGetXMLDesc and finding the <target dev='...'> - * attribute within //domain/devices/disk. (For example, "xvda"). + * The @path parameter is either the device target shorthand (the + * <target dev='...'/> sub-element, such as "xvda"), or (since 0.9.8) + * an unambiguous source name of the block device (the <source + * file='...'/> sub-element, such as "/path/to/image"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. * * Domains may have more than one block device. To get stats for * each you should make multiple calls to this function. @@ -6927,7 +6933,7 @@ error: /** * virDomainBlockPeek: * @dom: pointer to the domain object - * @path: path to the block device + * @path: path to the block device, or device shorthand * @offset: offset within block device * @size: size to read * @buffer: return buffer (must be at least size bytes) @@ -6946,10 +6952,12 @@ error: * remote case, nor if you don't have sufficient permission. * Hence the need for this call). * - * 'path' must be a device or file corresponding to the domain. - * In other words it must be the precise string returned in - * a <disk><source dev='...'/></disk> from - * virDomainGetXMLDesc. + * The @path parameter is either an unambiguous source name of the + * block device (the <source file='...'/> sub-element, such as + * "/path/to/image"), or (since 0.9.5) the device target shorthand + * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. * * 'offset' and 'size' represent an area which must lie entirely * within the device or file. 'size' may be 0 to test if the @@ -7133,16 +7141,24 @@ error: /** * virDomainGetBlockInfo: * @domain: a domain object - * @path: path to the block device or file + * @path: path to the block device, or device shorthand * @info: pointer to a virDomainBlockInfo structure allocated by the user * @flags: currently unused, pass zero * * Extract information about a domain's block device. * + * The @path parameter is either an unambiguous source name of the + * block device (the <source file='...'/> sub-element, such as + * "/path/to/image"), or (since 0.9.5) the device target shorthand + * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. + * * Returns 0 in case of success and -1 in case of failure. */ int -virDomainGetBlockInfo(virDomainPtr domain, const char *path, virDomainBlockInfoPtr info, unsigned int flags) +virDomainGetBlockInfo(virDomainPtr domain, const char *path, + virDomainBlockInfoPtr info, unsigned int flags) { virConnectPtr conn; @@ -16837,11 +16853,18 @@ error: /** * virDomainBlockJobAbort: * @dom: pointer to domain object - * @path: fully-qualified filename of disk + * @path: path to the block device, or device shorthand * @flags: currently unused, for future extension * * Cancel the active block job on the given disk. * + * The @path parameter is either an unambiguous source name of the + * block device (the <source file='...'/> sub-element, such as + * "/path/to/image"), or (since 0.9.5) the device target shorthand + * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. + * * Returns -1 in case of failure, 0 when successful. */ int virDomainBlockJobAbort(virDomainPtr dom, const char *path, @@ -16889,13 +16912,20 @@ error: /** * virDomainGetBlockJobInfo: * @dom: pointer to domain object - * @path: fully-qualified filename of disk + * @path: path to the block device, or device shorthand * @info: pointer to a virDomainBlockJobInfo structure * @flags: currently unused, for future extension * * Request block job information for the given disk. If an operation is active * @info will be updated with the current progress. * + * The @path parameter is either an unambiguous source name of the + * block device (the <source file='...'/> sub-element, such as + * "/path/to/image"), or (since 0.9.5) the device target shorthand + * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. + * * Returns -1 in case of failure, 0 when nothing found, 1 when info was found. */ int virDomainGetBlockJobInfo(virDomainPtr dom, const char *path, @@ -16944,13 +16974,20 @@ error: /** * virDomainBlockJobSetSpeed: * @dom: pointer to domain object - * @path: fully-qualified filename of disk + * @path: path to the block device, or device shorthand * @bandwidth: specify bandwidth limit in Mbps * @flags: currently unused, for future extension * * Set the maximimum allowable bandwidth that a block job may consume. If * bandwidth is 0, the limit will revert to the hypervisor default. * + * The @path parameter is either an unambiguous source name of the + * block device (the <source file='...'/> sub-element, such as + * "/path/to/image"), or (since 0.9.5) the device target shorthand + * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. + * * Returns -1 in case of failure, 0 when successful. */ int virDomainBlockJobSetSpeed(virDomainPtr dom, const char *path, @@ -16999,7 +17036,7 @@ error: /** * virDomainBlockPull: * @dom: pointer to domain object - * @path: Fully-qualified filename of disk + * @path: path to the block device, or device shorthand * @bandwidth: (optional) specify copy bandwidth limit in Mbps * @flags: currently unused, for future extension * @@ -17010,6 +17047,13 @@ error: * the operation can be aborted with virDomainBlockJobAbort(). When finished, * an asynchronous event is raised to indicate the final status. * + * The @path parameter is either an unambiguous source name of the + * block device (the <source file='...'/> sub-element, such as + * "/path/to/image"), or (since 0.9.5) the device target shorthand + * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. + * * The maximum bandwidth (in Mbps) that will be used to do the copy can be * specified with the bandwidth parameter. If set to 0, libvirt will choose a * suitable default. Some hypervisors do not support this feature and will diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fe2ab85..98ce695 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7082,18 +7082,12 @@ qemuDomainBlockStats(virDomainPtr dom, goto cleanup; } - for (i = 0 ; i < vm->def->ndisks ; i++) { - if (STREQ(path, vm->def->disks[i]->dst)) { - disk = vm->def->disks[i]; - break; - } - } - - if (!disk) { + if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { qemuReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); goto cleanup; } + disk = vm->def->disks[i]; if (!disk->info.alias) { qemuReportError(VIR_ERR_INTERNAL_ERROR, @@ -7174,18 +7168,12 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (*nparams != 0) { - for (i = 0 ; i < vm->def->ndisks ; i++) { - if (STREQ(path, vm->def->disks[i]->dst)) { - disk = vm->def->disks[i]; - break; - } - } - - if (!disk) { + if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { qemuReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); goto cleanup; } + disk = vm->def->disks[i]; if (!disk->info.alias) { qemuReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e6ff696..f365bf4 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2803,7 +2803,7 @@ static int testDomainBlockStats(virDomainPtr domain, virDomainObjPtr privdom; struct timeval tv; unsigned long long statbase; - int i, found = 0, ret = -1; + int ret = -1; testDriverLock(privconn); privdom = virDomainFindByName(&privconn->domains, @@ -2815,14 +2815,7 @@ static int testDomainBlockStats(virDomainPtr domain, goto error; } - for (i = 0 ; i < privdom->def->ndisks ; i++) { - if (STREQ(path, privdom->def->disks[i]->dst)) { - found = 1; - break; - } - } - - if (!found) { + if (virDomainDiskIndexByName(privdom->def, path, false) < 0) { testError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); goto error; -- 1.7.7.3

2 4