- Devel - libvirt List Archives

[libvirt] [PATCHv3 0/4] VMX: CD-ROM handling improvements
by Doug Goldstein 02 Sep '13

02 Sep '13

A user came into #virt the other day and was trying to get libvirtd to work with VMWare Fusion 5, which is basically the Mac OS X version of VMWare Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. However I came across the fact that we only support 2 types of CD-ROMs instead of the 3 types that VMWare has lead to adding support for a <driver> element to CD-ROM drives. v3: * Dropped 'auto detect' support from series as it needs more work based on feedback * Added patch to combine virVMXFormatHardDisk and virVMXFormatCDROM into one function. * Converted to <disk type='block' device='lun'> instead of adding a <driver> element to better match the behavior available via QEMU. v2: * Added additional test cases and fixed issues that arose from those Doug Goldstein (4): VMX: Create virVMXFormatDisk() from HD and CD-ROM VMX: Add cdrom-raw dev type from VMWare Fusion VMX: Add a VMWare Fusion 5 configuration for tests VMX: Some serial ports are not actually connected docs/formatdomain.html.in | 3 +- src/libvirt_vmx.syms | 3 +- src/vmx/vmx.c | 216 ++++++++------------- src/vmx/vmx.h | 5 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 + tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 24 +++ .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx | 6 + .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 24 +++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 +++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 38 ++++ tests/vmx2xmltest.c | 4 + tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx | 13 ++ tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml | 14 ++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx | 14 ++ .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml | 14 ++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 +++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 40 ++++ tests/xml2vmxtest.c | 4 + 18 files changed, 400 insertions(+), 145 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml -- 1.8.1.5

3 14

[libvirt] [PATCH 1/2] Fix AM_LDFLAGS typo
by Guido Günther 02 Sep '13

02 Sep '13

--- This should probably go into 1.1.2 src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 636bcbc..19dfb81 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1455,7 +1455,7 @@ libvirt_driver_nwfilter_la_CFLAGS = \ -I$(top_srcdir)/src/access \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) -libvirt_driver_nwfilter_la_LDFLAGS = $(LD_AMFLAGS) +libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_nwfilter_la_LIBADD = $(LIBPCAP_LIBS) $(LIBNL_LIBS) $(DBUS_LIBS) if WITH_DRIVER_MODULES libvirt_driver_nwfilter_la_LIBADD += ../gnulib/lib/libgnu.la -- 1.8.4.rc3

2 2

[libvirt] How to add uplink in esx virtual switch using libvirt
by varun bhatnagar 02 Sep '13

02 Sep '13

Hi, I have an ESXi server, on top of it I have created one VM whose IP address is 192.168.79.1. I want to connect to the VM on ESXi server from my host machine but I am not able to do it. I have created a network "networkforSC" and I have pasted my xml file content below but I am not able to add any uplink (how to add it?) . Below is the xml file of my node as well as the network which I am creating on my ESXi server *<domain type='vmware'>* *<name>testNode</name>* *<uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid>* *<memory>1048576</memory>* *<currentMemory>1048576</currentMemory>* *<vcpu>1</vcpu>* *<console>/dev/console</console>* *<os>* *<type arch='x86_64'>hvm</type>* *</os>* *<devices>* *<disk type='file' device='disk'>* *<source file='[datastore1] testNode/testNode.vmdk'/>* *<target dev='sda' bus='scsi'/>* *<address type='drive' controller='0' bus='0' unit='0'/>* *</disk>* *<controller type='scsi' index='0' model='lsilogic'/>* ** *<interface type='bridge'>* *<mac address='00:50:56:25:48:c7'/>* *<source bridge='VM Network'/>* *</interface>* *<interface type='bridge'>* *<source bridge='test'/>* *</interface>* *</devices>* *</domain>* ########################################## Network File: *<network>* *<name>networkforSC</name>* *<portgroup name='test'>* *</portgroup>* *</network>* I have checked the network which got created on the server. As I have not attached any uplink (vmnic0) I can not see it (I want to attach it). #esxcli network vswitch standard list * * *networkforSC* *Name: networkforSC* *Class: etherswitch* *Num Ports: 128* *Used Ports: 2* *Configured Ports: 128* *MTU: 1500* *CDP Status: listen* *Beacon Enabled: false* *Beacon Threshold: 3* *Beacon Required By:* *Uplinks:* *Portgroups: test* Can anyone please help me out in adding the uplink and also can anyone tell me whether I am going in a right direction so that I could ping my virtual machine created on ESXi server. Regards, Varun

1 0

[libvirt] [PATCH] Add forwarders attribute to <dns /> element.
by Diego Woitasen 02 Sep '13

02 Sep '13

