- Devel - libvirt List Archives

[libvirt] [PATCH] selinux: Don't mask errors of virSecuritySELinuxGenNewContext
by Peter Krempa 24 Apr '13

24 Apr '13

virSecuritySELinuxGenNewContext() reports sensible errors but at virSecuritySELinuxGenSecurityLabel() the error is masked with a non-specific one. --- src/security/security_selinux.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c620a2e..89d63ab 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -685,13 +685,10 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, } } - seclabel->label = - virSecuritySELinuxGenNewContext(baselabel, mcs, false); - if (!seclabel->label) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot generate selinux context for %s"), mcs); + seclabel->label = virSecuritySELinuxGenNewContext(baselabel, mcs, false); + if (!seclabel->label) goto cleanup; - } + break; case VIR_DOMAIN_SECLABEL_NONE: -- 1.8.2.1

2 1

[libvirt] [PATCH] qemuBuildCommandLine: Don't overwrite errors with NWFilter's one
by Michal Privoznik 24 Apr '13

24 Apr '13

Currently, if there has been an error in building command line process after virtual interfaces has been created, the flow jumps to 'error' label, where virDomainConfNWFilterTeardown() is called. This may report an error as well, but should not overwrite the original cause why we jumped to 'error' label. --- src/qemu/qemu_command.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 741fa82..92b15d9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5872,6 +5872,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainSnapshotObjPtr snapshot, enum virNetDevVPortProfileOp vmop) { + virErrorPtr originalError = NULL; int i, j; const char *emulator; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -7802,13 +7803,16 @@ qemuBuildCommandLine(virConnectPtr conn, virObjectUnref(cfg); return cmd; - no_memory: +no_memory: virReportOOMError(); - error: +error: virObjectUnref(cfg); - /* free up any resources in the network driver */ + /* free up any resources in the network driver + * but don't overwrite the original error */ + originalError = virSaveLastError(); for (i = 0; i <= last_good_net; i++) virDomainConfNWFilterTeardown(def->nets[i]); + virSetError(originalError); virCommandFree(cmd); return NULL; } -- 1.8.1.5

2 1

[libvirt] [PATCH 0/6] Cleanup of internal API naming conventions
by Daniel P. Berrange 24 Apr '13

24 Apr '13

The naming conventions used for APIs in both src/driver.h and src/remote/remote_protocol.x should follow the public API naming, but there are a great many violations of this. This series fixes them all, and adds some tests which will help prevent regressions.

2 18

[libvirt] [PATCH] qemu: Generate agent socket path if missing
by Michal Privoznik 24 Apr '13

24 Apr '13

It's not desired to force users imagine path for a socket they are not even supposed to connect to. On the other hand, we already have a release where the qemu agent socket path is exposed to XML, so we cannot silently drop it from there. The new path is generated in form: $LOCALSTATEDIR/lib/libvirt/qemu/channel/target/$domain.$name --- libvirt.spec.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 34 ++++++++++++++++------------------ src/qemu/qemu_domain.c | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 328b009..11fc12d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1719,6 +1719,7 @@ fi %if %{with_qemu} %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr{0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} diff --git a/src/Makefile.am b/src/Makefile.am index fc6b846..9576da8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2097,6 +2097,7 @@ if WITH_SANLOCK endif if WITH_QEMU $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channel/target" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 03e5740..3ff548a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6464,7 +6464,9 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (path == NULL) { + /* path can be auto generated */ + if (!path && + chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char device")); goto error; @@ -6559,7 +6561,6 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, char *type = NULL; const char *nodeName; virDomainChrDefPtr def; - int remaining; bool seenTarget = false; if (!(def = virDomainChrDefNew())) @@ -6583,29 +6584,26 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, } cur = node->children; - remaining = virDomainChrSourceDefParseXML(&def->source, cur, flags, - def, ctxt, - vmSeclabels, nvmSeclabels); - if (remaining < 0) - goto error; - if (remaining) { - while (cur != NULL) { - if (cur->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(cur->name, BAD_CAST "target")) { - seenTarget = true; - if (virDomainChrDefParseTargetXML(def, cur) < 0) { - goto error; - } + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "target")) { + seenTarget = true; + if (virDomainChrDefParseTargetXML(def, cur) < 0) { + goto error; } } - cur = cur->next; } + cur = cur->next; } if (!seenTarget && ((def->targetType = virDomainChrDefaultTargetType(def->deviceType)) < 0)) goto cleanup; + if (virDomainChrSourceDefParseXML(&def->source, node->children, flags, def, + ctxt, vmSeclabels, nvmSeclabels) < 0) + goto error; + if (def->source.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { if (def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -13897,8 +13895,8 @@ virDomainChrSourceDefFormat(virBufferPtr buf, case VIR_DOMAIN_CHR_TYPE_UNIX: virBufferAsprintf(buf, " <source mode='%s'", def->data.nix.listen ? "bind" : "connect"); - virBufferEscapeString(buf, " path='%s'/>\n", - def->data.nix.path); + virBufferEscapeString(buf, " path='%s'", def->data.nix.path); + virBufferAddLit(buf, "/>\n"); break; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3d6eef4..967890f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -738,6 +738,22 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, (def->os.arch == VIR_ARCH_S390 || def->os.arch == VIR_ARCH_S390X)) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO; + /* auto generate unix socket path */ + if (dev->type == VIR_DOMAIN_DEVICE_CHR && + dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + dev->data.chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + dev->data.chr->source.type == VIR_DOMAIN_CHR_TYPE_UNIX && + !dev->data.chr->source.data.nix.path && + (cfg || (driver && (cfg = virQEMUDriverGetConfig(driver))))) { + + if (virAsprintf(&dev->data.chr->source.data.nix.path, + "%s/channel/target/%s.%s", + cfg->libDir, def->name, + dev->data.chr->target.name) < 0) + goto no_memory; + dev->data.chr->source.data.nix.listen = true; + } + ret = 0; cleanup: -- 1.8.1.5

3 3

[libvirt] Using leases with virtlockd
by Jim Fehlig 24 Apr '13

24 Apr '13

Nearly a question for the users list, but I might be encountering a bug too. I'm using virtlockd with 'auto_disk_leases = 0' and struggle with the correct configuration for a lease in the domXML. Using <lease> <lockspace>test-ls</lockspace> <key>test-lock</key> <target path='/var/lib/libvirt/lockd'/> </lease> results in the following error when starting the domain internal error Lockspace for path /var/lib/libvirt/lockd/test-ls It appears the path attribute + lockspace are used as the Lockspace for this lease. But I'm not sure what "Lockspace" means in this context. Is it a directory? A file? I assume the latter since it is just flock()ed when the domain is started, right? I'll be happy to provide patches to fix any bugs that might exist here (docs included), but need understand the correct configuration of leases with virtlockd first :). BTW, nice piece of work Daniel! Regards, Jim

2 1

[libvirt] [PATCH] Use camelCase for XML attribute numQueues
by Martin Kletzander 24 Apr '13

24 Apr '13

In commit d4bf0a9, we used num_queues for an attribute in the XML, but the consensus is that we use camelCase for that. Since there was no release yet (the above commit describes as v1.0.4-65-gd4bf0a9), we still have time to change it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This patch applies on top of Laine's RNG tightening patch [1] and it was proposed in that thread as well. [1] http://www.redhat.com/archives/libvir-list/2013-April/msg01320.html --- docs/formatdomain.html.in | 2 +- docs/schemas/domaincommon.rng | 2 +- src/conf/domain_conf.c | 6 +++--- src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0cc56d9..a5be162 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2135,7 +2135,7 @@ controller. A "scsi" controller has an optional attribute <code>model</code>, which is one of "auto", "buslogic", "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or - "vmpvscsi". The attribute <code>num_queues</code> + "vmpvscsi". The attribute <code>numQueues</code> (<span class="since">1.0.5 (QEMU and KVM only)</span>) specifies the number of queues for the controller. For best performance, it's recommended to specify a value matching the number of vCPUs. A "usb" diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 3976b82..bcb1453 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1444,7 +1444,7 @@ </attribute> </optional> <optional> - <attribute name="num_queues"> + <attribute name="numQueues"> <ref name="unsignedInt"/> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1643f30..0487053 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5195,10 +5195,10 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->model = -1; } - if ((num_queues = virXMLPropString(node, "num_queues"))) { + if ((num_queues = virXMLPropString(node, "numQueues"))) { if (virStrToLong_ui(num_queues, NULL, 10, &def->num_queues) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'num_queues' value '%s'"), num_queues); + _("Malformed 'numQueues' value '%s'"), num_queues); goto error; } } @@ -13531,7 +13531,7 @@ virDomainControllerDefFormat(virBufferPtr buf, } if (def->num_queues) - virBufferAsprintf(buf, " num_queues='%u'", def->num_queues); + virBufferAsprintf(buf, " numQueues='%u'", def->num_queues); switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 009d42d..65675b7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3574,7 +3574,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, !(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'num_queues' is only supported by virtio-scsi controller")); + _("'numQueues' is only supported by virtio-scsi controller")); return NULL; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml index dfa9cf1..063ccf7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml @@ -20,7 +20,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='usb' index='0'/> - <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> + <controller type='scsi' index='0' model='virtio-scsi' numQueues='8'/> <memballoon model='virtio'/> </devices> </domain> -- 1.8.1.5

5 12

[libvirt] internal error Cannot find suitable CPU model for given data
by yue 24 Apr '13

24 Apr '13

hi,all: if xml configuration is not right? <cpu match="exact"> <model>Nehalem</model> <topology cores="1" sockets="1" threads="1"/> </cpu> thanks

2 1

[libvirt] Patch sets proper SELinux context on /proc/meminfo (proc_t)
by dwalsh＠redhat.com 24 Apr '13

24 Apr '13

[PATCH] Fuse file system mounted at /proc/meminfo needs correct

2 2

[libvirt] [PATCH 0/2] Prefer -machine accel={tcg, kvm} over -{dis, en}able-kvm
by Jiri Denemark 24 Apr '13

24 Apr '13

Jiri Denemark (2): qemu: Move -enable-kvm and friends earlier in the command line qemu: Use -machine accel=tcg|kvm when available src/qemu/qemu_command.c | 141 ++++++++++++--------- .../qemuxml2argv-cpu-host-kvmclock.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 4 + tests/qemuxml2argvdata/qemuxml2argv-kvm.xml | 22 ++++ .../qemuxml2argv-machine-core-off.args | 2 +- .../qemuxml2argv-machine-core-on.args | 2 +- .../qemuxml2argv-machine-usb-opt.args | 2 +- tests/qemuxml2argvtest.c | 1 + 9 files changed, 113 insertions(+), 65 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm.xml -- 1.8.2.1

2 5

Re: [libvirt] [PATCHv2] Configure native vlan modes on Open vSwitch ports
by james robson 24 Apr '13

24 Apr '13

