- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] qemu: Introduce 'features' QMP query (blockdev-add saga)
by Peter Krempa 19 Jun '19

19 Jun '19

qemu introduced a new field in the QMP schema which allows to query features for a schema entry. Add the support to libvirt for querying it. Patch 3/3 is part of my blockdev series and I don't mind holding on to it until I post patches which make use of it. It's posted here mostly for demonstration purpose. Peter Krempa (3): tests: qemucaps: Introduce test data for qemu 4.1.0 qemu: qapi: Implement support for 'features' qemu: caps: Add capability for dynamic 'auto-read-only' support for files src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_qapi.c | 41 + .../caps_4.1.0.x86_64.replies | 23482 ++++++++++++++++ .../caps_4.1.0.x86_64.xml | 1388 + 5 files changed, 24914 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml -- 2.21.0

2 7

[libvirt] [PATCH] network: add virNetworkPortRef API
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

Normal practice is to provide a Ref API for all objects, but this was forgotten for the virNetworkPortPtr object. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- include/libvirt/libvirt-network.h | 3 +++ src/libvirt-network.c | 32 +++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + 3 files changed, 36 insertions(+) diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h index 97eceef754..c9ff0a49ed 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -455,4 +455,7 @@ virNetworkListAllPorts(virNetworkPtr network, int virNetworkPortFree(virNetworkPortPtr port); +int +virNetworkPortRef(virNetworkPortPtr port); + #endif /* LIBVIRT_NETWORK_H */ diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 6ed32c8ba2..c182064c0f 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1690,3 +1690,35 @@ virNetworkPortFree(virNetworkPortPtr port) virObjectUnref(port); return 0; } + + +/** + * virNetworkPortRef: + * @port: a network port object + * + * Increment the reference count on the network port. For each + * additional call to this method, there shall be a corresponding + * call to virNetworkPortFree to release the reference count, once + * the caller no longer needs the reference to this object. + * + * This method is typically useful for applications where multiple + * threads are using a network port, and it is required that the + * port remain resident until all threads have finished using + * it. ie, each new thread using a network port would increment + * the reference count. + * + * Returns 0 in case of success, -1 in case of failure. + */ +int +virNetworkPortRef(virNetworkPortPtr port) +{ + VIR_DEBUG("port=%p refs=%d", port, + port ? port->parent.u.s.refs : 0); + + virResetLastError(); + + virCheckNetworkPortReturn(port, -1); + + virObjectRef(port); + return 0; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 46c32a081b..75f7fdfb0c 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -831,6 +831,7 @@ LIBVIRT_5.5.0 { virNetworkPortGetUUIDString; virNetworkPortDelete; virNetworkPortFree; + virNetworkPortRef; virNetworkPortSetParameters; } LIBVIRT_5.2.0; -- 2.21.0

2 1

[libvirt] [security-notice PATCH 0/9] various improvements to script for finding broken/fixed branches/tags
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

This series provides for much greater automation when publishing details of security flaws. It is now possible to just provide the broken and fixed commit hash on the master branch. All the tag info and details of branches are now filled in automatically. Daniel P. Berrangé (9): scripts: change data structures used to track branches & tags scripts: report vulnerable branches which don't have any tags too scripts: add ability to handle a fixed commit hash scripts: change to update notice files inplace scripts: allow for notices to have multiple commit hashes scripts: optimize tag to branch mapping scripts: add detection of cherry-picks in branches scripts: fuzzy matching on subject to identify unannotated cherry picks notices: re-generate all branch/tag info notices/2008/0001.xml | 6 - notices/2009/0001.xml | 2 + notices/2010/0001.xml | 3 - notices/2010/0002.xml | 3 - notices/2010/0004.xml | 2 +- notices/2011/0001.xml | 10 +- notices/2011/0002.xml | 4 + notices/2012/0001.xml | 14 +- notices/2012/0002.xml | 2 +- notices/2012/0003.xml | 4 + notices/2013/0001.xml | 8 + notices/2013/0002.xml | 8 + notices/2013/0003.xml | 21 ++ notices/2013/0005.xml | 2 +- notices/2013/0006.xml | 1 + notices/2013/0007.xml | 2 +- notices/2013/0010.xml | 16 +- notices/2013/0012.xml | 28 ++- notices/2013/0015.xml | 2 +- notices/2013/0016.xml | 22 ++- notices/2013/0018.xml | 102 +++++----- notices/2013/0020.xml | 68 ++++--- notices/2013/0021.xml | 2 +- notices/2014/0001.xml | 8 + notices/2014/0003.xml | 107 ++++++++-- notices/2014/0004.xml | 25 ++- notices/2014/0005.xml | 21 +- notices/2014/0006.xml | 22 ++- notices/2014/0007.xml | 18 +- notices/2014/0008.xml | 6 +- notices/2014/0009.xml | 5 +- notices/2014/0010.xml | 8 +- notices/2015/0001.xml | 10 +- notices/2015/0002.xml | 6 +- notices/2015/0003.xml | 14 +- notices/2015/0004.xml | 13 +- notices/2016/0001.xml | 4 +- notices/2016/0002.xml | 1 + notices/2017/0001.xml | 4 +- notices/2017/0002.xml | 6 +- notices/2018/0001.xml | 159 ++++++++++++++- notices/2018/0002.xml | 158 ++++++++++++++- notices/2018/0003.xml | 161 ++++++++++++++- notices/2018/0004.xml | 159 ++++++++++++++- notices/2018/0005.xml | 162 ++++++++++++++- notices/2019/0001.xml | 2 +- notices/2019/0002.xml | 2 +- scripts/report-vulnerable-tags.pl | 319 ++++++++++++++++++++++++++---- 48 files changed, 1507 insertions(+), 225 deletions(-) -- 2.21.0

2 19

[libvirt] [PATCH] conf: remove unused class_id variable
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix src/conf/virnetworkportdef.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 5dfa3a3583..29ecf5b178 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -88,7 +88,6 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) VIR_AUTOFREE(char *) plugtype = NULL; VIR_AUTOFREE(char *) managed = NULL; VIR_AUTOFREE(char *) driver = NULL; - VIR_AUTOFREE(char *) class_id = NULL; if (VIR_ALLOC(def) < 0) return NULL; -- 2.21.0

