- Devel - libvirt List Archives

[libvirt] [RFCv2 PoCv1 PATCH 00/15] Just Admin API
by Martin Kletzander 23 Apr '15

23 Apr '15

*** BLURB *** ... Just kidding :) Sooo... After very very VERY long time, here's a draft of an admin interface that is supposed to open up new possibilities to be done on a live daemon. The aim here is to create some first inches of that API in order to open up the possibility of new API function creation to more people. I already spent so much time explaining so much of that that I don't know what else to point at in here. Maybe the fact that last three patches are just an example on how this might work. Of course there won't be any functions like listClientIDs with the need of getting each client info by another API. There's going to be e.g. virAdmClientInfo and virAdmGetClients() will return the list of them, etc. Long story short, let's not repeat past mistakes ;) With all that said, feel free to hate, love, comment or just try out compiling this series and let me know how many things I've missed and screwed up (hopefully zero). Martin Kletzander (15): util: add virJSONValueCopy util: Add virabstracts file for keeping abstract classes datatypes: Use abstract connect class in virConnect Break virNetServer into virNetSubServers Teach gendispatch how to handle admin dispatching files Add admin protocol Build client headers for admin protocol Add admin error domain Add libvirt-admin library Add XML files with admin API specification Add configuration options for permissions on daemon's admin socket Add support for admin API in libvirt daemon rpc: Add virNetSubServerGetNClients admin: Add virAdmHello function Example virt-admin .gitignore | 5 + Makefile.am | 4 +- cfg.mk | 11 +- configure.ac | 19 +- daemon/Makefile.am | 33 +- daemon/admin_server.c | 119 +++++ daemon/admin_server.h | 36 ++ daemon/libvirtd-config.c | 5 +- daemon/libvirtd-config.h | 1 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 138 ++++-- daemon/libvirtd.conf | 8 + daemon/libvirtd.h | 14 +- daemon/remote.c | 194 ++++----- daemon/test_libvirtd.aug.in | 1 + docs/Makefile.am | 23 +- docs/apibuild.py | 10 +- include/libvirt/Makefile.am | 6 +- include/libvirt/libvirt-admin.h | 63 +++ include/libvirt/virterror.h | 3 +- libvirt-admin.pc.in | 13 + libvirt.spec.in | 10 + po/POTFILES.in | 3 + src/Makefile.am | 134 +++++- src/admin/admin_protocol.x | 73 ++++ src/admin_protocol-structs | 17 + src/datatypes.c | 39 +- src/datatypes.h | 45 +- src/internal.h | 1 + src/libvirt-admin.c | 363 ++++++++++++++++ src/libvirt-host.c | 3 +- src/libvirt_admin.syms | 19 + src/libvirt_private.syms | 6 + src/libvirt_remote.syms | 17 +- src/locking/lock_daemon.c | 40 +- src/locking/lock_daemon_dispatch.c | 18 +- src/lxc/lxc_controller.c | 18 +- src/rpc/gendispatch.pl | 141 +++--- src/rpc/virnetserver.c | 859 +++++++++++++------------------------ src/rpc/virnetserver.h | 61 +-- src/rpc/virnetserverprogram.c | 12 +- src/rpc/virnetserverprogram.h | 9 +- src/rpc/virnetsubserver.c | 672 +++++++++++++++++++++++++++++ src/rpc/virnetsubserver.h | 78 ++++ src/util/virabstracts.c | 100 +++++ src/util/virabstracts.h | 57 +++ src/util/virerror.c | 95 ++-- src/util/virerror.h | 4 +- src/util/virjson.c | 65 ++- src/util/virjson.h | 4 +- tests/confdata/libvirtd.conf | 6 + tests/confdata/libvirtd.out | 5 + tests/jsontest.c | 111 +++++ tools/virt-admin/Makefile.am | 70 +++ tools/virt-admin/virt-admin.c | 68 +++ tools/virt-admin/virt-admin.pod | 43 ++ 56 files changed, 3092 insertions(+), 881 deletions(-) create mode 100644 daemon/admin_server.c create mode 100644 daemon/admin_server.h create mode 100644 include/libvirt/libvirt-admin.h create mode 100644 libvirt-admin.pc.in create mode 100644 src/admin/admin_protocol.x create mode 100644 src/admin_protocol-structs create mode 100644 src/libvirt-admin.c create mode 100644 src/libvirt_admin.syms create mode 100644 src/rpc/virnetsubserver.c create mode 100644 src/rpc/virnetsubserver.h create mode 100644 src/util/virabstracts.c create mode 100644 src/util/virabstracts.h create mode 100644 tools/virt-admin/Makefile.am create mode 100644 tools/virt-admin/virt-admin.c create mode 100644 tools/virt-admin/virt-admin.pod -- 2.3.5

