- Devel - libvirt List Archives

[libvirt] [dbus PATCH 0/9] random fixes
by Pavel Hrdina 07 May '18

07 May '18

*** BLURB HERE *** Pavel Hrdina (9): Process input arguments before getting libvirt object Use ++ operator instead of += in for loop connect: Fix List* methods to return empty array for empty list connect: Pass error into virtDBusConnectOpen function domain: There is no need to check ret again domain: Return error if libvirt API fails domain: Introduce virtDBusDomainGVariantToMountpoints helper domain: Introduce virtDBusDomainGVariantToCpumap helper util: Use spaces around operators src/connect.c | 28 ++++++--------- src/domain.c | 110 ++++++++++++++++++++++++++++------------------------------ src/main.c | 2 +- src/network.c | 2 +- src/util.c | 6 ++-- 5 files changed, 70 insertions(+), 78 deletions(-) -- 2.14.3

3 11

[libvirt] [PATCH 0/7] Couple of tiny fixes for virsh and translation.
by Lin Ma 07 May '18

07 May '18

Lin Ma (7): virsh: Error out while domain not found for 'qemu-monitor-event' command virsh: Error out while domain not found for 'event' command po: fix typo: remove a redundant Chinese character virsh: Simplify control flow for 'desc' command virsh: Simplify control flow for 'qemu-agent-command' command qemu: stats: Display the net type and net source in bulk stats qemu: stats: Display net count,type and source even if domain is inactive po/zh_CN.mini.po | 2 +- src/libvirt-domain.c | 2 ++ src/qemu/qemu_driver.c | 11 ++++++++--- tools/virsh-domain.c | 33 ++++++++++++++++----------------- tools/virsh.pod | 2 ++ 5 files changed, 29 insertions(+), 21 deletions(-) -- 2.15.1

3 15

[libvirt] [PATCH] xenconfig: Remove references to my name and email
by David Kiarie 05 May '18

05 May '18

Replace references to my name and email with a pseudonym Signed-off-by: David Kiarie <davidkiarie4(a)gmail.com> --- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xl.h | 2 +- tests/xlconfigtest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 35d52f8a..b383560d 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -17,7 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)mail.com> * Author: Jim Fehlig <jfehlig(a)suse.com> */ diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h index 68f332ac..4ce13f05 100644 --- a/src/xenconfig/xen_xl.h +++ b/src/xenconfig/xen_xl.h @@ -17,7 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani<davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> */ #ifndef __VIR_XEN_XL_H__ diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 39f51e2d..1bbc0b72 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> * */ -- 2.17.0

1 0

[libvirt] ZFS backend does fail if used on non top level pools
by Christian Ehrhardt 04 May '18

04 May '18

Hi, by discussing on bug [1] we found an issue in the ZFS storage backend. When one defines a zfs pool through XML (virsh pool-create --build) a top level ZFS pool will be created and works fine. The virsh pool-define-as counterpart to this is: $ fallocate -l 100M /tmp/Mzfs $ sudo zpool create Mzfs /tmp/Mzfs $ virsh pool-define-as --name zfs --source-name Mzfs --type zfs $ virsh pool-start zfs $ virsh vol-create-as --pool zfs --name vol1 --capacity 10M $ virsh vol-list --pool zfs vol1 /dev/zvol/Mzfs/vol1 $ virsh pool-refresh zfs Pool zfs refreshed $ virsh vol-list --pool zfs vol1 /dev/zvol/Mzfs/vol1 Ok, all fine so far. But if one wants to use a zfs-FS as sub-pool things work a while but fail as soon as pool info is refreshed. $ fallocate -l 100M /tmp/Xzfs $ sudo zpool create Xzfs /tmp/Xzfs $ sudo zfs create Xzfs/images $ virsh pool-define-as --name Xzfs --source-name Xzfs/images --type zfs I ended with the pool not being started (expected after pool-define-as), but then $ virsh pool-start Xzfs $ virsh vol-create-as --pool Xzfs --name vol1 --capacity 10M $ virsh vol-list --pool Xzfs vol1 /dev/zvol/Xzfs/images/vol1 $ virsh pool-refresh zfs Pool zfs refreshed $ virsh vol-list --pool Xzfs # no output anymore We happened to find this in the libvirt log: error : virCommandWait:2601 : internal error: Child process (/sbin/zpool get -Hp health,size,free,allocated Xzfs/images) unexpected exit status 1: cannot open 'Xzfs/images': invalid character '/' in pool name So it seems the data refresh would need to become aware of filesytems and strip this to the basename before doing the call. This comes from src/storage/storage_backend_zfs.c cmd = virCommandNewArgList(ZPOOL, "get", "-Hp", "health,size,free,allocated", def->source.name, NULL); # fails zfs list -Hp -t volume -r -o name,volsize,refreservation Xzfs/images # would work zfs list -Hp -t volume -r -o name,volsize,refreservation Xzfs But there might be more to it than what I see, either more changes needed to fully work with subpools or intentionally not working with them. For the latter we should still consider improving the error handling, like refusing right away with a reasonable message on "virsh pool-define-as". I wondered if one with more experience in that area of libvirt would be willing to pick this up or has an opinion why it would not need to be changed that I might be missing? [1]: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1767997 -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

3 2

[libvirt] [PATCH 0/5] Another batch of old capability cleanups
by Ján Tomko 04 May '18

04 May '18

Ján Tomko (5): qemu: remove qemuBuildObsoleteAccelArg qemuBuildMachineCommandLine: use a switch for virDomainVirtType Deprecate QEMU_CAPS_NO_KVM_PIT Depreacte QEMU_CAPS_TDF Deprecate QEMU_CAPS_NESTING src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 101 +++++++-------------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/clock-hpet-off.args | 1 - tests/qemuxml2argvdata/hugepages-numa.args | 1 - tests/qemuxml2argvdata/no-kvm-pit-device.args | 28 ------ tests/qemuxml2argvdata/no-kvm-pit-device.xml | 29 ------ tests/qemuxml2argvdata/q35-virt-manager-basic.args | 1 - tests/qemuxml2argvtest.c | 3 +- tests/qemuxml2xmltest.c | 1 - 22 files changed, 40 insertions(+), 149 deletions(-) delete mode 100644 tests/qemuxml2argvdata/no-kvm-pit-device.args delete mode 100644 tests/qemuxml2argvdata/no-kvm-pit-device.xml -- 2.16.1

2 8

[libvirt] [PATCH] lxc: convert to typesafe virConf accessors in lxc_native.c
by Prafull 04 May '18

04 May '18