> Date: Thu, 18 Apr 2013 14:14:32 -0400 > From: Laine Stump <laine(a)laine.org> > To: libvir-list(a)redhat.com > Subject: Re: [libvirt] [PATCHv2] Configure native vlan modes on Open > vSwitch ports > Message-ID: <51703808.2000504(a)laine.org> > Content-Type: text/plain; charset=ISO-8859-1 > > On 04/18/2013 01:44 PM, james robson wrote: > > Hello, > > Has any one been able to review this yet? I realise that the 'Since > > 1.0.3' in the doc page is now out of date, but is the code itself > > acceptable? > > I was hoping that someone with more knowledge of Open vSwitch and/or > vlan tagging/trunking/native mode would repond to the message (Kyle?) > but there was silence instead... > > > > > > > > diff --git a/tests/networkxml2xmlin/openvswitch-net.xml > > b/tests/networkxml2xmlin/openvswitch-net.xml > > index a3d82b1..93c49d5 100644 > > --- a/tests/networkxml2xmlin/openvswitch-net.xml > > +++ b/tests/networkxml2xmlin/openvswitch-net.xml > > @@ -21,4 +21,13 @@ > > <parameters profileid='alice-profile'/> > > </virtualport> > > </portgroup> > > + <portgroup name='tagged'> > > + <vlan native_mode='tagged' native_tag='123'> > > + <tag id='555'/> > > + <tag id='444'/> > > + </vlan> > > + <virtualport> > > + <parameters profileid='tagged-profile'/> > > + </virtualport> > > + </portgroup> > > As brought up again in a separate conversation today, we prefer to use > camelCase rather than underscored in attribute and element names. So, if > we were to use the layout you're proposing, the attributes should be > called "nativeMode" and "nativeTag". > > However, I'm wondering if there might be a better way to structure it. > What about this? > > > <vlan trunk='yes'> > <tag id='123' native='tagged|untagged'/> (or whatever values are > appropriate) > <tag id='555'/> > <tag id='444'/> > </vlan> > > Do I understand correctly that native mode is telling what to do with > packets that come in untagged, and that (using your nomenclature > "native_mode='yes' native_tag='123'" means "when an untagged packet come > in from this interface, it should be tagged as 123 before forwarding"? That is correct, setting the native vlan changes how an untagged packet is handled when it enters the port. The difference between the 'tagged' and 'untagged' modes is in how packets on the native vlan are processed before exiting the port. > And what happens when native_mode='yes' but there is no native_tag? In that case you configuration is invalid, and will get an error. > (that's what I was trying to describe with <tag id='123' > native='untagged'/>, but I don't even know if that makes sense, because > I don't know exactly what is the native vlan tag and what is done with > it :-) That arrangement would make sense, I chose the arrangement I did for two main reasons. There can only be one native vlan on a port, making it an attribute of the 'vlan' tag enforces this. Also, I wanted to keep the validation and processing separate rather than add 'if native' branches to the loops that operate on the vlan id list. I can see the advantage of having a single setting to configure the native vlan, rather than the two attributes I proposed. If the new suggestion is preferred I can rework my patch to use that format. > Also, is it valid to have a native_mode/native_tag if trunk='no'? (right > now trunk is automatically set to 'yes' if there is more than one vlan tag) It isn't valid to have trunk='no' and the native settings. Therefore "<vlan trunk='no' native_mode='tagged' native_tag='123'>" will get an error if you try to enter it. If no "trunk" attribute is set explicitly then it will be set to 'yes'. This means "<vlan native_mode='tagged' native_tag='123'>" is equivalent to "<vlan trunk='yes' native_mode='tagged' native_tag='123'>". > > > </network> > > diff --git a/tests/networkxml2xmlout/openvswitch-net.xml > > b/tests/networkxml2xmlout/openvswitch-net.xml > > index a3d82b1..ab3d797 100644 > > --- a/tests/networkxml2xmlout/openvswitch-net.xml > > +++ b/tests/networkxml2xmlout/openvswitch-net.xml > > @@ -21,4 +21,13 @@ > > <parameters profileid='alice-profile'/> > > </virtualport> > > </portgroup> > > + <portgroup name='tagged'> > > + <vlan trunk='yes' native_mode='tagged' native_tag='123'> > > + <tag id='555'/> > > + <tag id='444'/> > > + </vlan> > > + <virtualport> > > + <parameters profileid='tagged-profile'/> > > + </virtualport> > > + </portgroup> > > </network> > > > Protected by Websense Hosted Email Security -- www.websense.com

2 4

[libvirt] [PATCHv2 0/6] Add support for guest-agent based cpu hot(un)plug
by Peter Krempa 24 Apr '13

24 Apr '13

This version contains fixes requested by Eric on patches 1/6, 3/6 and 4/6. Patch 2/6 is new in the series. I tweaked some details in 5/6 and 6/6 but they weren't reviewed in version 1. Changes are described in the patches themselves. Peter Krempa (6): virsh-domain: Refactor cmdVcpucount and fix output on inactive domains conf: Reword error message to be more universal qemu_agent: Introduce helpers for agent based CPU hot(un)plug API: Introduce VIR_DOMAIN_VCPU_AGENT, for agent based CPU hot(un)plug qemu: Implement request of vCPU state using the guest agent qemu: Implement support for VIR_DOMAIN_VCPU in qemuDomainSetVcpusFlags include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 2 +- src/libvirt.c | 24 +++- src/qemu/qemu_agent.c | 148 ++++++++++++++++++++++ src/qemu/qemu_agent.h | 12 ++ src/qemu/qemu_driver.c | 189 +++++++++++++++++++++++++--- tools/virsh-domain.c | 292 +++++++++++++++++++++---------------------- tools/virsh.pod | 13 +- 8 files changed, 510 insertions(+), 171 deletions(-) -- 1.8.1.5

3 15

[libvirt] What about next release ?
by Daniel Veillard 23 Apr '13

23 Apr '13

We are getting quite close to the end of the month, if we want to stick to the 'end of month release' I guess we need to enter the freeze for 1.0.5 at the end of the week say Friday, and then push the release, assuming there is no big problem on Thursday next week (May 2, I could probably do it on May 1 but most civilized people will enjoy the May 1 day off so that should not change that much ;-) 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/

3 3

[libvirt] domblkstat not reporting disk errors
by SHREE DUTH AWASTHI 23 Apr '13

23 Apr '13

Hi All, We are using libvirt 0.10.2 with hypervisor QEMU 0.14.1 We see that our hardware doesnt report any disk errors ( virsh domblkstat) CENTOS(Libvirt version 0.9.4) virsh # domblkstat fp-cla0 hda hda rd_req 59837 hda rd_bytes 477478400 hda wr_req 462795 hda wr_bytes 5631972352 *hda errs 0 * Our hardware (libvirt version 0.10.2) virsh # domblkstat CLA-0 hda hda rd_req 11 hda rd_bytes 217088 hda wr_req 0 hda wr_bytes 0 Could you please let us know if it is a known issue or does libvirt have any dependency for this ? Please throw more light on this. Thanks and Regards, Shree Duth Awasthi.

1 0

[libvirt] [PATCH] Omitting braces with a single-line body
by harryxiyou＠gmail.com 23 Apr '13

23 Apr '13

From: Harry Wei <harryxiyou(a)gmail.com> After i read libvirt/HACKING file, i find we should Omit braces with a single-line body. So this patch fix this coding style problem for Sheepdog storage backend driver. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- src/storage/storage_backend_sheepdog.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 35a3a04..15fa29c 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -97,12 +97,10 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, const char *address = "localhost"; int port = 7000; if (pool->def->source.nhost > 0) { - if (pool->def->source.hosts[0].name != NULL) { + if (pool->def->source.hosts[0].name != NULL) address = pool->def->source.hosts[0].name; - } - if (pool->def->source.hosts[0].port) { + if (pool->def->source.hosts[0].port) port = pool->def->source.hosts[0].port; - } } virCommandAddArg(cmd, "-a"); virCommandAddArgFormat(cmd, "%s", address); @@ -210,11 +208,10 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, continue; /* skip space */ - if (p + 2 < next) { + if (p + 2 < next) p += 2; - } else { + else return -1; - } /* skip name */ while (*p != '\0' && *p != ' ') { -- 1.7.9.5

4 4

[libvirt] [libvirt-designer] Add missing files to EXTRA_DIST
by Christophe Fergeau 23 Apr '13

23 Apr '13

This fixes make distcheck --- I've pushed this under the trivial rule. Christophe Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9ef319a..726d475 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,8 @@ EXTRA_DIST = \ $(PACKAGE).spec \ $(pkgconfig_DATA:%.pc=%.pc.in) \ AUTHORS.in \ + GNUmakefile \ + maint.mk \ README.in \ $(NULL) -- 1.8.1.4

1 0

[libvirt] [PATCH 0/3] Ignore libvirt logs when reading QEMU error output
by Jiri Denemark 23 Apr '13

23 Apr '13

Jiri Denemark (3): qemu: Move QEMU log reading into a separate function qemu: Ignore libvirt logs when reading QEMU error output logging: Make log regexp more compact (and readable) src/qemu/qemu_process.c | 81 +++++++++++++++++++++++++------------------------ src/util/virlog.c | 4 +-- 2 files changed, 44 insertions(+), 41 deletions(-) -- 1.8.2.1

2 7

[libvirt] [PATCH] update input ip processing
by Gene Czarcinski 23 Apr '13

23 Apr '13

1. Handle invalid ULong prefix specified. When parsing for @prefix as a ULong, a -2 can be returned if the specification is not a valid ULong. 2. Error out if address= is not specified. 3. Merge netmask process/tests under family tests. 4. Max sure that prefix does not exceed maximum. . Signed-off-by: Gene Czarcinski <gene(a)czarc.net> --- src/conf/network_conf.c | 118 +++++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 52 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 2b56ca7..1503ece 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1136,7 +1136,8 @@ virNetworkIPDefParseXML(const char *networkName, xmlNodePtr cur, save; char *address = NULL, *netmask = NULL; - unsigned long prefix; + unsigned long prefix = 0; + int prefixRc; int result = -1; save = ctxt->node; @@ -1144,14 +1145,8 @@ virNetworkIPDefParseXML(const char *networkName, /* grab raw data from XML */ def->family = virXPathString("string(./@family)", ctxt); - address = virXPathString("string(./@address)", ctxt); - if (virXPathULong("string(./@prefix)", ctxt, &prefix) < 0) - def->prefix = 0; - else - def->prefix = prefix; - - netmask = virXPathString("string(./@netmask)", ctxt); + address = virXPathString("string(./@address)", ctxt); if (address) { if (virSocketAddrParse(&def->address, address, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1160,23 +1155,66 @@ virNetworkIPDefParseXML(const char *networkName, goto cleanup; } + } else { + virReportError(VIR_ERR_XML_ERROR, + _("Network address must be specified in definition of network '%s'"), + networkName); + goto cleanup; + } + + netmask = virXPathString("string(./@netmask)", ctxt); + if (netmask) { + if (virSocketAddrParse(&def->netmask, netmask, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad netmask '%s' in definition of network '%s'"), + netmask, networkName); + goto cleanup; + } + + } + + prefixRc = virXPathULong("string(./@prefix)", ctxt, &prefix); + if (prefixRc == -2) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid ULong value specified for prefix in definition of network '%s'"), + networkName); + goto cleanup; } + if (prefixRc < 0) + def->prefix = 0; + else + def->prefix = prefix; - /* validate family vs. address */ - if (def->family == NULL) { + /* validate address, etc. for each family */ + if ((def->family == NULL) || (STREQ(def->family, "ipv4"))) { if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no family specified for non-IPv4 address '%s' in network '%s'"), - address, networkName); + _("%s family specified for non-IPv4 address '%s' in network '%s'"), + def->family == NULL? "no" : "ipv4", address, networkName); goto cleanup; } - } else if (STREQ(def->family, "ipv4")) { - if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"), - address, networkName); - goto cleanup; + if (netmask) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"), + networkName, netmask, address); + goto cleanup; + } + if (def->prefix > 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' cannot have both a prefix and a netmask"), + networkName); + goto cleanup; + } + } + else { + if (def->prefix > 32 ) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid IPv4 prefix '%lu'specified in network'%s'"), + prefix, networkName); + goto cleanup; + } } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { @@ -1185,47 +1223,23 @@ virNetworkIPDefParseXML(const char *networkName, address, networkName); goto cleanup; } - } else { - virReportError(VIR_ERR_XML_ERROR, - _("Unrecognized family '%s' in definition of network '%s'"), - def->family, networkName); - goto cleanup; - } - - /* parse/validate netmask */ - if (netmask) { - if (address == NULL) { - /* netmask is meaningless without an address */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("netmask specified without address in network '%s'"), - networkName); - goto cleanup; - } - - if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { + if (netmask) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("netmask not supported for address '%s' in network '%s' (IPv4 only)"), + _("specifying netmask invalid for IPv6 address '%s' in network '%s'"), address, networkName); goto cleanup; } - - if (def->prefix > 0) { - /* can't have both netmask and prefix at the same time */ + if (def->prefix > 128 ) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network '%s' cannot have both prefix='%u' and a netmask"), - networkName, def->prefix); - goto cleanup; - } - - if (virSocketAddrParse(&def->netmask, netmask, AF_UNSPEC) < 0) - goto cleanup; - - if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"), - networkName, netmask, address); + _("Invalid IPv6 prefix '%lu'specified in network'%s'"), + prefix, networkName); goto cleanup; } + } else { + virReportError(VIR_ERR_XML_ERROR, + _("Unrecognized family '%s' in definition of network '%s'"), + def->family, networkName); + goto cleanup; } cur = node->children; -- 1.8.1.4

2 1

[libvirt] [libvirt-designer PATCHv2 0/3] Improve disk bus type generation
by Christophe Fergeau 23 Apr '13

23 Apr '13

Here is a new version of this series rebased against master. Christophe

3 9

[libvirt] [libvirt-designer 1/3] Fix 'dependancy' typo in README file
by Christophe Fergeau 23 Apr '13

23 Apr '13

--- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index ed39b9d..b7ca356 100644 --- a/README +++ b/README @@ -24,7 +24,7 @@ Or to install into a private user specific location make make install -The following mandatory dependancies are required in order to +The following mandatory dependencies are required in order to build libvirt-designer libvirt-gconfig >= 0.1.3 (part of libvirt-glib project releases) -- 1.8.1.4

2 5

[libvirt] [PATCH] qemu: Fix setting of memory tunables
by Peter Krempa 23 Apr '13

23 Apr '13

Refactoring done in 19c6ad9ac7e7eb2fd3c8262bff5f087b508ad07f didn't correctly take into account the order cgroup limit modification needs to be done in. This resulted into errors when decreasing the limits. The operations need to take place in this order: decrease hard limit change swap hard limit or change swap hard limit increase hard limit This patch also fixes the check if the hard_limit is less than swap_hard_limit to print better error messages. For this purpose I introduced a helper function virCompareLimitUlong to compare limit values where value of 0 is equal to unlimited. Additionally the check is now applied also when the user does not provide all of the tunables through the API and in that case the currently set values are used. This patch resolves: https://bugzilla.redhat.com/show_bug.cgi?id=950478 --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 95 ++++++++++++++++++++++++------------------------ src/util/virutil.c | 12 ++++++ src/util/virutil.h | 2 + 4 files changed, 63 insertions(+), 47 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 30fdcd7..ec644ee 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1835,6 +1835,7 @@ safezero; virArgvToString; virAsprintf; virBuildPathInternal; +virCompareLimitUlong; virDirCreate; virDoubleToStr; virEnumFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cee5557..a174fb0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7103,11 +7103,11 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, virDomainDefPtr persistentDef = NULL; virDomainObjPtr vm = NULL; unsigned long long swap_hard_limit; - unsigned long long memory_hard_limit; - unsigned long long memory_soft_limit; + unsigned long long hard_limit = 0; + unsigned long long soft_limit = 0; bool set_swap_hard_limit = false; - bool set_memory_hard_limit = false; - bool set_memory_soft_limit = false; + bool set_hard_limit = false; + bool set_soft_limit = false; virQEMUDriverConfigPtr cfg = NULL; int ret = -1; int rc; @@ -7157,62 +7157,63 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, set_ ## VALUE = true; VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit) - VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, memory_hard_limit) - VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, memory_soft_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, soft_limit) #undef VIR_GET_LIMIT_PARAMETER + /* Swap hard limit must be greater than hard limit. + * Note that limit of 0 denotes unlimited */ + if (set_swap_hard_limit || set_hard_limit) { + unsigned long long mem_limit = vm->def->mem.hard_limit; + unsigned long long swap_limit = vm->def->mem.swap_hard_limit; - /* It will fail if hard limit greater than swap hard limit anyway */ - if (set_swap_hard_limit && set_memory_hard_limit && - memory_hard_limit > swap_hard_limit) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("memory hard_limit tunable value must be lower than " - "swap_hard_limit")); - goto cleanup; - } + if (set_swap_hard_limit) + swap_limit = swap_hard_limit; - if (set_swap_hard_limit) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if ((rc = virCgroupSetMemSwapHardLimit(priv->cgroup, swap_hard_limit)) < 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory swap_hard_limit tunable")); - goto cleanup; - } - vm->def->mem.swap_hard_limit = swap_hard_limit; + if (set_hard_limit) + mem_limit = hard_limit; + + if (virCompareLimitUlong(mem_limit, swap_limit) > 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("memory hard_limit tunable value must be lower " + "than swap_hard_limit")); + goto cleanup; } + } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - persistentDef->mem.swap_hard_limit = swap_hard_limit; +#define QEMU_SET_MEM_PARAMETER(FUNC, VALUE) \ + if (set_ ## VALUE) { \ + if (flags & VIR_DOMAIN_AFFECT_LIVE) { \ + if ((rc = FUNC(priv->cgroup, VALUE)) < 0) { \ + virReportSystemError(-rc, _("unable to set memory %s tunable"), \ + #VALUE); \ + \ + goto cleanup; \ + } \ + vm->def->mem.VALUE = VALUE; \ + } \ + \ + if (flags & VIR_DOMAIN_AFFECT_CONFIG) \ + persistentDef->mem.VALUE = VALUE; \ } - if (set_memory_hard_limit) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if ((rc = virCgroupSetMemoryHardLimit(priv->cgroup, memory_hard_limit)) < 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory hard_limit tunable")); - goto cleanup; - } - vm->def->mem.hard_limit = memory_hard_limit; - } + /* Soft limit doesn't clash with the others */ + QEMU_SET_MEM_PARAMETER(virCgroupSetMemorySoftLimit, soft_limit); - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - persistentDef->mem.hard_limit = memory_hard_limit; + /* set hard limit before swap hard limit if decreasing it */ + if (virCompareLimitUlong(vm->def->mem.hard_limit, hard_limit) > 0) { + QEMU_SET_MEM_PARAMETER(virCgroupSetMemoryHardLimit, hard_limit); + /* inhibit changing the limit a second time */ + set_hard_limit = false; } - if (set_memory_soft_limit) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if ((rc = virCgroupSetMemorySoftLimit(priv->cgroup, memory_soft_limit)) < 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory soft_limit tunable")); - goto cleanup; - } - vm->def->mem.soft_limit = memory_soft_limit; - } + QEMU_SET_MEM_PARAMETER(virCgroupSetMemSwapHardLimit, swap_hard_limit); - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - persistentDef->mem.soft_limit = memory_soft_limit; - } + /* otherwise increase it after swap hard limit */ + QEMU_SET_MEM_PARAMETER(virCgroupSetMemoryHardLimit, hard_limit); + +#undef QEMU_SET_MEM_PARAMETER if (flags & VIR_DOMAIN_AFFECT_CONFIG && virDomainSaveConfig(cfg->configDir, persistentDef) < 0) diff --git a/src/util/virutil.c b/src/util/virutil.c index 9cc3672..491a004 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -3832,3 +3832,15 @@ virFindFCHostCapableVport(const char *sysfs_prefix ATTRIBUTE_UNUSED) } #endif /* __linux__ */ + +int +virCompareLimitUlong(unsigned long long a, unsigned long b) +{ + if (a == b) + return 0; + + if (a == 0 || a > b) + return 1; + + return -1; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 7b37d65..39033db 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -324,4 +324,6 @@ char *virGetFCHostNameByWWN(const char *sysfs_prefix, char *virFindFCHostCapableVport(const char *sysfs_prefix); +int virCompareLimitUlong(unsigned long long a, unsigned long b); + #endif /* __VIR_UTIL_H__ */ -- 1.8.1.5

2 2

[libvirt] Add UID/GID support to virt-sandbox-service
by dwalsh＠redhat.com 23 Apr '13

23 Apr '13

This patch set is adding support for UID/GID/USERNAME/USERDIR for use with openshift containers Also fixes virt-sandbox-service to not complain if the destdir has been precreated. Finally we also do not want excess processes running withing containers (/bin/sh). [sandbox PATCH 1/3] Add UID/GID support for use with interactive [sandbox PATCH 2/3] Only create the destination path if it does not [sandbox PATCH 3/3] Do not run a shell within a lxc container by

2 6

[libvirt] [PATCH] rpc: message related sizes enlarged
by Viktor Mihajlovski 23 Apr '13

23 Apr '13

From: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> We have seen an issue on s390x platform where domain XMLs larger than 1MB were used. The define command was finished successfully. The dumpxml command was not successful (i.e. could not encode message payload). Enlarged message related sizes (e.g. maximum string size, message size, etc.) to handle larger system configurations used on s390x platform. Signed-off-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/remote/remote_protocol.x | 6 +++--- src/rpc/virnetprotocol.x | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b957b8e..d492bf3 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -65,7 +65,7 @@ * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const REMOTE_STRING_MAX = 1048576; +const REMOTE_STRING_MAX = 4194304; /* A long string, which may NOT be NULL. */ typedef string remote_nonnull_string<REMOTE_STRING_MAX>; @@ -160,13 +160,13 @@ const REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX = 1024; * Note applications need to be aware of this limit and issue multiple * requests for large amounts of data. */ -const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 1048576; +const REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX = 4194304; /* Maximum length of a memory peek buffer message. * Note applications need to be aware of this limit and issue multiple * requests for large amounts of data. */ -const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 1048576; +const REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX = 4194304; /* * Maximum length of a security label list. diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index eb2e81d..7d5557c 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -45,13 +45,13 @@ /*----- Data types. -----*/ /* Maximum total message size (serialised). */ -const VIR_NET_MESSAGE_MAX = 4194304; +const VIR_NET_MESSAGE_MAX = 16777216; /* Size of struct virNetMessageHeader (serialised)*/ const VIR_NET_MESSAGE_HEADER_MAX = 24; /* Size of message payload */ -const VIR_NET_MESSAGE_PAYLOAD_MAX = 4194280; +const VIR_NET_MESSAGE_PAYLOAD_MAX = 16777192; /* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX */ const VIR_NET_MESSAGE_LEN_MAX = 4; @@ -60,7 +60,7 @@ const VIR_NET_MESSAGE_LEN_MAX = 4; * This is an arbitrary limit designed to stop the decoder from trying * to allocate unbounded amounts of memory when fed with a bad message. */ -const VIR_NET_MESSAGE_STRING_MAX = 1048576; +const VIR_NET_MESSAGE_STRING_MAX = 4194304; /* Limit on number of File Descriptors allowed to be * passed per message -- 1.7.9.5

3 4

[libvirt] [PATCH] Replace more cases of /system with /machine
by Daniel P. Berrange 23 Apr '13

23 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The change in commit aed4986322fe77bdf718e31a0587d00f04f3d97a was incomplete, missing a couple of cases of /system. This caused failure to start VMs. Pushed under trivial rule Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_cgroup.c | 2 +- src/qemu/qemu_cgroup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 7311489..4a661da 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -557,7 +557,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, bool startup) /* We only auto-create the default partition. In other * cases we expec the sysadmin/app to have done so */ rc = virCgroupNewPartition(def->resource->partition, - STREQ(def->resource->partition, "/system"), + STREQ(def->resource->partition, "/machine"), -1, &parent); if (rc != 0) { diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 3a58f24..891984a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -256,7 +256,7 @@ int qemuInitCgroup(virQEMUDriverPtr driver, /* We only auto-create the default partition. In other * cases we expec the sysadmin/app to have done so */ rc = virCgroupNewPartition(vm->def->resource->partition, - STREQ(vm->def->resource->partition, "/system"), + STREQ(vm->def->resource->partition, "/machine"), cfg->cgroupControllers, &parent); if (rc != 0) { -- 1.8.1.4

1 0

[libvirt] virCommandProcessIO: hangs on poll()
by wangxiaojun 22 Apr '13

22 Apr '13

recent qemu (git resp) with param like: #>qemu-kvm -S -no-user-config -nodefaults -nographic -M none -qmp monarg -pidfile pidfile will just hangs forever. no any output or errors . and when libvirt Try to get caps via QMP qemuCaps. it run above command. so virCommandProcessIO call poll() will be hangs forever. i patch the libvirt (git resp) with : diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50712b0..915edaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2377,7 +2377,6 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, virCommandClearCaps(cmd); virCommandSetGID(cmd, runGid); virCommandSetUID(cmd, runUid); - if (virCommandRun(cmd, &status) < 0) goto cleanup; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index ac56a63..84738f9 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1824,6 +1824,7 @@ virCommandProcessIO(virCommandPtr cmd) int i; struct pollfd fds[3]; int nfds = 0; + int pfds = 0; if (cmd->inpipe != -1) { fds[nfds].fd = cmd->inpipe; @@ -1846,8 +1847,8 @@ virCommandProcessIO(virCommandPtr cmd) if (nfds == 0) break; - - if (poll(fds, nfds, -1) < 0) { + pfds = poll(fds, nfds, -1); + if ( pfds< 0) { if (errno == EAGAIN || errno == EINTR) continue; virReportSystemError(errno, "%s", @@ -1855,10 +1856,22 @@ virCommandProcessIO(virCommandPtr cmd) goto cleanup; } - for (i = 0; i < nfds ; i++) { - if (fds[i].revents & (POLLIN | POLLHUP | POLLERR) && + for (i = 0; i < pfds ; i++) { + if (fds[i].revents & (POLLHUP | POLLRDHUP | POLLERR | POLLNVAL)) + { + if (fds[i].fd == errfd) { + VIR_DEBUG("hangup on stderr"); + } else if (fds[i].fd == outfd) { + VIR_DEBUG("hangup on stdout"); + } else { + VIR_DEBUG("hangup on stdin"); + } + errfd = -1; + } + + if (fds[i].revents & (POLLIN | POLLHUP | POLLRDHUP | POLLERR | POLLNVAL) && (fds[i].fd == errfd || fds[i].fd == outfd)) { - char data[1024]; + char data[1024*2]; char **buf; size_t *len; int done; So everythings is OK. i use gentoo OS. qemu git source and libvirt git source.

2 1

[libvirt] [PATCH] rng: tighten up domain <controller> schema
by Laine Stump 22 Apr '13

22 Apr '13

The rng schema for <controller> had been non-specific about which types of controllers allowed which models, and also allowed the num_queues attribute (since that hasn't been released yet, should we rename it to "numQueues"?) and <master> subelement to be included for any controller type. In reality, half of the models are allowed only for type='scsi', and the other half only for type='usb', num_queues is allowed only for type='scsi', and <master> only for type='usb'. This patch makes a separate <group> for type='scsi' and type='usb', with each group allowing only the appropriate model values, and allowing num_queue and <master> only when appropriate. <interleave> also hadn't been specified, forcing a specific order of subelements, which should never be done. (Note that the <interleave> had to surround the main element attributes that are in the <group> subelements, due to one of the <group>s containing a subelement). --- docs/schemas/domaincommon.rng | 145 +++++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 64 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c96a247..26523a7 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1402,80 +1402,97 @@ </define> <define name="controller"> <element name="controller"> - <choice> - <group> - <optional> + <attribute name="index"> + <ref name="unsignedInt"/> + </attribute> + <interleave> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + <choice> +  + <group> <attribute name="type"> <choice> <value>fdc</value> <value>ide</value> - <value>scsi</value> <value>sata</value> <value>ccid</value> - <value>usb</value> </choice> </attribute> - </optional> - </group> -  - <group> - <attribute name="type"> - <value>virtio-serial</value> - </attribute> - <optional> - <attribute name="ports"> - <ref name="unsignedInt"/> + </group> +  + <group> + <attribute name="type"> + <value>scsi</value> </attribute> - </optional> - <optional> - <attribute name="vectors"> - <ref name="unsignedInt"/> + <optional> + <attribute name="model"> + <choice> + <value>auto</value> + <value>buslogic</value> + <value>lsilogic</value> + <value>lsisas1068</value> + <value>vmpvscsi</value> + <value>ibmvscsi</value> + <value>virtio-scsi</value> + <value>lsisas1078</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="num_queues"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </group> +  + <group> + <attribute name="type"> + <value>usb</value> </attribute> - </optional> - </group> - </choice> - <attribute name="index"> - <ref name="unsignedInt"/> - </attribute> - <optional> - <attribute name="model"> - <choice> - <value>auto</value> - <value>buslogic</value> - <value>lsilogic</value> - <value>lsisas1068</value> - <value>vmpvscsi</value> - <value>ibmvscsi</value> - <value>virtio-scsi</value> - <value>lsisas1078</value> - <value>piix3-uhci</value> - <value>piix4-uhci</value> - <value>ehci</value> - <value>ich9-ehci1</value> - <value>ich9-uhci1</value> - <value>ich9-uhci2</value> - <value>ich9-uhci3</value> - <value>vt82c686b-uhci</value> - <value>pci-ohci</value> - <value>nec-xhci</value> - <value>none</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="num_queues"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <ref name="usbmaster"/> - </optional> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> + <optional> + <attribute name="model"> + <choice> + <value>piix3-uhci</value> + <value>piix4-uhci</value> + <value>ehci</value> + <value>ich9-ehci1</value> + <value>ich9-uhci1</value> + <value>ich9-uhci2</value> + <value>ich9-uhci3</value> + <value>vt82c686b-uhci</value> + <value>pci-ohci</value> + <value>nec-xhci</value> + <value>none</value> + </choice> + </attribute> + </optional> + <optional> + <ref name="usbmaster"/> + </optional> + </group> +  + <group> + <attribute name="type"> + <value>virtio-serial</value> + </attribute> + <optional> + <attribute name="ports"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="vectors"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </group> + </choice> + </interleave> </element> </define> <define name="filesystem"> -- 1.7.11.7

5 18

[libvirt] [PATCH v1 00/12] Multiple TX queue support
by Michal Privoznik 22 Apr '13

22 Apr '13

Kernel and subsequently QEMU learned multiple transmit queues a while ago. The feature has a nice advantage, it alloes a single guest to transmit multiple flows of network data using multiple CPUs simultaneously which increase traffic bandwidth. A lot. The documentation how to use this is available at [1] or [2]. 1: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/tree/Docume… 2: http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-options.hx;hb=HEAD#l1363 Michal Privoznik (12): Introduce /domain/devices/interface/driver/@queues attribute qemu: Move interface cmd line construction into a separate function qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Make qemuMonitorAddHostNetwork to pass multiple FDs qemu: Adapt command line generation to multiqueue net util: Learn virNetDevTapCreate multiqueue network qemu: Allow multiple vhost-net openings qemu: Rework qemuNetworkIfaceConnect qemu: Adapt qemuDomainAttachNetDevice to multiqueue net qemu: Change qemuOpenVhostNet return value qemu: Adapt qemuBuildInterfaceCommandLine to to multiqueue net qemu: Enable multiqueue network docs/formatdomain.html.in | 11 +- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_command.c | 527 +++++++++++++-------- src/qemu/qemu_command.h | 13 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_hotplug.c | 99 ++-- src/qemu/qemu_monitor.c | 78 +-- src/qemu/qemu_monitor.h | 8 +- src/uml/uml_conf.c | 5 +- src/util/virnetdevtap.c | 105 ++-- src/util/virnetdevtap.h | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 +- .../qemuxml2argv-net-virtio-device.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 50 ++ tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 19 files changed, 616 insertions(+), 339 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vhost_queues.xml -- 1.8.1.5

1 12

[libvirt] [PATCH v3] qemu: Implement CPUs check against machine type's cpu-max
by Michal Novotny 22 Apr '13

22 Apr '13

Implement check whether (maximum) vCPUs doesn't exceed machine type's cpu-max settings. On older versions of QEMU the check is disabled. Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 38 +++++++++++++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 7 +++++++ src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d10c8aa..bbfe85f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -243,6 +243,7 @@ struct _virQEMUCaps { size_t nmachineTypes; char **machineTypes; char **machineAliases; + int *machineMaxCpus; }; struct _virQEMUCapsCache { @@ -322,6 +323,7 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, { char *name = qemuCaps->machineTypes[defIdx]; char *alias = qemuCaps->machineAliases[defIdx]; + int cpu_max = qemuCaps->machineMaxCpus[defIdx]; memmove(qemuCaps->machineTypes + 1, qemuCaps->machineTypes, @@ -329,8 +331,12 @@ virQEMUCapsSetDefaultMachine(virQEMUCapsPtr qemuCaps, memmove(qemuCaps->machineAliases + 1, qemuCaps->machineAliases, sizeof(qemuCaps->machineAliases[0]) * defIdx); + memmove(qemuCaps->machineMaxCpus + 1, + qemuCaps->machineMaxCpus, + sizeof(qemuCaps->machineMaxCpus[0]) * defIdx); qemuCaps->machineTypes[0] = name; qemuCaps->machineAliases[0] = alias; + qemuCaps->machineMaxCpus[0] = cpu_max; } /* Format is: @@ -377,7 +383,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, } if (VIR_REALLOC_N(qemuCaps->machineTypes, qemuCaps->nmachineTypes + 1) < 0 || - VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0) { + VIR_REALLOC_N(qemuCaps->machineAliases, qemuCaps->nmachineTypes + 1) < 0 || + VIR_REALLOC_N(qemuCaps->machineMaxCpus, qemuCaps->nmachineTypes + 1) < 0) { VIR_FREE(name); VIR_FREE(canonical); goto no_memory; @@ -390,6 +397,8 @@ virQEMUCapsParseMachineTypesStr(const char *output, qemuCaps->machineTypes[qemuCaps->nmachineTypes-1] = name; qemuCaps->machineAliases[qemuCaps->nmachineTypes-1] = NULL; } + /* Value 0 means "unknown" as it's not exposed by QEMU binary */ + qemuCaps->machineMaxCpus[qemuCaps->nmachineTypes-1] = 0; } while ((p = next)); @@ -1718,6 +1727,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) goto no_memory; if (VIR_ALLOC_N(ret->machineAliases, qemuCaps->nmachineTypes) < 0) goto no_memory; + if (VIR_ALLOC_N(ret->machineMaxCpus, qemuCaps->nmachineTypes) < 0) + goto no_memory; ret->nmachineTypes = qemuCaps->nmachineTypes; for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i]))) @@ -1725,6 +1736,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) if (qemuCaps->machineAliases[i] && !(ret->machineAliases[i] = strdup(qemuCaps->machineAliases[i]))) goto no_memory; + ret->machineMaxCpus[i] = qemuCaps->machineMaxCpus[i]; } return ret; @@ -1923,6 +1935,25 @@ const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, } +int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + const char *name) +{ + size_t i; + + if (!name) + return 0; + + for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { + if (!qemuCaps->machineMaxCpus[i]) + continue; + if (STREQ(qemuCaps->machineTypes[i], name)) + return qemuCaps->machineMaxCpus[i]; + } + + return 0; +} + + static int virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) @@ -2073,6 +2104,10 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, virReportOOMError(); goto cleanup; } + if (VIR_ALLOC_N(qemuCaps->machineMaxCpus, nmachines) < 0) { + virReportOOMError(); + goto cleanup; + } for (i = 0 ; i < nmachines ; i++) { if (machines[i]->alias) { @@ -2087,6 +2122,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, } if (machines[i]->isDefault) defIdx = i; + qemuCaps->machineMaxCpus[i] = machines[i]->cpu_max; } qemuCaps->nmachineTypes = nmachines; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4e76799..bd97e8d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -223,7 +223,8 @@ size_t virQEMUCapsGetMachineTypes(virQEMUCapsPtr qemuCaps, char ***names); const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps, const char *name); - +int virQEMUCapsGetMachineMaxCpus(virQEMUCapsPtr qemuCaps, + const char *name); int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps, size_t *nmachines, virCapsGuestMachinePtr **machines); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index f39f009..c097953 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -650,6 +650,7 @@ struct _qemuMonitorMachineInfo { char *name; bool isDefault; char *alias; + int cpu_max; }; int qemuMonitorGetMachines(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6fdd650..adbd865 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4024,6 +4024,13 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, goto cleanup; } } + + if (virJSONValueObjectHasKey(child, "cpu-max") && + virJSONValueObjectGetNumberInt(child, "cpu-max", &info->cpu_max) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("query-machines reply has malformed 'cpu-max' data")); + goto cleanup; + } } ret = n; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ce9f501..9eae8f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3266,6 +3266,30 @@ qemuSetUnprivSGIO(virDomainDiskDefPtr disk) return ret; } +static bool +qemuValidateCpuMax(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) +{ + int cpu_max; + + cpu_max = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine); + if (!cpu_max) + return true; + + if (def->vcpus > cpu_max) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("CPUs greater than specified machine type limit")); + return false; + } + + if (def->maxvcpus > cpu_max) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("Maximum CPUs greater than specified machine type limit")); + return false; + } + + return true; +} + int qemuProcessStart(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -3481,6 +3505,9 @@ int qemuProcessStart(virConnectPtr conn, vm->def->emulator))) goto cleanup; + if (!qemuValidateCpuMax(vm->def, priv->qemuCaps)) + goto cleanup; + if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0) goto cleanup; -- 1.7.11.7