1 0

[libvirt] [PATCH v2 0/4] Misc fixes to network port code
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Fixes for bugs spotted by coverity Daniel P. Berrangé (4): conf: fix leak when parsing network port XML conf: fix leak of directory handle when loading network ports conf: fix NULL deref when exporting ports conf: add error checking of UUID generation src/conf/domain_conf.c | 12 ++++++++++-- src/conf/virnetworkobj.c | 9 ++++++--- src/conf/virnetworkportdef.c | 26 +++++++++----------------- 3 files changed, 25 insertions(+), 22 deletions(-) -- 2.21.0

2 6

[libvirt] [go-xml PATCH] Add support for network filter binding XML schema
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- nwfilter_binding.go | 73 +++++++++++++++++++++++++++++++++++++++++++++ xml_test.go | 3 ++ 2 files changed, 76 insertions(+) create mode 100644 nwfilter_binding.go diff --git a/nwfilter_binding.go b/nwfilter_binding.go new file mode 100644 index 0000000..918ab71 --- /dev/null +++ b/nwfilter_binding.go @@ -0,0 +1,73 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2017 Lian Duan <blazeblue(a)gmail.com> + * + */ + +package libvirtxml + +import ( + "encoding/xml" +) + +type NWFilterBinding struct { + XMLName xml.Name `xml:"filterbinding"` + Owner *NWFilterBindingOwner `xml:"owner"` + PortDev *NWFilterBindingPortDev `xml:"portdev"` + MAC *NWFilterBindingMAC `xml:"mac"` + FilterRef *NWFilterBindingFilterRef `xml:"filterref"` +} + +type NWFilterBindingOwner struct { + UUID string `xml:"uuid,omitempty"` + Name string `xml:"name,omitempty"` +} + +type NWFilterBindingPortDev struct { + Name string `xml:"name,attr"` +} + +type NWFilterBindingMAC struct { + Address string `xml:"address,attr"` +} + +type NWFilterBindingFilterRef struct { + Filter string `xml:"filter,attr"` + Parameters []NWFilterBindingFilterParam `xml:"parameter"` +} + +type NWFilterBindingFilterParam struct { + Name string `xml:"name,attr"` + Value string `xml:"value,attr"` +} + +func (s *NWFilterBinding) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), s) +} + +func (s *NWFilterBinding) Marshal() (string, error) { + doc, err := xml.MarshalIndent(s, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/xml_test.go b/xml_test.go index 320c248..d1da879 100644 --- a/xml_test.go +++ b/xml_test.go @@ -83,6 +83,7 @@ var xmldirs = []string{ "testdata/libvirt/tests/storagevolxml2xmlin", "testdata/libvirt/tests/storagevolxml2xmlout", "testdata/libvirt/tests/vircaps2xmldata", + "testdata/libvirt/tests/virnwfilterbindingxml2xmldata", "testdata/libvirt/tests/virstorageutildata", "testdata/libvirt/tests/vmx2xmldata", "testdata/libvirt/tests/xlconfigdata", @@ -325,6 +326,8 @@ func testRoundTrip(t *testing.T, xml string, filename string) { } else { doc = &CapsHostCPU{} } + } else if strings.HasPrefix(xml, "<filterbinding") { + doc = &NWFilterBinding{} } else if strings.HasPrefix(xml, "<filter") { doc = &NWFilter{} } else if strings.HasPrefix(xml, "<interface") { -- 2.21.0

1 0

[libvirt] [go-xml PATCH] Add support for network port XML schema
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- domain.go | 1 + network.go | 1 + network_port.go | 200 ++++++++++++++++++++++++++++++++++++++++++++++++ xml_test.go | 3 + 4 files changed, 205 insertions(+) create mode 100644 network_port.go diff --git a/domain.go b/domain.go index 0757048..a7cbdcf 100644 --- a/domain.go +++ b/domain.go @@ -440,6 +440,7 @@ type DomainInterfaceSourceNetwork struct { Network string `xml:"network,attr,omitempty"` PortGroup string `xml:"portgroup,attr,omitempty"` Bridge string `xml:"bridge,attr,omitempty"` + PortID string `xml:"portid,attr,omitempty"` } type DomainInterfaceSourceBridge struct { diff --git a/network.go b/network.go index d4faf46..61c1af0 100644 --- a/network.go +++ b/network.go @@ -282,6 +282,7 @@ type NetworkBandwidthParams struct { } type NetworkBandwidth struct { + ClassID uint `xml:"classID,attr,omitempty"` Inbound *NetworkBandwidthParams `xml:"inbound"` Outbound *NetworkBandwidthParams `xml:"outbound"` } diff --git a/network_port.go b/network_port.go new file mode 100644 index 0000000..3cbc7fb --- /dev/null +++ b/network_port.go @@ -0,0 +1,200 @@ +/* + * This file is part of the libvirt-go-xml project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (C) 2019 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" + "fmt" +) + +type NetworkPort struct { + XMLName xml.Name `xml:"networkport"` + UUID string `xml:"uuid,omitempty"` + Owner *NetworkPortOwner `xml:"owner",` + MAC *NetworkPortMAC `xml:"mac"` + Group string `xml:"group,omitempty"` + Bandwidth *NetworkBandwidth `xml:"bandwidth"` + VirtualPort *NetworkVirtualPort `xml:"virtualport"` + RXFilters *NetworkPortRXFilters `xml:"rxfilters"` + Plug *NetworkPortPlug `xml:"plug"` +} + +type NetworkPortOwner struct { + UUID string `xml:"uuid,omitempty"` + Name string `xml:"name,omitempty"` +} + +type NetworkPortMAC struct { + Address string `xml:"address,attr"` +} + +type NetworkPortRXFilters struct { + TrustGuest string `xml:"trustGuest,attr"` +} + +type NetworkPortPlug struct { + Bridge *NetworkPortPlugBridge `xml:"-"` + Network *NetworkPortPlugNetwork `xml:"-"` + Direct *NetworkPortPlugDirect `xml:"-"` + HostDevPCI *NetworkPortPlugHostDevPCI `xml:"-"` +} + +type NetworkPortPlugBridge struct { + Bridge string `xml:"bridge,attr"` + MacTableManager string `xml:"macTableManager,attr,omitempty"` +} + +type NetworkPortPlugNetwork struct { + Bridge string `xml:"bridge,attr"` + MacTableManager string `xml:"macTableManager,attr,omitempty"` +} + +type NetworkPortPlugDirect struct { + Dev string `xml:"dev,attr"` + Mode string `xml:"mode,attr"` +} + +type NetworkPortPlugHostDevPCI struct { + Managed string `xml:"managed,attr,omitempty"` + Driver *NetworkPortPlugHostDevPCIDriver `xml:"driver"` + Address *NetworkPortPlugHostDevPCIAddress `xml:"address"` +} + +type NetworkPortPlugHostDevPCIDriver struct { + Name string `xml:"name,attr"` +} + +type NetworkPortPlugHostDevPCIAddress struct { + Domain *uint `xml:"domain,attr"` + Bus *uint `xml:"bus,attr"` + Slot *uint `xml:"slot,attr"` + Function *uint `xml:"function,attr"` +} + +func (a *NetworkPortPlugHostDevPCIAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error { + marshalUintAttr(&start, "domain", a.Domain, "0x%04x") + marshalUintAttr(&start, "bus", a.Bus, "0x%02x") + marshalUintAttr(&start, "slot", a.Slot, "0x%02x") + marshalUintAttr(&start, "function", a.Function, "0x%x") + e.EncodeToken(start) + e.EncodeToken(start.End()) + return nil +} + +func (a *NetworkPortPlugHostDevPCIAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + for _, attr := range start.Attr { + if attr.Name.Local == "domain" { + if err := unmarshalUintAttr(attr.Value, &a.Domain, 0); err != nil { + return err + } + } else if attr.Name.Local == "bus" { + if err := unmarshalUintAttr(attr.Value, &a.Bus, 0); err != nil { + return err + } + } else if attr.Name.Local == "slot" { + if err := unmarshalUintAttr(attr.Value, &a.Slot, 0); err != nil { + return err + } + } else if attr.Name.Local == "function" { + if err := unmarshalUintAttr(attr.Value, &a.Function, 0); err != nil { + return err + } + } + } + d.Skip() + return nil +} + +func (p *NetworkPortPlug) MarshalXML(e *xml.Encoder, start xml.StartElement) error { + start.Name.Local = "plug" + if p.Bridge != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "bridge", + }) + return e.EncodeElement(p.Bridge, start) + } else if p.Network != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "network", + }) + return e.EncodeElement(p.Network, start) + } else if p.Direct != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "direct", + }) + return e.EncodeElement(p.Direct, start) + } else if p.HostDevPCI != nil { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "hostdev-pci", + }) + return e.EncodeElement(p.HostDevPCI, start) + } + return nil +} + +func (p *NetworkPortPlug) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + typ, ok := getAttr(start.Attr, "type") + if !ok { + return fmt.Errorf("Missing type attribute on plug") + } else if typ == "bridge" { + var pb NetworkPortPlugBridge + if err := d.DecodeElement(&pb, &start); err != nil { + return err + } + p.Bridge = &pb + } else if typ == "network" { + var pn NetworkPortPlugNetwork + if err := d.DecodeElement(&pn, &start); err != nil { + return err + } + p.Network = &pn + } else if typ == "direct" { + var pd NetworkPortPlugDirect + if err := d.DecodeElement(&pd, &start); err != nil { + return err + } + p.Direct = &pd + } else if typ == "hostdev-pci" { + var ph NetworkPortPlugHostDevPCI + if err := d.DecodeElement(&ph, &start); err != nil { + return err + } + p.HostDevPCI = &ph + } + d.Skip() + return nil +} + +func (s *NetworkPort) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), s) +} + +func (s *NetworkPort) Marshal() (string, error) { + doc, err := xml.MarshalIndent(s, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/xml_test.go b/xml_test.go index 320c248..7e3876a 100644 --- a/xml_test.go +++ b/xml_test.go @@ -83,6 +83,7 @@ var xmldirs = []string{ "testdata/libvirt/tests/storagevolxml2xmlin", "testdata/libvirt/tests/storagevolxml2xmlout", "testdata/libvirt/tests/vircaps2xmldata", + "testdata/libvirt/tests/virnetworkportxml2xmldata", "testdata/libvirt/tests/virstorageutildata", "testdata/libvirt/tests/vmx2xmldata", "testdata/libvirt/tests/xlconfigdata", @@ -306,6 +307,8 @@ func testRoundTrip(t *testing.T, xml string, filename string) { doc = &Domain{} } else if strings.HasPrefix(xml, "<capabilities") { doc = &Caps{} + } else if strings.HasPrefix(xml, "<networkport") { + doc = &NetworkPort{} } else if strings.HasPrefix(xml, "<network") { doc = &Network{} } else if strings.HasPrefix(xml, "<secret") { -- 2.21.0

1 0

[libvirt] ANNOUNCE: virt-manager 2.2.0 released
by Cole Robinson 18 Jun '19

18 Jun '19

I'm happy to announce the release of virt-manager 2.2.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks - virt-install: libosinfo --unattended support (Fabiano Fidêncio, Cole Robinson) - Improve CPU model security defaults (Pavel Hrdina) - virt-install: new --install option. Ex: virt-install --install fedora29 - virt-install: new --install kernel=,initrd= - virt-install: --disk, --memory, --name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson) - virt-install: add device suboption aliases which consistently match libvirt XML naming - virt-xml: new --start, --no-define options (Marc Hartmayer) - virt-install: Add driver_queues argument to --controller (Vasudeva Kamath) - RISC-V support (Andrea Bolognani) - Device default improvements for non-x86 KVM (Andrea Bolognani) - Redesigned 'New Network' wizard - libguestfs inspection improvements (Pino Toscano) - virt-install: Add support for xenbus controller (Jim Fehlig) - cli: Add --disk wwn=,rawio= (Athina Plaskasoviti) - cli: Add --memballoon autodeflate=,stats.period= (Athina Plaskasoviti) - cli: Add --iothreads (Athina Plaskasoviti) - cli: Add --numatune memory.placement (Athina Plaskasoviti) - cli: Add --launchSecurity option (Erik Skultety) - cli: Fill in --memorybacking options - cli: --smartcard: support database= and certificate[0-9]*= - cli: --sysinfo: Add chasis suboptions - cli: --metadata: add genid= and genid_enable= - cli: --vcpus: add vcpus.vcpu[0-9]* config - cli: fill in all common char source options for --serial, --parellel, --console, --channel, --smartcard, --rng, --redirdev Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 1

[libvirt] [PATCH v6 00/23] network: refactor to decouple virt drivers from network driver
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

An update to v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00681.html v2: https://www.redhat.com/archives/libvir-list/2019-February/msg01581.html v3: https://www.redhat.com/archives/libvir-list/2019-March/msg01259.html v4: https://www.redhat.com/archives/libvir-list/2019-April/msg01186.html v5: https://www.redhat.com/archives/libvir-list/2019-May/msg00358.html Currently the network driver registers a set of callbacks with the virt driver in order to handle allocating/releasing network ports associated with guest NICs. This series introduces a virNetworkPortPtr object and associated XML that describes a network port. The virt drivers now call public APIs associated with this new object to create/delete ports for guest NICs. Changed in v6: - Fixed mistakes in RNG schema & example XML - Fix docs typos Changed in v5: - Separately track ports with type=network vs type=bridge to deal with fallout after reverting patches which merged them - Add RNG schema and XML format docs - Change to use classID attr on <bandwidth> isntead of of separate <class id="xx"/> element - Drop obsolete driver deps from RPM spec - Other misc bug fixes found during testing Changed in v4: - Merged the ACKd patches which didn't depend on other un-acked parts - Improve bandwidth error messages - Ensure we set floor sum to zero when starting network - Misc fixes for previous review comments NB, I have not added missing docs for the new XML doc format yet. This is work in progress. Changed in v3: - Remove unused API symbol - Fix dist of test data files Changed in v2: - Fix many bugs related to upgrades with running VMs - Convert over bandwidth controls to the new APIs - Handle reconnecting VIFs to bridges during startup - Much much more that I can't remember Daniel P. Berrangé (23): conf: allow bandwidth parsing / formatting to include class ID conf: introduce virNetworkPortDefPtr struct and XML support network: make networkLogAllocation independent of domain conf conf: add APIs to convert virDomainNetDef to virNetworkPortDef network: convert networkAllocateActualDevice to virNetworkPortDef network: convert networkNotifyActualDevice to virNetworkPortDef network: convert networkReleaseActualDevice to virNetworkPortDef network: convert hook script to take a network port XML network: remove the virDomainNetBandwidthChangeAllowed callback network: introduce networkAllocatePort network: introduce networkNotifyPort network: introduce networkReleasePort network: introduce networkUpdatePortBandwidth network: add public APIs for network port object access: add permissions for network port objects remote: add support for new network port APIs virsh: add support for network port APIs conf: support recording ports against virNetworkObjPtr network: add implementation of network port APIs lxc, libxl: notify network driver of NICs during reconnect lxc, libxl: save domain status after reconnect conf: record a portid against the domain conf conf: switch over to use network port APIs for virt drivers docs/docs.html.in | 1 + docs/formatdomain.html.in | 8 + docs/formatnetworkport.html.in | 212 +++ docs/hooks.html.in | 24 +- docs/schemas/domaincommon.rng | 5 + docs/schemas/networkcommon.rng | 5 + docs/schemas/networkport.rng | 154 +++ include/libvirt/libvirt-network.h | 122 ++ include/libvirt/virterror.h | 3 + libvirt.spec.in | 1 + src/access/genpolkit.pl | 2 +- src/access/viraccessdriver.h | 6 + src/access/viraccessdrivernop.c | 11 + src/access/viraccessdriverpolkit.c | 26 + src/access/viraccessdriverstack.c | 25 + src/access/viraccessmanager.c | 16 + src/access/viraccessmanager.h | 6 + src/access/viraccessperm.c | 6 + src/access/viraccessperm.h | 44 + src/conf/Makefile.inc.am | 2 + src/conf/domain_conf.c | 531 +++++++- src/conf/domain_conf.h | 49 +- src/conf/netdev_bandwidth_conf.c | 30 +- src/conf/netdev_bandwidth_conf.h | 2 + src/conf/network_conf.c | 8 +- src/conf/virnetworkobj.c | 303 +++++ src/conf/virnetworkobj.h | 34 + src/conf/virnetworkportdef.c | 508 +++++++ src/conf/virnetworkportdef.h | 113 ++ src/datatypes.c | 60 + src/datatypes.h | 41 + src/driver-network.h | 41 + src/libvirt-network.c | 444 +++++++ src/libvirt_private.syms | 23 +- src/libvirt_public.syms | 15 + src/libxl/libxl_driver.c | 33 + src/lxc/lxc_process.c | 35 + src/network/bridge_driver.c | 1182 ++++++++++------- src/qemu/qemu_driver.c | 8 +- src/remote/remote_daemon_dispatch.c | 73 + src/remote/remote_driver.c | 69 + src/remote/remote_protocol.x | 124 +- src/remote_protocol-structs | 69 + src/rpc/gendispatch.pl | 18 +- src/util/virerror.c | 9 + src/util/virhook.c | 4 +- src/util/virhook.h | 4 +- tests/Makefile.am | 7 + .../net-virtio-network-portgroup.xml | 6 +- tests/virnetdevbandwidthtest.c | 1 + .../plug-bridge-mactbl.xml | 9 + .../virnetworkportxml2xmldata/plug-bridge.xml | 15 + .../virnetworkportxml2xmldata/plug-direct.xml | 12 + .../plug-hostdev-pci.xml | 12 + .../plug-network.xml | 15 + tests/virnetworkportxml2xmldata/plug-none.xml | 8 + tests/virnetworkportxml2xmltest.c | 104 ++ tests/virschematest.c | 1 + tools/virsh-completer.c | 50 + tools/virsh-completer.h | 4 + tools/virsh-network.c | 399 +++++- tools/virsh-network.h | 5 + 62 files changed, 4499 insertions(+), 658 deletions(-) create mode 100644 docs/formatnetworkport.html.in create mode 100644 docs/schemas/networkport.rng create mode 100644 src/conf/virnetworkportdef.c create mode 100644 src/conf/virnetworkportdef.h create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-mactbl.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-direct.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-network.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-none.xml create mode 100644 tests/virnetworkportxml2xmltest.c -- 2.21.0

3 44

Re: [libvirt] [PATCH] storage: escape ipv6 for ceph mon hosts to librados
by Yi Li 18 Jun '19

18 Jun '19

> >Hosts for rbd are ceph monitor daemons. These have fixed IP addresses, > >so they are often referenced by IP rather than hostname for > >convenience, or to avoid relying on DNS. Using IPv4 addresses as the > >host name works already, but IPv6 addresses require rbd-specific > > If you include the escaping in the XML, does it currently work? > <host name='[2205::192:168:205:141]' port='6789'/> Yes, It works. > > > >escaping because the colon is used as an option separator in the > >string passed to librados. > > > >Escape these colons, and enclose the IPv6 address in square brackets > >so it is distinguished from the port, which is currently mandatory. > > > >Signed-off-by: Yi Li <yili(a)winhong.com> > >--- > > docs/schemas/storagepool.rng | 5 ++++- > > src/storage/storage_backend_rbd.c | 13 ++++++++++--- > > tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml | 13 +++++++++++++ > > tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml | 16 ++++++++++++++++ > > tests/storagepoolxml2xmltest.c | 1 + > > 5 files changed, 44 insertions(+), 4 deletions(-) > > create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml > > create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml > > > >diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c > >index f8c968e..3056563 100644 > >--- a/src/storage/storage_backend_rbd.c > >+++ b/src/storage/storage_backend_rbd.c > >@@ -268,9 +268,16 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, > > source->hosts[i].name); > > } else if (source->hosts[i].name != NULL && > > source->hosts[i].port) { > >- virBufferAsprintf(&mon_host, "%s:%d,", > >- source->hosts[i].name, > >- source->hosts[i].port); > >+ /* assume host containing : is ipv6 */ > >+ if (strchr(source->hosts[i].name, ':')) { > > if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) > > By using this helper function, we won't try to escape an address that is > already escaped. > > Also, instead of copying the whole virBuffer call twice, it would be > nicer to assign the format to a temporary variable like we do in qemuMigrationDstPrepare > > Jano Good point. I'd sending a v2. > > > >+ virBufferAsprintf(&mon_host, "[%s]:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } else { > >+ virBufferAsprintf(&mon_host, "%s:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } > > } else { > > virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > > _("received malformed monitor, check the XML definition")); On Sun, Apr 28, 2019 at 1:10 PM winhong-yili <yili(a)winhong.com> wrote: > > >Hosts for rbd are ceph monitor daemons. These have fixed IP addresses, > >so they are often referenced by IP rather than hostname for > >convenience, or to avoid relying on DNS. Using IPv4 addresses as the > >host name works already, but IPv6 addresses require rbd-specific > > If you include the escaping in the XML, does it currently work? > <host name='[2205::192:168:205:141]' port='6789'/> > > >escaping because the colon is used as an option separator in the > >string passed to librados. > > > >Escape these colons, and enclose the IPv6 address in square brackets > >so it is distinguished from the port, which is currently mandatory. > > > >Signed-off-by: Yi Li <yili(a)winhong.com> > >--- > > docs/schemas/storagepool.rng | 5 ++++- > > src/storage/storage_backend_rbd.c | 13 ++++++++++--- > > tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml | 13 +++++++++++++ > > tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml | 16 ++++++++++++++++ > > tests/storagepoolxml2xmltest.c | 1 + > > 5 files changed, 44 insertions(+), 4 deletions(-) > > create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ipv6.xml > > create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ipv6.xml > > > >diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c > >index f8c968e..3056563 100644 > >--- a/src/storage/storage_backend_rbd.c > >+++ b/src/storage/storage_backend_rbd.c > >@@ -268,9 +268,16 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, > > source->hosts[i].name); > > } else if (source->hosts[i].name != NULL && > > source->hosts[i].port) { > >- virBufferAsprintf(&mon_host, "%s:%d,", > >- source->hosts[i].name, > >- source->hosts[i].port); > >+ /* assume host containing : is ipv6 */ > >+ if (strchr(source->hosts[i].name, ':')) { > > if (virSocketAddrNumericFamily(listenAddress) == AF_INET6) > > By using this helper function, we won't try to escape an address that is > already escaped. > > Also, instead of copying the whole virBuffer call twice, it would be > nicer to assign the format to a temporary variable like we do in qemuMigrationDstPrepare > > Jano > > >+ virBufferAsprintf(&mon_host, "[%s]:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } else { > >+ virBufferAsprintf(&mon_host, "%s:%d,", > >+ source->hosts[i].name, > >+ source->hosts[i].port); > >+ } > > } else { > > virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > > _("received malformed monitor, check the XML definition"));

2 2