4 29

[libvirt] [PATCH] rng: fix port number range validation
by Daniel P. Berrange 23 Apr '15

23 Apr '15

The PortNumber data type is declared to derive from 'short'. Unfortunately this is an signed type, so validates the range [-32,768, 32,767] which excludes valid port numbers between 32767 and 65535. We can't use 'unsignedShort', since we need -1 to be a valid port number too. This change is to use 'int' and set an explicit max boundary instead of relying on the data types' built-in max. One of the existing tests is changed to use a high port number to validate the schema. https://bugzilla.redhat.com/show_bug.cgi?id=1214664 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/schemas/basictypes.rng | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index f086ad2..a83063a 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -349,8 +349,9 @@ </define> <define name="PortNumber"> - <data type="short"> + <data type="int"> <param name="minInclusive">-1</param> + <param name="maxInclusive">65535</param> </data> </define> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index 1b61fcf..34dc767 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -1,4 +1,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none -vnc 127.0.0.1:0,share=allow-exclusive +-net none -serial none -parallel none -vnc 127.0.0.1:59630,share=allow-exclusive diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml index f78ff48..4b88e49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml @@ -25,7 +25,7 @@ <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='5900' autoport='no' listen='127.0.0.1' sharePolicy='allow-exclusive'> + <graphics type='vnc' port='65530' autoport='no' listen='127.0.0.1' sharePolicy='allow-exclusive'> <listen type='address' address='127.0.0.1'/> </graphics> <video> -- 2.1.0

2 1

[libvirt] [PATCH 0/2] Apparmor PCI passthrough fixes
by Cédric Bosdonnat 23 Apr '15

23 Apr '15

Hi all, These two simple patches intend to fix apparmor profiles for PCI passthrough with the qemu driver. Cédric Bosdonnat (2): Allow access to vendor and device file for PCI device passthrough Apparmor: allow reading block-rbd.so examples/apparmor/libvirt-qemu | 1 + src/util/virpci.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.1.4

2 3

[libvirt] [PATCH] util: string: Avoid use of deprecated function index()
by Peter Krempa 23 Apr '15

23 Apr '15