1 1

[libvirt] [PATCH] qemu: Fix the wrong expression
by Osier Yang 22 Apr '13

22 Apr '13

Wrong use of the parentheses causes "rc" always having a boolean value, either "1" or "0", and thus we can't get the detailed error message when it fails: Before (I only have 1 node): % virsh numatune f18 --nodeset 12 error: Unable to change numa parameters error: unable to set numa tunable: Unknown error -1 After: virsh numatune f18 --nodeset 12 error: Unable to change numa parameters error: unable to set numa tunable: Invalid argument --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cee5557..0de7ffd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7470,7 +7470,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, continue; } - if ((rc = virCgroupSetCpusetMems(priv->cgroup, nodeset_str) != 0)) { + if ((rc = virCgroupSetCpusetMems(priv->cgroup, nodeset_str)) != 0) { virReportSystemError(-rc, "%s", _("unable to set numa tunable")); virBitmapFree(nodeset); -- 1.8.1.4

2 2

[libvirt] USB pass-through with XEN
by Carlos Rodrigues 20 Apr '13

20 Apr '13

Hello everybody, I try to doing USB pass-through with XEN hypervisor using libvirt and i get the following error: # virsh attach-device c6test /tmp/usb_device.xml error: Failed to attach device from /tmp/usb_device.xml error: unsupported configuration: unsupported device type # cat /tmp/usb_device.xml <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id="0x0529" /> <product id="0x0001" /> </source> </hostdev> But using xm command, the USB pass-through has been successfully # xm usb-add c6test host:0529:0001 I try it on Fedora 17 with libvirt 1.0.4 and xen 4.2.1. Does anyone know how can i do to put libvirt work with XEN USB pass-through? Best regards, -- Carlos Rodrigues <cmar(a)eurotux.com> Engenheiro de Software Sénior Eurotux Informática, S.A. | www.eurotux.com (t) +351 253 680 300

2 1

[libvirt] [PATCH 0/5] qemu: invoke qemu-bridge-helper from libvirtd
by Paolo Bonzini 20 Apr '13

20 Apr '13

The <interface type='bridge'> is working mostly because of a bad design decision in Linux. Ideally, QEMU would run with an empty capability bounding set and would not be able to do any privileged operation (not even by running a helper program). This is not the case because dropping capabilities from the bounding set requires a capability of its own, CAP_SETPCAP; thus QEMU does *not* run with an empty bounding set if invoked via qemu:///session. This series lets libvirtd invoke the privileged helper program on its own, which is a cleaner design that would work even if the above Linux bug was not there. Also, this adds a <target dev='tap0'/> element to the XML of an active domain using <interface type='bridge'>. libvirt now needs to know the path to the helper (patch 3), and must not set permitted/effective capabilities on children when running unprivileged (patches 1/2). Apart from this, the recvfd and virCommand APIs make the task almost trivial. Paolo Bonzini (5): util: simplify virSetUIDGIDWithCaps util: allow using virCommandAllowCap with setuid helpers qemu_conf: add new configuration key bridge_helper virnetdevtap: add virNetDevTapGetName qemu: launch bridge helper from libvirtd src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 8 +++ src/qemu/qemu_command.c | 133 +++++++++++++++++++++++++++---------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_conf.c | 3 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_hotplug.c | 25 +++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virnetdevtap.c | 33 +++++++++ src/util/virnetdevtap.h | 3 + src/util/virutil.c | 36 +++++++--- 12 files changed, 183 insertions(+), 63 deletions(-) -- 1.8.1.4

5 27

[libvirt] [PATCH] docs: fix usage of 'onto'
by Eric Blake 20 Apr '13

20 Apr '13