Useful to set custom forwarders instead of using the contents of /etc/resolv.conf. It helps me to setup dnsmasq as local nameserver to resolv VM domain names from domain 0, when domain option is used. Signed-off-by: Diego Woitasen <diego.woitasen(a)vhgroup.net> --- docs/formatnetwork.html.in | 8 ++++ docs/schemas/network.rng | 5 +++ src/conf/network_conf.c | 43 ++++++++++++++++++++-- src/conf/network_conf.h | 2 + src/network/bridge_driver.c | 8 ++++ .../nat-network-dns-forwarders.conf | 16 ++++++++ .../nat-network-dns-forwarders.xml | 12 ++++++ tests/networkxml2conftest.c | 1 + 8 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e1482db..4dd809a 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -631,6 +631,8 @@ <domain name="example.com"/> <dns> <txt name="example" value="example value" /> + <forwarders addr="8.8.8.8" /> + <forwarders addr="8.8.4.4" /> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> @@ -685,6 +687,12 @@ Currently supported sub-elements of <code><dns></code> are: <dl> + <dt><code>forwarders</code></dt> + <dd>A <code>dns</code> element can have 0 or more <code>forwarders</code> elements. + Each forwarders element defines an IP address to be used as forwarder + in DNS server configuration. The addr attribute is required and defines the + IP address of every forwarder. <span class="since">Since N/A</span> + </dd> <dt><code>txt</code></dt> <dd>A <code>dns</code> element can have 0 or more <code>txt</code> elements. Each txt element defines a DNS TXT record and has two attributes, both diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ab183f1..e0c2b51 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -217,6 +217,11 @@ </attribute> </optional> <zeroOrMore> + <element name="forwarders"> + <attribute name="addr"><ref name="ipAddr"/></attribute> + </element> + </zeroOrMore> + <zeroOrMore> <element name="txt"> <attribute name="name"><ref name="dnsName"/></attribute> <attribute name="value"><text/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..1c1aa64 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -175,6 +175,11 @@ virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) static void virNetworkDNSDefClear(virNetworkDNSDefPtr def) { + if (def->forwarders) { + while (def->nfwds) + VIR_FREE(def->forwarders[--def->nfwds]); + VIR_FREE(def->forwarders); + } if (def->txts) { while (def->ntxts) virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); @@ -1037,8 +1042,9 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *hostNodes = NULL; xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; + xmlNodePtr *fwdNodes = NULL; char *forwardPlainNames = NULL; - int nhosts, nsrvs, ntxts; + int nfwds, nhosts, nsrvs, ntxts; size_t i; int ret = -1; xmlNodePtr save = ctxt->node; @@ -1058,6 +1064,30 @@ virNetworkDNSDefParseXML(const char *networkName, } } + nfwds = virXPathNodeSet("./forwarders", ctxt, &fwdNodes); + if (nfwds < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid <forwarders> element found in <dns> of network %s"), + networkName); + goto cleanup; + } + if (nfwds > 0) { + if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) + goto cleanup; + + for (i = 0; i < nfwds; i++) { + def->forwarders[i] = virXMLPropString(fwdNodes[i], "addr"); + if (virSocketAddrParse(NULL, def->forwarders[i], AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid forwarder IP address '%s' " + "in network '%s'"), + def->forwarders[i], networkName); + goto cleanup; + } + def->nfwds++; + } + } + nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1121,6 +1151,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: VIR_FREE(forwardPlainNames); + VIR_FREE(fwdNodes); VIR_FREE(hostNodes); VIR_FREE(srvNodes); VIR_FREE(txtNodes); @@ -2267,13 +2298,14 @@ virNetworkDNSDefFormat(virBufferPtr buf, int result = 0; size_t i, j; - if (!(def->forwardPlainNames || def->nhosts || def->nsrvs || def->ntxts)) + if (!(def->forwardPlainNames || def->forwarders || def->nhosts || + def->nsrvs || def->ntxts)) goto out; virBufferAddLit(buf, "<dns"); if (def->forwardPlainNames) { virBufferAddLit(buf, " forwardPlainNames='yes'"); - if (!(def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->forwarders || def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); goto out; } @@ -2282,6 +2314,11 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + for (i = 0; i < def->nfwds; i++) { + virBufferAsprintf(buf, "<forwarders addr='%s' />\n", + def->forwarders[i]); + } + for (i = 0; i < def->ntxts; i++) { virBufferAsprintf(buf, "<txt name='%s' value='%s'/>\n", def->txts[i].name, diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index c28bfae..b425986 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -122,6 +122,8 @@ struct _virNetworkDNSDef { virNetworkDNSHostDefPtr hosts; size_t nsrvs; virNetworkDNSSrvDefPtr srvs; + size_t nfwds; + char **forwarders; }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3a8be90..a2cfb35 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -708,6 +708,14 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (!network->def->dns.forwardPlainNames) virBufferAddLit(&configbuf, "domain-needed\n"); + if (network->def->dns.forwarders) { + virBufferAddLit(&configbuf, "no-resolv\n"); + for (i=0; i < network->def->dns.nfwds; i++) { + virBufferAsprintf(&configbuf, "server=%s\n", + network->def->dns.forwarders[i]); + } + } + if (network->def->domain) { virBufferAsprintf(&configbuf, "domain=%s\n" diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders.conf new file mode 100644 index 0000000..ebca289 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +no-resolv +server=8.8.8.8 +server=8.8.4.4 +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tests/networkxml2confdata/nat-network-dns-forwarders.xml new file mode 100644 index 0000000..9cd2667 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.xml @@ -0,0 +1,12 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <forwarders addr='8.8.8.8' /> + <forwarders addr='8.8.4.4' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 5825af3..ad50e88 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -145,6 +145,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); + DO_TEST("nat-network-dns-forwarders", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 1.8.1.2

1 0

[libvirt] [PATCHv2 0/2] Support setting the 'removable' flag for USB disks
by Fred A. Kemp 02 Sep '13

02 Sep '13

From: "Fred A. Kemp" <anonym(a)riseup.net> The commit message of patch #2 explains the purpose of this patch set. A review would be greatly appreciated! Note that I've only added the new capability for usb-storage.removable to the qemu help tests of qemu(-kvm) version 1.2.0, since that's what I had easily available to get the output of `-device usb-storage,?` from. I hope that's not an issue, otherwise, is there a way to obtain these outputs without having to hunt down and install all supported versions? Previous submissions of this patch set to this list: http://www.redhat.com/archives/libvir-list/2013-March/msg01051.html http://www.redhat.com/archives/libvir-list/2013-May/msg02039.html https://www.redhat.com/archives/libvir-list/2013-July/msg01635.html https://www.redhat.com/archives/libvir-list/2013-August/msg00581.html Fred A. Kemp (2): qemu: Add capability flag for usb-storage qemu: Support setting the 'removable' flag for USB disks docs/formatdomain.html.in | 8 +++-- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 31 ++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 24 +++++++++++++++ tests/qemuhelpdata/qemu-1.2.0-device | 11 +++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 11 +++++++ tests/qemuhelptest.c | 20 +++++++++---- .../qemuxml2argv-disk-usb-device-removable.args | 8 +++++ .../qemuxml2argv-disk-usb-device-removable.xml | 27 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++- 13 files changed, 155 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml -- 1.7.10.4

4 8

[libvirt] [PATCH 2/2] Pass AM_LDFLAGS to driver modules too
by Guido Günther 02 Sep '13

02 Sep '13

This gives us a RO got, otherwise Debian's lintian complains: W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_vbox.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_xen.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_storage.so W: libvirt-bin: hardening-no-relro usr/lib/libvirt/connection-driver/libvirt_driver_uml.so W: libvirt-sanlock: hardening-no-relro usr/lib/libvirt/lock-driver/sanlock.so --- src/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 19dfb81..097682c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1000,7 +1000,7 @@ libvirt_driver_xen_la_LIBADD = libvirt_driver_xen_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_xen.la libvirt_driver_xen_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_xen_la_LDFLAGS = -module -avoid-version +libvirt_driver_xen_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_xen.la # Stateful, so linked to daemon instead @@ -1050,7 +1050,7 @@ libvirt_driver_vbox_la_LIBADD = libvirt_driver_vbox_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_vbox.la libvirt_driver_vbox_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version +libvirt_driver_vbox_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_vbox.la # GPLv2-only license requries that it be linked into @@ -1083,7 +1083,7 @@ libvirt_driver_libxl_la_LIBADD = libvirt_driver_libxl_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_libxl.la libvirt_driver_libxl_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version +libvirt_driver_libxl_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_libxl.la # Stateful, so linked to daemon instead @@ -1108,7 +1108,7 @@ libvirt_driver_qemu_la_LIBADD = libvirt_driver_qemu_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_qemu.la libvirt_driver_qemu_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version +libvirt_driver_qemu_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_qemu.la # Stateful, so linked to daemon instead @@ -1184,7 +1184,7 @@ libvirt_driver_uml_la_LIBADD = libvirt_driver_uml_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_uml.la libvirt_driver_uml_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_uml_la_LDFLAGS = -module -avoid-version +libvirt_driver_uml_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_uml.la # Stateful, so linked to daemon instead @@ -1361,7 +1361,7 @@ libvirt_driver_storage_la_LIBADD = libvirt_driver_storage_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_storage.la libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS = -module -avoid-version +libvirt_driver_storage_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else noinst_LTLIBRARIES += libvirt_driver_storage.la # Stateful, so linked to daemon instead @@ -2114,7 +2114,7 @@ if WITH_SANLOCK lockdriver_LTLIBRARIES += sanlock.la sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) sanlock_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS = -module -avoid-version +sanlock_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) sanlock_la_LIBADD = -lsanlock_client \ ../gnulib/lib/libgnu.la -- 1.8.4.rc3

2 1

[libvirt] [PATCH 1/3] CPU: Implement guestData for PPC CPU driver
by Li Zhang 02 Sep '13

02 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> On Power platform, Power7+ can support Power7 guest. It needs to define XML configuration to specify guest's CPU model. For exmaple: <cpu match='exact'> <model>POWER7+_v2.1</model> <vendor>IBM</vendor> </cpu> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 647a8a1..84fa3f7 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -99,6 +99,23 @@ ppcModelFindPVR(const struct ppc_map *map, return NULL; } +static struct ppc_model * +ppcModelCopy(const struct ppc_model *model) +{ + struct ppc_model *copy; + + if (VIR_ALLOC(copy) < 0 || + VIR_STRDUP(copy->name, model->name) < 0) { + ppcModelFree(copy); + return NULL; + } + + copy->data.pvr = model->data.pvr; + copy->vendor = model->vendor; + + return copy; +} + static struct ppc_vendor * ppcVendorFind(const struct ppc_map *map, const char *name) @@ -126,6 +143,29 @@ ppcVendorFree(struct ppc_vendor *vendor) VIR_FREE(vendor); } +static struct ppc_model * +ppcModelFromCPU(const virCPUDefPtr cpu, + const struct ppc_map *map) +{ + struct ppc_model *model = NULL; + + if ((model = ppcModelFind(map, cpu->model)) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown CPU model %s"), cpu->model); + goto error; + } + + if ((model = ppcModelCopy(model)) == NULL) + goto error; + + return model; + +error: + ppcModelFree(model); + return NULL; +} + + static int ppcVendorLoad(xmlXPathContextPtr ctxt, struct ppc_map *map) @@ -288,6 +328,112 @@ error: return NULL; } +static virCPUDataPtr +ppcMakeCPUData(virArch arch, struct cpuPPCData *data) +{ + virCPUDataPtr cpuData; + + if (VIR_ALLOC(cpuData) < 0) + return NULL; + + cpuData->arch = arch; + cpuData->data.ppc = *data; + data = NULL; + + return cpuData; +} + +static virCPUCompareResult +ppcCompute(virCPUDefPtr host, + const virCPUDefPtr cpu, + virCPUDataPtr *guestData, + char **message) + +{ + struct ppc_map *map = NULL; + struct ppc_model *host_model = NULL; + struct ppc_model *guest_model = NULL; + + int ret = 0; + virArch arch; + size_t i; + + if (cpu->arch != VIR_ARCH_NONE) { + bool found = false; + + for (i = 0; i < ARRAY_CARDINALITY(archs); i++) { + if (archs[i] == cpu->arch) { + found = true; + break; + } + } + + if (!found) { + VIR_DEBUG("CPU arch %s does not match host arch", + virArchToString(cpu->arch)); + if (message && + virAsprintf(message, + _("CPU arch %s does not match host arch"), + virArchToString(cpu->arch)) < 0) + goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + arch = cpu->arch; + } else { + arch = host->arch; + } + + if (cpu->vendor && + (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { + VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", + cpu->vendor); + if (message && + virAsprintf(message, + _("host CPU vendor does not match required " + "CPU vendor %s"), + cpu->vendor) < 0) + goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + + if (!(map = ppcLoadMap()) || + !(host_model = ppcModelFromCPU(host, map)) || + !(guest_model = ppcModelFromCPU(cpu, map))) + goto error; + + if (guestData != NULL) { + if (cpu->type == VIR_CPU_TYPE_GUEST && + cpu->match == VIR_CPU_MATCH_STRICT && + STRNEQ(guest_model->name, host_model->name)) { + VIR_DEBUG("host CPU model does not match required CPU model %s", + guest_model->name); + if (message && + virAsprintf(message, + _("host CPU model does not match required " + "CPU model %s"), + guest_model->name) < 0) + goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + + if (!(*guestData = ppcMakeCPUData(arch, &guest_model->data))) + goto error; + } + + ret = VIR_CPU_COMPARE_IDENTICAL; + +out: + ppcMapFree(map); + ppcModelFree(host_model); + ppcModelFree(guest_model); + return ret; + +error: + ret = VIR_CPU_COMPARE_ERROR; + goto out; + +} + static virCPUCompareResult ppcCompare(virCPUDefPtr host, virCPUDefPtr cpu) @@ -369,6 +515,15 @@ ppcNodeData(void) } #endif +static virCPUCompareResult +ppcGuestData(virCPUDefPtr host, + virCPUDefPtr guest, + virCPUDataPtr *data, + char **message) +{ + return ppcCompute(host, guest, data, message); +} + static int ppcUpdate(virCPUDefPtr guest ATTRIBUTE_UNUSED, const virCPUDefPtr host ATTRIBUTE_UNUSED) @@ -466,6 +621,13 @@ error: goto cleanup; } +static int +ppcHasFeature(const virCPUDataPtr data ATTRIBUTE_UNUSED, + const char *name ATTRIBUTE_UNUSED) +{ + return 0; +} + struct cpuArchDriver cpuDriverPowerPC = { .name = "ppc64", .arch = archs, @@ -479,8 +641,8 @@ struct cpuArchDriver cpuDriverPowerPC = { #else .nodeData = NULL, #endif - .guestData = NULL, + .guestData = ppcGuestData, .baseline = ppcBaseline, .update = ppcUpdate, - .hasFeature = NULL, + .hasFeature = ppcHasFeature, }; -- 1.8.1.4

2 5

[libvirt] Release of libvirt-1.1.2
by Daniel Veillard 02 Sep '13

02 Sep '13

As scheduled I have pushed the tarballs and rpms of the new release at the usual place: ftp://libvirt.org/libvirt/ This is a medium sized release with less than 300 commits, with a inclination toward code improvements and bugs fixes, in particular fixes for 4 CVEs. It may be a good idea to upgrade ! Features: - various improvements to libxl driver (Jim Fehlig, Bamvor Jian Zhang) - systemd integration improvements (Daniel P. Berrange, Mooli Tayer) - Add flag to BaselineCPU API to return detailed CPU features (Don Dugger) - Introduce a virt-login-shell binary (Dan Walsh) - conf: add startupPolicy attribute for harddisk (Guannan Ren) Security: - provide supplemental groups even when parsing label (CVE-2013-4291) (Eric Blake) - Add bounds checking on virDomainMigrate*Params RPC calls (CVE-2013-4292) (Daniel P. Berrange) - CVE-2013-5651 virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array (Peter Krempa) - CVE-2013-4239 xen: fix memory corruption in legacy driver (Jim Fehlig) Documentation: - Reformat <disk> attribute description in formatdomain (John Ferlan) - Update iSCSI storage pool example (John Ferlan) - Update formatsecrets to include more examples of each type (John Ferlan) - Update the formatdomain disk examples (John Ferlan) - Clean 09adfdc62de2b up (Michal Privoznik) - virt-pki-validate: add --help/--version option (Eric Blake) - virt-xml-validate: add --help/--version option (Eric Blake) - Discourage users to set hard_limit (Michal Privoznik) - Update polkit examples to use 'lookup' method (Daniel P. Berrange) - fix usb node device sub-element names (Xuesong Zhang) - virt-login-shell: improve error message grammar (Ruben Kerkhof) - storage pool permission copy-paste fix (Philipp Hahn) - mention VIR_TEST_RANGE (Eric Blake) - Document use of systemd socket activation (Daniel P. Berrange) - Remove leftovers from hyperv spinlocks documentation (Ján Tomko) - Fix typo in domain name in polkit acl example (Daniel P. Berrange) - Add documentation for access control system (Daniel P. Berrange) - Add an example config file for virtlockd (Daniel P. Berrange) - Add a man page for virtlockd daemon (Daniel P. Berrange) - Add info about access control checks into API reference (Daniel P. Berrange) - Fix minor typos in messages and docs (Yuri Chornoivan) Portability: - build: fix virtlockd file distribution (Eric Blake) - build: shipped files must not depend on BUILT_SOURCES (Eric Blake) - build: only create virt-login-shell for lxc builds (Eric Blake) - qemu: Only setup vhost if virtType == "kvm" (Cole Robinson) - Process virtlockd.conf instead of libvirtd.conf (Guido Günther) - Change way we fake dbus method calls (Daniel P. Berrange) - random: don't mix RAND_MAX with random_r (Eric Blake) - tests: skip schema validation tests if xmllint is missing (Eric Blake) - Check for --no-copy-dt-needed linker flag (Guido Günther) - Simplify RELRO_LDFLAGS (Guido Günther) - tests: fix building without xattr support (Claudio Bley) - nwfilter: Don't fail to start if DBus isn't available (Peter Krempa) - virsystemd: Don't fail to start VM if DBus isn't available or compiled in (Peter Krempa) - tools: Make sure to distribute conf_DATA, fix RPM build (Cole Robinson) - Directly link against needed libraries (Guido Günther) - Directly link against needed libraries (Guido Günther) - build: avoid -lgcrypt with newer gnutls (Eric Blake) - build: more workarounds for if_bridge.h (Eric Blake) - tests: avoid too-large constants (Eric Blake) - tests: work with older dbus (Eric Blake) - build: fix compilation of virt-login-shell.c (Jim Fehlig) - maint: the compiler is not always named gcc (Eric Blake) - build: fix qemuagenttest build with -O0 in fedora 19. (Jincheng Miao) - spec: RHEL-7 does not have sanlock on i686 (Jiri Denemark) - spec: Disable libssh2 support for RHEL (Peter Krempa) Bug Fixes: - qemu_hotplug: Resolve DEADCODE coverity error (John Ferlan) - Fix memory leak in cmdAttachDisk (Hongwei Bi) - python: Fix a PyList usage mistake (Guan Qiang) - qemu: Remove hostdev entry when freeing the depending network entry (Peter Krempa) - virsh: detect programming errors with option parsing (Eric Blake) - virt-sanlock-cleanup; Fix augtool usage (Jiri Denemark) - virsh: Fix debugging (Martin Kletzander) - virsh: free the caps list properly if one of them is invalid (Ján Tomko) - virsh: free the formatting string when listing pool details (Ján Tomko) - virsh: free the list from ListAll APIs even for 0 items (Ján Tomko) - virsh: free messages after logging them to a file (Ján Tomko) - Test network update XML parsing (Ján Tomko) - Always specify qcow2 compat level on qemu-img command line (Ján Tomko) - virsh: fix return value error of cpu-stats (Guannan Ren) - Don't free NULL network in cmdNetworkUpdate (Ján Tomko) - schema: Allow dots in device aliases (Jiri Denemark) - qemu: Don't update count of vCPUs if hot-plug fails silently (Peter Krempa) - tests: Add URI precedence checking (Martin Kletzander) - Fix URI connect precedence (Martin Kletzander) - libxl: fix libvirtd crash when reconnecting domains (Jim Fehlig) - migration: do not restore labels on failed migration (Eric Blake) - storage: Fix the use-after-free memory bug (Osier Yang) - storage: Fix coverity warning (Osier Yang) - qemu_conf: Fix broken logic for adding passthrough iscsi lun (Osier Yang) - libxl: Resolve possible NULL dereference (John Ferlan) - virsh: Don't leak list of volumes when undefining domain with storage (Peter Krempa) - virbitmaptest: Shut coverity up in case of broken test (Peter Krempa) - storage: Update pool metadata after adding/removing/resizing volume (Osier Yang) - virbitmaptest: Add test for out of bounds condition (Peter Krempa) - virsh-domain: Fix memleak in cmdCPUBaseline (Peter Krempa) - libxl: unref DomainObjPrivate on error path (Jim Fehlig) - virsh-domain: Fix memleak in cmdUndefine with storage (Peter Krempa) - Fix qemuProcessReadLog with non-zero offset (Ján Tomko) - network: permit upstream forwarding of unqualified DNS names (Laine Stump) - virsh-domain: Flip logic in cmdSetvcpus (Peter Krempa) - Don't crash in qemuBuildDeviceAddressStr (Guido Günther) - libxl: fix libvirtd segfault (Jim Fehlig) - Make check for /dev/loop device names stricter to avoid /dev/loop-control (Daniel P. Berrange) - libxl: fix node ranges in libxlNodeGetCellsFreeMemory() (Dario Faggioli) - Fix double-free and broken logic in virt-login-shell (Daniel P. Berrange) - virnettlscontext: Resolve Coverity warnings (UNINIT) (John Ferlan) - remote: Fix a segfault in remoteDomainCreateWithFlags (Alex Jia) - qemu: Allow hotplug of multiple SCSI devices (Eric Farman) - Fix validation of CA certificate chains (Daniel P. Berrange) - Reverse logic allowing partial DHCP host XML (Ján Tomko) - xen: Use internal interfaces in xenDomainUsedCpus (Stefan Bader) - qemu_migration: Don't error on tunelled migration with --copy-storage (Michal Privoznik) - build: fix missing max_queued_clients in augeas test file for libvirtd.conf (Laine Stump) - Fix crashing upgrading from older libvirts with running guests (Daniel P. Berrange) - Avoid crash if NULL is passed for filename/funcname in logging (Daniel P. Berrange) - qemumonitortestutils: Don't skip va_end() on error path (Peter Krempa) - tests: Coverity found new NULL_RETURNS (John Ferlan) - Configuring systemd to restart libvirt on failure (Mooli Tayer) - xen: Avoid double free of virDomainDef in xenDaemonCreateXML (Stefan Bader) Improvements: - build: fix 'make distcheck' out of the box (Eric Blake) - virsh-domain: rename print_job_progress to vshPrintJobProgress (Peter Krempa) - Prohibit unbounded arrays in XDR protocols (Daniel P. Berrange) - Add bounds checking on virConnectListAllSecrets RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllNWFilters RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllNodeDevices RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllInterfaces RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllNetworks RPC call (Daniel P. Berrange) - Add bounds checking on virStoragePoolListAllVolumes RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllStoragePools RPC call (Daniel P. Berrange) - Add bounds checking on virConnectListAllDomains RPC call (Daniel P. Berrange) - Add bounds checking on virDomain{SnapshotListAllChildren,ListAllSnapshots} RPC calls (Daniel P. Berrange) - Add bounds checking on virDomainGetJobStats RPC call (Daniel P. Berrange) - autogen.sh: Correctly detect .git as a file (Michal Privoznik) - bridge_driver: Introduce networkObjFromNetwork (Michal Privoznik) - virsh-pool.c: Don't jump over variable declaration (Michal Privoznik) - Remove the space before the slash in network XML (Ján Tomko) - Build QEMU command line for pcihole64 (Ján Tomko) - Add pcihole64 element to root PCI controllers (Ján Tomko) - Allow controller XML parsing to use XPath context (Ján Tomko) - Move virDomainParseScaledValue earlier (Ján Tomko) - Add ftp protocol support for cdrom disk (Aline Manera) - Add http protocol support for cdrom disk (Aline Manera) - virsh: C99 style for info_domfstrim and opts_lxc_enter_namespace (Tomas Meszaros) - qemuDomainAttachHostPciDevice: Fall back to mem balloon if there's no hard_limit (Michal Privoznik) - qemuhotplugtest: Add tests for virtio SCSI disk hotplug (Jiri Denemark) - qemuhotplugtest: Add tests for USB disk hotplug (Jiri Denemark) - qemuhotplugtest: Add tests for async virtio disk detach (Jiri Denemark) - qemuhotplugtest: Add support for DEVICE_DELETED event (Jiri Denemark) - qemu: Let tests override waiting time for device unplug (Jiri Denemark) - qemu: Export qemuProcessHandleDeviceDeleted for tests (Jiri Denemark) - tests: Add support for passing driver to qemu monitor (Jiri Denemark) - tests: Add support for passing vm to qemu monitor (Jiri Denemark) - qemuhotplugtest: Add tests for virtio disk hotplug (Jiri Denemark) - qemuxml2argvtest: Add XML for testing device hotplug (Jiri Denemark) - qemuhotplugtest: Define QMP_OK for the most common reply (Jiri Denemark) - qemuhotplugtest: Compare domain XML after device hotplug (Jiri Denemark) - qemuhotplugtest: Generate better output (Jiri Denemark) - qemu: Move qemuDomainDetachDeviceDiskLive to qemu_hotplug.c (Jiri Denemark) - qemu: Move qemuDomainAttachDeviceDiskLive to qemu_hotplug.c (Jiri Denemark) - qemu: Avoid using global qemu_driver in event handlers (Jiri Denemark) - qemu: Typedef monitor callbacks (Jiri Denemark) - python: simplify complicated conditional assignment (Claudio Bley) - Test for object identity when checking for None in Python (Claudio Bley) - qemuagenttest.c: Missing documentation (Timeout) (Nehal J Wani) - python: Use RELRO_LDFLAGS and NO_INDIRECT_LDFLAGS (Guido Günther) - Set security label on FD for virDomainOpenGraphics (Daniel P. Berrange) - qemuBuildNicDevStr: Add mq=on for multiqueue networking (Michal Privoznik) - virBitmapParse: Fix behavior in case of error and fix up callers (Peter Krempa) - VMX: Improve disk parse error for unknown values (Doug Goldstein) - bridge driver: implement networkEnableIpForwarding for BSD (Roman Bogorodskiy) - BSD: implement virNetDev(Set|Clear)IPv4Address (Roman Bogorodskiy) - Test handling of non-existent x509 certs (Daniel P. Berrange) - Report secret usage error message similarly (John Ferlan) - virsh: Print cephx and iscsi usage (John Ferlan) - selinux: enhance test to cover nfs label failure (Eric Blake) - selinux: distinguish failure to label from request to avoid label (Eric Blake) - virsh-pool: Improve error message in cmdPoolList (Peter Krempa) - virsh: modify vshStringToArray to duplicate the elements too (Peter Krempa) - qemuBuildCommandLine: Fall back to mem balloon if there's no hard_limit (Michal Privoznik) - qemuSetupMemoryCgroup: Handle hard_limit properly (Michal Privoznik) - virt-xml-validate: add missing schemas (Eric Blake) - libxl: implement NUMA capabilities reporting (Jim Fehlig) - virdbus: Add virDBusHasSystemBus() (Peter Krempa) - Make max_clients in virtlockd configurable (David Weber) - snapshot_conf: Allow parsing an XML node (Cole Robinson) - test: Unify object XML parsing (Cole Robinson) - test: Simplify args passed to testDomainStartState (Cole Robinson) - test: Split object parsing into their own functions (Cole Robinson) - maint: slightly reduce configure size (Eric Blake) - libxl: refactor capabilities code (Jim Fehlig) - virbitmaptest: Fix function header formatting (Peter Krempa) - maint: update gnulib submodule (Eric Blake) - maint: fix typo for 'switch' (Eric Blake) - examples: support crash events in event-test.py (Giuseppe Scrivano) - cpu: Add Power7+ and Power8 CPU definition in map.xml (Li Zhang) - Ensure that /dev exists in the container root filesystem (Daniel P. Berrange) - Properly handle -h / -V for --help/--version aliases in virtlockd/libvirtd (Daniel P. Berrange) - Address missed feedback from review of virt-login-shell (Daniel P. Berrange) - Honour root prefix in lxcContainerMountFSBlockAuto (Daniel P. Berrange) - tests: Fix parallel runs of TLS test suites (Martin Kletzander) - cgroup macros refactoring, part 5 (Roman Bogorodskiy) - cgroup macros refactoring, part 4 (Roman Bogorodskiy) - cgroup macros refactoring, part 3 (Roman Bogorodskiy) - cgroup macros refactoring, part 2 (Roman Bogorodskiy) - cgroup macros refactoring, part 1 (Roman Bogorodskiy) - cgroup: functional sort (Eric Blake) - cgroup: topological sort (Eric Blake) - cgroup: use consistent formatting (Eric Blake) - Add missing ATTRIBUTE_UNUSED (Guido Günther) - virsh: nicer abort of blockcopy (Eric Blake) - tests: Skip virsh-all test as expensive (Peter Krempa) - qemuagenttest: Test timeout of agent commands (Peter Krempa) - tests: add helper to determine when to skip expensive tests (Eric Blake) - build: add configure option to disable gnulib tests (Eric Blake) - qemuagenttest: Test arbitrary command passthrough (Peter Krempa) - Record the where the auto-generated data comes from (Daniel P. Berrange) - tests: test negative number through dbus (Eric Blake) - libxl: Create per-domain log file (Jim Fehlig) - Fix parallel runs of TLS test suites (Daniel P. Berrange) - configure: fix formatting of missing pkg-config modules error (Giuseppe Scrivano) - Ensure securityfs is mounted readonly in container (Dan Walsh) - Change data passed into TLS test cases (Daniel P. Berrange) - Avoid re-generating certs every time (Daniel P. Berrange) - Split TLS test into two separate tests (Daniel P. Berrange) - maint: avoid C99 loop declaration (Eric Blake) - qemu: support to drop disk with 'optional' startupPolicy (Guannan Ren) - nwfilter: Use -m conntrack rather than -m state (Stefan Berger) - virGetGroupList: always include the primary group (Guido Günther) - qemu: improve error reporting during PCI address validation (Laine Stump) - qemu: enable using implicit sata controller in q35 machines (Laine Stump) - qemu: properly set/use device alias for pci controllers (Laine Stump) - qemu: fix handling of default/implicit devices for q35 (Laine Stump) - qemu: add dmi-to-pci-bridge controller (Laine Stump) - qemu: add pcie-root controller (Laine Stump) - qemu: enable auto-allocate of all PCI addresses (Laine Stump) - Introduce max_queued_clients (Michal Privoznik) - RPC: Don't accept client if it would overcommit max_clients (Michal Privoznik) - qemu: eliminate almost-duplicate code in qemu_command.c (Laine Stump) - qemu: rename some functions in qemu_command.c (Laine Stump) - conf: add default USB controller in qemu post-parse callback (Laine Stump) - spec: Explicitly claim ownership of channel subdir (Jiri Denemark) - Ensure LXC/QEMU APIs set the filename for errors (Daniel P. Berrange) - Remove reference to python/tests from RPM %doc (Daniel P. Berrange) - qemuagenttest: Check invalid response in shutdown test (Peter Krempa) - qemuagenttest: Fix checking of shutdown mode (Peter Krempa) - bridge driver: extract platform specifics (Roman Bogorodskiy) - valgrind: Adjust filter for _dl_allocate_tls (John Ferlan) - maint: use modern autoconf idioms (Eric Blake) - qemu: check presence of each disk and its backing file as well (Guannan Ren) - qemu: add helper functions for diskchain checking (Guannan Ren) - qemu: refactor qemuDomainCheckDiskPresence for only disk presence check (Guannan Ren) - Enable support for systemd-machined in cgroups creation (Daniel P. Berrange) - Cope with races while killing processes (Daniel P. Berrange) - Add support for systemd cgroup mount (Daniel P. Berrange) - Add APIs for formatting systemd slice/scope names (Daniel P. Berrange) - qemuagenttest: Add tests for CPU plug functions and helpers (Peter Krempa) - qemuagenttest: Introduce testing of shutdown commands (Peter Krempa) - qemuagenttest: Add testing of agent suspend modes (Peter Krempa) - qemuagenttest: Test the filesystem trimming (Peter Krempa) - tests: Add qemuagenttest (Peter Krempa) - qemumonitortestutils: Add the ability to check arguments of commands (Peter Krempa) - qemumonitortestutils: Improve error reporting from mock qemu monitor (Peter Krempa) - qemumonitortestutils: Add instrumentation for guest agent testing (Peter Krempa) - qemumonitortestutils: Split lines on \n instead of \r\n (Peter Krempa) - qemumonitortestutils: Refactor the test helpers to allow reuse (Peter Krempa) - qemumonitortestutils: Split up creation of the test to allow reuse (Peter Krempa) - qemumonitortestutils: Don't crash on non fully initialized test (Peter Krempa) - qemumonitortestutils: remove multiline function calls (Peter Krempa) - qemumonitortestutils: Use VIR_DELETE_ELEMENT and VIR_APPEND_ELEMENT (Peter Krempa) - qemumonitortestutils: Use consistent header style and line spacing (Peter Krempa) - qemu_agent: Remove obvious comments (Peter Krempa) - qemu_agent: Move updater function for VCPU hotplug into qemu_agent.c (Peter Krempa) - qemu_agent: Output newline at the end of the sync JSON message (Peter Krempa) - conf: Export virDomainChrSourceDefClear() (Peter Krempa) - add console support in libxl (Bamvor Jian Zhang) - util: add virGetUserDirectoryByUID (Dan Walsh) - maint: fix typo for SENTINEL (Eric Blake) - spec: Don't mix commands with macro definitions (Jiri Denemark) - spec: Use --enable-werror on RHEL (Jiri Denemark) - tests: Put a mock library at the start of LD_PRELOAD (Jiri Denemark) - Support apparmor in RPM spec (Daniel P. Berrange) - Delete obsolete / unused python test files (Daniel P. Berrange) Cleanups: - qemu_hotplug: Fix whitespace around addition in argument (Peter Krempa) - qemu: Drop qemuDomainMemoryLimit (Michal Privoznik) - maint: avoid bootstrap warning (Eric Blake) - libxl: remove unnecessary curly braces (Jim Fehlig) - virtio-rng: Remove double space in error message (Peter Krempa) - Don't mark parentIndex with ATTRIBUTE_UNUSED (Ján Tomko) Thanks everybody who contributed to this release in some ways, ideas, bug reports, patches or reviews ! Including localization updates, we now have a dozen of languague with complete or near complate translations :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Entering freeze for libvirt-1.1.2
by Daniel Veillard 02 Sep '13

02 Sep '13

I am a day late but I finally tagged the release candidate 1 of 1.1.2 in git and push the tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ so the plan is to have an rc2 candidate on friday and if everything looks good push the final release 1.1.2 on Monday. Please give it a try especially for potential portability issues, thanks in advance ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

9 21

[libvirt] [PATCH] qemu_hotplug: Resolve DEADCODE coverity error
by John Ferlan 01 Sep '13

01 Sep '13

Remove unused 'cgroup' variable in qemuDomainAttachDeviceDiskLive() to resolve coverity DEADCODE complaint --- Refactoring of qemuDomainAttachDeviceDiskLive() in the following patch: https://www.redhat.com/archives/libvir-list/2013-August/msg00079.html seemed to wake up Coverity and it complained about deadcode as a result of 'cgroup' only ever been NULL thus the check for it to be non-NULL in order to call qemuTeardownDiskCgroup() would not be able to occur. The code actually hadn't changed, but for some reason coverity now found it. Followed example in qemuDomainChangeDiskMediaLive() and just removed the 'cgroup' variable. src/qemu/qemu_hotplug.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9c655ff..6cdee44 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -683,7 +683,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, virDomainDiskDefPtr orig_disk = NULL; virDomainDeviceDefPtr dev_copy = NULL; virDomainDiskDefPtr tmp = NULL; - virCgroupPtr cgroup = NULL; virCapsPtr caps = NULL; int ret = -1; @@ -773,10 +772,10 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, break; } - if (ret != 0 && cgroup) { - if (qemuTeardownDiskCgroup(vm, disk) < 0) - VIR_WARN("Failed to teardown cgroup for disk path %s", - NULLSTR(disk->src)); + if (ret != 0 && + qemuTeardownDiskCgroup(vm, disk) < 0) { + VIR_WARN("Failed to teardown cgroup for disk path %s", + NULLSTR(disk->src)); } end: -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix memory leak in cmdAttachDisk
by hwbi 31 Aug '13

31 Aug '13

When virBufferError is ok in cmdAttachDisk,the latter should 'goto cleanup',instead of returning a false to prevent memory leaking. --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3fd57fd..568d61d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -661,7 +661,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (virBufferError(&buf)) { vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); - return false; + goto cleanup; } xml = virBufferContentAndReset(&buf); -- 1.7.1

3 3

[libvirt] [PATCH] random: don't mix RAND_MAX with random_r
by Eric Blake 31 Aug '13

31 Aug '13

FreeBSD 10 recently changed their definition of RAND_MAX, to try and cover the fact that their evenly distributed results really are a smaller range than a full power of 2. As a result, I did some investigation, and learned: 1. POSIX requires random() to be evenly distributed across exactly 31 bits. glibc also guarantees this for rand(), but the two are unrelated, and POSIX only associates RAND_MAX with rand(). Avoiding RAND_MAX altogether thus avoids a build failure on FreeBSD 10. 2. Concatenating random bits from a PRNG will NOT provide uniform coverage over the larger value UNLESS the period of the original PRNG is at least as large as the number of bits being concatenated. Simple example: suppose that RAND_MAX were 1 with a period of 2**1 (which means that the PRNG merely alternates between 0 and 1). Concatenating two successive rand() calls would then invariably result in 01 or 10, which is a rather non-uniform distribution (00 and 11 are impossible) and an even worse period (2**0, since our second attempt will get the same number as our first attempt). But a RAND_MAX of 1 with a period of 2**2 (alternating between 0, 1, 1, 0) provides sane coverage of all four values, if properly tempered. (Back-to-back calls would still only see half the values if we don't do some tempering). We therefore want to guarantee a period of at least 2**64, preferably larger (as a tempering factor); POSIX only makes this guarantee for random() with 256 bytes of info. * src/util/virrandom.c (virRandomBits): Use constants that are accurate for the PRNG we are using, not an unrelated PRNG. (randomState): Ensure the period of our PRNG exceeds our usage. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I debated pushing this under the build-breaker rule, but would like to get feedback from an actual FreeBSD build first if possible. src/util/virrandom.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index c233732..37d1a82 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE -static char randomState[128]; +static char randomState[256]; static struct random_data randomData; static virMutex randomLock; @@ -70,9 +70,20 @@ virRandomOnceInit(void) VIR_ONCE_GLOBAL_INIT(virRandom) -/* The algorithm of virRandomBits requires that RAND_MAX == 2^n-1 for - * some n; gnulib's random_r meets this property. */ -verify(((RAND_MAX + 1U) & RAND_MAX) == 0); +/* The algorithm of virRandomBits relies on gnulib's guarantee that + * random_r() matches the POSIX requirements on random() of being + * evenly distributed among exactly [0, 2**31) (that is, we always get + * exactly 31 bits). While this happens to be the value of RAND_MAX + * on glibc, note that POSIX only requires RAND_MAX to be tied to the + * weaker rand(), so there are platforms where RAND_MAX is smaller + * than the range of random_r(). For the results to be evenly + * distributed among up to 64 bits, we also rely on the period of + * random_r() to be at least 2**64, which POSIX only guarantees for + * random() if you use 256 bytes of state. */ +enum { + RANDOM_BITS_PER_ITER = 31, + RANDOM_BITS_MASK = (1U << RANDOM_BITS_PER_ITER) - 1, +}; /** * virRandomBits: @@ -85,7 +96,6 @@ verify(((RAND_MAX + 1U) & RAND_MAX) == 0); */ uint64_t virRandomBits(int nbits) { - int bits_per_iter = count_one_bits(RAND_MAX); uint64_t ret = 0; int32_t bits; @@ -98,10 +108,10 @@ uint64_t virRandomBits(int nbits) virMutexLock(&randomLock); - while (nbits > bits_per_iter) { + while (nbits > RANDOM_BITS_PER_ITER) { random_r(&randomData, &bits); - ret = (ret << bits_per_iter) | (bits & RAND_MAX); - nbits -= bits_per_iter; + ret = (ret << RANDOM_BITS_PER_ITER) | (bits & RANDOM_BITS_MASK); + nbits -= RANDOM_BITS_PER_ITER; } random_r(&randomData, &bits); -- 1.8.3.1

3 4

[libvirt] [PATCH] build: shipped files must not depend on BUILT_SOURCES
by Eric Blake 31 Aug '13

31 Aug '13

'make distcheck' was failing with: make[3]: Entering directory `/home/eblake/libvirt-tmp2/libvirt-1.1.1/_build/docs' perl ../../docs/genaclperms.pl ../../src/access/viraccessperm.h > ../../docs/aclperms.htmlinc /bin/sh: ../../docs/aclperms.htmlinc: Permission denied when simulating the case of a user doing a VPATH build from a read-only source tree. The culprit? BUILT_SOURCES are _always_ built, and so must NOT be built into srcdir and need not be part of the tarball. On the other hand, shipped files must never depend on files in the builddir. While it would be possible to fix the problem by generating aclperms.htmlinc into builddir, we then have the problem that we ship acl.html - we'd have to rejigger a lot of things to not ship pre-built html. So this patch goes the other direction - we don't need BUILT_SOURCES, but instead ensure that we have proper dependencies so that all files in srcdir are up-to-date at the time the tarball is created. And because we ship html files in the tarball, that implies we don't expect users to be able to rebuild them, so we must not clean any files that would trigger a rebuild except under the maintainer rules. * docs/Makefile.am (BUILT_SOURCES): Delete. (CLEANFILES): Downgrade aclperms.htmlinc cleanup... (maintainer-clean-local): ...and move hvsupport.html.in... (MAINTAINERCLEANFILES): ...to a maintainer action. (hvsupport.html.in): Write into srcdir. (hvsupport.html): Ensure files are built in order. (aclperms.htmlinc): Honor silent make. (EXTRA_DIST): Ship aclperms.htmlinc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. Still not there, but getting much closer; now 'make distcheck' fails with: rm -f Makefile ERROR: files left in build directory after distclean: ./src/virtlockd.8 docs/Makefile.am | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9939cc8..410c256 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -25,8 +25,6 @@ DOC_SOURCE_DIR=../src DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt -BUILT_SOURCES=hvsupport.html.in - apihtml = \ html/index.html \ html/libvirt-libvirt.html \ @@ -89,9 +87,15 @@ internals_html_in = \ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) internals_html = $(internals_html_in:%.html.in=%.html) +# todo.html is special - it is shipped in the tarball, but we +# have a dedicated 'todo' target to rebuild it from a proper +# config file, all other users are able to build it locally. +# For all other files, since we ship pre-built html in the +# tarball, we must also ship the sources, even when those +# sources are themselves generated. dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) \ todo.html.in \ - hvsupport.html.in + $(srcdir)/hvsupport.html.in dot_html = $(dot_html_in:%.html.in=%.html) dot_php_in = $(notdir $(wildcard $(srcdir)/*.php.in)) @@ -136,25 +140,22 @@ EXTRA_DIST= \ $(xml) $(qemu_xml) $(lxc_xml) $(fig) $(png) $(css) \ $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ $(internals_html_in) $(internals_html) \ - sitemap.html.in \ + sitemap.html.in aclperms.htmlinc \ todo.pl hvsupport.pl todo.cfg-example -BUILT_SOURCES += aclperms.htmlinc - -CLEANFILES = $(srcdir)/aclperms.htmlinc - acl.html:: $(srcdir)/aclperms.htmlinc $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ $(srcdir)/genaclperms.pl Makefile.am - $(PERL) $(srcdir)/genaclperms.pl $< > $@ + $(AM_V_GEN)$(PERL) $(srcdir)/genaclperms.pl $< > $@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) \ $(addprefix $(srcdir)/,$(internals_html)) \ - $(addprefix $(srcdir)/,$(dot_php)) + $(addprefix $(srcdir)/,$(dot_php)) \ + $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc all-am: web @@ -183,7 +184,9 @@ todo: rm -f todo.html.in $(MAKE) todo.html -hvsupport.html.in: $(srcdir)/hvsupport.pl \ +hvsupport.html:: $(srcdir)/hvsupport.html.in + +$(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl \ $(srcdir)/../src/libvirt_public.syms \ $(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/libvirt_lxc.syms \ $(srcdir)/../src/driver.h @@ -295,7 +298,7 @@ clean-local: maintainer-clean-local: clean-local rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml \ - todo.html.in hvsupport.html.in + todo.html.in rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml rm -rf $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml rm -rf $(APIBUILD_STAMP) -- 1.8.3.1

1 1

[libvirt] [PATCH] build: fix virtlockd file distribution
by Eric Blake 31 Aug '13

31 Aug '13

Since virtlockd is only built when libvirtd is built, we should not install its auxiliary files unconditionally. This solves two failures. 1. 'make distcheck' complains: rm -f Makefile ERROR: files left in build directory after distclean: ./src/virtlockd.8 2. './autobuild.sh' complains: Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/eblake/rpmbuild/BUILDROOT/mingw-libvirt-1.1.1-1.fc19.eblake1377879911.x86_64 error: Installed (but unpackaged) file(s) found: /usr/i686-w64-mingw32/sys-root/mingw/etc/libvirt/virtlockd.conf /usr/i686-w64-mingw32/sys-root/mingw/share/augeas/lenses/tests/test_virtlockd.aug /usr/i686-w64-mingw32/sys-root/mingw/share/augeas/lenses/virtlockd.aug /usr/i686-w64-mingw32/sys-root/mingw/share/man/man8/virtlockd.8 /usr/x86_64-w64-mingw32/sys-root/mingw/etc/libvirt/virtlockd.conf /usr/x86_64-w64-mingw32/sys-root/mingw/share/augeas/lenses/tests/test_virtlockd.aug /usr/x86_64-w64-mingw32/sys-root/mingw/share/augeas/lenses/virtlockd.aug /usr/x86_64-w64-mingw32/sys-root/mingw/share/man/man8/virtlockd.8 * src/Makefile.am (CLEANFILES): Add virtlockd.8. (man8_MANS, conf_DATA, augeas_DATA, augeastest_DATA): Only install virtlockd files when daemon is built. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule, once my testing completes. src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..636bcbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2046,14 +2046,16 @@ virtlockd.8: $(srcdir)/virtlockd.8.in < $< > $@-t && \ mv $@-t $@ +if WITH_LIBVIRTD man8_MANS = virtlockd.8 conf_DATA += locking/virtlockd.conf augeas_DATA += locking/virtlockd.aug augeastest_DATA += test_virtlockd.aug +endif WITH_LIBVIRTD -CLEANFILES += test_virtlockd.aug +CLEANFILES += test_virtlockd.aug virtlockd.8 MAINTAINERCLEANFILES += $(srcdir)/virtlockd.8.in EXTRA_DIST += \ -- 1.8.3.1

1 0

[libvirt] [PATCH] build: fix 'make distcheck' out of the box
by Eric Blake 31 Aug '13

31 Aug '13

With the 1.1.1 tarball, if a user does 'make && make distcheck', things pass, but if they do 'make distcheck' after 'make clean', there is an odd failure: GEN ../../docs/devhelp/index.html I/O error : Permission denied I/O error : Permission denied runtime error: file ../../docs/devhelp/devhelp.xsl line 43 element document xsltDocumentElem: unable to save to ../../docs/devhelp/libvirt-virterror.html I/O error : Permission denied I/O error : Permission denied This implies that the rules for 'make dist' are missing a dependency - the generated documentation needs to be up-to-date before creating the tarball, or else the tarball will be missing files, where the end user will end up trying to rebuild files in srcdir, and that fails when srcdir is read-only. 1.1.1 plus this patch now works without issues (other issues have crept in to 1.1.2-rc1 that prevent 'make distcheck' from working, but those will be cleaned up in later patches). * docs/Makefile.am (dist-local): New dependency. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- All that explanation, and just one line to change. :) Pushing under the build-breaker rule. docs/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 0b0d2d4..9939cc8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -288,6 +288,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ check-local: all +dist-local: all clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html -- 1.8.3.1

1 0

[libvirt] [PATCH] cgroup: Don't fail to start a VM when DBus isn't compiled in or running
by Peter Krempa 30 Aug '13

30 Aug '13

The systemd code to create cgroups has fallback means built in, but fails to engage them if a host isn't running DBus or libvirtd is compiled without DBus (yes, you still don't need to run DBus). This patch changes the return value in case DBus isn't available to so that the fallback code can be activated and cgroups are created manually. --- src/util/virsystemd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 251b846..25fcf96 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -145,8 +145,10 @@ int virSystemdCreateMachine(const char *name, char *username = NULL; char *slicename = NULL; - if (!(conn = virDBusGetSystemBus())) - return -1; + if (!(conn = virDBusGetSystemBus())) { + virResetLastError(); + return -2; + } if (privileged) { if (virAsprintf(&machinename, "%s-%s", drivername, name) < 0) -- 1.8.3.2

2 2

[libvirt] [PATCH] doc: Update help for virsh_desc command
by Yanbing Du 30 Aug '13

30 Aug '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ccb6080..47fd6cb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6657,19 +6657,19 @@ static const vshCmdOptDef opts_desc[] = { }, {.name = "live", .type = VSH_OT_BOOL, - .help = N_("modify/get running state") + .help = N_("get/set description of running state domain") }, {.name = "config", .type = VSH_OT_BOOL, - .help = N_("modify/get persistent configuration") + .help = N_("get/set description of persistent definition domain") }, {.name = "current", .type = VSH_OT_BOOL, - .help = N_("modify/get current state configuration") + .help = N_("get/set description of current state domain") }, {.name = "title", .type = VSH_OT_BOOL, - .help = N_("modify/get the title instead of description") + .help = N_("get/set the title instead of description") }, {.name = "edit", .type = VSH_OT_BOOL, -- 1.7.1

2 1

[libvirt] [PATCH] Add documentation for access control system
by Daniel P. Berrange 30 Aug '13

30 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This adds two new pages to the website, acl.html describing the general access control framework and permissions models, and aclpolkit.html describing the use of polkit as an access control driver. page.xsl is modified to support a new syntax <div id="include" filename="somefile.htmlinc"/> which will cause the XSL transform to replace that <div> with the contents of 'somefile.htmlinc'. We use this in the acl.html.in file, to pull the table of permissions for each libvirt object. This table is autogenerated from the enums in src/access/viraccessperms.h by the genaclperms.pl script. newapi.xsl is modified so that the list of permissions checks shown against each API will link to the description of the permissions in acl.html Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + docs/Makefile.am | 12 +- docs/acl.html.in | 100 ++++++++++++ docs/aclpolkit.html.in | 414 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/auth.html.in | 6 +- docs/genaclperms.pl | 124 +++++++++++++++ docs/newapi.xsl | 4 +- docs/page.xsl | 11 ++ docs/sitemap.html.in | 10 ++ 9 files changed, 677 insertions(+), 5 deletions(-) create mode 100644 docs/acl.html.in create mode 100644 docs/aclpolkit.html.in create mode 100644 docs/genaclperms.pl diff --git a/.gitignore b/.gitignore index ae9de0b..4216bf1 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ /daemon/libvirtd.policy /daemon/libvirtd.service /daemon/test_libvirtd.aug +/docs/aclperms.htmlinc /docs/apibuild.py.stamp /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in diff --git a/docs/Makefile.am b/docs/Makefile.am index aabee44..9057432 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -128,7 +128,7 @@ fig = \ migration-unmanaged-direct.fig EXTRA_DIST= \ - apibuild.py \ + apibuild.py genaclperms.pl \ site.xsl newapi.xsl news.xsl page.xsl \ hacking1.xsl hacking2.xsl wrapstring.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ @@ -139,6 +139,16 @@ EXTRA_DIST= \ sitemap.html.in \ todo.pl hvsupport.pl todo.cfg-example +BUILT_SOURCES += aclperms.htmlinc + +CLEANFILES = aclperms.htmlinc + +acl.html:: aclperms.htmlinc + +aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ + genaclperms.pl Makefile.am + $(PERL) genaclperms.pl $< > $@ + MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ $(addprefix $(srcdir)/,$(apihtml)) \ diff --git a/docs/acl.html.in b/docs/acl.html.in new file mode 100644 index 0000000..5fb633d --- /dev/null +++ b/docs/acl.html.in @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Client access control</h1> + <p> + Libvirt's client access control framework allows administrators + to setup fine grained permission rules across client users, + managed objects and API operations. This allows client connections + to be locked down to a minimal set of privileges. + </p> + + <ul id="toc"></ul> + + <h2><a name="intro">Access control introduction</a></h2> + + <p> + In a default configuration, the libvirtd daemon have three levels + of access control. All connections start off in an unauthenticated + state, where the only API operations allowed are those required + to complete authentication. After successful authentication, a + connection either has full, unrestricted access to all libvirt + API calls, or is locked down to only "read only" operations, + according to what socket a client connection originated on. + </p> + + <p> + The access control framework allows authenticated connections to + have fine grained permission rules to be defined by the administrator. + Every API call in libvirt has a set of permissions that will + be validated against the object being used. For example, the + <code>virDomainSetSchedulerParametersFlags</code> method will + check whether the client user has the <code>write</code> + permission on the <code>domain</code> object instance passed + in as a parameter. Further permissions will also be checked + if certain flags are set in the API call. In addition to + checks on the object passed into an API call, some methods + will filter their results. For example the <code>virConnectListAllDomains</code> + method will check the <code>search_domains</code> on the <code>connect</code> + object, but will also filter the returned <code>domain</code> + objects to only those on which the client user has the + <code>getattr</code> permission. + </p> + + <h2><a name="drivers">Access control drivers</a></h2> + + <p> + The access control framework is designed as a pluggable + system to enable future integration with arbitrary access + control technologies. By default, the <code>none</code> + driver is used, which does not access controll checks at + all. At this time, libvirt ships with support for using + <a href="http://www.freedesktop.org/wiki/Software/polkit/">polkit</a> as a real access + control driver. To learn how to use the polkit access + driver consult <a href="aclpolkit.html">the configuration + docs</a>. + </p> + + <p> + The access driver is configured in the <code>libvirtd.conf</code> + configuration file, using the <code>access_drivers</code> + parameter. This parameter accepts an array of access control + driver names. If more than one access driver is requested, + then all must succeed in order for access to be granted. + To enable 'polkit' as the driver + </p> + + <pre> +# augtool -s set '/files/etc/libvirt/libvirtd.conf/access_drivers[1]' polkit + </pre> + + <p> + And to reset back to the default (no-op) driver + </p> + + + <pre> +# augtool -s rm /files/etc/libvirt/libvirtd.conf/access_drivers + </pre> + + <p> + <strong>Note:</strong> changes to libvirtd.conf require that + the libvirtd daemon be restarted. + </p> + + <h2><a name="perms">Objects and permissions</a></h2> + + <p> + Libvirt applies access control to all the main object + types in its API. Each object type, in turn, has a set + of permissions defined. To determine what permissions + are checked for specific API call, consult the + <a href="html/libvirt-libvirt.html">API reference manual</a> + documentation for the API in question. + </p> + + <div id="include" filename="aclperms.htmlinc"/> + + </body> +</html> diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in new file mode 100644 index 0000000..d7be0bd --- /dev/null +++ b/docs/aclpolkit.html.in @@ -0,0 +1,414 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Polkit access control</h1> + + <p> + Libvirt's client <a href="acl.html">access control framework</a> allows + administrators to setup fine grained permission rules across client users, + managed objects and API operations. This allows client connections + to be locked down to a minimal set of privileges. The polkit driver + provides a simple implementation of the access control framework + </p> + + <ul id="toc"></ul> + + <h2><a name="intro">Introduction</a></h2> + + <p> + A default install of libvirt will typically use + <a href="http://www.freedesktop.org/wiki/Software/polkit/">polkit</a> + to authenticate the initial user connection to libvirtd. This is a + very coarse grained check though either allowing full read-write + access to all APIs, or just read-only access. The polkit access + control driver in libvirt builds on this capability to allow for + fine grained control over the operations a user may perform on an + object. + </p> + + <h2><a name="perms">Permission names</a></h2> + + <p> + The libvirt <a href="acl.html#perms">object names and permission names</a> + are mapped onto polkit action names using the simple pattern: + </p> + + <pre>org.libvirt.api.$object.$permission +</pre> + + <p> + The only caveat is that any underscore characters in the + object or permission names are converted to hyphens. So, + for example, the <code>search_storage_vols</code> permission + on the <code>storage_pool</code> object maps to the polkit + action: + </p> + <pre>org.libvirt.api.storage-pool.search-storage-vols +</pre> + + <p> + The default policy for any permission which corresponds to + an "read only" operation, is to allow access. All other + permissions default to deny access. + </p> + + <h2><a name="attrs">Object identity attributes</a></h2> + + <p> + To allow polkit authorization rules to be written to match + against individual object instances, libvirt provides a number + of authorization detail attributes when performing a permission + check. The set of attributes varies according to the type + of object being checked + </p> + + <h3><a name="object_connect">virConnectPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + </tbody> + </table> + + <h3><a name="object_domain">virDomainPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>domain_name</td> + <td>Name of the domain, unique to the local host</td> + </tr> + <tr> + <td>domain_uuid</td> + <td>UUID of the domain, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_interface">virInterfacePtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>interface_name</td> + <td>Name of the network interface, unique to the local host</td> + </tr> + <tr> + <td>interface_mac</td> + <td>MAC address of the network interface, not unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_network">virNetworkPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>network_name</td> + <td>Name of the network, unique to the local host</td> + </tr> + <tr> + <td>network_uuid</td> + <td>UUID of the network, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_node_device">virNodeDevicePtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>node_device_name</td> + <td>Name of the node device, unique to the local host</td> + </tr> + </tbody> + </table> + + <h3><a name="object_nwfilter">virNWFilterPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>nwfilter_name</td> + <td>Name of the network filter, unique to the local host</td> + </tr> + <tr> + <td>nwfilter_uuid</td> + <td>UUID of the network filter, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_secret">virSecretPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>secret_uuid</td> + <td>UUID of the secret, globally unique</td> + </tr> + <tr> + <td>secret_usage_volume</td> + <td>Name of the associated volume, if any</td> + </tr> + <tr> + <td>secret_usage_ceph</td> + <td>Name of the associated Ceph server, if any</td> + </tr> + <tr> + <td>secret_usage_target</td> + <td>Name of the associated iSCSI target, if any</td> + </tr> + <tr> + <td></td> + <td></td> + </tr> + </tbody> + </table> + + <h3><a name="object_storage_pool">virStoragePoolPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>pool_name</td> + <td>Name of the storage pool, unique to the local host</td> + </tr> + <tr> + <td>pool_uuid</td> + <td>UUID of the storage pool, globally unique</td> + </tr> + </tbody> + </table> + + <h3><a name="object_storage_vol">virStorageVolPtr</a></h3> + <table class="acl"> + <thead> + <tr> + <th>Attribute</th> + <th>Description</th> + </tr> + </thead> + <tbody> + <tr> + <td>connect_driver</td> + <td>Name of the libvirt connection driver</td> + </tr> + <tr> + <td>pool_name</td> + <td>Name of the storage pool, unique to the local host</td> + </tr> + <tr> + <td>pool_uuid</td> + <td>UUID of the storage pool, globally unique</td> + </tr> + <tr> + <td>vol_name</td> + <td>Name of the storage volume, unique to the pool</td> + </tr> + <tr> + <td>vol_key</td> + <td>Key of the storage volume, globally unique</td> + </tr> + </tbody> + </table> + + + <h2><a name="user">User identity attributes</a></h2> + + <p> + At this point in time, the only attribute provided by + libvirt to identify the user invoking the operation + is the PID of the client program. This means that the + polkit access control driver is only useful if connections + to libvirt are restricted to its UNIX domain socket. If + connections are being made to a TCP socket, no identifying + information is available & access will be denied. + Also note that if the client is connecting via an SSH + tunnel, it is the local SSH user that will be identified. + In future versions, it is expected that more information + about the client user will be provided, including the + SASAL / Kerberos username and/or x509 distinguished + name obtained from the authentication provider in use. + </p> + + + <h2><a name="checks">Writing acces control policies</a></h2> + + <p> + If using versions of polkit prior to 0.106 then it is only + possible to validate (user, permission) pairs via the <code>.pkla</code> + files. Fully validation of the (user, permission, object) triple + requires the new JavaScript <code>.rules</code> support that + was introduced in version 0.106. That latter is what will be + described here. + </p> + + <p> + Libvirt does not ship any rules files by default. It merely + provides a definition of the default behaviour for each + action (permission). As noted earlier, permissions which + correspond to read-only operations in libvirt will be allowed + to all users by default; everything else is denied by default. + Defining custom rules requires creation of a file in the + <code>/etc/polkit-1/rules.d</code> directory with a name + chosen by the administrator (<code>100-libvirt-acl.rules</code> + would be a reasonable choice). See the <code>polkit(8)</code> + manual page for a description of how to write these files + in general. The key idea is to create a file containing + something like + </p> + + <pre> + polkit.addRule(function(action, subject) { + ....logic to check 'action' and 'subject'... + }); + </pre> + + <p> + In this code snippet above, the <code>action</code> object + instance will represent the libvirt permission being checked + along with identifying attributes for the object it is being + applied to. The <code>subject</code> meanwhile will identify + the libvirt client app (with the caveat above about it only + dealing with local clients connected via the UNIX socket). + On the <code>action</code> object, the permission name is + accessible via the <code>id</code> attribute, while the + object identifying attributes are exposed via a set of + attributes with the naming convention <code>_detail_[attrname]</code>. + For example, the 'domain_name' attribute would be exposed via + a property <code>_detail_domain_name</code>. + </p> + + <h3><a name="exconnect">Example: restricting ability to connect to drivers</a></h3> + + <p> + Consider a local user <code>berrange</code> + who has been granted permission to connect to libvirt in + full read-write mode. The goal is to only allow them to + use the <code>QEMU</code> driver and not the Xen or LXC + drivers which are also available in libvirtd. + To achieve this we need to write a rule which checks + whether the <code>_detail_connect_driver</code> attribute + is <code>QEMU</code>, and match on a action + name of <code>org.libvirt.api.connect.getattr</code>. Using + the javascript rules format, this ends up written as + </p> + + <pre> +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.api.connect.getattr" && + subject.user == "berrange") { + if (action._detail_connect_driver == 'QEMU') { + return polkit.Result.YES; + } else { + return polkit.Result.NO; + } + } +}); + </pre> + + <h3><a name="exdomain">Example: restricting access to a single domain</a></h3> + + <p> + Consider a local user <code>berrange</code> + who has been granted permission to connect to libvirt in + full read-write mode. The goal is to only allow them to + see the domain called <code>demo</code> on the LXC driver. + To achieve this we need to write a rule which checks + whether the <code>_detail_connect_driver</code> attribute + is <code>LXC</code> and the <code>_detail_domain_name</code> + attribute is <code>demo</code>, and match on a action + name of <code>org.libvirt.api.domain.getattr</code>. Using + the javascript rules format, this ends up written as + </p> + + <pre> +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.api.domain.getattr" && + subject.user == "berrange") { + if (action._detail_connect_driver == 'LXC' && + action._detail_domain_name == 'busy') { + return polkit.Result.YES; + } else { + return polkit.Result.NO; + } + } +}); + </pre> + </body> +</html> diff --git a/docs/auth.html.in b/docs/auth.html.in index e5703c7..37f2978 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -2,12 +2,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <h1 >Authentication & access control</h1> + <h1>Connection authentication</h1> <p> When connecting to libvirt, some connections may require client authentication before allowing use of the APIs. The set of possible authentication mechanisms is administrator controlled, independent - of applications using libvirt. + of applications using libvirt. Once authenticated, libvirt can apply + fine grained <a href="acl.html">access control</a> to the operations + performed by a client. </p> <ul id="toc"></ul> diff --git a/docs/genaclperms.pl b/docs/genaclperms.pl new file mode 100644 index 0000000..244a68e --- /dev/null +++ b/docs/genaclperms.pl @@ -0,0 +1,124 @@ +#!/usr/bin/perl +# +# Copyright (C) 2013 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. +# + +use strict; +use warnings; + +my @objects = ( + "CONNECT", "DOMAIN", "INTERFACE", + "NETWORK","NODE_DEVICE", "NWFILTER", + "SECRET", "STORAGE_POOL", "STORAGE_VOL", + ); + +my %class; + +foreach my $object (@objects) { + my $class = lc $object; + + $class =~ s/(^\w|_\w)/uc $1/eg; + $class =~ s/_//g; + $class =~ s/Nwfilter/NWFilter/; + $class = "vir" . $class . "Ptr"; + + $class{$object} = $class; +} + +my $objects = join ("|", @objects); + +my %opts; +my $in_opts = 0; + +my %perms; + +while (<>) { + if ($in_opts) { + if (m,\*/,) { + $in_opts = 0; + } elsif (/\*\s*\@(\w+):\s*(.*?)\s*$/) { + $opts{$1} = $2; + } + } elsif (m,/\*\*,) { + $in_opts = 1; + } elsif (/VIR_ACCESS_PERM_($objects)_((?:\w|_)+),/) { + my $object = $1; + my $perm = lc $2; + next if $perm eq "last"; + + $perm =~ s/_/-/g; + + $perms{$object} = {} unless exists $perms{$object}; + $perms{$object}->{$perm} = { + desc => $opts{desc}, + message => $opts{message}, + anonymous => $opts{anonymous} + }; + %opts = (); + } +} + +print <<EOF; +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> +EOF + +foreach my $object (sort { $a cmp $b } keys %perms) { + my $class = $class{$object}; + my $olink = lc "object_" . $object; + print <<EOF; +<h3><a name="$olink">$class</a></h3> +<table class="acl"> + <thead> + <tr> + <th>Permission</th> + <th>Description</th> + </tr> + </thead> + <tbody> +EOF + + foreach my $perm (sort { $a cmp $b } keys %{$perms{$object}}) { + my $description = $perms{$object}->{$perm}->{desc}; + + die "missing description for $object.$perm" unless + defined $description; + + my $plink = lc "perm_" . $object . "_" . $perm; + $plink =~ s/-/_/g; + + print <<EOF; + <tr> + <td><a name="$plink">$perm</a></td> + <td>$description</td> + </tr> +EOF + + } + + print <<EOF; + </tbody> +</table> +EOF +} + +print <<EOF; + </body> +</html> +EOF diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 58f12eb..606d244 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -71,8 +71,8 @@ <xsl:template match="check" mode="acl"> <tr> - <td><xsl:value-of select="@object"/></td> - <td><xsl:value-of select="@perm"/></td> + <td><a href="../acl.html#object_{@object}"><xsl:value-of select="@object"/></a></td> + <td><a href="../acl.html#perm_{@object}_{@perm}"><xsl:value-of select="@perm"/></a></td> <xsl:choose> <xsl:when test="@flags"> <td><xsl:value-of select="@flags"/></td> diff --git a/docs/page.xsl b/docs/page.xsl index 7da34ff..a2da854 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -26,6 +26,10 @@ <xsl:call-template name="toc"/> </xsl:template> + <xsl:template match="html:div[@id='include']" mode="content"> + <xsl:call-template name="include"/> + </xsl:template> +  <xsl:template match="html:ul" mode="menu"> @@ -174,4 +178,11 @@ </html> </xsl:template> + <xsl:template name="include"> + <xsl:variable name="inchtml"> + <xsl:copy-of select="document(@filename)"/> + </xsl:variable> + + <xsl:apply-templates select="exsl:node-set($inchtml)/html:html/html:body/*" mode="content"/> + </xsl:template> </xsl:stylesheet> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index fd10caf..a8d2177 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -69,6 +69,16 @@ <span>Configure authentication for the libvirt daemon</span> </li> <li> + <a href="acl.html">Access control</a> + <span>Configure access control libvirt APIs</span> + <ul> + <li> + <a href="aclpolkit.html">Polkit access control</a> + <span>Using polkit for API access control</span> + </li> + </ul> + </li> + <li> <a href="migration.html">Migration</a> <span>Migrating guests between machines</span> </li> -- 1.8.1.4

3 5

[libvirt] [PATCH v2 0/9] Support qemu-system-arm vexpress-a9
by Cole Robinson 30 Aug '13

30 Aug '13

This series adds the bits needed to kick of a qemu-system-arm -machine vexpress-a9 guest. vexpress-a15 likely works as well but is untested. Patches 1-3 are related bugfixes/improvements. Patch 7 adds disk bus=sd, which is often the only way to specify storage for ARM boards. Patch 9 adds virtio-mmio address support, which enables virtio for ARM vexpress machine types. The rest are mostly about fixing CLI generations. Unfortunately qemu ARM boards don't quite work like x86 where we can mix and match devices, so -device is out of the picture (for non-virtio), meaning we have to fall back to CLI infrastrucure like -net nic and -serial. v2: Rebased series Drop patches applied with Laine's series Add patch 1 and 3 Clarify caveats in a few patch descriptions Cole Robinson (9): qemu: Set QEMU_AUDIO_DRV=none with -nographic qemu: Only setup vhost if virtType == "kvm" domain_conf: Add default memballon in PostParse callbacks qemu: Don't add default memballoon device on ARM qemu: Fix adding specifying char devs for ARM qemu: Don't try to allocate PCI addresses for ARM domain_conf: Add disk bus=sd, wire it up for qemu qemu: Fix networking for ARM guests qemu: Support virtio-mmio transport for virtio on ARM docs/formatdomain.html.in | 3 +- docs/schemas/domaincommon.rng | 20 ++++ src/conf/domain_conf.c | 30 +++-- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 22 ++++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 131 +++++++++++++++++---- src/qemu/qemu_domain.c | 32 ++++- src/qemu/qemu_process.c | 37 +++--- src/xen/xen_driver.c | 9 ++ .../qemuxml2argv-arm-vexpressa9-basic.args | 8 ++ .../qemuxml2argv-arm-vexpressa9-basic.xml | 34 ++++++ .../qemuxml2argv-arm-vexpressa9-nodevs.args | 5 + .../qemuxml2argv-arm-vexpressa9-nodevs.xml | 26 ++++ .../qemuxml2argv-arm-vexpressa9-virtio.args | 14 +++ .../qemuxml2argv-arm-vexpressa9-virtio.xml | 45 +++++++ .../qemuxml2argv-balloon-device-auto.args | 3 +- .../qemuxml2argv-balloon-device-period.args | 3 +- .../qemuxml2argv-balloon-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-blkdeviotune.args | 3 +- .../qemuxml2argv-blkiotune-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 3 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 3 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 3 +- .../qemuxml2argv-boot-menu-disable-drive.args | 3 +- .../qemuxml2argv-boot-menu-disable.args | 3 +- .../qemuxml2argv-boot-menu-enable.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 3 +- .../qemuxml2argv-boot-network.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 3 +- .../qemuxml2argv-channel-guestfwd.args | 3 +- .../qemuxml2argv-channel-virtio-auto.args | 3 +- .../qemuxml2argv-channel-virtio.args | 3 +- .../qemuxml2argv-clock-france.args | 4 +- .../qemuxml2argv-clock-localtime.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 3 +- .../qemuxml2argv-clock-variable.args | 3 +- .../qemuxml2argv-console-compat-auto.args | 3 +- .../qemuxml2argv-console-compat-chardev.args | 3 +- .../qemuxml2argv-console-compat.args | 3 +- .../qemuxml2argv-console-sclp.args | 3 +- .../qemuxml2argv-console-virtio-ccw.args | 3 +- .../qemuxml2argv-console-virtio-many.args | 3 +- .../qemuxml2argv-console-virtio-s390.args | 3 +- .../qemuxml2argv-console-virtio.args | 3 +- .../qemuxml2argv-cpu-eoi-disabled.args | 3 +- .../qemuxml2argv-cpu-eoi-enabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 3 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-kvmclock.args | 3 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model.args | 2 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 3 +- .../qemuxml2argv-cpu-minimum1.args | 3 +- .../qemuxml2argv-cpu-minimum2.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 +- .../qemuxml2argv-cpu-topology1.args | 3 +- .../qemuxml2argv-cpu-topology2.args | 3 +- .../qemuxml2argv-cpu-topology3.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 3 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 3 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 3 +- .../qemuxml2argv-disk-cdrom-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 3 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 3 +- .../qemuxml2argv-disk-drive-boot-disk.args | 3 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 3 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-none.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-wb.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-wt.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 3 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 3 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 3 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 3 +- .../qemuxml2argv-disk-drive-fat.args | 3 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 3 +- .../qemuxml2argv-disk-drive-network-gluster.args | 3 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 3 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 3 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 3 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd.args | 3 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 4 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 3 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 3 +- .../qemuxml2argv-disk-drive-shared.args | 3 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 3 +- .../qemuxml2argv-disk-floppy-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 3 +- .../qemuxml2argv-disk-geometry.args | 3 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 3 +- .../qemuxml2argv-disk-sata-device.args | 3 +- .../qemuxml2argv-disk-scsi-device-auto.args | 3 +- .../qemuxml2argv-disk-scsi-device.args | 3 +- .../qemuxml2argv-disk-scsi-disk-split.args | 2 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 3 +- .../qemuxml2argv-disk-scsi-megasas.args | 3 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 3 +- .../qemuxml2argv-disk-scsi-vscsi.args | 3 +- .../qemuxml2argv-disk-snapshot.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 3 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 3 +- .../qemuxml2argv-disk-virtio-ccw.args | 3 +- .../qemuxml2argv-disk-virtio-s390.args | 3 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 3 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 3 +- .../qemuxml2argv-eoi-disabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 3 +- .../qemuxml2argv-graphics-vnc-sasl.args | 3 +- .../qemuxml2argv-graphics-vnc-tls.args | 3 +- .../qemuxml2argv-graphics-vnc-websocket.args | 3 +- .../qemuxml2argv-hostdev-pci-address-device.args | 3 +- .../qemuxml2argv-hostdev-pci-address.args | 3 +- .../qemuxml2argv-hostdev-scsi-boot.args | 3 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 3 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 3 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 3 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 3 +- .../qemuxml2argv-hostdev-usb-address-device.args | 3 +- .../qemuxml2argv-hostdev-usb-address.args | 3 +- .../qemuxml2argv-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 3 +- .../qemuxml2argv-input-usbmouse-addr.args | 3 +- .../qemuxml2argv-input-usbmouse.args | 3 +- .../qemuxml2argv-input-usbtablet.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-lease.args | 3 +- .../qemuxml2argv-machine-aliases1.args | 2 +- .../qemuxml2argv-machine-aliases2.args | 3 +- .../qemuxml2argv-machine-core-off.args | 3 +- .../qemuxml2argv-machine-core-on.args | 3 +- .../qemuxml2argv-machine-usb-opt.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 3 +- .../qemuxml2argv-minimal-s390.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 3 +- .../qemuxml2argv-misc-disable-s3.args | 3 +- .../qemuxml2argv-misc-disable-suspends.args | 3 +- .../qemuxml2argv-misc-enable-s4.args | 3 +- .../qemuxml2argv-misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- .../qemuxml2argv-mlock-unsupported.args | 2 +- .../qemuxml2argv-monitor-json.args | 3 +- .../qemuxml2argv-multifunction-pci-device.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 3 +- .../qemuxml2argv-net-eth-ifname.args | 3 +- .../qemuxml2argv-net-eth-names.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 3 +- .../qemuxml2argv-net-hostdev-vfio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 +- .../qemuxml2argv-net-virtio-ccw.args | 3 +- .../qemuxml2argv-net-virtio-device.args | 3 +- .../qemuxml2argv-net-virtio-netdev.args | 3 +- .../qemuxml2argv-net-virtio-s390.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 2 +- .../qemuxml2argv-nographics-vga.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 3 +- .../qemuxml2argv-nosharepages.args | 3 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 3 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 3 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 3 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 3 +- .../qemuxml2argv-numatune-memory.args | 3 +- .../qemuxml2argv-parallel-parport-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp.args | 3 +- .../qemuxml2argv-pci-autoadd-addr.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-nvram.args | 3 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 +- .../qemuxml2argv-reboot-timeout-disabled.args | 3 +- .../qemuxml2argv-reboot-timeout-enabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 3 +- .../qemuxml2argv-restore-v2-fd.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 3 +- .../qemuxml2argv-s390-piix-controllers.args | 2 +- .../qemuxml2argv-s390-usb-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.args | 3 +- .../qemuxml2argv-seclabel-dynamic.args | 3 +- .../qemuxml2argv-seclabel-none.args | 3 +- .../qemuxml2argv-seclabel-static-relabel.args | 3 +- .../qemuxml2argv-seclabel-static.args | 3 +- .../qemuxml2argv-serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 3 +- .../qemuxml2argv-serial-file-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 3 +- .../qemuxml2argv-serial-many-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 3 +- .../qemuxml2argv-serial-pty-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 3 +- .../qemuxml2argv-serial-tcp-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 3 +- .../qemuxml2argv-serial-udp-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 3 +- .../qemuxml2argv-serial-unix-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 3 +- .../qemuxml2argv-serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 3 +- .../qemuxml2argv-smartcard-controller.args | 3 +- .../qemuxml2argv-smartcard-host-certificates.args | 3 +- .../qemuxml2argv-smartcard-host.args | 3 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 3 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 3 +- .../qemuxml2argv-sound-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 3 +- .../qemuxml2argv-tpm-passthrough.args | 2 +- .../qemuxml2argv-usb-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 3 +- .../qemuxml2argv-usb-ich9-companion.args | 3 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 3 +- .../qemuxml2argv-usb-piix3-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 3 +- .../qemuxml2argv-usb-redir-boot.args | 3 +- .../qemuxml2argv-usb-redir-filter.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 3 +- .../qemuxml2argv-virtio-rng-default.args | 3 +- .../qemuxml2argv-virtio-rng-egd.args | 3 +- .../qemuxml2argv-virtio-rng-random.args | 3 +- .../qemuxml2argv-watchdog-device.args | 3 +- .../qemuxml2argv-watchdog-dump.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 3 +- tests/qemuxml2argvtest.c | 10 ++ .../qemuxmlns-qemu-ns-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 2 +- .../qemuxmlns-qemu-ns-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 2 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 2 +- tests/testutilsqemu.c | 33 ++++++ 300 files changed, 920 insertions(+), 344 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml -- 1.8.3.1

3 19

[libvirt] [PATCH] Let test_virtlockd.aug find the libvird augeas lense
by Guido Günther 30 Aug '13

30 Aug '13

Otherwise we fail "make check" like: GEN check-augeas-virtlockd Syntax error in lens definition test_virtlockd.aug:8.8-.20:Could not load module Libvirtd for Libvirtd.lns test_virtlockd.aug:8.8-.20:Undefined variable Libvirtd.lns This doesn't show up on systems where libvirtd (and it's lenses) are installed but in a clean chroot. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index d8b943d..bf2ec79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1675,7 +1675,8 @@ check-augeas-lockd: test_libvirt_lockd.aug check-augeas-virtlockd: test_virtlockd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ + '$(AUGPARSE)' -I $(top_srcdir)/daemon/ \ + -I $(srcdir)/locking test_virtlockd.aug; \ fi # -- 1.8.4.rc3

2 5

[libvirt] [PATCH] Change way we fake dbus method calls
by Daniel P. Berrange 30 Aug '13

30 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Ubuntu libdbus.so links with -Bsymbolic-functions, which means that we can only LD_PRELOAD functions that we directly call. Functions which libdbus.so calls internally can not be replaced. Thus we cannot use dbus_message_new_error or dbus_message_new_method_return Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virsystemdmock.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index ded52d2..5dbd33f 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -65,22 +65,32 @@ dbus_bool_t dbus_message_set_reply_serial(DBusMessage *message ATTRIBUTE_UNUSED, } DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connection ATTRIBUTE_UNUSED, - DBusMessage *message, + DBusMessage *message ATTRIBUTE_UNUSED, int timeout_milliseconds ATTRIBUTE_UNUSED, DBusError *error) { DBusMessage *reply = NULL; - if (getenv("FAIL_BAD_SERVICE")) - reply = dbus_message_new_error(message, - "org.freedesktop.systemd.badthing", - "Something went wrong creating the machine"); - else if (getenv("FAIL_NO_SERVICE")) + if (getenv("FAIL_BAD_SERVICE")) { + DBusMessageIter iter; + const char *error_message = "Something went wrong creating the machine"; + if (!(reply = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR))) + return NULL; + dbus_message_set_error_name(reply, "org.freedesktop.systemd.badthing"); + dbus_message_iter_init_append(reply, &iter); + if (!dbus_message_iter_append_basic(&iter, + DBUS_TYPE_STRING, + &error_message)) { + dbus_message_unref(reply); + return NULL; + } + } else if (getenv("FAIL_NO_SERVICE")) { dbus_set_error(error, "org.freedesktop.DBus.Error.ServiceUnknown", "%s", "The name org.freedesktop.machine1 was not provided by any .service files"); - else - reply = dbus_message_new_method_return(message); + } else { + reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + } return reply; } -- 1.7.9.5

3 2

[libvirt] [PATCH 0/3] Fix bitmap parsing code and add tests
by Peter Krempa 30 Aug '13

30 Aug '13

The bitmap parsing code might cause a crash of the application using it. Fix it and add tests so that it doesn't happen again. Peter Krempa (3): virbitmap: Refactor virBitmapParse to avoid access beyond bounds of array virbitmaptest: Fix function header formatting virbitmaptest: Add test for out of bounds condition src/util/virbitmap.c | 38 +++++++++++++------------------- tests/virbitmaptest.c | 60 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 67 insertions(+), 31 deletions(-) -- 1.8.3.2

4 10

[libvirt] [PATCHv3 0/6] virsh: More intelligent auto-completion
by Tomas Meszaros 30 Aug '13

30 Aug '13

Hi, this patch series is a prototype for my GSoC project (Michal Privoznik is my mentor). I'm working on virsh auto-completion, trying to make it more "intelligent". At this stage, prototype is capable of command and option completion. Three completer functions are currently implemented so you can test it. If it turns out that this prototype is good enough, I will implement more completer functions. --- v3: * vshReconnect() is now called only when we reach the point that completion is being attempted on commands that needs connection * moved all .completer intializations into the 4/6, 5/6 and 6/6 v2: https://www.redhat.com/archives/libvir-list/2013-August/msg00992.html v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00371.html Tomas Meszaros (6): virsh: C99 style for info_domfstrim and opts_lxc_enter_namespace virsh: Add vshCmdCompleter and vshOptCompleter virsh: Improve readline generators and readline completion virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter .gnulib | 2 +- tools/virsh-domain-monitor.c | 32 ++- tools/virsh-domain.c | 248 +++++++++++++++++----- tools/virsh-snapshot.c | 45 +++- tools/virsh.c | 480 +++++++++++++++++++++++++++++++++++++++++-- tools/virsh.h | 11 + 6 files changed, 725 insertions(+), 93 deletions(-) -- 1.8.3.1

2 15

[libvirt] [PATCH V2] Use loop-control to allocate loop device.
by Ian Main 30 Aug '13

30 Aug '13

This patch changes virFileLoopDeviceOpen() to use the new loop-control device to allocate a new loop device. If this behavior is unsupported we fall back to the previous method of searching /dev for a free device. With this patch you can start as many image based LXC domains as you like (well almost). Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=995543 V2: - Modified to use a dedicated error return for loop-control allocation function. - Only do fallback if /dev/loop-control does not exist, otherwise return error. Signed-off-by: Ian Main <imain(a)redhat.com> --- configure.ac | 12 +++++++++ src/util/virfile.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac8cfa1..10cd872 100644 --- a/configure.ac +++ b/configure.ac @@ -913,6 +913,18 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then AC_MSG_ERROR([Required kernel features for LXC were not found]) fi ]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ + #include <sched.h> + #include <linux/loop.h> + #include <sys/epoll.h> + ]], [[ + unshare(!(LOOP_CTL_GET_FREE)); + ]])], [ + AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], + [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', + and to 0 if you don't.]) + ]) fi if test "$with_lxc" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) diff --git a/src/util/virfile.c b/src/util/virfile.c index 2b07ac9..22a0db5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -528,7 +528,56 @@ int virFileUpdatePerm(const char *path, #if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR -static int virFileLoopDeviceOpen(char **dev_name) + +#if HAVE_DECL_LOOP_CTL_GET_FREE + +/* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occured + * while in the process of allocating or opening the loop device. On success + * we return 0 and modify the fd to the appropriate file descriptor. + * If /dev/loop-control does not exist, we return 0 and do not set fd. */ + +static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd) +{ + int devnr; + int ctl_fd; + char *looppath = NULL; + + VIR_DEBUG("Opening loop-control device"); + if ((ctl_fd = open("/dev/loop-control", O_RDWR)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to open /dev/loop-control")); + if (errno == ENOENT) { + return 0; + } + return -1; + } + + if ((devnr = ioctl(ctl_fd, LOOP_CTL_GET_FREE)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get free loop device via ioctl")); + close(ctl_fd); + return -1; + } + close(ctl_fd); + + VIR_DEBUG("Found free loop device number %i", devnr); + + if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) + return -1; + + if ((*fd = open(looppath, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), looppath); + VIR_FREE(looppath); + return -1; + } + + *dev_name = looppath; + return 0; +} +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + +static int virFileLoopDeviceOpenSearch(char **dev_name) { int fd = -1; DIR *dh = NULL; @@ -601,6 +650,28 @@ cleanup: return fd; } +static int virFileLoopDeviceOpen(char **dev_name) +{ + int loop_fd = -1; + +#ifdef HAVE_DECL_LOOP_CTL_GET_FREE + if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) + return -1; + + VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + + if (loop_fd < 0) { + VIR_WARN("loop-control allocation failed, trying search technique."); + } else { + return loop_fd; + } +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + + /* Without the loop control device we just use the old technique. */ + loop_fd = virFileLoopDeviceOpenSearch(dev_name); + + return loop_fd; +} int virFileLoopDeviceAssociate(const char *file, char **dev) -- 1.8.1.4

2 1

[libvirt] [RFC]Libvirt Wireshark Dissector
by Yuto KAWAMURA 30 Aug '13

30 Aug '13

Hi libvirt developers, I would like to ask you to review the dissector of libvirt RPC protocol which I've been developing on project of Google Summer of Code 2013[1][2][3]. It can add support for dissecting libvirt RPC protocol packet which communicate via TCP socket to Wireshark. This feature was presented by Michal Privoznik year before last[4]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. Now it is available to build and install dissector from repository[3]. Only you need to do is: git clone https://github.com/kawamuray/libvirt-wireshark-dissector.git cd libvirt-wireshark-dissector autoreconf --install ./configure && make sudo make install Above commands only install a single shared object: $(dirname `which wireshark`)/../lib/wireshark/plugins/<wireshark version>/libvirt.so . After rebooting wireshark(or tshark), your wireshark have support for dissecting libvirt RPC packet. Please make sure your libvirtd is listening on port 16509(default libvirtd port) and connect to libvirtd using TCP socket(e.g. qemu+tcp:///system). You can also try the feature; generate dissector from your libvirt source tree by adding few options to ./configure. Please see README and ./configure --help output for more detail. Please try and review it. Any comments, reviews and patches for dissector code, generator code and usability are welcome. Regards. kawamuray [1] http://www.google-melange.com/gsoc/project/google/gsoc2013/kawamuray/7001 [2] http://wiki.qemu.org/Features/LibvirtWiresharkDissector [3] https://github.com/kawamuray/libvirt-wireshark-dissector [4] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html

2 2