--- src/util/virstring.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 1cd4987..e48c29a 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -976,6 +976,21 @@ static const char control_chars[] = "\x10\x11\x12\x13\x14\x15\x16\x17" "\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"; + +static bool +virStringIsControlChar(char c) +{ + const char *cch; + + for (cch = control_chars; *cch; cch++) { + if (*cch == c) + return true; + } + + return false; +} + + bool virStringHasControlChars(const char *str) { @@ -1003,7 +1018,7 @@ virStringStripControlChars(char *str) len = strlen(str); for (i = 0, j = 0; i < len; i++) { - if (index(control_chars, str[i])) + if (virStringIsControlChar(str[i])) continue; str[j++] = str[i]; -- 2.3.5

2 1

[libvirt] [PATCH] qemu: Don't fail to reboot domains with unresponsive agent
by zhang bo 23 Apr '15

23 Apr '15

just as what b8e25c35d7f80a2fadc0e51e95318e39db3d1687 did, we fall back to the ACPI method when the guest agent is unresponsive in qemuDomainReboot. Signed-off-by: YueWenyuan <yuewenyuan(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/qemu/qemu_driver.c | 67 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6fc9696..964a9c5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2002,21 +2002,14 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; - bool useAgent = false; + bool useAgent = false, agentRequested, acpiRequested; bool isReboot = true; + bool agentForced; int agentFlag = QEMU_AGENT_SHUTDOWN_REBOOT; virCheckFlags(VIR_DOMAIN_REBOOT_ACPI_POWER_BTN | VIR_DOMAIN_REBOOT_GUEST_AGENT, -1); - /* At most one of these two flags should be set. */ - if ((flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) && - (flags & VIR_DOMAIN_REBOOT_GUEST_AGENT)) { - virReportInvalidArg(flags, "%s", - _("flags for acpi power button and guest agent are mutually exclusive")); - return -1; - } - if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; @@ -2028,38 +2021,25 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) } priv = vm->privateData; + agentRequested = flags & VIR_DOMAIN_REBOOT_GUEST_AGENT; + acpiRequested = flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN; if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if ((flags & VIR_DOMAIN_REBOOT_GUEST_AGENT) || - (!(flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) && - priv->agent)) + /* Prefer agent unless we were requested to not to. */ + if (agentRequested || (!flags && priv->agent)) useAgent = true; - if (!useAgent) { -#if WITH_YAJL - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Reboot is not supported with this QEMU binary")); - goto cleanup; - } - } else { -#endif - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Reboot is not supported without the JSON monitor")); - goto cleanup; -#if WITH_YAJL - } -#endif - } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - if (useAgent && !qemuDomainAgentAvailable(vm, true)) - goto endjob; + agentForced = agentRequested && !acpiRequested; + if (useAgent && !qemuDomainAgentAvailable(vm, true)) { + if (agentForced) + goto endjob; + useAgent = false; + } if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2071,7 +2051,28 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) qemuDomainObjEnterAgent(vm); ret = qemuAgentShutdown(priv->agent, agentFlag); qemuDomainObjExitAgent(vm); - } else { + } + + /* If we are not enforced to use just an agent, try ACPI + * shutdown as well in case agent did not succeed. + */ + if ((!useAgent) || + (ret < 0 && (acpiRequested || !flags))) { +#if WITH_YAJL + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("ACPI reboot is not supported with this QEMU binary")); + goto endjob; + } + } else { +#endif + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("ACPI reboot is not supported without the JSON monitor")); + goto endjob; +#if WITH_YAJL + } +#endif qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); if (qemuDomainObjExitMonitor(driver, vm) < 0) -- 1.7.12.4

2 1

[libvirt] [PATCH] bhyve: fix build in tests
by Roman Bogorodskiy 23 Apr '15

23 Apr '15

Commit 835cf84 dropped expectedVirtTypes argument for virDomainDefParse*() functions, however bhyve tests still try to pass that to virDomainDefParseFile(), therefore build fails. Fix build by fixing virDomainDefParseFile() usage. --- tests/bhyvexml2argvtest.c | 1 - tests/bhyvexml2xmltest.c | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c5b0681..26d0075 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -32,7 +32,6 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out; if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, - 1 << VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto out; diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index a1a3701..2e742cf 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -27,7 +27,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml) goto fail; if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt, - 1 << VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; -- 2.3.5

2 2

[libvirt] [PATCH] configure: Report --with-loader-nvram value in summary
by Cole Robinson 23 Apr '15

23 Apr '15

--- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 7f6fd7c..d5fb71d 100644 --- a/configure.ac +++ b/configure.ac @@ -2980,6 +2980,7 @@ AC_MSG_NOTICE([ XML Catalog: $XML_CATALOG_FILE]) AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files]) AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR]) +AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) AC_MSG_NOTICE([]) -- 2.3.5

2 4

[libvirt] [PATCH V2 0/2] Support libvirt's lock manager in the libxl driver
by Jim Fehlig 22 Apr '15

22 Apr '15

V2 of https://www.redhat.com/archives/libvir-list/2015-April/msg00845.html Patch 2 has been ACKed and pushed since it is independent of the lock manager integration. Patch 1 has been changed to address Daniel's comments. Patch 2 (was patch 3 in V1) is unchanged for the time being. Jim Fehlig (2): locking: relax PID requirement libxl: provide integration with lock manager src/Makefile.am | 12 +++++++++ src/libxl/libvirtd_libxl.aug | 2 ++ src/libxl/libxl.conf | 10 ++++++++ src/libxl/libxl_conf.c | 14 +++++++++++ src/libxl/libxl_conf.h | 6 +++++ src/libxl/libxl_domain.c | 47 ++++++++++++++++++++++++++++++++++-- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 25 +++++++++++++++++++ src/libxl/libxl_migration.c | 6 +++++ src/libxl/test_libvirtd_libxl.aug.in | 1 + src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_dispatch.c | 16 ++++++------ src/locking/lock_driver_lockd.c | 7 ++---- 13 files changed, 133 insertions(+), 16 deletions(-) -- 1.8.4.5

2 4

[libvirt] [PATCH] spec: Fix libxl build with driver modules
by Cole Robinson 22 Apr '15

22 Apr '15

--- Pushed as build breaker libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5d8a9d4..c5c6608 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2127,6 +2127,9 @@ exit 0 %if %{with_libxl} %files daemon-driver-libxl %defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%{_datadir}/augeas/lenses/libvirtd_libxl.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ -- 2.3.5

1 0

[libvirt] [PATCH] configure: Fix --loader-nvram typo
by Cole Robinson 22 Apr '15

22 Apr '15

--- Pushed as trivial configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aed0934..7f6fd7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2776,7 +2776,7 @@ AC_ARG_WITH([loader-nvram], fi AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$withval"], - [List of laoder:nvram pairs])]) + [List of loader:nvram pairs])]) # Some GNULIB base64 symbols clash with a kerberos library AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash]) -- 2.3.5

1 0