http://www.uhv.edu/ac/newsletters/writing/grammartip2009.07.01.htm (and several other sites) give hints that 'onto' is best used if you can also add 'up' just before it and still make sense. In many cases in the code base, we really want the two-word form, or even a simplification to just 'on' or 'to'. * docs/hacking.html.in: Use correct 'on to'. * python/libvirt-override.c: Likewise. * src/lxc/lxc_controller.c: Likewise. * src/util/virpci.c: Likewise. * daemon/THREADS.txt: Use simpler 'on'. * docs/formatdomain.html.in: Better usage. * docs/internals/rpc.html.in: Likewise. * src/conf/domain_event.c: Likewise. * src/rpc/virnetclient.c: Likewise. * tests/qemumonitortestutils.c: Likewise. * HACKING: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. daemon/THREADS.txt | 2 +- docs/formatdomain.html.in | 6 +++--- docs/hacking.html.in | 2 +- docs/internals/rpc.html.in | 8 ++++---- python/libvirt-override.c | 4 ++-- src/conf/domain_event.c | 4 ++-- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetclient.c | 4 ++-- src/util/virpci.c | 4 ++-- tests/qemumonitortestutils.c | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/daemon/THREADS.txt b/daemon/THREADS.txt index 6386941..762ca25 100644 --- a/daemon/THREADS.txt +++ b/daemon/THREADS.txt @@ -40,7 +40,7 @@ The server lock is used in conjunction with a condition variable to pass jobs from the event loop thread to the workers. The main event loop thread handles I/O from the client socket, and once a complete RPC message has been read off the wire (and optionally -decrypted), it will be placed onto the 'dx' job queue for the +decrypted), it will be placed on the 'dx' job queue for the associated client object. The job condition will be signalled and a worker will wakup and process it. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0cc56d9..888c005 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -741,7 +741,7 @@ <p> Resource partitions are currently supported by the QEMU and - LXC drivers, which map partition paths onto cgroups directories, + LXC drivers, which map partition paths to cgroups directories, in all mounted controllers. <span class="since">Since 1.0.5</span> </p> @@ -2701,7 +2701,7 @@ </p> <p> - Provides a bridge from the VM directly onto the LAN. This assumes + Provides a bridge from the VM directly to the LAN. This assumes there is a bridge device on the host which has one or more of the hosts physical NICs enslaved. The guest VM will have an associated tun device created with a name of vnetN, which can also be overridden with the @@ -2908,7 +2908,7 @@ <dl> <dt><code>profileid</code></dt> <dd>The profile ID contains the name of the port profile that is to - be applied onto this interface. This name is resolved by the port + be applied to this interface. This name is resolved by the port profile database into the network parameters from the port profile, and those network parameters will be applied to this interface. </dd> diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 632d357..99933d1 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -394,7 +394,7 @@ </pre> <p> - However, the moment your loop/if/else body extends onto a second + However, the moment your loop/if/else body extends on to a second line, for whatever reason (even if it's just an added comment), then you should add braces. Otherwise, it would be too easy to insert a statement just before that comment (without adding braces), thinking diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index 4cf1e38..91e8449 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -418,7 +418,7 @@ After a complete packet has been read, the header must be decoded and all 6 fields fully validated, before attempting to dispatch the payload. Once dispatched, the payload can be decoded and passed - onto the appropriate API for execution. The RPC code must not take + on to the appropriate API for execution. The RPC code must not take any action based on the payload, since it has no way to validate the semantics of the payload data. It must delegate this to the execution API (e.g. corresponding libvirt public API). @@ -785,7 +785,7 @@ return value and output parameters, or error object and encode them into a reply packet. Again it does not attempt to do any semantic validation of output data, aside from variable length - field limit checks. The worker thread puts the reply packet onto + field limit checks. The worker thread puts the reply packet on the transmission queue for the client. The worker is now finished and goes back to wait for another incoming method call. </p> @@ -811,10 +811,10 @@ for the worker threads, it is sidetracked into a per-stream processing queue. When the stream becomes writable, queued incoming stream packets will be processed, passing their data - payload onto the stream. Conversely when the stream becomes + payload on the stream. Conversely when the stream becomes readable, chunks of data will be read from it, encoded into new outgoing packets, and placed on the client's transmit - queue + queue. </p> <h4><a name="apiserverdispatchex1">Example with overlapping methods</a></h4> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 3d8490c..244b7ec 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -4,7 +4,7 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005, 2007-2012 Red Hat, Inc. + * Copyright (C) 2005, 2007-2013 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ @@ -5084,7 +5084,7 @@ libvirt_virEventRegisterImpl(ATTRIBUTE_UNUSED PyObject * self, updateTimeoutName = py_str(updateTimeoutObj); removeTimeoutName = py_str(removeTimeoutObj); - /* Inc refs since we're holding onto these objects until + /* Inc refs since we're holding on to these objects until * the next call (if any) to this function. */ Py_INCREF(addHandleObj); diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 96a07ac..825012a 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1,7 +1,7 @@ /* * domain_event.c: domain event queue processing helpers * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * * This library is free software; you can redistribute it and/or @@ -1179,7 +1179,7 @@ virDomainEventPtr virDomainEventBalloonChangeNewFromObj(virDomainObjPtr obj, * @evtQueue: the dom event queue * @event: the event to add * - * Internal function to push onto the back of a virDomainEventQueue + * Internal function to push to the back of a virDomainEventQueue * * Returns: 0 on success, -1 on failure */ diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index f46f813..740b872 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1699,7 +1699,7 @@ int main(int argc, char *argv[]) _exit(0); } - /* Don't hold onto any cwd we inherit from libvirtd either */ + /* Don't hold on to any cwd we inherit from libvirtd either */ if (chdir("/") < 0) { virReportSystemError(errno, "%s", _("Unable to change to root dir")); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 010c5c3..1d228f0 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1,7 +1,7 @@ /* * virnetclient.c: generic network RPC client * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-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 @@ -1771,7 +1771,7 @@ static int virNetClientIO(virNetClientPtr client, goto cleanup; } - /* Grr, someone passed the buck onto us ... */ + /* Grr, someone passed the buck to us ... */ } else { client->haveTheBuck = true; } diff --git a/src/util/virpci.c b/src/util/virpci.c index d94ff54..0fcf8ca 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1208,7 +1208,7 @@ virPCIDeviceReattach(virPCIDevicePtr dev, * condition where the hypervisor is still cleaning up the device while * libvirt is trying to re-attach it to the host device driver. To avoid * this situation, we look through /proc/iomem, and if the hypervisor is - * still holding onto the bar (denoted by the string in the matcher variable), + * still holding on to the bar (denoted by the string in the matcher variable), * then we can wait around a bit for that to clear up. * * A typical /proc/iomem looks like this (snipped for brevity): @@ -1230,7 +1230,7 @@ virPCIDeviceReattach(virPCIDevicePtr dev, * f0000000-f0003fff : kvm_assigned_device * * Returns 0 if we are clear to continue, and 1 if the hypervisor is still - * holding onto the resource. + * holding on to the resource. */ int virPCIDeviceWaitForCleanup(virPCIDevicePtr dev, const char *matcher) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index fe98813..43e7cb9 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -77,7 +77,7 @@ struct _qemuMonitorTest { static void qemuMonitorTestItemFree(qemuMonitorTestItemPtr item); /* - * Appends data for a reply onto the outgoing buffer + * Appends data for a reply to the outgoing buffer */ static int qemuMonitorTestAddReponse(qemuMonitorTestPtr test, const char *response) -- 1.8.1.4

1 0

[libvirt] [PATCH] audit: properly encode device path in cgroup audit
by Eric Blake 20 Apr '13

20 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=922186 Commit d04916fa introduced a regression in audit quality - even though the code was computing the proper escaped name for a path, it wasn't feeding that escaped name on to the audit message. As a result, /var/log/audit/audit.log would mention a field path=/dev/hpet instead of the intended path="/dev/hpet", which in turn caused ausearch to format the audit log as path=(null). * src/conf/domain_audit.c (virDomainAuditCgroupPath): Use constructed encoding. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- A rather embarrassing bug of mine, especially since it took two years to find that such a trivial fix was needed. src/conf/domain_audit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 85d97b4..6d0ae48 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -1,7 +1,7 @@ /* * domain_audit.c: Domain audit management * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -682,8 +682,8 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupPtr cgroup, rdev = virDomainAuditGetRdev(path); if (!(detail = virAuditEncode("path", path)) || - virAsprintf(&extra, "path path=%s rdev=%s acl=%s", - path, VIR_AUDIT_STR(rdev), perms) < 0) { + virAsprintf(&extra, "path %s rdev=%s acl=%s", + detail, VIR_AUDIT_STR(rdev), perms) < 0) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } -- 1.8.1.4

2 2

[libvirt] [PATCH v2 00/11] qemu: add PCI bridge support
by Ján Tomko 20 Apr '13

20 Apr '13

Add new 'pci' controller type with two models: pci-root - auto-added to a pc* machine, providing pci bus 0 pci-bridge - auto-added if the devices would not leave at least one slot empty on bus 0 or bus >0 is specified Ján Tomko (10): qemu: make qemuComparePCIDevice aware of multiple buses qemu: print PCI address hexadecimally in errors qemu: QEMU_PCI constant consistency qemu: move PCI address check out of qemuPCIAddressAsString qemu: switch PCI address set from hash table to an array qemu: rename CheckSlot to SlotInUse conf: add model attribute to virDomainDefMaybeAddController conf: add PCI controllers qemu: auto-add bridges and allow using them qemu: auto-add pci-root controller for pc machine types liguang (1): qemu: build command line for pci-bridge device docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 63 ++- src/conf/domain_conf.h | 14 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 477 +++++++++++++-------- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_domain.c | 37 ++ src/qemu/qemu_hotplug.c | 4 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/external_vm.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/qemuhelptest.c | 21 +- .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 1 + .../qemuxml2argv-blkiotune-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 1 + .../qemuxml2argv-boot-menu-disable.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 1 + .../qemuxml2argv-channel-guestfwd.xml | 1 + .../qemuxml2argv-channel-virtio.xml | 1 + .../qemuxml2argv-clock-localtime.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 1 + .../qemuxml2argv-console-compat.xml | 1 + .../qemuxml2argv-console-virtio-many.xml | 1 + .../qemuxml2argv-controller-order.xml | 1 + .../qemuxml2argv-cpu-eoi-disabled.xml | 1 + .../qemuxml2argv-cpu-eoi-enabled.xml | 1 + .../qemuxml2argv-cpu-host-kvmclock.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 1 + .../qemuxml2argv-disk-cdrom-empty.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 1 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 1 + .../qemuxml2argv-disk-drive-boot-disk.xml | 1 + .../qemuxml2argv-disk-drive-cache-directsync.xml | 1 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-none.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 1 + .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 1 + .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 1 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 1 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 1 + ...rgv-disk-drive-error-policy-wreport-rignore.xml | 1 + .../qemuxml2argv-disk-drive-fat.xml | 1 + .../qemuxml2argv-disk-drive-fmt-qcow.xml | 1 + .../qemuxml2argv-disk-drive-network-gluster.xml | 1 + .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 1 + .../qemuxml2argv-disk-drive-network-iscsi.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-export.xml | 1 + ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd.xml | 1 + ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 1 + .../qemuxml2argv-disk-scsi-device.xml | 1 + .../qemuxml2argv-disk-scsi-disk-vpd.xml | 1 + ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 1 + .../qemuxml2argv-disk-scsi-megasas.xml | 1 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 1 + .../qemuxml2argv-disk-scsi-vscsi.xml | 1 + .../qemuxml2argv-disk-source-pool.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 1 + .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 1 + .../qemuxml2argv-encrypted-disk.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 1 + .../qemuxml2argv-floppy-drive-fat.xml | 1 + .../qemuxml2argv-graphics-listen-network.xml | 1 + .../qemuxml2argv-graphics-sdl-fullscreen.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 1 + .../qemuxml2argv-graphics-spice-compression.xml | 1 + .../qemuxml2argv-graphics-spice-qxl-vga.xml | 1 + .../qemuxml2argv-graphics-spice.xml | 1 + .../qemuxml2argv-graphics-vnc-sasl.xml | 1 + .../qemuxml2argv-graphics-vnc-socket.xml | 1 + .../qemuxml2argv-graphics-vnc-tls.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 1 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argv-hostdev-usb-address.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 1 + .../qemuxml2argv-input-usbmouse.xml | 1 + .../qemuxml2argv-input-usbtablet.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 1 + .../qemuxml2argv-machine-core-off.xml | 1 + .../qemuxml2argv-machine-core-on.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 1 + .../qemuxml2argv-misc-disable-s3.xml | 1 + .../qemuxml2argv-misc-disable-suspends.xml | 1 + .../qemuxml2argv-misc-enable-s4.xml | 1 + .../qemuxml2argv-misc-no-reboot.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argv-net-eth-ifname.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + .../qemuxml2argv-net-openvswitch.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-device.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 1 + .../qemuxml2argv-nographics-vga.xml | 1 + .../qemuxml2argv-numad-static-vcpu-no-numatune.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 1 + .../qemuxml2argv-qemu-ns-no-env.xml | 1 + .../qemuxml2argv-reboot-timeout-disabled.xml | 1 + .../qemuxml2argv-reboot-timeout-enabled.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 1 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 1 + .../qemuxml2argv-seclabel-dynamic-override.xml | 1 + .../qemuxml2argv-seclabel-none.xml | 1 + .../qemuxml2argv-seclabel-static.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 1 + .../qemuxml2argv-serial-tcp-telnet.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 1 + .../qemuxml2argv-tpm-passthrough.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 1 + .../qemuxml2argv-virtio-rng-egd.xml | 1 + .../qemuxml2argv-virtio-rng-random.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 1 + .../qemuxml2xmlout-balloon-device-auto.xml | 1 + .../qemuxml2xmlout-channel-virtio-auto.xml | 1 + .../qemuxml2xmlout-console-compat-auto.xml | 1 + .../qemuxml2xmlout-console-virtio.xml | 1 + .../qemuxml2xmlout-disk-mirror.xml | 1 + .../qemuxml2xmlout-disk-scsi-device-auto.xml | 1 + .../qemuxml2xmlout-graphics-listen-network2.xml | 1 + .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 1 + ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 1 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 + .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 1 + .../qemuxml2xmlout-serial-target-port-auto.xml | 1 + .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 1 + 168 files changed, 574 insertions(+), 211 deletions(-) -- 1.8.1.5

3 33

[libvirt] [PATCHv2] conf: Reword error message to be more universal
by Peter Krempa 19 Apr '13

19 Apr '13

The error message that warns user when a request to chagne/get persistent configuration of a transient domain is requested suggests that changes are being made. Reword it to be more universal and allow it to be used for getter APIs too. Before: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: cannot change persistent config of a transient domain After: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: transient domains do not have any persistent config --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1643f30..758f416 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2251,8 +2251,8 @@ virDomainLiveConfigHelperMethod(virCapsPtr caps, if (*flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!dom->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient domain")); + _("transient domains do not have any " + "persistent config")); goto cleanup; } if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) { -- 1.8.2.1

2 2

[libvirt] [PATCH] qemu: Enable the capability bit for -no-kvm-pit-reinjection on x86 only
by Viktor Mihajlovski 19 Apr '13

19 Apr '13

From: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> On architectures not supporting the Intel specific programmable interval timer, like e.g. S390, starting a domain with a clock definition containing a pit timer results in the error "Option no-kvm-pit-reinjection not supported for this target". By moving the capability enablement for -no-kvm-pit-reinjection from the InitQMPBasic section into the x86_64 and i686 only enablement section all other architectures are no longer automatically enabled. In addition architecture related capabilities enablements were refactored into a new architecture bound capabilities initialization function. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 55 ++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a95f23c..028e77c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2367,13 +2367,48 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_USER_CONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); } +/* Capabilities that are architecture depending + * initialized for QEMU. + */ +static int +virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, + qemuMonitorPtr mon) +{ + char *archstr = NULL; + int ret = -1; + + if (!(archstr = qemuMonitorGetTargetArch(mon))) + return -1; + + if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown QEMU arch %s"), archstr); + goto cleanup; + } + + /* + * Currently only x86_64 and i686 support PCI-multibus, + * -no-acpi and -no-kvm-pit-reinjection. + */ + if (qemuCaps->arch == VIR_ARCH_X86_64 || + qemuCaps->arch == VIR_ARCH_I686) { + virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); + } + + ret = 0; + +cleanup: + VIR_FREE(archstr); + return ret; +} static int virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, @@ -2391,7 +2426,6 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, char *monarg = NULL; char *monpath = NULL; char *pidfile = NULL; - char *archstr; pid_t pid = 0; virDomainObj vm; @@ -2508,23 +2542,8 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); - if (!(archstr = qemuMonitorGetTargetArch(mon))) - goto cleanup; - - if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown QEMU arch %s"), archstr); - VIR_FREE(archstr); + if (virQEMUCapsInitArchQMPBasic(qemuCaps, mon) < 0) goto cleanup; - } - VIR_FREE(archstr); - - /* Currently only x86_64 and i686 support PCI-multibus and -no-acpi. */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); - } if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; -- 1.7.9.5

1 0

[libvirt] [PATCHv2] network: bridge_driver: don't lose transient networks on daemon restart
by Peter Krempa 19 Apr '13

19 Apr '13