From: Prafullkumar Tale <talep158(a)gmail.com> Signed-off-by: Prafullkumar Tale <talep158(a)gmail.com> --- src/lxc/lxc_native.c | 141 +++++++++++++++++++++++++-------------------------- 1 file changed, 70 insertions(+), 71 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 55ea774..35077e1 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -199,19 +199,15 @@ lxcSetRootfs(virDomainDefPtr def, virConfPtr properties) { int type = VIR_DOMAIN_FS_TYPE_MOUNT; - virConfValuePtr value; + char *value = NULL; - if (!(value = virConfGetValue(properties, "lxc.rootfs")) || - !value->str) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Missing lxc.rootfs configuration")); + if (virConfGetValueString(properties, "lxc.rootfs", &value) <= 0) return -1; - } - if (STRPREFIX(value->str, "/dev/")) + if (STRPREFIX(value, "/dev/")) type = VIR_DOMAIN_FS_TYPE_BLOCK; - if (lxcAddFSDef(def, type, value->str, "/", false, 0) < 0) + if (lxcAddFSDef(def, type, value, "/", false, 0) < 0) return -1; return 0; @@ -684,17 +680,17 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) static int lxcCreateConsoles(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; int nbttys = 0; virDomainChrDefPtr console; size_t i; - if (!(value = virConfGetValue(properties, "lxc.tty")) || !value->str) + if (virConfGetValueString(properties, "lxc.tty", &value) <= 0) return 0; - if (virStrToLong_i(value->str, NULL, 10, &nbttys) < 0) { + if (virStrToLong_i(value, NULL, 10, &nbttys) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse int: '%s'"), - value->str); + value); return -1; } @@ -761,89 +757,91 @@ lxcIdmapWalkCallback(const char *name, virConfValuePtr value, void *data) static int lxcSetMemTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; unsigned long long size = 0; - if ((value = virConfGetValue(properties, - "lxc.cgroup.memory.limit_in_bytes")) && - value->str && STRNEQ(value->str, "-1")) { - if (lxcConvertSize(value->str, &size) < 0) - return -1; + if (virConfGetValueString(properties, + "lxc.cgroup.memory.limit_in_bytes", + &value) > 0) { + if (lxcConvertSize(value, &size) < 0) + goto error; size = size / 1024; virDomainDefSetMemoryTotal(def, size); def->mem.hard_limit = virMemoryLimitTruncate(size); } - if ((value = virConfGetValue(properties, - "lxc.cgroup.memory.soft_limit_in_bytes")) && - value->str && STRNEQ(value->str, "-1")) { - if (lxcConvertSize(value->str, &size) < 0) - return -1; - + if (virConfGetValueString(properties, + "lxc.cgroup.memory.soft_limit_in_bytes", + &value) > 0) { + if (lxcConvertSize(value, &size) < 0) + goto error; def->mem.soft_limit = virMemoryLimitTruncate(size / 1024); } - if ((value = virConfGetValue(properties, - "lxc.cgroup.memory.memsw.limit_in_bytes")) && - value->str && STRNEQ(value->str, "-1")) { - if (lxcConvertSize(value->str, &size) < 0) - return -1; - + if (virConfGetValueString(properties, + "lxc.cgroup.memory.memsw.limit_in_bytes", + &value) > 0) { + if (lxcConvertSize(value, &size) < 0) + goto error; def->mem.swap_hard_limit = virMemoryLimitTruncate(size / 1024); } return 0; + + error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse integer: '%s'"), value); + return -1; + } static int lxcSetCpuTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; - if ((value = virConfGetValue(properties, "lxc.cgroup.cpu.shares")) && - value->str) { - if (virStrToLong_ull(value->str, NULL, 10, &def->cputune.shares) < 0) + if (virConfGetValueString(properties, "lxc.cgroup.cpu.shares", + &value) > 0) { + if (virStrToLong_ull(value, NULL, 10, &def->cputune.shares) < 0) goto error; def->cputune.sharesSpecified = true; } - if ((value = virConfGetValue(properties, - "lxc.cgroup.cpu.cfs_quota_us")) && - value->str && virStrToLong_ll(value->str, NULL, 10, - &def->cputune.quota) < 0) - goto error; + if (virConfGetValueString(properties, "lxc.cgroup.cpu.cfs_quota_us", + &value) > 0) { + if (virStrToLong_ll(value, NULL, 10, &def->cputune.quota) < 0) + goto error; + } - if ((value = virConfGetValue(properties, - "lxc.cgroup.cpu.cfs_period_us")) && - value->str && virStrToLong_ull(value->str, NULL, 10, - &def->cputune.period) < 0) - goto error; + if (virConfGetValueString(properties, "lxc.cgroup.cpu.cfs_period_us", + &value) > 0) { + if (virStrToLong_ull(value, NULL, 10, &def->cputune.period) < 0) + goto error; + } return 0; error: virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse integer: '%s'"), value->str); + _("failed to parse integer: '%s'"), value); return -1; } static int lxcSetCpusetTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; virBitmapPtr nodeset = NULL; - if ((value = virConfGetValue(properties, "lxc.cgroup.cpuset.cpus")) && - value->str) { - if (virBitmapParse(value->str, &def->cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) + if (virConfGetValueString(properties, "lxc.cgroup.cpuset.cpus", + &value) > 0) { + if (virBitmapParse(value, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) return -1; - def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC; } - if ((value = virConfGetValue(properties, "lxc.cgroup.cpuset.mems")) && - value->str) { - if (virBitmapParse(value->str, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + if (virConfGetValueString(properties, "lxc.cgroup.cpuset.mems", + &value) > 0) { + if (virBitmapParse(value, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) return -1; if (virDomainNumatuneSet(def->numa, def->placement_mode == @@ -952,14 +950,15 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data) static int lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; - if ((value = virConfGetValue(properties, "lxc.cgroup.blkio.weight")) && - value->str && virStrToLong_ui(value->str, NULL, 10, - &def->blkio.weight) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse integer: '%s'"), value->str); - return -1; + if (virConfGetValueString(properties, "lxc.cgroup.blkio.weight", + &value) > 0) { + if (virStrToLong_ui(value, NULL, 10, &def->blkio.weight) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse integer: '%s'"), value); + return -1; + } } if (virConfWalk(properties, lxcBlkioDeviceWalkCallback, def) < 0) @@ -971,13 +970,13 @@ lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) static void lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; char **toDrop = NULL; const char *capString; size_t i; - if ((value = virConfGetValue(properties, "lxc.cap.drop")) && value->str) - toDrop = virStringSplit(value->str, " ", 0); + if (virConfGetValueString(properties, "lxc.cap.drop", &value) > 0) + toDrop = virStringSplit(value, " ", 0); for (i = 0; i < VIR_DOMAIN_CAPS_FEATURE_LAST; i++) { capString = virDomainCapsFeatureTypeToString(i); @@ -998,7 +997,7 @@ lxcParseConfigString(const char *config, { virDomainDefPtr vmdef = NULL; virConfPtr properties = NULL; - virConfValuePtr value; + char *value = NULL; if (!(properties = virConfReadString(config, VIR_CONF_FLAG_LXC_FORMAT))) return NULL; @@ -1031,11 +1030,11 @@ lxcParseConfigString(const char *config, vmdef->nfss = 0; vmdef->os.type = VIR_DOMAIN_OSTYPE_EXE; - if ((value = virConfGetValue(properties, "lxc.arch")) && value->str) { - virArch arch = virArchFromString(value->str); - if (arch == VIR_ARCH_NONE && STREQ(value->str, "x86")) + if (virConfGetValueString(properties, "lxc.arch", &value) > 0) { + virArch arch = virArchFromString(value); + if (arch == VIR_ARCH_NONE && STREQ(value, "x86")) arch = VIR_ARCH_I686; - else if (arch == VIR_ARCH_NONE && STREQ(value->str, "amd64")) + else if (arch == VIR_ARCH_NONE && STREQ(value, "amd64")) arch = VIR_ARCH_X86_64; vmdef->os.arch = arch; } @@ -1043,8 +1042,8 @@ lxcParseConfigString(const char *config, if (VIR_STRDUP(vmdef->os.init, "/sbin/init") < 0) goto error; - if (!(value = virConfGetValue(properties, "lxc.utsname")) || - !value->str || (VIR_STRDUP(vmdef->name, value->str) < 0)) + if (virConfGetValueString(properties, "lxc.utsname", &value) <= 0 || + VIR_STRDUP(vmdef->name, value) < 0) goto error; if (!vmdef->name && (VIR_STRDUP(vmdef->name, "unnamed") < 0)) goto error; -- 2.7.4

2 1

[libvirt] [dbus PATCH] Add detail argument to DomainEvent signal
by Katerina Koukiou 04 May '18

04 May '18

Adjust all DomainEvent tests to do detail type checking. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- This commit is rebased on top of unmerged patches for removing enum<->string translation. data/org.libvirt.Connect.xml | 1 + src/events.c | 4 ++-- tests/libvirttest.py | 55 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_connect.py | 6 +++-- tests/test_domain.py | 15 ++++++++---- 5 files changed, 72 insertions(+), 9 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 8272da6..0f1456f 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -171,6 +171,7 @@ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventC…"/> <arg name="domain" type="o"/> <arg name="event" type="u"/> + <arg name="detail" type="u"/> </signal> <signal name="NetworkEvent"> <annotation name="org.gtk.GDBus.DocString" diff --git a/src/events.c b/src/events.c index b432535..ea55180 100644 --- a/src/events.c +++ b/src/events.c @@ -8,7 +8,7 @@ static gint virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, gint event, - gint detail G_GNUC_UNUSED, + gint detail, gpointer opaque) { virtDBusConnect *connect = opaque; @@ -21,7 +21,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "DomainEvent", - g_variant_new("(ou)", path, event), + g_variant_new("(ouu)", path, event, detail), NULL); return 0; diff --git a/tests/libvirttest.py b/tests/libvirttest.py index 06ac0e4..eee67a0 100644 --- a/tests/libvirttest.py +++ b/tests/libvirttest.py @@ -100,6 +100,61 @@ class DomainEvent(IntEnum): CRASHED = 8 +class DomainEventDefinedDetailType(IntEnum): + ADDED = 0 + UPDATED = 1 + RENAMED = 2 + FROM_SNAPSHOT = 3 + LAST = 4 + + +class DomainEventResumedDetailType(IntEnum): + UNPAUSED = 0 + MIGRATED = 1 + FROM_SNAPSHOT = 2 + POSTCOPY = 3 + LAST = 4 + + +class DomainEventStartedDetailType(IntEnum): + BOOTED = 0 + MIGRATED = 1 + RESTORED = 2 + FROM_SNAPSHOT = 3 + WAKEUP = 4 + LAST = 5 + + +class DomainEventStoppedDetailType(IntEnum): + SHUTDOWN = 0 + DESTROYED = 1 + CRASHED = 2 + MIGRATED = 3 + SAVED = 4 + FAILED = 5 + FROM_SNAPSHOT = 6 + LAST = 7 + + +class DomainEventSuspendedDetailType(IntEnum): + PAUSED = 0 + MIGRATED = 1 + IOERROR = 2 + WATCHDOG = 3 + RESTORED = 4 + FROM_SNAPSHOT = 5 + API_ERROR = 6 + POSTCOPY = 7 + POSTCOPY_FAILED = 8 + LAST = 9 + + +class DomainEventUndefinedDetailType(IntEnum): + REMOVED = 0 + RENAMED = 1 + LAST = 2 + + class DomainState(IntEnum): NOSTATE = 0 RUNNING = 1 diff --git a/tests/test_connect.py b/tests/test_connect.py index 7748822..a2bd17f 100755 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -31,9 +31,10 @@ class TestConnect(libvirttest.BaseTestClass): ''' def test_connect_domain_create_xml(self): - def domain_started(path, event): + def domain_started(path, event, detail): if event != libvirttest.DomainEvent.STARTED: return + assert detail == libvirttest.DomainEventStartedDetailType.BOOTED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -45,9 +46,10 @@ class TestConnect(libvirttest.BaseTestClass): self.main_loop() def test_comnect_domain_define_xml(self): - def domain_defined(path, event): + def domain_defined(path, event, detail): if event != libvirttest.DomainEvent.DEFINED: return + assert detail == libvirttest.DomainEventDefinedDetailType.ADDED assert isinstance(path, dbus.ObjectPath) self.loop.quit() diff --git a/tests/test_domain.py b/tests/test_domain.py index c7e09cd..dfa19ed 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -47,9 +47,10 @@ class TestDomain(libvirttest.BaseTestClass): assert autostart_current == dbus.Boolean(autostart_expected) def test_domain_managed_save(self): - def domain_stopped(path, event): + def domain_stopped(path, event, detail): if event != libvirttest.DomainEvent.STOPPED: return + assert detail == libvirttest.DomainEventStoppedDetailType.SAVED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -74,9 +75,10 @@ class TestDomain(libvirttest.BaseTestClass): assert description_expected == domain.GetMetadata(metadata_description, "", 0) def test_resume(self): - def domain_resumed(path, event): + def domain_resumed(path, event, detail): if event != libvirttest.DomainEvent.RESUMED: return + assert detail == libvirttest.DomainEventResumedDetailType.UNPAUSED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -92,9 +94,10 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() def test_shutdown(self): - def domain_stopped(path, event): + def domain_stopped(path, event, detail): if event != libvirttest.DomainEvent.STOPPED: return + assert detail == libvirttest.DomainEventStoppedDetailType.SHUTDOWN assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -109,9 +112,10 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() def test_suspend(self): - def domain_suspended(path, event): + def domain_suspended(path, event, detail): if event != libvirttest.DomainEvent.SUSPENDED: return + assert detail == libvirttest.DomainEventSuspendedDetailType.PAUSED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -126,9 +130,10 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() def test_undefine(self): - def domain_undefined(path, event): + def domain_undefined(path, event, detail): if event != libvirttest.DomainEvent.UNDEFINED: return + assert detail == libvirttest.DomainEventUndefinedDetailType.REMOVED assert isinstance(path, dbus.ObjectPath) self.loop.quit() -- 2.15.0

2 1

[libvirt] [dbus PATCH v2 0/9] Remove all enum->string and string->enum code
by Katerina Koukiou 04 May '18

04 May '18

Changes from v1: * Added the three last patches Katerina Koukiou (9): Abandon usage of all *TypeToString functions in domain.c Abandon usage of all *TypeToString functions in connect.c Abandon usage of all *TypeToString functions in network.c Change DomainEvent argument from string to unsigned int Change NetworkEvent argument from string to unsigned int Remove virtDBusUtilEnum{From,From}String functions Remove reason to string translation in virtDBusEventsDomainTrayChange Remove state to string translation in virtDBusDomainGetState Remove reason to string translation in virtDBusEventsDomainDiskChange data/org.libvirt.Connect.xml | 6 +- data/org.libvirt.Domain.xml | 20 ++--- data/org.libvirt.Network.xml | 6 +- src/connect.c | 18 +--- src/domain.c | 203 ++++--------------------------------------- src/events.c | 72 ++------------- src/network.c | 66 +------------- src/util.c | 27 ------ src/util.h | 28 ------ tests/libvirttest.py | 32 +++++++ tests/test_connect.py | 24 +++-- tests/test_domain.py | 46 ++++++---- tests/test_network.py | 20 +++-- 13 files changed, 131 insertions(+), 437 deletions(-) -- 2.15.0

2 18

[libvirt] [perl PATCH] spec: Drop %{extra_release}
by Andrea Bolognani 04 May '18

04 May '18

It was mainly meant to be used for automatic builds through Test::AutoBuild, so it can be removed now. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- perl-Sys-Virt.spec.PL | 2 +- prepare-release.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-Sys-Virt.spec.PL b/perl-Sys-Virt.spec.PL index dbb749d..ffa6c86 100644 --- a/perl-Sys-Virt.spec.PL +++ b/perl-Sys-Virt.spec.PL @@ -24,7 +24,7 @@ __DATA__ Name: perl-Sys-Virt Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic Group: Development/Libraries diff --git a/prepare-release.sh b/prepare-release.sh index 9de67fe..fea03f4 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -52,7 +52,5 @@ rm -f $NAME-*.tar.gz make dist if [ -f /usr/bin/rpmbuild ]; then - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz + rpmbuild --nodeps -ta --clean $NAME-*.tar.gz fi -- 2.17.0

2 1

[libvirt] [perl PATCH v2 0/3] maint: Rename autobuild.sh to prepare-release.sh
by Andrea Bolognani 04 May '18

04 May '18

Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00221.html Andrea Bolognani (3): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to Test::AutoBuild prepare-release: Drop references to Debian packages autobuild.sh => prepare-release.sh | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) rename autobuild.sh => prepare-release.sh (67%) -- 2.17.0

2 10

[libvirt] [PATCH 0/2] adding virHas/GetLastErrorCode/Domain to paritally replace virGetLastError
by ramyelkest 04 May '18

04 May '18

Many places in the code call virGetLastError() just to check the raised error code, or domain. However virGetLastError() can return NULL, so the code has to check for that as well. So Instead we create functions virGetLastErrorCode and virGetLastErrorDomain (in addition to the existing virGetLastErrorMessage) that always return a valid error code/domain/message, to simplify callers. Also created virHasLastErrorCode for completion This is my first commit, for: https://wiki.libvirt.org/page/BiteSizedTasks#Add_and_use_virGetLastErrorCod… Notes: * There are a few instances of virGetLastErrorCode() left where we use multiple fields from the error, which makes sense to keep it. * I didn't manage to use virGetLastErrorDomain() (due to the above) so I'm inclined to remove it. * virHasLastError is more or less only a semantic improvement over virGetLastError, so I'm happy to revert it if needed Signed-off-by: Ramy Elkest <ramyelkest(a)gmail.com> ramyelkest (2): util: adding virHasLastError and virGetLastErrorCode/Domain all: replacing virGetLastError with virHas/GetLastErrorCode/Domain include/libvirt/virterror.h | 3 ++ src/libvirt_public.syms | 7 +++++ src/locking/lock_driver_lockd.c | 3 +- src/lxc/lxc_controller.c | 4 +-- src/qemu/qemu_agent.c | 3 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 12 ++++---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 4 +-- src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 3 +- src/rpc/virnetclient.c | 2 +- src/util/virerror.c | 63 +++++++++++++++++++++++++++++++++++++++++ src/util/virfilecache.c | 3 +- src/util/virxml.c | 4 +-- tests/commandtest.c | 2 +- tests/testutils.c | 6 ++-- tests/virhostcputest.c | 2 +- tests/virstoragetest.c | 8 +++--- tools/virsh-domain-monitor.c | 7 ++--- tools/virsh-domain.c | 4 +-- tools/virsh-util.c | 3 +- tools/vsh.c | 2 +- 26 files changed, 110 insertions(+), 51 deletions(-) -- 2.7.4

2 4

[libvirt] [jenkins-ci PATCH] guests: Update vault
by Pavel Hrdina 04 May '18

04 May '18

Renaming node in Jenkins changes the secret as well so we cannot reuse the same secret as for the old node. This updates the libvirt-fedora-28 secret to correct one. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. guests/vars/vault.yml | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml index 403bd9b..5bf89dc 100644 --- a/guests/vars/vault.yml +++ b/guests/vars/vault.yml @@ -1,46 +1,46 @@ $ANSIBLE_VAULT;1.1;AES256 -37663961316238333332643164623861363938613135376161343231383739663836313130363538 -3136326161376136376332636534643437626530316439650a636134636561333962376564626635 -31306539613534653133383161313834633133316361303539646234356335386639303332323063 -3937626336326131650a373737396639373063316131633634393961393634663961613532353134 -32623065373438336561643538666536666665323536643730386364653162323939616131313634 -38653936663937613765663465353166656363356336636362353432636537633836623930653437 -30353239303435613536636333386436336638636462626537623766343237376331643334633433 -37353531616466386234376639306261303561373035383338383366646537373231386362313562 -66663965366438383833653631386236356163653835303664666539326362383362343838653333 -39623535616361653838626164306666626634373237626638373131303439356164646361613838 -64333165393935636162613638626461313661623963626664366361366364643136313236306636 -61633665393630356133306338343563636332386539626366383133326662633638306330323437 -34613034326465346338633538363231386430363932656430346634663437333734363234346533 -35303962333032626435343030653338656133323932386264346562323133326164623961623466 -62643763333563336362666439653038653335373531303930313239393166623539386239323337 -39393337313563656131646130633330313230366462306636363535386663666131613662363566 -63643030633262336263316134636136616430636536363464386436616530336264396264393762 -36646531636238343763376438666163376166613231306363633536623166356437386333383665 -37353962383238346132633230373666366638386162663263663134303936633034643737386362 -36393537373864323632376632376134303866393966336536376139393334613163356234623863 -36353837616535313266326538376663316366616561613833393037316264396532306430623338 -33636339623861313536323835326464636265386536646263643765306432626462363533373434 -32343961613563613734633736396139623463653230303337333862393836393533363637626662 -35376236613436323736643533613436646136373436363862383933323231663237343838313262 -34343337343031326139366636346632303738366439346433633738313464366438366235356462 -65376165396532623566663335396332333635346661613431343237366166376462393732373532 -62616631643564653865386133663666313366313336323432316236336165386234323165366461 -35343238336235386364363732343862393039326234653539643861383832393465343536353739 -33633134333836393965343935316564653866363130343234633566643463343331306135386334 -39316166616463383964613432373437623964343164383638666531303064313063663330366566 -33643930396232626266396634366564633163333837373062636131623463613061656138363534 -39383830626136636563663233376237626565643661656430336462626436386235643239646365 -34303938323237626362613765326138376130666466373033626338363161383432623465353131 -39373230336330666337393161306437313035373164366330333533636662313266336333626261 -37353638623362643138356434323864346265613835306665383564323139333539336231323534 -38323664396438663664343436333133656336663633396234303034633163643534346139663632 -34633364373066303363306366653566353338326566616138643761343166343536333239653966 -39626639383762653439643631663161303333323330313063336532303531393830646532343261 -65363434373538653337306233333238653465313266643838333862616337323063626432393939 -34663838363931353561396164623138366538376230333738373962356337366533643866343863 -37633366323334323936303962653462353831386262336233336339633366336164623766653862 -32653262373433343136386363386231373938636661373363393331663365636333633164353563 -38643966373261356131666432313934313038363034306162373262353666303936666564303935 -62383432633763623864323263616632396166363165336331363434316430626334616537376132 -63666665336362373265363462343666356434323365633632626632666130356431 +66646139336431653964363035353762363664313738393832356132333835616363373032656335 +3439633266356532316564643762623935643736613839390a616631363336393962633464326264 +31373235323236303134356165386638663865353331353362386538386233363438623035343462 +3864656136376430360a646235373734636666373934616463363234316262376534633865616632 +32643566633531323162366134333562363463336237646130393965646335316561393565663664 +36343164373564336233363963393031363937336137303433396265323261663632373534613365 +31613838363562366564646333646638303837626638323065326237623665646264633233633537 +39373432363962396463323532353434623631383763346234343462333565383333366439393835 +30356437393232363432313334616462346164393437303330343562356461626464633935376239 +39626464316662333736643962623961343662396236306239333335373033366535623730353538 +66346164333839626563366666373432363331343030663537663536623965303333393534316538 +66623737363431303632363237323562306134376336393564366138626435343539613239623539 +39653331623466333535356166653036356564373138623461643862346161383062623738626266 +32613337323038646134336333613266386332353431656263353463656162393732343730393736 +34373033653933656565613063316463373535333836353234333536643639323037373333376338 +65666632623161326538333263626264373535633462306361633835323439663536326433616263 +66373532633865653834323565333536313731643837393834666464626565373938336537363633 +33323335633261643638643038623631633362633366393564316632383030656262383931656262 +65306265316264373732623466393935666633353730346632336262663766333833393961353565 +36383336313062363930633335346430306138656538633637623266383461323735643635613531 +38613265353736303336616638303333343739313033383363303638346266663830613534666464 +33383538303562643232626333303065313364386336366165316263363135396637623739316261 +32376332373539616334646130366262343837323832623965376566343366336563386639326333 +36653365383162623333373766393166656463393331663035616636386238396365663535383334 +39663634386133613138333730366331653262383761633462633239666132343239643735303732 +37343239383038343332656565313465666261646436333536363532376361636461336133336465 +65663561336430336664636262356362636635623961386462313437373863366134343164643762 +64653236616435326432363137646362646433316535393135353333336331313832623461623536 +35653739613834323564313163383563383633343336316533356535623838313663623464353238 +66333862623762316363636439613430363038633062663439383032393934313266316131323836 +30396163303038323564663639656161353336356435633635306538313032626566306366666135 +36383234353161313534343962336536313763306337393239626330396363396235643239306436 +31386631383666363365313434366538616130636164363536343364653861666662343065346663 +31356430653831653962333333396436626630333831343537366636336462373865643164326637 +65623237373561616164333238336463666239306564626538383666303562623632303630303335 +36386665346135623334646336663831666136323231376131383263343631643962643962336466 +38376264376662383263373562313263613866316138653862643833666134316338343863363631 +32663961366635353461303633366364333836636639386537396565333737353164616165323238 +66656666323265323361613162353835313763656637633464363131343361366435313565326664 +63663064336231633865663665666564366264366638356265396236326436623133653836376665 +30383436353663663637363337313232373430356261316465326261656161356436373265653939 +63356538663134386438666638386563393961373265363532653733373263623932613737613234 +61643536663036633132623161343935376633313364616436626561396262303765393662346632 +62353432646234383764366235623062636536666537323831316133636537306334616266363164 +64613735653731626231313931633839326663343262316362383763653832356163 -- 2.14.3

1 0

[libvirt] [PATCH] Qemu driver: Support network-backed pflash disks.
by Prerna Saxena 04 May '18

04 May '18

This implements support for firmware loader & NVRAM disks over network-backed disks. As discussed in https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html, the patch embeds the <source> spec for disks in <loader> and <nvram> elements as well. Currently, the source type is annotated by introducing a new attribute "backing" for both 'loader' and 'nvram' elements. Hence, a sample XML with new annotation looks like this: <loader readonly='yes' type='pflash' backing='file'> <source file='/usr/share/OVMF/OVMF_CODE.fd'/> </loader> <nvram backing='network'> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> </source> The patche automatically re-formats any older-stype declaration into this new style. Templates can be used to create a new NVRAM only if the nvram backing = 'file'.

3 4

[libvirt] [dbus PATCH v2 0/2] improve annotation of properties
by Pavel Hrdina 04 May '18

04 May '18

Pavel Hrdina (2): Change the default annotation for emitting changed properties to false Annotate properties that will never change during the object lifecycle data/org.libvirt.Connect.xml | 3 +++ data/org.libvirt.Domain.xml | 2 ++ data/org.libvirt.Network.xml | 3 +++ 3 files changed, 8 insertions(+) -- 2.14.3

2 3

[libvirt] [dbus PATCH 0/4] various fixes
by Pavel Hrdina 04 May '18

04 May '18

Pavel Hrdina (4): configure: Bump required libvirt version Revert "Implement BridgeName property for Network interface." Annotate properties for which we will not emit changed signal Annotate properties that will never change during the object lifecycle configure.ac | 2 +- data/org.libvirt.Connect.xml | 5 +++++ data/org.libvirt.Domain.xml | 10 ++++++++++ data/org.libvirt.Network.xml | 9 +++++---- src/network.c | 23 ----------------------- tests/test_network.py | 1 - 6 files changed, 21 insertions(+), 29 deletions(-) -- 2.14.3

2 9

[libvirt] [dbus PATCH] Implement SetGuestVcpus method for Domain Interface
by Katerina Koukiou 04 May '18

04 May '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Domain.xml | 7 +++++ src/domain.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index db43b1c..eae6d97 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -463,6 +463,13 @@ <arg name="params" type="a{sv}" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="SetGuestVcpus"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetGuestVcpus"/> + <arg name="vcpumap" type="ab" direction="in"/> + <arg name="state" type="i" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="SetInterfaceParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetInterfaceP…"/> diff --git a/src/domain.c b/src/domain.c index e305fa3..bbc4ead 100644 --- a/src/domain.c +++ b/src/domain.c @@ -72,6 +72,39 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMetadata, "title", "element") +static gchar * +virtDBusDomainConvertBoolArrayToGuestVcpumap(GVariantIter *iter) +{ + g_autoptr(GVariantIter) tmpIter = NULL; + gboolean set; + gint intervalCnt = 0; + guint intervalStart = 0; + gboolean setPrev = 0; + g_autofree GString *ret = NULL; + + ret = g_string_new(""); + for (guint i = 0; ; i++) { + gboolean next = g_variant_iter_loop(iter, "b", &set); + + if (set && !setPrev) + intervalStart = i; + else if ((!set && setPrev) || next) { + if (intervalCnt > 0) + g_string_append_printf(ret, ","); + if (intervalStart != i - 1) + g_string_append_printf(ret, "%d-%d", intervalStart, i - 1); + else + g_string_append_printf(ret, "%d", intervalStart); + intervalCnt++; + } + setPrev = set; + if (!next) + break; + } + + return ret->str; +} + struct _virtDBusDomainFSInfoList { virDomainFSInfoPtr *info; gint count; @@ -2490,6 +2523,34 @@ virtDBusDomainSetBlockIOTune(GVariant *inArgs, } } +static void +virtDBusDomainSetGuestVcpus(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autoptr(GVariantIter) iter = NULL; + gint state; + guint flags; + g_autofree gchar *ret = NULL; + + g_variant_get(inArgs, "(abiu)", &iter, &state, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virtDBusDomainConvertBoolArrayToGuestVcpumap(iter); + + if (virDomainSetGuestVcpus(domain, ret, state, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainSetInterfaceParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2988,6 +3049,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "SendProcessSignal", virtDBusDomainSendProcessSignal }, { "SetBlkioParameters", virtDBusDomainSetBlkioParameters }, { "SetBlockIOTune", virtDBusDomainSetBlockIOTune }, + { "SetGuestVcpus", virtDBusDomainSetGuestVcpus }, { "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters }, { "SetVcpus", virtDBusDomainSetVcpus }, { "SetMemory", virtDBusDomainSetMemory }, -- 2.15.0

2 1

[libvirt] [PATCH 03/12] virsh: Create macros for VSH_OT_STRING "domain" option
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 3 +++ tools/virsh-domain.c | 3 +++ tools/virsh-snapshot.c | 3 +++ tools/virsh.h | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8e071779b4..8ad651626b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -43,6 +43,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6601f94a12..8a63761fab 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -68,6 +68,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e4908eea70..3d86ac84d1 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -45,6 +45,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + /* Helper for snapshot-create and snapshot-create-as */ static bool virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, diff --git a/tools/virsh.h b/tools/virsh.h index f2213ebb57..9dcf104cc4 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -107,6 +107,14 @@ .help = _helpstr \ } +# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_STRING, \ + .help = _helpstr, \ + .completer = virshDomainNameCompleter, \ + .completer_flags = cflags, \ + } + typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; -- 2.15.1

2 1

[libvirt] [PATCH 06/12] virsh: Create macros for VSH_OT_ARGV "domain" option
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 3 +++ tools/virsh-domain.c | 3 +++ tools/virsh-snapshot.c | 3 +++ tools/virsh.h | 9 +++++++++ 4 files changed, 18 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8ad651626b..e4a21534cb 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -46,6 +46,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 689f9d686b..89aefbf86a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -71,6 +71,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 3d86ac84d1..0c86b6c950 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -48,6 +48,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + /* Helper for snapshot-create and snapshot-create-as */ static bool virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, diff --git a/tools/virsh.h b/tools/virsh.h index 9dcf104cc4..a33d108b2d 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -115,6 +115,15 @@ .completer_flags = cflags, \ } +# define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_ARGV, \ + .flags = VSH_OFLAG_NONE, \ + .help = _helpstr, \ + .completer = virshDomainNameCompleter, \ + .completer_flags = cflags, \ + } + typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; -- 2.15.1

2 1

[libvirt] [PATCH 02/12] virsh: Conditionally Ignore the first entry in list of completions
by Lin Ma 04 May '18

04 May '18

The first entry in the returned array is the substitution for TEXT. It causes unnecessary output if other commands or options share the same prefix, e.g. $ virsh des<TAB><TAB> des desc destroy or $ virsh domblklist --d<TAB><TAB> --d --details --domain This patch fixes the above issue. Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/vsh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 73ec007e56..38058c874a 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3458,6 +3458,7 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) const vshCmdOpt *opt = NULL; char **matches = NULL, **iter; virBuffer buf = VIR_BUFFER_INITIALIZER; + int n; if (vshCommandOptStringQuiet(ctl, cmd, "string", &arg) <= 0) goto cleanup; @@ -3493,8 +3494,11 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) if (!(matches = vshReadlineCompletion(arg, 0, 0))) goto cleanup; - for (iter = matches; *iter; iter++) + for (n =0, iter = matches; *iter; iter++, n++) { + if (n == 0 && matches[1]) + continue; printf("%s\n", *iter); + } ret = true; cleanup: -- 2.15.1

2 1

[libvirt] [PATCH 11/12] domain_event: Introduce function virDomainEventGetName
by Lin Ma 04 May '18

04 May '18

It will be used in next patch for event name completion. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/conf/domain_event.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 3 +++ src/libvirt_private.syms | 1 + 3 files changed, 66 insertions(+) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 97520706c9..f8bd457b34 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1968,6 +1968,68 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, } +const char * +virDomainEventGetName(int event) +{ + virResetLastError(); + + switch (event) { + case VIR_DOMAIN_EVENT_ID_LIFECYCLE: + return VIR_DOMAIN_EVENT_LIFECYCLE; + case VIR_DOMAIN_EVENT_ID_REBOOT: + return VIR_DOMAIN_EVENT_REBOOT; + case VIR_DOMAIN_EVENT_ID_RTC_CHANGE: + return VIR_DOMAIN_EVENT_RTC_CHANGE; + case VIR_DOMAIN_EVENT_ID_WATCHDOG: + return VIR_DOMAIN_EVENT_WATCHDOG; + case VIR_DOMAIN_EVENT_ID_IO_ERROR: + return VIR_DOMAIN_EVENT_IO_ERROR; + case VIR_DOMAIN_EVENT_ID_GRAPHICS: + return VIR_DOMAIN_EVENT_GRAPHICS; + case VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON: + return VIR_DOMAIN_EVENT_IO_ERROR_REASON; + case VIR_DOMAIN_EVENT_ID_CONTROL_ERROR: + return VIR_DOMAIN_EVENT_CONTROL_ERROR; + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB: + return VIR_DOMAIN_EVENT_BLOCK_JOB; + case VIR_DOMAIN_EVENT_ID_DISK_CHANGE: + return VIR_DOMAIN_EVENT_DISK_CHANGE; + case VIR_DOMAIN_EVENT_ID_TRAY_CHANGE: + return VIR_DOMAIN_EVENT_TRAY_CHANGE; + case VIR_DOMAIN_EVENT_ID_PMWAKEUP: + return VIR_DOMAIN_EVENT_PMWAKEUP; + case VIR_DOMAIN_EVENT_ID_PMSUSPEND: + return VIR_DOMAIN_EVENT_PMSUSPEND; + case VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE: + return VIR_DOMAIN_EVENT_BALLOON_CHANGE; + case VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK: + return VIR_DOMAIN_EVENT_PMSUSPEND_DISK; + case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED: + return VIR_DOMAIN_EVENT_DEVICE_REMOVED; + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2: + return VIR_DOMAIN_EVENT_BLOCK_JOB_2; + case VIR_DOMAIN_EVENT_ID_TUNABLE: + return VIR_DOMAIN_EVENT_TUNABLE; + case VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE: + return VIR_DOMAIN_EVENT_AGENT_LIFECYCLE; + case VIR_DOMAIN_EVENT_ID_DEVICE_ADDED: + return VIR_DOMAIN_EVENT_DEVICE_ADDED; + case VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION: + return VIR_DOMAIN_EVENT_MIGRATION_ITERATION; + case VIR_DOMAIN_EVENT_ID_JOB_COMPLETED: + return VIR_DOMAIN_EVENT_JOB_COMPLETED; + case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED: + return VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED; + case VIR_DOMAIN_EVENT_ID_METADATA_CHANGE: + return VIR_DOMAIN_EVENT_METADATA_CHANGE; + case VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD: + return VIR_DOMAIN_EVENT_BLOCK_THRESHOLD; + default: + return NULL; + } +} + + virObjectEventPtr virDomainQemuMonitorEventNew(int id, const char *name, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3992a29c58..9c3a1e3b88 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -327,4 +327,7 @@ virDomainQemuMonitorEventNew(int id, const char *details) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); +const char * +virDomainEventGetName(int event); + #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 92b5e0fa2b..0b6c414b66 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -641,6 +641,7 @@ virDomainEventWatchdogNewFromDom; virDomainEventWatchdogNewFromObj; virDomainQemuMonitorEventNew; virDomainQemuMonitorEventStateRegisterID; +virDomainEventGetName; # conf/domain_nwfilter.h -- 2.15.1

2 1

[libvirt] [PATCH 12/12] virsh: Add event name completion to 'event' command
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-completer.c | 36 ++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 3 +++ tools/virsh-domain.c | 1 + 3 files changed, 40 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index e3b8234b41..a188a8d7ab 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -30,6 +30,7 @@ #include "viralloc.h" #include "virstring.h" #include "virxml.h" +extern const char *virDomainEventGetName(int event); char ** @@ -522,3 +523,38 @@ virshSnapshotNameCompleter(vshControl *ctl, virshDomainFree(dom); return NULL; } + + +char ** +virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + size_t i = 0; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (VIR_ALLOC_N(ret, VIR_DOMAIN_EVENT_ID_LAST + 1) < 0) + goto error; + + for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { + const char *name = virDomainEventGetName(i); + + if (name == NULL) + goto error; + + if (VIR_STRDUP(ret[i], name) < 0) + goto error; + } + + return ret; + +error: + VIR_FREE(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index fa443d3ad7..27d78dc7ac 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -69,5 +69,8 @@ char ** virshSecretUUIDCompleter(vshControl *ctl, char ** virshSnapshotNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshEventNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); #endif diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e21ba0117b..ce72d414b9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13369,6 +13369,7 @@ static const vshCmdOptDef opts_event[] = { }, {.name = "event", .type = VSH_OT_ARGV, + .completer = virshEventNameCompleter, .help = N_("which event type to wait for") }, {.name = NULL} -- 2.15.1

2 1

[libvirt] [PATCH 10/12] virsh: Introduce some VIR_DOMAIN_EVENT_* macros representing domain event names
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- include/libvirt/libvirt-domain.h | 201 +++++++++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 50 +++++----- 2 files changed, 226 insertions(+), 25 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 12fd34037e..f7dd510f7f 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4424,6 +4424,207 @@ typedef enum { } virDomainEventID; +/** + * VIR_DOMAIN_EVENT_LIFECYCLE: + * + * Macro for the event name "lifecycle" + */ + +# define VIR_DOMAIN_EVENT_LIFECYCLE "lifecycle" + +/** + * VIR_DOMAIN_EVENT_REBOOT: + * + * Macro for the event name "reboot" + */ + +# define VIR_DOMAIN_EVENT_REBOOT "reboot" + +/** + * VIR_DOMAIN_EVENT_RTC_CHANGE: + * + * Macro for the event name "rtc-change" + */ + +# define VIR_DOMAIN_EVENT_RTC_CHANGE "rtc-change" + +/** + * VIR_DOMAIN_EVENT_WATCHDOG: + * + * Macro for the event name "watchdog" + */ + +# define VIR_DOMAIN_EVENT_WATCHDOG "watchdog" + +/** + * VIR_DOMAIN_EVENT_IO_ERROR: + * + * Macro for the event name "io-error" + */ + +# define VIR_DOMAIN_EVENT_IO_ERROR "io-error" + +/** + * VIR_DOMAIN_EVENT_GRAPHICS: + * + * Macro for the event name "graphics" + */ + +# define VIR_DOMAIN_EVENT_GRAPHICS "graphics" + +/** + * VIR_DOMAIN_EVENT_IO_ERROR_REASON: + * + * Macro for the event name "io-error-reason" + */ + +# define VIR_DOMAIN_EVENT_IO_ERROR_REASON "io-error-reason" + +/** + * VIR_DOMAIN_EVENT_CONTROL_ERROR: + * + * Macro for the event name "control-error" + */ + +# define VIR_DOMAIN_EVENT_CONTROL_ERROR "control-error" + +/** + * VIR_DOMAIN_EVENT_BLOCK_JOB: + * + * Macro for the event name "block-job" + */ + +# define VIR_DOMAIN_EVENT_BLOCK_JOB "block-job" + +/** + * VIR_DOMAIN_EVENT_DISK_CHANGE: + * + * Macro for the event name "disk-change" + */ + +# define VIR_DOMAIN_EVENT_DISK_CHANGE "disk-change" + +/** + * VIR_DOMAIN_EVENT_TRAY_CHANGE: + * + * Macro for the event name "tray-change" + */ + +# define VIR_DOMAIN_EVENT_TRAY_CHANGE "tray-change" + +/** + * VIR_DOMAIN_EVENT_PMWAKEUP: + * + * Macro for the event name "pm-wakeup" + */ + +# define VIR_DOMAIN_EVENT_PMWAKEUP "pm-wakeup" + +/** + * VIR_DOMAIN_EVENT_PMSUSPEND: + * + * Macro for the event name "pm-suspend" + */ + +# define VIR_DOMAIN_EVENT_PMSUSPEND "pm-suspend" + +/** + * VIR_DOMAIN_EVENT_BALLOON_CHANGE: + * + * Macro for the event name "balloon-change" + */ + +# define VIR_DOMAIN_EVENT_BALLOON_CHANGE "balloon-change" + +/** + * VIR_DOMAIN_EVENT_PMSUSPEND_DISK: + * + * Macro for the event name "pm-suspend-disk" + */ + +# define VIR_DOMAIN_EVENT_PMSUSPEND_DISK "pm-suspend-disk" + +/** + * VIR_DOMAIN_EVENT_DEVICE_REMOVED: + * + * Macro for the event name "device-removed" + */ + +# define VIR_DOMAIN_EVENT_DEVICE_REMOVED "device-removed" + +/** + * VIR_DOMAIN_EVENT_BLOCK_JOB_2: + * + * Macro for the event name "block-job-2" + */ + +# define VIR_DOMAIN_EVENT_BLOCK_JOB_2 "block-job-2" + +/** + * VIR_DOMAIN_EVENT_TUNABLE: + * + * Macro for the event name "tunable" + */ + +# define VIR_DOMAIN_EVENT_TUNABLE "tunable" + +/** + * VIR_DOMAIN_EVENT_AGENT_LIFECYCLE: + * + * Macro for the event name "agent-lifecycle" + */ + +# define VIR_DOMAIN_EVENT_AGENT_LIFECYCLE "agent-lifecycle" + +/** + * VIR_DOMAIN_EVENT_DEVICE_ADDED: + * + * Macro for the event name "device-added" + */ + +# define VIR_DOMAIN_EVENT_DEVICE_ADDED "device-added" + +/** + * VIR_DOMAIN_EVENT_MIGRATION_ITERATION: + * + * Macro for the event name "migration-iteration" + */ + +# define VIR_DOMAIN_EVENT_MIGRATION_ITERATION "migration-iteration" + +/** + * VIR_DOMAIN_EVENT_JOB_COMPLETED: + * + * Macro for the event name "job-completed" + */ + +# define VIR_DOMAIN_EVENT_JOB_COMPLETED "job-completed" + +/** + * VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED: + * + * Macro for the event name "device-removal-failed" + */ + +# define VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED "device-removal-failed" + +/** + * VIR_DOMAIN_EVENT_METADATA_CHANGE: + * + * Macro for the event name "metadata-change" + */ + +# define VIR_DOMAIN_EVENT_METADATA_CHANGE "metadata-change" + +/** + * VIR_DOMAIN_EVENT_BLOCK_THRESHOLD: + * + * Macro for the event name "block-threshold" + */ + +# define VIR_DOMAIN_EVENT_BLOCK_THRESHOLD "block-threshold" + + /* Use VIR_DOMAIN_EVENT_CALLBACK() to cast the 'cb' parameter */ int virConnectDomainEventRegisterAny(virConnectPtr conn, virDomainPtr dom, /* Optional, to filter */ diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b35c9adaaa..e21ba0117b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13283,53 +13283,53 @@ virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, static vshEventCallback vshEventCallbacks[] = { - { "lifecycle", + { VIR_DOMAIN_EVENT_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, - { "reboot", virshEventGenericPrint, }, - { "rtc-change", + { VIR_DOMAIN_EVENT_REBOOT, virshEventGenericPrint, }, + { VIR_DOMAIN_EVENT_RTC_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventRTCChangePrint), }, - { "watchdog", + { VIR_DOMAIN_EVENT_WATCHDOG, VIR_DOMAIN_EVENT_CALLBACK(virshEventWatchdogPrint), }, - { "io-error", + { VIR_DOMAIN_EVENT_IO_ERROR, VIR_DOMAIN_EVENT_CALLBACK(virshEventIOErrorPrint), }, - { "graphics", + { VIR_DOMAIN_EVENT_GRAPHICS, VIR_DOMAIN_EVENT_CALLBACK(virshEventGraphicsPrint), }, - { "io-error-reason", + { VIR_DOMAIN_EVENT_IO_ERROR_REASON, VIR_DOMAIN_EVENT_CALLBACK(virshEventIOErrorReasonPrint), }, - { "control-error", virshEventGenericPrint, }, - { "block-job", + { VIR_DOMAIN_EVENT_CONTROL_ERROR, virshEventGenericPrint, }, + { VIR_DOMAIN_EVENT_BLOCK_JOB, VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockJobPrint), }, - { "disk-change", + { VIR_DOMAIN_EVENT_DISK_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventDiskChangePrint), }, - { "tray-change", + { VIR_DOMAIN_EVENT_TRAY_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventTrayChangePrint), }, - { "pm-wakeup", + { VIR_DOMAIN_EVENT_PMWAKEUP, VIR_DOMAIN_EVENT_CALLBACK(virshEventPMChangePrint), }, - { "pm-suspend", + { VIR_DOMAIN_EVENT_PMSUSPEND, VIR_DOMAIN_EVENT_CALLBACK(virshEventPMChangePrint), }, - { "balloon-change", + { VIR_DOMAIN_EVENT_BALLOON_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventBalloonChangePrint), }, - { "pm-suspend-disk", + { VIR_DOMAIN_EVENT_PMSUSPEND_DISK, VIR_DOMAIN_EVENT_CALLBACK(virshEventPMChangePrint), }, - { "device-removed", + { VIR_DOMAIN_EVENT_DEVICE_REMOVED, VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovedPrint), }, - { "block-job-2", + { VIR_DOMAIN_EVENT_BLOCK_JOB_2, VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockJobPrint), }, - { "tunable", + { VIR_DOMAIN_EVENT_TUNABLE, VIR_DOMAIN_EVENT_CALLBACK(virshEventTunablePrint), }, - { "agent-lifecycle", + { VIR_DOMAIN_EVENT_AGENT_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(virshEventAgentLifecyclePrint), }, - { "device-added", + { VIR_DOMAIN_EVENT_DEVICE_ADDED, VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceAddedPrint), }, - { "migration-iteration", + { VIR_DOMAIN_EVENT_MIGRATION_ITERATION, VIR_DOMAIN_EVENT_CALLBACK(virshEventMigrationIterationPrint), }, - { "job-completed", + { VIR_DOMAIN_EVENT_JOB_COMPLETED, VIR_DOMAIN_EVENT_CALLBACK(virshEventJobCompletedPrint), }, - { "device-removal-failed", + { VIR_DOMAIN_EVENT_DEVICE_REMOVAL_FAILED, VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovalFailedPrint), }, - { "metadata-change", + { VIR_DOMAIN_EVENT_METADATA_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), }, - { "block-threshold", + { VIR_DOMAIN_EVENT_BLOCK_THRESHOLD, VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockThresholdPrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 2.15.1

2 1

[libvirt] [dbus PATCH v2] Implement SetGuestVcpus method for Domain Interface
by Katerina Koukiou 04 May '18

04 May '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Fixed conditions since v1 was creating incorrect vcpumap. If all vcpus will be passed False the API will not work, since '' is not valid cpumap but this scenario should not be used. data/org.libvirt.Domain.xml | 7 +++++ src/domain.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index db43b1c..eae6d97 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -463,6 +463,13 @@ <arg name="params" type="a{sv}" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="SetGuestVcpus"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetGuestVcpus"/> + <arg name="vcpumap" type="ab" direction="in"/> + <arg name="state" type="i" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="SetInterfaceParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetInterfaceP…"/> diff --git a/src/domain.c b/src/domain.c index e305fa3..28cbe76 100644 --- a/src/domain.c +++ b/src/domain.c @@ -72,6 +72,39 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMetadata, "title", "element") +static gchar * +virtDBusDomainConvertBoolArrayToGuestVcpumap(GVariantIter *iter) +{ + g_autoptr(GVariantIter) tmpIter = NULL; + gint intervalCnt = 0; + guint intervalStart = 0; + gboolean set; + gboolean setPrev = 0; + g_autofree GString *ret = NULL; + + ret = g_string_new(""); + for (guint i = 0; ; i++) { + gboolean next = g_variant_iter_loop(iter, "b", &set); + + if (next && set && !setPrev) + intervalStart = i; + else if ((!next && setPrev) || (!set && setPrev)) { + if (intervalCnt > 0) + g_string_append_printf(ret, ","); + if (intervalStart != i - 1) + g_string_append_printf(ret, "%d-%d", intervalStart, i - 1); + else + g_string_append_printf(ret, "%d", intervalStart); + intervalCnt++; + } + setPrev = set; + if (!next) + break; + } + + return ret->str; +} + struct _virtDBusDomainFSInfoList { virDomainFSInfoPtr *info; gint count; @@ -2490,6 +2523,34 @@ virtDBusDomainSetBlockIOTune(GVariant *inArgs, } } +static void +virtDBusDomainSetGuestVcpus(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autoptr(GVariantIter) iter = NULL; + gint state; + guint flags; + g_autofree gchar *ret = NULL; + + g_variant_get(inArgs, "(abiu)", &iter, &state, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virtDBusDomainConvertBoolArrayToGuestVcpumap(iter); + + if (virDomainSetGuestVcpus(domain, ret, state, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainSetInterfaceParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2988,6 +3049,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "SendProcessSignal", virtDBusDomainSendProcessSignal }, { "SetBlkioParameters", virtDBusDomainSetBlkioParameters }, { "SetBlockIOTune", virtDBusDomainSetBlockIOTune }, + { "SetGuestVcpus", virtDBusDomainSetGuestVcpus }, { "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters }, { "SetVcpus", virtDBusDomainSetVcpus }, { "SetMemory", virtDBusDomainSetMemory }, -- 2.15.0

1 0

[libvirt] [PATCH 08/12] vshReadlineOptionsGenerator: Add already provided VSH_OT_ARGV options to list
by Lin Ma 04 May '18

04 May '18

It's helpful for users while they type certain kind of VSH_OT_ARGV options. e.g. $ virsh domstats --domain sles12sp3 --d<TAB> Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 5a9916cbb0..9cfd4d92b8 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2685,7 +2685,7 @@ vshReadlineOptionsGenerator(const char *text, } while (opt) { - if (STREQ(opt->def->name, name)) { + if (STREQ(opt->def->name, name) && opt->def->type != VSH_OT_ARGV) { exists = true; break; } -- 2.15.1

1 0

[libvirt] [PATCH 07/12] virsh: Apply macro for current VSH_OT_ARGV "domain" options
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index e4a21534cb..1e1ee60198 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2000,11 +2000,7 @@ static const vshCmdOptDef opts_domstats[] = { .type = VSH_OT_BOOL, .help = N_("add backing chain information to block stats"), }, - {.name = "domain", - .type = VSH_OT_ARGV, - .flags = VSH_OFLAG_NONE, - .help = N_("list of domains to get stats for"), - }, + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("list of domains to get stats for"), 0), {.name = NULL} }; -- 2.15.1

1 0