Until now tranisent networks weren't really useful as libvirtd wasn't able to remember them across restarts. This patch adds support for loading status files of transient networks (that already were generated) so that the status isn't lost. This patch chops up virNetworkObjUpdateParseFile and turns it into virNetworkLoadState and a few friends that will help us to load status XMLs and refactors the functions that are loading the configs to use them. --- Notes: Version 2: - renamed confDir to statusDir - clarified comment about goto - removed check if bridge name is present in XML - switched removal of inactive transient networks to while loop to avoid re-iteration src/conf/network_conf.c | 207 ++++++++++++++++++++++++++++---------------- src/conf/network_conf.h | 10 ++- src/libvirt_private.syms | 2 +- src/network/bridge_driver.c | 51 ++++++----- 4 files changed, 171 insertions(+), 99 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 75584a0..18a7d57 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1967,81 +1967,6 @@ cleanup: return def; } -int -virNetworkObjUpdateParseFile(const char *filename, - virNetworkObjPtr net) -{ - int ret = -1; - xmlDocPtr xml = NULL; - xmlNodePtr node = NULL; - virNetworkDefPtr tmp = NULL; - xmlXPathContextPtr ctxt = NULL; - - xml = virXMLParse(filename, NULL, _("(network status)")); - if (!xml) - return -1; - - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(); - goto cleanup; - } - - node = xmlDocGetRootElement(xml); - if (xmlStrEqual(node->name, BAD_CAST "networkstatus")) { - /* Newer network status file. Contains useful - * info which are not to be found in bare config XML */ - char *class_id = NULL; - char *floor_sum = NULL; - - ctxt->node = node; - class_id = virXPathString("string(./class_id[1]/@bitmap)", ctxt); - if (class_id) { - virBitmapFree(net->class_id); - if (virBitmapParse(class_id, 0, - &net->class_id, CLASS_ID_BITMAP_SIZE) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed 'class_id' attribute: %s"), - class_id); - VIR_FREE(class_id); - goto cleanup; - } - } - VIR_FREE(class_id); - - floor_sum = virXPathString("string(./floor[1]/@sum)", ctxt); - if (floor_sum && - virStrToLong_ull(floor_sum, NULL, 10, &net->floor_sum) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed 'floor_sum' attribute: %s"), - floor_sum); - VIR_FREE(floor_sum); - } - VIR_FREE(floor_sum); - } - - node = virXPathNode("//network", ctxt); - if (!node) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not find any 'network' element")); - goto cleanup; - } - - ctxt->node = node; - tmp = virNetworkDefParseXML(ctxt); - - if (tmp) { - net->newDef = net->def; - net->def = tmp; - } - - ret = 0; - -cleanup: - xmlFreeDoc(xml); - xmlXPathFreeContext(ctxt); - return ret; -} static int virNetworkDNSDefFormat(virBufferPtr buf, @@ -2554,6 +2479,104 @@ cleanup: return ret; } +virNetworkObjPtr +virNetworkLoadState(virNetworkObjListPtr nets, + const char *stateDir, + const char *name) +{ + char *configFile = NULL; + virNetworkDefPtr def = NULL; + virNetworkObjPtr net = NULL; + xmlDocPtr xml = NULL; + xmlNodePtr node = NULL; + xmlXPathContextPtr ctxt = NULL; + virBitmapPtr class_id_map = NULL; + unsigned long long floor_sum_val = 0; + + + if ((configFile = virNetworkConfigFile(stateDir, name)) == NULL) + goto error; + + if (!(xml = virXMLParseCtxt(configFile, NULL, _("(network status)"), &ctxt))) + goto error; + + if (!(node = virXPathNode("//network", ctxt))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find any 'network' element in status file")); + goto error; + } + + /* parse the definition first */ + ctxt->node = node; + if (!(def = virNetworkDefParseXML(ctxt))) + goto error; + + if (!STREQ(name, def->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Network config filename '%s'" + " does not match network name '%s'"), + configFile, def->name); + goto error; + } + + /* now parse possible status data */ + node = xmlDocGetRootElement(xml); + if (xmlStrEqual(node->name, BAD_CAST "networkstatus")) { + /* Newer network status file. Contains useful + * info which are not to be found in bare config XML */ + char *class_id = NULL; + char *floor_sum = NULL; + + ctxt->node = node; + if ((class_id = virXPathString("string(./class_id[1]/@bitmap)", ctxt))) { + if (virBitmapParse(class_id, 0, &class_id_map, + CLASS_ID_BITMAP_SIZE) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'class_id' attribute: %s"), + class_id); + VIR_FREE(class_id); + goto error; + } + } + VIR_FREE(class_id); + + floor_sum = virXPathString("string(./floor[1]/@sum)", ctxt); + if (floor_sum && + virStrToLong_ull(floor_sum, NULL, 10, &floor_sum_val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'floor_sum' attribute: %s"), + floor_sum); + VIR_FREE(floor_sum); + } + VIR_FREE(floor_sum); + } + + /* create the object */ + if (!(net = virNetworkAssignDef(nets, def, true))) + goto error; + /* do not put any "goto error" below this comment */ + + /* assign status data stored in the network object */ + if (class_id_map) { + virBitmapFree(net->class_id); + net->class_id = class_id_map; + } + + if (floor_sum_val > 0) + net->floor_sum = floor_sum_val; + +cleanup: + VIR_FREE(configFile); + xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); + return net; + +error: + virBitmapFree(class_id_map); + virNetworkDefFree(def); + goto cleanup; +} + virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, const char *configDir, const char *autostartDir, @@ -2612,6 +2635,40 @@ error: return NULL; } + +int +virNetworkLoadAllState(virNetworkObjListPtr nets, + const char *stateDir) +{ + DIR *dir; + struct dirent *entry; + + if (!(dir = opendir(stateDir))) { + if (errno == ENOENT) + return 0; + + virReportSystemError(errno, _("Failed to open dir '%s'"), stateDir); + return -1; + } + + while ((entry = readdir(dir))) { + virNetworkObjPtr net; + + if (entry->d_name[0] == '.') + continue; + + if (!virFileStripSuffix(entry->d_name, ".xml")) + continue; + + if ((net = virNetworkLoadState(nets, stateDir, entry->d_name))) + virNetworkObjUnlock(net); + } + + closedir(dir); + return 0; +} + + int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, const char *configDir, const char *autostartDir) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1a86e3d..163478c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -280,9 +280,6 @@ virNetworkDefPtr virNetworkDefParseString(const char *xmlStr); virNetworkDefPtr virNetworkDefParseFile(const char *filename); virNetworkDefPtr virNetworkDefParseNode(xmlDocPtr xml, xmlNodePtr root); -int virNetworkObjUpdateParseFile(const char *filename, - virNetworkObjPtr net); - char *virNetworkDefFormat(const virNetworkDefPtr def, unsigned int flags); static inline const char * @@ -318,10 +315,17 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets, const char *autostartDir, const char *file); +virNetworkObjPtr virNetworkLoadState(virNetworkObjListPtr nets, + const char *stateDir, + const char *name); + int virNetworkLoadAllConfigs(virNetworkObjListPtr nets, const char *configDir, const char *autostartDir); +int virNetworkLoadAllState(virNetworkObjListPtr nets, + const char *stateDir); + int virNetworkDeleteConfig(const char *configDir, const char *autostartDir, virNetworkObjPtr net); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 30fdcd7..f778e9c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -454,6 +454,7 @@ virNetworkIpDefNetmask; virNetworkIpDefPrefix; virNetworkList; virNetworkLoadAllConfigs; +virNetworkLoadAllState; virNetworkObjAssignDef; virNetworkObjFree; virNetworkObjGetPersistentDef; @@ -465,7 +466,6 @@ virNetworkObjSetDefTransient; virNetworkObjUnlock; virNetworkObjUnsetDefTransient; virNetworkObjUpdate; -virNetworkObjUpdateParseFile; virNetworkRemoveInactive; virNetworkSaveConfig; virNetworkSaveStatus; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6ea09fa..27dd230 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -180,6 +180,7 @@ networkRemoveInactive(struct network_driver *driver, char *radvdconfigfile = NULL; char *configfile = NULL; char *radvdpidbase = NULL; + char *statusfile = NULL; dnsmasqContext *dctx = NULL; virNetworkDefPtr def = virNetworkObjGetPersistentDef(net); @@ -201,6 +202,9 @@ networkRemoveInactive(struct network_driver *driver, if (!(configfile = networkDnsmasqConfigFileName(def->name))) goto no_memory; + if (!(statusfile = virNetworkConfigFile(NETWORK_STATE_DIR, def->name))) + goto no_memory; + /* dnsmasq */ dnsmasqDelete(dctx); unlink(leasefile); @@ -210,6 +214,9 @@ networkRemoveInactive(struct network_driver *driver, unlink(radvdconfigfile); virPidFileDelete(NETWORK_PID_DIR, radvdpidbase); + /* remove status file */ + unlink(statusfile); + /* remove the network definition */ virNetworkRemoveInactive(&driver->networks, net); @@ -220,6 +227,7 @@ cleanup: VIR_FREE(configfile); VIR_FREE(radvdconfigfile); VIR_FREE(radvdpidbase); + VIR_FREE(statusfile); dnsmasqContextFree(dctx); return ret; @@ -253,33 +261,15 @@ networkBridgeDummyNicName(const char *brname) } static void -networkFindActiveConfigs(struct network_driver *driver) { +networkFindActiveConfigs(struct network_driver *driver) +{ unsigned int i; for (i = 0 ; i < driver->networks.count ; i++) { virNetworkObjPtr obj = driver->networks.objs[i]; - char *config; virNetworkObjLock(obj); - if ((config = virNetworkConfigFile(NETWORK_STATE_DIR, - obj->def->name)) == NULL) { - virNetworkObjUnlock(obj); - continue; - } - - if (access(config, R_OK) < 0) { - VIR_FREE(config); - virNetworkObjUnlock(obj); - continue; - } - - /* Try and load the live config */ - if (virNetworkObjUpdateParseFile(config, obj) < 0) - VIR_WARN("Unable to update config of '%s' network", - obj->def->name); - VIR_FREE(config); - /* If bridge exists, then mark it active */ if (obj->def->bridge && virNetDevExists(obj->def->bridge) == 1) { @@ -306,6 +296,21 @@ networkFindActiveConfigs(struct network_driver *driver) { cleanup: virNetworkObjUnlock(obj); } + + /* remove inactive transient networks */ + i = 0; + while (i < driver->networks.count) { + virNetworkObjPtr obj = driver->networks.objs[i]; + virNetworkObjLock(obj); + + if (!obj->persistent && !obj->active) { + networkRemoveInactive(driver, obj); + continue; + } + + virNetworkObjUnlock(obj); + i++; + } } @@ -415,6 +420,10 @@ networkStartup(bool privileged, /* if this fails now, it will be retried later with dnsmasqCapsRefresh() */ driverState->dnsmasqCaps = dnsmasqCapsNewFromBinary(DNSMASQ); + if (virNetworkLoadAllState(&driverState->networks, + NETWORK_STATE_DIR) < 0) + goto error; + if (virNetworkLoadAllConfigs(&driverState->networks, driverState->networkConfigDir, driverState->networkAutostartDir) < 0) @@ -479,6 +488,8 @@ networkReload(void) { return 0; networkDriverLock(driverState); + virNetworkLoadAllState(&driverState->networks, + NETWORK_STATE_DIR); virNetworkLoadAllConfigs(&driverState->networks, driverState->networkConfigDir, driverState->networkAutostartDir); -- 1.8.2.1

2 2

[libvirt] [PATCH v2 1/1] Set legacy USB option with default for ppc64.
by Li Zhang 19 Apr '13

19 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Currently, -device xxx still can't work well for ppc64 platform. It's better use legacy USB option with default for ppc64. This patch is to legacy USB option with default for ppc64. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v2 -> v1: * Add test cases for USB controller configuration on PPC64. src/qemu/qemu_command.c | 3 ++- .../qemuxml2argv-pseries-usb-default.args | 1 + .../qemuxml2argv-pseries-usb-default.xml | 17 +++++++++++++++++ .../qemuxml2argv-pseries-usb-multi.args | 1 + .../qemuxml2argv-pseries-usb-multi.xml | 19 +++++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63b9350..a48eada 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6467,7 +6467,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == -1 && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) { + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || + def->os.arch == VIR_ARCH_PPC64)) { if (usblegacy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controllers are " diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args new file mode 100644 index 0000000..745910b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb -chardev pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.xml new file mode 100644 index 0000000..e62a78c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <console type='pty'> + <address type="spapr-vio"/> + </console> + <memballoon model="none"/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args new file mode 100644 index 0000000..ac17b8c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2 -device pci-ohci,id=usb1,bus=pci,addr=0x3 -chardev pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.xml new file mode 100644 index 0000000..f45d9d1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.xml @@ -0,0 +1,19 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <console type='pty'> + <address type="spapr-vio"/> + </console> + <controller type='usb' index='0' model='piix3-uhci'/> + <controller type='usb' index='1' model='pci-ohci'/> + <memballoon model="none"/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be6c759..3bbe395 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -902,6 +902,14 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-vio", QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("pseries-usb-default", QEMU_CAPS_DRIVE, + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION); + DO_TEST("pseries-usb-multi", QEMU_CAPS_DRIVE, + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION); DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST_ERROR("pseries-vio-address-clash", QEMU_CAPS_DRIVE, -- 1.8.1.4

2 4

[libvirt] [PATCH designer] Adapt saner libtool versioning scheme from libvirt
by Daniel P. Berrange 19 Apr '13

19 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The current way libtool versioning is calculated has a timebomb when the package version number changes to 1.0.0, which will cause the library soname to change. Adapt to the latest libvirt macros for libtool versioning, which use an explicit variable LIBVIRT_DESIGNER_SONUM setting for changing soname. --- configure.ac | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c999826..2a55f75 100644 --- a/configure.ac +++ b/configure.ac @@ -19,9 +19,47 @@ LIBVIRT_DESIGNER_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` LIBVIRT_DESIGNER_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` LIBVIRT_DESIGNER_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` LIBVIRT_DESIGNER_VERSION=$LIBVIRT_DESIGNER_MAJOR_VERSION.$LIBVIRT_DESIGNER_MINOR_VERSION.$LIBVIRT_DESIGNER_MICRO_VERSION$LIBVIRT_DESIGNER_MICRO_VERSION_SUFFIX -LIBVIRT_DESIGNER_VERSION_INFO=`expr $LIBVIRT_DESIGNER_MAJOR_VERSION + $LIBVIRT_DESIGNER_MINOR_VERSION`:$LIBVIRT_DESIGNER_MICRO_VERSION:$LIBVIRT_DESIGNER_MINOR_VERSION LIBVIRT_DESIGNER_VERSION_NUMBER=`expr $LIBVIRT_DESIGNER_MAJOR_VERSION \* 1000000 + $LIBVIRT_DESIGNER_MINOR_VERSION \* 1000 + $LIBVIRT_DESIGNER_MICRO_VERSION` +# In libtool terminology we need to figure out: +# +# CURRENT +# The most recent interface number that this library implements. +# +# REVISION +# The implementation number of the CURRENT interface. +# +# AGE +# The difference between the newest and oldest interfaces that this +# library implements. +# +# In other words, the library implements all the interface numbers +# in the range from number `CURRENT - AGE' to `CURRENT'. +# +# Libtool assigns the soname version from `CURRENT - AGE', and we +# don't want that to ever change in libvirt. ie it must always be +# zero, to produce libvirt.so.0. +# +# We would, however, like the libvirt-designer version number reflected +# in the so version'd symlinks, and this is based on AGE.REVISION +# eg libvirt-designer.so.0.AGE.REVISION +# +# Assuming we do ever want to break soname version, this can +# toggled. But seriously, don't touch this, unless we explicitly +# agree to break ABI on the mailing list. +LIBVIRT_DESIGNER_SONUM=0 + +# The following examples show what libtool will do +# +# Input: 0.9.14 -> libvirt-designer.so.0.9.14 +# Input: 1.0.0 -> libvirt-designer.so.0.1000.0 +# Input: 2.5.8 -> libvirt-designer.so.0.2005.8 +# +AGE=`expr $LIBVIRT_DESIGNER_MAJOR_VERSION '*' 1000 + $LIBVIRT_DESIGNER_MINOR_VERSION` +REVISION=$LIBVIRT_DESIGNER_MICRO_VERSION +CURRENT=`expr $LIBVIRT_DESIGNER_SONUM + $AGE` +LIBVIRT_DESIGNER_VERSION_INFO=$CURRENT:$REVISION:$AGE + AC_SUBST([LIBVIRT_DESIGNER_MAJOR_VERSION]) AC_SUBST([LIBVIRT_DESIGNER_MINOR_VERSION]) AC_SUBST([LIBVIRT_DESIGNER_MICRO_VERSION]) -- 1.8.1.4

2 2

[libvirt] Reworked patch set to add UID/GID support for containers
by dwalsh＠redhat.com 19 Apr '13

19 Apr '13

Combined all UID/GID patches, taken into account Dan Berrange feedback. Now UID will be based off the current UID. Sandbox Shell is no longer used when using LXC containers. Connect will now just execute a shell within the container. [sandbox PATCH 1/6] Add UID/GID support for use with interactive [sandbox PATCH 2/6] We should not turn on the sanbox shell by [sandbox PATCH 3/6] Only create the destination directory if it does

3 6

[libvirt] [libvirt-designer][PATCH] test: Add new SimpleDisk test
by Michal Privoznik 19 Apr '13

19 Apr '13

This test is meant for adding CDROM, floppy and disk to a domain. For now, each method has _file and _device variant, which are tested for now. --- libvirt-designer/test-designer-domain.c | 101 ++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/libvirt-designer/test-designer-domain.c b/libvirt-designer/test-designer-domain.c index bbd5a28..90f7e68 100644 --- a/libvirt-designer/test-designer-domain.c +++ b/libvirt-designer/test-designer-domain.c @@ -125,6 +125,41 @@ static const gchar *capslxcxml = " </guest>" "</capabilities>"; +static const gchar *domain_machine_simple_iso_result = + "<domain>\n" + " <devices>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar1\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hda\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar2\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdb\"/>\n" + " </disk>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar3\"/>\n" + " <driver name=\"qemu\" type=\"qcow2\"/>\n" + " <target bus=\"ide\" dev=\"hdc\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar4\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdd\"/>\n" + " </disk>\n" + " <disk type=\"file\">\n" + " <source file=\"/foo/bar5\"/>\n" + " <driver name=\"qemu\" type=\"bochs\"/>\n" + " <target bus=\"ide\" dev=\"hde\"/>\n" + " </disk>\n" + " <disk type=\"block\">\n" + " <source dev=\"/foo/bar6\"/>\n" + " <driver name=\"qemu\" type=\"raw\"/>\n" + " <target bus=\"ide\" dev=\"hdf\"/>\n" + " </disk>\n" + " </devices>\n" + "</domain>"; static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer opaque) { @@ -142,6 +177,49 @@ static void test_domain_machine_setup(GVirDesignerDomain **design, gconstpointer } +static void test_domain_machine_simple_disk_setup(GVirDesignerDomain **design, gconstpointer opaque) +{ + GError *error = NULL; + GVirConfigDomainDisk *disk; + OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); + OsinfoDb *db = osinfo_db_new(); + OsinfoPlatform *platform = osinfo_platform_new("http://myhypervisor.org/awesome/6.6.6"); + GVirConfigCapabilities *caps = gvir_config_capabilities_new_from_xml(capsqemuxml, NULL); + + *design = gvir_designer_domain_new(db, os, platform, caps); + g_assert(*design); + + disk = gvir_designer_domain_add_cdrom_file(*design, "/foo/bar1", "raw", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_cdrom_device(*design, "/foo/bar2", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_file(*design, "/foo/bar3", "qcow2", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_device(*design, "/foo/bar4", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_floppy_file(*design, "/foo/bar5", "bochs", &error); + g_assert(disk); + g_object_unref(disk); + + disk = gvir_designer_domain_add_disk_device(*design, "/foo/bar6", &error); + g_assert(disk); + g_object_unref(disk); + + g_object_unref(os); + g_object_unref(db); + g_object_unref(platform); + g_object_unref(caps); +} + + static void test_domain_container_setup(GVirDesignerDomain **design, gconstpointer opaque) { OsinfoOs *os = osinfo_os_new("http://myoperatingsystem/amazing/4.2"); @@ -243,6 +321,22 @@ static void test_domain_machine_alt_arch_run(GVirDesignerDomain **design, gconst g_object_unref(osconfig); } +static void test_domain_machine_simple_disk_run(GVirDesignerDomain **design, gconstpointer opaque) +{ + GError *error = NULL; + gboolean ret; + GVirConfigDomain *config; + gchar *xml; + + config = gvir_designer_domain_get_config(*design); + xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(config)); + g_test_message("XML %s", xml); + g_assert_cmpstr(xml, + ==, + domain_machine_simple_iso_result); + g_free(xml); +} + static void test_domain_container_host_arch_run(GVirDesignerDomain **design, gconstpointer opaque) { GError *error = NULL; @@ -362,5 +456,12 @@ int main(int argc, char **argv) test_domain_container_setup, test_domain_container_alt_arch_run, test_domain_teardown); + g_test_add("/TestDesignerDomain/SimpleDisk", + GVirDesignerDomain *, + &domain, + test_domain_machine_simple_disk_setup, + test_domain_machine_simple_disk_run, + test_domain_teardown); + return g_test_run(); } -- 1.8.1.5

2 1

[libvirt] [PATCH glib] Adopt saner libtool versioning scheme from libvirt
by Daniel P. Berrange 19 Apr '13

19 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The current way libtool versioning is calculated has a timebomb when the package version number changes to 1.0.0, which will cause the library soname to change. Adapt to the latest libvirt macros for libtool versioning, which use an explicit variable LIBVIRT_GLIB_SONUM setting for changing soname. --- configure.ac | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cef5025..360c13f 100644 --- a/configure.ac +++ b/configure.ac @@ -21,9 +21,46 @@ LIBVIRT_GLIB_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` LIBVIRT_GLIB_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` LIBVIRT_GLIB_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` LIBVIRT_GLIB_VERSION=$LIBVIRT_GLIB_MAJOR_VERSION.$LIBVIRT_GLIB_MINOR_VERSION.$LIBVIRT_GLIB_MICRO_VERSION$LIBVIRT_GLIB_MICRO_VERSION_SUFFIX -LIBVIRT_GLIB_VERSION_INFO=`expr $LIBVIRT_GLIB_MAJOR_VERSION + $LIBVIRT_GLIB_MINOR_VERSION`:$LIBVIRT_GLIB_MICRO_VERSION:$LIBVIRT_GLIB_MINOR_VERSION LIBVIRT_GLIB_VERSION_NUMBER=`expr $LIBVIRT_GLIB_MAJOR_VERSION \* 1000000 + $LIBVIRT_GLIB_MINOR_VERSION \* 1000 + $LIBVIRT_GLIB_MICRO_VERSION` +# In libtool terminology we need to figure out: +# +# CURRENT +# The most recent interface number that this library implements. +# +# REVISION +# The implementation number of the CURRENT interface. +# +# AGE +# The difference between the newest and oldest interfaces that this +# library implements. +# +# In other words, the library implements all the interface numbers +# in the range from number `CURRENT - AGE' to `CURRENT'. +# +# Libtool assigns the soname version from `CURRENT - AGE', and we +# don't want that to ever change in libvirt. ie it must always be +# zero, to produce libvirt.so.0. +# +# We would, however, like the libvirt-glib version number reflected +# in the so version'd symlinks, and this is based on AGE.REVISION +# eg libvirt-glib.so.0.AGE.REVISION +# +# Assuming we do ever want to break soname version, this can +# toggled. But seriously, don't ever touch this. +LIBVIRT_GLIB_SONUM=0 + +# The following examples show what libtool will do +# +# Input: 0.9.14 -> libvirt-glib.so.0.9.14 +# Input: 1.0.0 -> libvirt-glib.so.0.1000.0 +# Input: 2.5.8 -> libvirt-glib.so.0.2005.8 +# +AGE=`expr $LIBVIRT_GLIB_MAJOR_VERSION '*' 1000 + $LIBVIRT_GLIB_MINOR_VERSION` +REVISION=$LIBVIRT_GLIB_MICRO_VERSION +CURRENT=`expr $LIBVIRT_GLIB_SONUM + $AGE` +LIBVIRT_GLIB_VERSION_INFO=$CURRENT:$REVISION:$AGE + AC_SUBST([LIBVIRT_GLIB_MAJOR_VERSION]) AC_SUBST([LIBVIRT_GLIB_MINOR_VERSION]) AC_SUBST([LIBVIRT_GLIB_MICRO_VERSION]) -- 1.8.1.4

2 1

[libvirt] [PATCH designer] Increment soname + symbol versions
by Daniel P. Berrange 19 Apr '13

19 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The ABI of some methods was explicitly broken, so the soname and symbol versions must all be incremented to reflect the ABI incompatibility --- configure.ac | 2 +- libvirt-designer/libvirt-designer.sym | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2a55f75..e70b2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ LIBVIRT_DESIGNER_VERSION_NUMBER=`expr $LIBVIRT_DESIGNER_MAJOR_VERSION \* 1000000 # Assuming we do ever want to break soname version, this can # toggled. But seriously, don't touch this, unless we explicitly # agree to break ABI on the mailing list. -LIBVIRT_DESIGNER_SONUM=0 +LIBVIRT_DESIGNER_SONUM=1 # The following examples show what libtool will do # diff --git a/libvirt-designer/libvirt-designer.sym b/libvirt-designer/libvirt-designer.sym index 7a24f2c..6e2e231 100644 --- a/libvirt-designer/libvirt-designer.sym +++ b/libvirt-designer/libvirt-designer.sym @@ -1,4 +1,4 @@ -LIBVIRT_DESIGNER_0.0.1 { +LIBVIRT_DESIGNER_0.0.2 { global: gvir_designer_init; gvir_designer_init_check; -- 1.8.1.4

2 1

[libvirt] [libvirt-designer][PATCH 1/2] cfg.mk: Update list of syntax-check exceptions
by Michal Privoznik 19 Apr '13

19 Apr '13

The bindtextdomain syntax-check macro is doing some dumb checking: each file containing '\<main *(' must call bindtextdomain. Even if it's mentioned inside a comment block, which we do as of e71ad8e13e7. --- Or shall we drop bindtextdomain rule instead? cfg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index 54f62d4..1e4b31d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -104,8 +104,8 @@ sc_copyright_format: prev_version_file = /dev/null -exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-designer/test)|(libvirt-designer/libvirt-designer-init-*)|(examples/virtxml.c) +exclude_file_name_regexp--sc_bindtextdomain = ^libvirt-designer/(test|libvirt-designer-main\.c)|^examples/virtxml\.c$$ -exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch] +exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch]$$ -exclude_file_name_regexp--sc_prohibit_strcmp = ^libvirt-designer/libvirt-designer-init-qemu.c +exclude_file_name_regexp--sc_prohibit_strcmp = ^libvirt-designer/libvirt-designer-init-qemu.c$$ -- 1.8.1.5

2 3

[libvirt] [PATCH] Virsh command vol-rename
by harryxiyou＠gmail.com 19 Apr '13

19 Apr '13

From: Harry Wei <harryxiyou(a)gmail.com> Vol-rename is a convenience function, requiring when one wanna rename a volume name. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> --- tools/virsh-volume.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 0ca295f..8757d54 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -490,6 +490,103 @@ cleanup: } /* + * "vol-rename" command + */ +static const vshCmdInfo info_vol_rename[] = { + {.name = "help", + .data = N_("rename a volume.") + }, + {.name = "desc", + .data = N_("Rename an existing volume.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_vol_rename[] = { + {.name = "vol", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("orig vol name or key") + }, + {.name = "newname", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("new name") + }, + {.name = "pool", + .type = VSH_OT_STRING, + .help = N_("pool name or uuid") + }, + {.name = NULL} +}; + +static bool +cmdVolRename(vshControl *ctl, const vshCmd *cmd) +{ + virStoragePoolPtr origpool = NULL; + virStorageVolPtr origvol = NULL, newvol = NULL; + const char *origname = NULL; + const char *name = NULL; + char *origxml = NULL; + xmlChar *newxml = NULL; + bool ret = false; + unsigned int flags = 0; + + if (!(origvol = vshCommandOptVol(ctl, cmd, "vol", "pool", &origname))) + goto cleanup; + + origpool = virStoragePoolLookupByVolume(origvol); + if (!origpool) { + vshError(ctl, "%s", _("failed to get parent pool")); + goto cleanup; + } + + if (vshCommandOptStringReq(ctl, cmd, "newname", &name) < 0) + goto cleanup; + + origxml = virStorageVolGetXMLDesc(origvol, 0); + if (!origxml) + goto cleanup; + + newxml = vshMakeCloneXML(origxml, name); + if (!newxml) { + vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); + goto cleanup; + } + + newvol = virStorageVolCreateXMLFrom(origpool, (char *) newxml, origvol, flags); + + if (newvol != NULL) { + vshPrint(ctl, _("Vol %s cloned from %s\n"), + virStorageVolGetName(newvol), virStorageVolGetName(origvol)); + } else { + vshError(ctl, _("Failed to clone vol from %s"), + virStorageVolGetName(origvol)); + goto cleanup; + } + + if (virStorageVolDelete(origvol, 0) == 0) { + vshPrint(ctl, _("Vol %s deleted\n"), origname); + } else { + vshError(ctl, _("Failed to delete vol %s"), origname); + goto cleanup; + } + + ret = true; + +cleanup: + VIR_FREE(origxml); + xmlFree(newxml); + if (origvol) + virStorageVolFree(origvol); + if (newvol) + virStorageVolFree(newvol); + if (origpool) + virStoragePoolFree(origpool); + return ret; +} + +/* * "vol-clone" command */ static const vshCmdInfo info_vol_clone[] = { @@ -1752,6 +1849,12 @@ cmdVolPath(vshControl *ctl, const vshCmd *cmd) } const vshCmdDef storageVolCmds[] = { + {.name = "vol-rename", + .handler = cmdVolRename, + .opts = opts_vol_rename, + .info = info_vol_rename, + .flags = 0 + }, {.name = "vol-clone", .handler = cmdVolClone, .opts = opts_vol_clone, -- 1.7.9.5

5 9

[libvirt] [PATCH] qemu: fix default spice password setting
by Ján Tomko 19 Apr '13

19 Apr '13

Set spice password even if default VNC password hasn't been set. https://bugzilla.redhat.com/show_bug.cgi?id=953720 --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a6c75cb..4f39ca4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2714,7 +2714,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver, int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - if (!auth->passwd && !cfg->vncPassword) { + if (!auth->passwd && !defaultPasswd) { ret = 0; goto cleanup; } -- 1.8.1.5

2 2

[libvirt] [libvirt-php PATCH] Fixed the libvirt_domain_disk_add and libvirt_domain_disk_remove so that they can handle block devices, and can update a running domain
by Martijn Otto 19 Apr '13

19 Apr '13

--- src/libvirt-php.c | 246 +++++++++++++++++++++++++---------------------------- 1 file changed, 114 insertions(+), 132 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 0b8345a..24e8606 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -4232,11 +4232,12 @@ PHP_FUNCTION(libvirt_domain_change_boot_devices) Since version: 0.4.2 Description: Function is used to add the disk to the virtual machine using set of API functions to make it as simple as possible for the user Arguments: @res [resource]: libvirt domain resource - @img [string]: string for the image file on the host system + @path [string]: string for the image file or device node on the system @dev [string]: string for the device to be presented to the guest (e.g. hda) @typ [string]: bus type for the device in the guest, usually 'ide' or 'scsi' - @driver [string]: driver type to be specified, like 'raw' or 'qcow2' - @flags [int]: flags for getting the XML description + @driver [string]: driver type to be specified, like 'raw' or 'qcow2' + @cache [string]: cache mode, can be 'default', 'none', 'writeback' or 'writethrough' + @io [string]: io mode, can be 'default', 'native' or 'threads' Returns: new domain resource */ PHP_FUNCTION(libvirt_domain_disk_add) @@ -4244,46 +4245,40 @@ PHP_FUNCTION(libvirt_domain_disk_add) php_libvirt_domain *domain=NULL; zval *zdomain; char *tmp1 = NULL; - char *tmp2 = NULL; char *xml; - char *img = NULL; - int img_len; + char *path = NULL; + int path_len; char *dev = NULL; int dev_len; char *driver = NULL; int driver_len; char *typ = NULL; int typ_len; - char *new_xml = NULL; - int new_len; + char *cache = "default"; + int cache_len; + char *io = "default"; + int io_len; char new[4096] = { 0 }; - long xflags = 0; int retval = -1; - int pos = -1; - php_libvirt_domain *res_domain = NULL; - php_libvirt_connection *conn = NULL; - virDomainPtr dom=NULL; + int block_device = 0; // whether the path leads to a block device (1) or to an image (0) + char cache_attr[32] = ""; // store the complete cache attribute, or an empty string to denote default + char io_attr[32] = ""; // store the complete io attribute, or an empty string to denote default - GET_DOMAIN_FROM_ARGS("rssss|l",&zdomain,&img,&img_len,&dev,&dev_len,&typ,&typ_len,&driver,&driver_len,&xflags); + GET_DOMAIN_FROM_ARGS("rssss|ss",&zdomain,&path,&path_len,&dev,&dev_len,&typ,&typ_len,&driver,&driver_len,&cache,&cache_len,&io,&io_len); - DPRINTF("%s: Domain %p, device = %s, image = %s, type = %s, driver = %s\n", PHPFUNC, - domain->domain, dev, img, typ, driver); + DPRINTF("%s: Domain %p, device = %s, path = %s, type = %s, driver = %s, cache = %s, io = %s\n", PHPFUNC, + domain->domain, dev, path, typ, driver, cache, io); - xml=virDomainGetXMLDesc(domain->domain,xflags); + // check whether the path leads to a block device + if (strncmp(path, "/dev/", 5) == 0) + block_device = 1; + + xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } - snprintf(new, sizeof(new), "//domain/devices/disk/source[@file=\"%s\"]/./@file", img); - tmp1 = get_string_from_xpath(xml, new, NULL, &retval); - if (tmp1 != NULL) { - free(tmp1); - snprintf(new, sizeof(new), "Domain already has image <i>%s</i> connected", img); - set_error(new TSRMLS_CC); - RETURN_FALSE; - } - snprintf(new, sizeof(new), "//domain/devices/disk/target[@dev='%s']/./@dev", dev); tmp1 = get_string_from_xpath(xml, new, NULL, &retval); if (tmp1 != NULL) { @@ -4293,58 +4288,72 @@ PHP_FUNCTION(libvirt_domain_disk_add) RETURN_FALSE; } - if (access(img, R_OK) != 0) { - snprintf(new, sizeof(new), "Image file <i>%s</i> doesn't exist", img); - set_error(new TSRMLS_CC); - RETURN_FALSE; - } - - snprintf(new, sizeof(new), - " <disk type='file' device='disk'>\n" - " <driver name='qemu' type='%s'/>\n" - " <source file='%s'/>\n" - " <target dev='%s' bus='%s'/>\n" - " </disk>", driver, img, dev, typ); - tmp1 = strstr(xml, "</emulator>") + strlen("</emulator>"); - pos = strlen(xml) - strlen(tmp1); + // do we want to use a non-default cache mode? + if (strncmp(cache, "default", 7) != 0) + snprintf(cache_attr, sizeof(cache_attr), "cache='%s'", cache); - tmp2 = emalloc( ( pos + 1 )* sizeof(char) ); - memset(tmp2, 0, pos + 1); - memcpy(tmp2, xml, pos); + // or a non-default io mode perhaps? + if (strncmp(io, "default", 7) != 0) + snprintf(io_attr, sizeof(io_attr), "io='%s'", io); - new_len = strlen(tmp1) + strlen(tmp2) + strlen(new) + 2; - new_xml = emalloc( new_len * sizeof(char) ); - snprintf(new_xml, new_len, "%s\n%s%s", tmp2, new, tmp1); - - conn = domain->conn; + // check for valid image file or device node + if (block_device == 0) { + // check whether the image already appears in the xml + snprintf(new, sizeof(new), "//domain/devices/disk/source[@file=\"%s\"]/./@file", path); + tmp1 = get_string_from_xpath(xml, new, NULL, &retval); + if (tmp1 != NULL) { + free(tmp1); + snprintf(new, sizeof(new), "Domain already has image <i>%s</i> connected", path); + set_error(new TSRMLS_CC); + RETURN_FALSE; + } - virDomainUndefine(domain->domain); - virDomainFree(domain->domain); + if (access(path, R_OK) != 0) { + snprintf(new, sizeof(new), "Image file <i>%s</i> doesn't exist", path); + set_error(new TSRMLS_CC); + RETURN_FALSE; + } - retval = virDomainFree(domain->domain); - if (retval != 0) { - DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); - } + // create the xml to add the device + snprintf(new, sizeof(new), + " <disk type='file' device='disk'>\n" + " <driver name='qemu' type='%s' %s %s/>\n" + " <source file='%s'/>\n" + " <target dev='%s' bus='%s'/>\n" + " </disk>", driver, cache_attr, io_attr, path, dev, typ); + } else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); - DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); - } - - dom=virDomainDefineXML(conn->conn, new_xml); - if (dom==NULL) { - DPRINTF("%s: Function failed, restoring original XML\n", PHPFUNC); - dom=virDomainDefineXML(conn->conn, xml); - if (dom == NULL) + // check whether the device already appears in the xml + snprintf(new, sizeof(new), "//domain/devices/disk/source[@dev=\"%s\"]/./@dev", path); + tmp1 = get_string_from_xpath(xml, new, NULL, &retval); + if (tmp1 != NULL) { + free(tmp1); + snprintf(new, sizeof(new), "Domain already has device <i>%s</i> connected", path); + set_error(new TSRMLS_CC); RETURN_FALSE; + } + + // create the xml to add the device + snprintf(new, sizeof(new), + " <disk type='block' device='disk'>\n" + " <driver name='qemu' type='%s' %s %s/>\n" + " <source dev='%s'/>\n" + " <target dev='%s' bus='%s'/>\n" + " </disk>", driver, cache_attr, io_attr, path, dev, typ); } - res_domain = emalloc(sizeof(php_libvirt_domain)); - res_domain->domain = dom; - res_domain->conn = conn; + // attach the disk to the domain + retval = virDomainAttachDeviceFlags(domain->domain, new, VIR_DOMAIN_AFFECT_CURRENT); + if (retval != 0) { + snprintf(new, sizeof(new), "%s: Cannot add device to domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); + set_error(new TSRMLS_CC); + RETURN_FALSE; + } - DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); - ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); + // the disk was successfully added + DPRINTF("%s: returning %p\n", PHPFUNC, domain->domain); + zend_list_addref(Z_LVAL_P(zdomain)); + RETURN_RESOURCE(Z_LVAL_P(zdomain)); } /* @@ -4360,96 +4369,69 @@ PHP_FUNCTION(libvirt_domain_disk_remove) { php_libvirt_domain *domain=NULL; zval *zdomain; - char *tmp1 = NULL; - char *tmp2 = NULL; + char *type = NULL; + char *path = NULL; + char *source = NULL; char *xml; char *dev = NULL; int dev_len; char *new_xml = NULL; int new_len; char new[4096] = { 0 }; - long xflags = 0; int retval = -1; - int pos = -1; - int i, idx = 0; - php_libvirt_domain *res_domain=NULL; - php_libvirt_connection *conn = NULL; - virDomainPtr dom = NULL; - GET_DOMAIN_FROM_ARGS("rs|l",&zdomain,&dev,&dev_len,&xflags); + GET_DOMAIN_FROM_ARGS("rs|l",&zdomain,&dev,&dev_len); DPRINTF("%s: Trying to remove %s from domain %p\n", PHPFUNC, dev, domain->domain); - xml=virDomainGetXMLDesc(domain->domain,xflags); + xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { set_error_if_unset("Cannot get the XML description" TSRMLS_CC); RETURN_FALSE; } - snprintf(new, sizeof(new), "//domain/devices/disk/target[@dev='%s']/./@dev", dev); - tmp1 = get_string_from_xpath(xml, new, NULL, &retval); - if (tmp1 == NULL) { + // check for the type, if no result is found, the disk does not exist + snprintf(new, sizeof(new), "//domain/devices/disk/target[@dev='%s']/../@type", dev); + type = get_string_from_xpath(xml, new, NULL, &retval); + if (type == NULL) { snprintf(new, sizeof(new), "Device <i>%s</i> is not connected to the guest", dev); set_error(new TSRMLS_CC); RETURN_FALSE; } - free(tmp1); - - snprintf(new, sizeof(new), "<target dev='%s'", dev); - tmp1 = strstr(xml, new) + strlen(new); - pos = strlen(xml) - strlen(tmp1); - - tmp2 = emalloc( ( pos + 1 )* sizeof(char) ); - memset(tmp2, 0, pos + 1); - memcpy(tmp2, xml, pos); - - for (i = strlen(tmp2) - 5; i > 0; i--) - if ((tmp2[i] == '<') && (tmp2[i+1] == 'd') - && (tmp2[i+2] == 'i') && (tmp2[i+3] == 's') - && (tmp2[i+4] == 'k')) { - tmp2[i-5] = 0; - break; - } + // are we dealing with a file or a block device? + if (strcmp(type, "file") == 0) + source = "file"; + else + source = "dev"; - for (i = 0; i < strlen(tmp1) - 7; i++) - if ((tmp1[i] == '<') && (tmp1[i+1] == '/') - && (tmp1[i+2] == 'd') && (tmp1[i+3] == 'i') - && (tmp1[i+4] == 's') && (tmp1[i+5] == 'k') - && (tmp1[i+6] == '>')) { - idx = i + 6; - break; - } + // retrieve the device or file + snprintf(new, sizeof(new), "//domain/devices/disk/target[@dev='%s']/../source/@%s", dev, source); + path = get_string_from_xpath(xml, new, NULL, &retval); - new_len = strlen(tmp2) + (strlen(tmp1) - idx); - new_xml = emalloc( new_len * sizeof(char) ); - memset(new_xml, 0, new_len); - strcpy(new_xml, tmp2); - for (i = idx; i < strlen(tmp1) - 1; i++) - new_xml[ strlen(tmp2) + i - idx ] = tmp1[i]; + // define the xml to remove the device + snprintf(new, sizeof(new), + " <disk type='%s' device='disk'>" + " <source %s='%s'/>" + " <target dev='%s'/>" + " </disk>", type, source, path, dev); - conn = domain->conn; - virDomainUndefine(domain->domain); + // cleanup temporary resources + free(type); + free(path); - retval = virDomainFree(domain->domain); + // remove the disk from the domain + retval = virDomainDetachDeviceFlags(domain->domain, new, VIR_DOMAIN_AFFECT_CURRENT); if (retval != 0) { - DPRINTF("%s: Cannot free domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); - } - else { - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain->domain, 0 TSRMLS_CC); - DPRINTF("%s: Domain %p freed\n", PHPFUNC, domain->domain); + snprintf(new, sizeof(new), "%s: Cannot remove device from domain %p, error code = %d (%s)\n", PHPFUNC, domain->domain, retval, LIBVIRT_G(last_error)); + set_error(new TSRMLS_CC); + RETURN_FALSE; } - dom=virDomainDefineXML(conn->conn,new_xml); - if (dom==NULL) RETURN_FALSE; - - res_domain = emalloc(sizeof(php_libvirt_domain)); - res_domain->domain = dom; - res_domain->conn = conn; - - DPRINTF("%s: returning %p\n", PHPFUNC, res_domain->domain); - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, res_domain->domain, 1 TSRMLS_CC); - ZEND_REGISTER_RESOURCE(return_value, res_domain, le_libvirt_domain); + // the disk was successfully removed + DPRINTF("%s: returning %p\n", PHPFUNC, domain->domain); + zend_list_addref(Z_LVAL_P(zdomain)); + RETURN_RESOURCE(Z_LVAL_P(zdomain)); } /* @@ -5172,7 +5154,7 @@ PHP_FUNCTION(libvirt_domain_get_block_info) { GET_DOMAIN_FROM_ARGS("rs",&zdomain,&dev,&dev_len); /* Get XML for the domain */ - xml=virDomainGetXMLDesc(domain->domain, VIR_DOMAIN_XML_INACTIVE); + xml=virDomainGetXMLDesc(domain->domain, 0); if (xml==NULL) { set_error("Cannot get domain XML" TSRMLS_CC); RETURN_FALSE; -- 1.7.9.5

1 0

[libvirt] [PATCH v4 1/2 RESEND] Add NVRAM device
by Li Zhang 19 Apr '13

19 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device. Users are allowed to specify spapr-vio devices'address. But NVRAM is not supported in libvirt. So this patch is to add NVRAM device to allow users to specify its address. In QEMU, NVRAM device's address is specified by "-global spapr-nvram.reg=xxxxx". In libvirt, XML file is defined as the following: <nvram> <address type='spapr-vio' reg='0x3000'/> </nvram> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v4 -> v3: * Sperate NVRAM definition from qemu command line parser. v3 -> v2: * Add NVRAM in domaincommon.rng and formatdomain.xml.in suggested by Daniel P.Berrange * Add NVRAM test cases suggested by Daniel P.Berrange * Remove nvram allocation when it is not specified suggested by Daniel P.Berrange * Add several error reports suggested by Daniel P.Berrange v2 -> v1: * Add NVRAM parameters parsing in qemuParseCommandLine docs/formatdomain.html.in | 35 ++++++++++++++++++++ docs/schemas/domaincommon.rng | 10 ++++++ src/conf/domain_conf.c | 76 +++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++ 4 files changed, 131 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d400e35..f590304 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4415,6 +4415,41 @@ qemu-kvm -net nic,model=? /dev/null </dl> + <h4><a name="elementsNVRAM">NVRAM device</a></h4> + <p> + One NVRAM device is always added to pSeries guests on PPC64. + And on PPC64, NVRAM devices' address type are VIO which + allows users to change.<code>nvram</code> element in XML file + is provided to specify its address. + Currently, libvirt only considers configuration for pSeries guests. + </p> + <p> + Example: usage of NVRAM configuration + </p> +<pre> + ... + <devices> + <nvram> + <address type='spapr-vio' reg='0x3000'/> + </nvram> + </devices> + ... +</pre> + <dl> + <dt><code>spapr-vio</code></dt> + <dd> + <p> + VIO device address type, this is only for PPC64. + </p> + </dd> + <dt><code>reg</code></dt> + <dd> + <p> + Devices' address + </p> + </dd> + </dl> + <h3><a name="seclabel">Security label</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2c31f76..2b58d95 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2764,6 +2764,13 @@ </optional> </element> </define> + <define name="nvram"> + <element name="nvram"> + <optional> + <ref name="address"/> + </optional> + </element> + </define> <define name="memballoon"> <element name="memballoon"> <attribute name="model"> @@ -3208,6 +3215,9 @@ <optional> <ref name="memballoon"/> </optional> + <optional> + <ref name="nvram"/> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 36a46da..3a5e59a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -193,6 +193,7 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "smartcard", "chr", "memballoon", + "nvram", "rng") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, @@ -1552,6 +1553,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1718,6 +1729,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: break; } @@ -1910,6 +1922,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); virDomainMemballoonDefFree(def->memballoon); + virDomainNVRAMDefFree(def->nvram); for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); @@ -2478,6 +2491,12 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, if (cb(def, &device, &def->rng->info, opaque) < 0) return -1; } + if (def->nvram) { + device.type = VIR_DOMAIN_DEVICE_NVRAM; + device.data.nvram = def->nvram; + if (cb(def, &device, &def->nvram->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -2509,6 +2528,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_RNG: break; @@ -7994,6 +8014,23 @@ error: goto cleanup; } +static virDomainNVRAMDefPtr +virDomainNVRAMDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + virDomainNVRAMDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 ) + return NULL; + + return def; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -11105,6 +11142,26 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); } + def->nvram = NULL; + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single nvram device is supported")); + goto error; + } + + if (n > 0) { + virDomainNVRAMDefPtr nvram = + virDomainNVRAMDefParseXML(nodes[0], flags); + if (!nvram) + goto error; + def->nvram = nvram; + VIR_FREE(nodes); + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -14159,6 +14216,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf, } static int +virDomainNVRAMDefFormat(virBufferPtr buf, + virDomainNVRAMDefPtr def, + unsigned int flags) +{ + virBufferAsprintf(buf, " <nvram>\n"); + if (virDomainDeviceInfoIsSet(&def->info, flags)) + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + + virBufferAddLit(buf, " </nvram>\n"); + + return 0; +} + +static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) { @@ -15469,6 +15541,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->rng) virDomainRNGDefFormat(buf, def->rng, flags); + if (def->nvram) + virDomainNVRAMDefFormat(buf, def->nvram, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); @@ -16749,6 +16824,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3ab0f15..d98bec1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -109,6 +109,9 @@ typedef virDomainChrDef *virDomainChrDefPtr; typedef struct _virDomainMemballoonDef virDomainMemballoonDef; typedef virDomainMemballoonDef *virDomainMemballoonDefPtr; +typedef struct _virDomainNVRAMDef virDomainNVRAMDef; +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr; + typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; @@ -137,6 +140,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_NVRAM, VIR_DOMAIN_DEVICE_RNG, VIR_DOMAIN_DEVICE_LAST @@ -163,6 +167,7 @@ struct _virDomainDeviceDef { virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virDomainRNGDefPtr rng; } data; }; @@ -1442,6 +1447,9 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainNVRAMDef { + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE = 0, @@ -1883,6 +1891,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -2041,6 +2050,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); -- 1.8.1.4

4 7

[libvirt] QEMU/KVM support for non zero PCI domain
by Charles Peri 19 Apr '13

19 Apr '13

Hi, I am trying to run Virt-Manager, using KVM on a SGIUV100 system with RHEL 6.1. I am trying to enable PCI pass-thorugh for the Mellanox, but the PCI domain for the device is 0001. 0001:01:00.0 Ethernet controller: Mellanox Technologies MT26448 [ConnectX EN 10GigE, PCIe 2.0 5GT/s] (rev b0) 0001:02:00.0 InfiniBand: Mellanox Technologies MT26428 [ConnectX VPI PCIe 2.0 5GT/s - IB QDR / 10GigE] (rev b0) When I try to add the device, I get an error stating that "Can't assign device inside non- zero PCI segment, as this KVM module doesn't support it". Is there a version of KVM module that supports non zero PCI segment? Sorry, if this is not the right email list to ask this question, I checked on the KVM IRC, but haven't got any answer. Thanks, Charles

2 5

[libvirt] [PATCHv3] Support for static routes on a virtual bridge
by Gene Czarcinski 19 Apr '13

19 Apr '13

This patch adds support for adding a static route for a network. The "gateway" sub-element specifies the gateway's IP address. Both IPv4 and IPv6 static routes are supported although it is expected that this functionality will have more use with IPv6. This updates add the <route> element to define a static route. The gateway= subelement species the gateway address which is to receive the packets forwarded to the network specified on the <route> definition. Tests are done to validate that the input definitions are correct. For example, for a static route ip definition, the address must be a network address and not a host address. Additional checks are added to ensure that the specified gateway has a network defined on this bridge. Whan a static route is added to a bridge, there is a slight possibility that the gateway address will be incorrect. If this is handled as an error, that bridge becomes unusable and can only be recovered by rebooting. If the error is ignored, then that network can be destroyed and the network definition file edited to correct the problem. Unfortunately, the error message only appears in syslog. However, with the checks performed when the network definition file is parsed, it is unlikely that this condition will ever occur. The command used is of the following form: ip route add <address>/<prefix> via <gateway> dev <virbr-bridge> \ proto static metric 1 . Signed-off-by: Gene Czarcinski <gene(a)czarc.net> --- docs/formatnetwork.html.in | 90 ++++++ docs/schemas/network.rng | 22 ++ src/conf/network_conf.c | 329 ++++++++++++++++++++- src/conf/network_conf.h | 8 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 40 +++ src/util/virnetdev.c | 46 +++ src/util/virnetdev.h | 5 + .../networkxml2xmlin/dhcp6host-routed-network.xml | 4 + .../networkxml2xmlout/dhcp6host-routed-network.xml | 4 + 10 files changed, 548 insertions(+), 1 deletion(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4dd0415..9f9304a 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -529,6 +529,63 @@ starting. </p> + <h5><a name="elementsStaticroute">Static Routes</a></h5> + <p> + It has been possible to define static routes on a virtual bridge + device <span class="since">Since 1.0.5</span>. Static route + definitions are used to provide routing information to the + virtualization host for networks which are not defined as a + network on one of the virtual bridges on the virtualization host. + </p> + + <p> + As shown in this example <a href="formatnetwork.html#examplesNoGateway">here</a>, + it is possible to define a virtual bridge interface with no + IPv4 or IPv6 networks. Such interfaces are useful in supporting + networks which have no visibility or direct connectivity with the + virtualization host. However, such interfaces can be used to support + virtual networks which only have guest connectivity. A guest + with connectivity to the internal-only network and another network + with with regular connectivity can act as a gateway between the + networks. A static route is used provide the routing information + so that IP packets (and especially response packets) can be sent from + the virtualization host to guests on the hidden network. While + static routes can be useful with IPv4 networks, they are essential + in supporting IPv6 on seconday/hidden networks. + </p> + + <p> + Here is a fragment of a definition which shows the static + route specification as well as the IPv4 and IPv6 definitions + for network addresses which are referred to in the + <code>gateway</code> gateway address specifications. + </p> + + <pre> + ... + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.128" end="192.168.122.254" /> + </dhcp> + </ip> + <route address="192.168.222.0" prefix="24" gateway="192.168.122.2"> + </route> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"> + </route> + ... + </pre> + + <p> + Notice that the <code>route</code> elements look very similar to + the <code>ip</code> address specification. Although parts are the same, + the meaning and effects of the two definitions are very different. The + <code>ip</code> address specification results in an address being defined + on the virtual bridge whereas the <code>route</code> definition is used + to create the static route for the specified network via the gateway address + on the virtual bridge device. + </p> + <h3><a name="elementsAddress">Addressing</a></h3> <p> @@ -540,6 +597,13 @@ a forward mode of 'route' or 'nat'. </p> + <p> + Another optional element can add a static route definition to + the bridge device. The static route is specified by the + <code>route</code> element with <code>gateway</code> used to + specify the gateway. <span class="since">Since 1.0.5</span> + </p> + <pre> ... <mac address='00:16:3E:5D:C7:9E'/> @@ -560,6 +624,7 @@ </dhcp> </ip> <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" /> </network></pre> <dl> @@ -809,6 +874,31 @@ </ip> </network></pre> + <p> + Below is yet another IPv6 variation. This variation has only IPv6 + defined with DHCPv6 on the primary IPv6 network. A static link + if defined for a second IPv6 network which will not be visable on + the bridge interface but rill have a static route defined for this + network via the specified gateway. Note that the gateway address + must be valid for the networks supported on the bridge interface. + <span class="since">Since 1.0.5</span> + </p> + + <pre> + <network> + <name>net7</name> + <bridge name="virbr7" /> + <forward mode="route"/> + <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> + <route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" > + </route> + </network></pre> + <h3><a name="examplesPrivate">Isolated network config</a></h3> <p> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6c3fae2..5bcba32 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -305,6 +305,28 @@ </optional> </element> </zeroOrMore> +  + <zeroOrMore> +  + <element name="route"> + <optional> + <attribute name="family"><ref name="addr-family"/></attribute> + </optional> + <optional> + <attribute name="address"><ref name="ipAddr"/></attribute> + </optional> + <optional> + <choice> + <attribute name="netmask"><ref name="ipv4Addr"/></attribute> + <attribute name="prefix"><ref name="ipPrefix"/></attribute> + </choice> + </optional> + <optional> + <attribute name="gateway"><ref name="ipAddr"/></attribute> + </optional> + </element> + </zeroOrMore> </interleave> </element> </define> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index c5535e6..15e0ed0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1280,6 +1280,208 @@ cleanup: } static int +virNetworkRouteDefParseXML(const char *networkName, + xmlNodePtr node, + xmlXPathContextPtr ctxt, + virNetworkIpDefPtr def) +{ + /* + * virNetworkRouteDef (reall a virNetworkIpDef) object is already + * allocated as part of an array. + * On failure clear it out, but don't free it. + */ + + xmlNodePtr save; + char *address = NULL, *netmask = NULL; + char *gateway = NULL; + unsigned long prefix; + int result = -1; + virSocketAddr testAddr; + + save = ctxt->node; + ctxt->node = node; + + /* grab raw data from XML */ + def->family = virXPathString("string(./@family)", ctxt); + address = virXPathString("string(./@address)", ctxt); + if (virXPathULong("string(./@prefix)", ctxt, &prefix) < 0) + def->prefix = 0; + else + def->prefix = prefix; + + netmask = virXPathString("string(./@netmask)", ctxt); + + gateway = virXPathString("string(./@gateway)", ctxt); + + if (address) { + if (virSocketAddrParse(&def->address, address, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad network address '%s' in route definition of network '%s'"), + address, networkName); + goto cleanup; + } + + } + + if (gateway) { + if (virSocketAddrParse(&def->gateway, gateway, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad gateway address '%s' in route definition of network '%s'"), + gateway, networkName); + goto cleanup; + } + + } + + /* validate family vs. address and gateway address too*/ + if (def->family == NULL) { + if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no family specified for non-IPv4 address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (gateway && + (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_UNSPEC)))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("no family specified for non-IPv4 gateway address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix > 0 && def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv4 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } + } else if (STREQ(def->family, "ipv4")) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (gateway && (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv4' specified for non-IPv4 gateway address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix > 0 && def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv4 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } + } else if (STREQ(def->family, "ipv6")) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (def->prefix == 0 || def->prefix > 64) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid prefix=%u specified for IPv6 address '%s' in network '%s'"), + def->prefix, address, networkName); + goto cleanup; + } + if (netmask) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("specifying netmask invalid for IPv6 address '%s' in network '%s'"), + address, networkName); + goto cleanup; + } + if (gateway && (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET6))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("family 'ipv6' specified for non-IPv6 gateway address '%s' in network '%s'"), + gateway, networkName); + goto cleanup; + } + } else { + virReportError(VIR_ERR_XML_ERROR, + _("Unrecognized family '%s' in definition of network '%s'"), + def->family, networkName); + goto cleanup; + } + + /* parse/validate netmask */ + if (netmask) { + if (address == NULL) { + /* netmask is meaningless without an address */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("netmask specified without address in network '%s'"), + networkName); + goto cleanup; + } + + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("netmask not supported for address '%s' in network '%s' (IPv4 only)"), + address, networkName); + goto cleanup; + } + + if (def->prefix > 0) { + /* can't have both netmask and prefix at the same time */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' cannot have both prefix='%u' and a netmask"), + networkName, def->prefix); + goto cleanup; + } + + if (virSocketAddrParse(&def->netmask, netmask, AF_UNSPEC) < 0) + goto cleanup; + + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"), + networkName, netmask, address); + goto cleanup; + } + } + + /* if static route gateway specified, make sure the address is a network address */ + if (def->prefix > 0) { + if (virSocketAddrMaskByPrefix(&def->address, def->prefix, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with prefix=%u to network-address in network '%s'"), + address, def->prefix, networkName); + goto cleanup; + } + } + if (netmask) { + if (virSocketAddrMask(&def->address, &def->netmask, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with netmask '%s' to network-address in network '%s'"), + address, netmask, networkName); + goto cleanup; + } + } + if (!virSocketAddrEqual(&def->address, &testAddr)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("address '%s' in network '%s' is not a network-address"), + address, networkName); + goto cleanup; + } + + result = 0; + +cleanup: + if (result < 0) { + virNetworkIpDefClear(def); + } + VIR_FREE(address); + VIR_FREE(netmask); + VIR_FREE(gateway); + + ctxt->node = save; + return result; +} + +static int virNetworkPortGroupParseXML(virPortGroupDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -1676,8 +1878,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) char *tmp; char *stp = NULL; xmlNodePtr *ipNodes = NULL; + xmlNodePtr *routeNodes = NULL; xmlNodePtr *portGroupNodes = NULL; - int nIps, nPortGroups; + int nIps, nPortGroups, nRoutes; xmlNodePtr dnsNode = NULL; xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; @@ -1831,6 +2034,82 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } VIR_FREE(ipNodes); + nRoutes = virXPathNodeSet("./route", ctxt, &routeNodes); + if (nRoutes < 0) + goto error; + + if (nRoutes > 0) { + int ii; + + /* allocate array to hold all the route definitions */ + if (VIR_ALLOC_N(def->routes, nRoutes) < 0) { + virReportOOMError(); + goto error; + } + /* parse each definition */ + for (ii = 0; ii < nRoutes; ii++) { + int ret = virNetworkRouteDefParseXML(def->name, routeNodes[ii], + ctxt, &def->routes[ii]); + if (ret < 0) + goto error; + def->nroutes++; + } + + /* now validate the correctness of any static route gateways specified + * + * note: the parameters within each definition are varified/assumed valid; + * the question being asked and answered here is if the specified gateway + * address has a network definition on this bridge + */ + nRoutes = def->nroutes; + nIps = def->nips; + for (ii = 0; ii < nRoutes; ii++) { + int jj; + virSocketAddr testAddr, testGw; + bool addrMatch; + virNetworkIpDefPtr gwdef = &def->routes[ii]; + if (VIR_SOCKET_ADDR_VALID(&gwdef->gateway)) { + addrMatch = false; + for (jj = 0; jj < nIps; jj++) { + virNetworkIpDefPtr def2 = &def->ips[jj]; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET6)) && + (!VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6))) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6)) && + (!VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET6))) + continue; + if ((VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&gwdef->gateway, AF_UNSPEC)) && + VIR_SOCKET_ADDR_IS_FAMILY(&def2->address, AF_INET6)) + continue; + if (def2->prefix > 0) { + virSocketAddrMaskByPrefix(&def2->address, def2->prefix, &testAddr); + virSocketAddrMaskByPrefix(&gwdef->gateway, def2->prefix, &testGw); + } + if (VIR_SOCKET_ADDR_VALID(&def2->netmask)) { + virSocketAddrMask(&def2->address, &def2->netmask, &testAddr); + virSocketAddrMask(&gwdef->gateway, &def2->netmask, &testGw); + } + if (VIR_SOCKET_ADDR_VALID(&testAddr) && + VIR_SOCKET_ADDR_VALID(&testGw) && + virSocketAddrEqual(&testAddr, &testGw)) { + addrMatch = true; + break; + } + } + if (!addrMatch) { + char *gw = virSocketAddrFormat(&gwdef->gateway); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid static route gateway specified: '%s'"), + gw); + VIR_FREE(gw); + goto error; + } + } + } + } + VIR_FREE(routeNodes); + forwardNode = virXPathNode("./forward", ctxt); if (forwardNode && virNetworkForwardDefParseXML(def->name, forwardNode, ctxt, &def->forward) < 0) { @@ -2203,6 +2482,49 @@ error: } static int +virNetworkRouteDefFormat(virBufferPtr buf, + const virNetworkIpDefPtr def) +{ + int result = -1; + + virBufferAddLit(buf, "<route"); + + if (def->family) { + virBufferAsprintf(buf, " family='%s'", def->family); + } + if (VIR_SOCKET_ADDR_VALID(&def->address)) { + char *addr = virSocketAddrFormat(&def->address); + if (!addr) + goto error; + virBufferAsprintf(buf, " address='%s'", addr); + VIR_FREE(addr); + } + if (VIR_SOCKET_ADDR_VALID(&def->netmask)) { + char *addr = virSocketAddrFormat(&def->netmask); + if (!addr) + goto error; + virBufferAsprintf(buf, " netmask='%s'", addr); + VIR_FREE(addr); + } + if (def->prefix > 0) { + virBufferAsprintf(buf," prefix='%u'", def->prefix); + } + if (VIR_SOCKET_ADDR_VALID(&def->gateway)) { + char *addr = virSocketAddrFormat(&def->gateway); + if (!addr) + goto error; + virBufferAsprintf(buf, " gateway='%s'", addr); + VIR_FREE(addr); + } + virBufferAddLit(buf, ">\n"); + virBufferAddLit(buf, "</route>\n"); + + result = 0; +error: + return result; +} + +static int virPortGroupDefFormat(virBufferPtr buf, const virPortGroupDefPtr def) { @@ -2400,6 +2722,11 @@ virNetworkDefFormatInternal(virBufferPtr buf, goto error; } + for (ii = 0; ii < def->nroutes; ii++) { + if (virNetworkRouteDefFormat(buf, &def->routes[ii]) < 0) + goto error; + } + if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0) goto error; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6ce9a00..39aec7e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -109,6 +109,8 @@ struct _virNetworkDNSDef { virNetworkDNSSrvDefPtr srvs; }; +/* NOTE: The folowing structure is used for both IP address + * definitions and for static route definitions */ typedef struct _virNetworkIpDef virNetworkIpDef; typedef virNetworkIpDef *virNetworkIpDefPtr; struct _virNetworkIpDef { @@ -124,6 +126,9 @@ struct _virNetworkIpDef { unsigned int prefix; /* ipv6 - only prefix allowed */ virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ + virSocketAddr gateway; /* gateway IP address for ip-route */ + + /* the following has no meaning if this is a static route definition */ size_t nranges; /* Zero or more dhcp ranges */ virSocketAddrRangePtr ranges; @@ -209,6 +214,9 @@ struct _virNetworkDef { size_t nips; virNetworkIpDefPtr ips; /* ptr to array of IP addresses on this network */ + size_t nroutes; + virNetworkIpDefPtr routes; /* ptr to array of static routes on this interface */ + virNetworkDNSDef dns; /* dns related configuration */ virNetDevVPortProfilePtr virtPortProfile; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 96eea0a..c51ba36 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1466,6 +1466,7 @@ virNetDevReplaceMacAddress; virNetDevReplaceNetConfig; virNetDevRestoreMacAddress; virNetDevRestoreNetConfig; +virNetDevSetGateway; virNetDevSetIPv4Address; virNetDevSetMAC; virNetDevSetMTU; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8b314a..2d4102e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2360,6 +2360,7 @@ out: return ret; } +/* add an IP address to a bridge */ static int networkAddAddrToBridge(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) @@ -2380,6 +2381,28 @@ networkAddAddrToBridge(virNetworkObjPtr network, return 0; } +/* add an IP (static) route to a bridge */ +static int +networkAddRouteToBridge(virNetworkObjPtr network, + virNetworkIpDefPtr ipdef) +{ + int prefix = virNetworkIpDefPrefix(ipdef); + + if (prefix < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("bridge '%s' has an invalid netmask or IP address"), + network->def->bridge); + return -1; + } + + if (virNetDevSetGateway(network->def->bridge, + &ipdef->address, + prefix, + &ipdef->gateway) < 0) + return -1; + return 0; +} + static int networkStartNetworkVirtual(struct network_driver *driver, virNetworkObjPtr network) @@ -2446,6 +2469,7 @@ networkStartNetworkVirtual(struct network_driver *driver, if (networkAddIptablesRules(driver, network) < 0) goto err1; + /* first, do all of the real addresses */ for (ii = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); ii++) { @@ -2464,6 +2488,22 @@ networkStartNetworkVirtual(struct network_driver *driver, if (virNetDevSetOnline(network->def->bridge, 1) < 0) goto err2; + /* now, do all of the static routes */ + if (network->def->nroutes > 0) { + for (ii = 0; ii < network->def->nroutes; ii++) { + ipdef = &network->def->routes[ii]; + /* Add the IP route to the bridge */ + /* ignore errors, error msg will be generated */ + /* but libvirt will not know and net-destroy will work. */ + if (VIR_SOCKET_ADDR_VALID(&ipdef->gateway)) { + if (networkAddRouteToBridge(network, ipdef) < 0) { + /* an error occurred adding the static route */ + continue; /* for now, do nothing */ + } + } + } + } + /* If forward.type != NONE, turn on global IP forwarding */ if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE && networkEnableIpForwarding(v4present, v6present) < 0) { diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 00e0f94..6ac9d9d 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -769,6 +769,52 @@ cleanup: } /** + * virNetDevSetGateway: + * @ifname: the interface name + * @addr: the IP network address (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * @gateway: via address for route (same as @addr) + * + * Add a route for a network IP address to an interface. This function + * *does not* remove any previously added IP static routes. + * + * Returns 0 in case of success or -1 in case of error. + */ + +int virNetDevSetGateway(const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *gateway) +{ + virCommandPtr cmd = NULL; + char *addrstr = NULL, *gatewaystr = NULL; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; + if (!(gatewaystr = virSocketAddrFormat(gateway))) + goto cleanup; + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "route", "add", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArgList(cmd, "via", NULL); + virCommandAddArgFormat(cmd, "%s", gatewaystr); + virCommandAddArgList(cmd, "dev", ifname, NULL); + virCommandAddArgList(cmd, "proto", "static", "metric", NULL); + virCommandAddArgFormat(cmd, "%u", 1); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(addrstr); + VIR_FREE(gatewaystr); + virCommandFree(cmd); + return ret; +} + +/** * virNetDevClearIPv4Address: * @ifname: the interface name * @addr: the IP address (IPv4 or IPv6) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 06d0650..8b94ea8 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -42,6 +42,11 @@ int virNetDevSetIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevSetGateway(const char *ifname, + virSocketAddr *addr, + unsigned int prefix, + virSocketAddr *gateway) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevClearIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) diff --git a/tests/networkxml2xmlin/dhcp6host-routed-network.xml b/tests/networkxml2xmlin/dhcp6host-routed-network.xml index 2693d87..29e9561 100644 --- a/tests/networkxml2xmlin/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlin/dhcp6host-routed-network.xml @@ -19,4 +19,8 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <route address="192.168.222.0" netmask="255.255.255.0" gateway="192.168.122.10"> + </route> + <route family="ipv6" address="2001:db8:ac10:fc00::" prefix="64" gateway="2001:db8:ac10:fd01::1:24"> + </route> </network> diff --git a/tests/networkxml2xmlout/dhcp6host-routed-network.xml b/tests/networkxml2xmlout/dhcp6host-routed-network.xml index 7305043..39af583 100644 --- a/tests/networkxml2xmlout/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlout/dhcp6host-routed-network.xml @@ -21,4 +21,8 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <route address='192.168.222.0' netmask='255.255.255.0' gateway='192.168.122.10'> + </route> + <route family='ipv6' address='2001:db8:ac10:fc00::' prefix='64' gateway='2001:db8:ac10:fd01::1:24'> + </route> </network> -- 1.8.1.4

2 3

[libvirt] need help: what should be supported?
by Gene Czarcinski 19 Apr '13

19 Apr '13

I need some help/guidance as to what networking characteristics should be supported by libvirt. Mostly, I am asking what should be valid for a prefix. For IPv4: The prefix can theoretically range from 0 to 32. Typically, the values of 8, 16 or 24 is used. For an IP specification, should I be able to specify prefix=32 (netmask 255.255.255.255)? This is not a network specification but one for a specific guest-host ... but, what will the virtualization host have for the address on this interface? Proposed: prefix (or equivalent netmask) must be 8 < prefix < 29 For IPv6: Similar to IPv4 but the range is (theoretically) 0 to 128. However, DHCPv6 and RA will **ONLY** work for prefix=64 ... nothing greater and nothing less. For an network on an interface which is visible to the virtualization host, it must have an address for the host; therefore, prefix <127. I am not sure what an IP definition with prefix=0 means for a libvirt virtual network. Proposed: Prefix=64 for DHCPv6 and/or RA support. For other network addresses (such as static route), 7 < prefix <= 64. Most IPv6 software does not appear to handle subnets where prefix > 64 except for prefix=128 for a specific host address. That is not to say that prefix <64 prefix < 128 could not have a meaning and be useful. But, if supported, how should it be specified so that user problems are minimized ... or do we just support it and what happens is a user problem? Comments? Suggestions?? Gene

2 2