- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Fix build with glibc-2.26 and clean up
by Martin Kletzander 16 Nov '17

16 Nov '17

Not pushed as build fix as glibc-2.26 is not that spread and the second patch is not a build fix. Review should be trivial, so hopefully almost no review bandwidth goes to waste ;) Martin Kletzander (2): build: Use XDR_CFLAGS in more places tests: Remove pointless _CFLAGS variables tests/Makefile.am | 28 +--------------------------- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 28 deletions(-) -- 2.15.0

2 3

[libvirt] [PATCH] qemu: taint domain if virDomainQemuAgentCommand API is used
by Pavel Hrdina 16 Nov '17

16 Nov '17

This is similar to the virDomainQemuMonitorCommand API, it can change the domain state in a way that libvirt may not understand. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_driver.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fffcc8e9da..55b3cb2430 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -100,7 +100,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, "host-cpu", "hook-script", "cdrom-passthrough", - "custom-dtb"); + "custom-dtb", + "custom-ga-command"); VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "none", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e3f060b122..af5e379468 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2444,6 +2444,7 @@ typedef enum { VIR_DOMAIN_TAINT_HOOK, /* Domain (possibly) changed via hook script */ VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH,/* CDROM passthrough */ VIR_DOMAIN_TAINT_CUSTOM_DTB, /* Custom device tree blob was specified */ + VIR_DOMAIN_TAINT_CUSTOM_GA_COMMAND, /* Custom guest agent command */ VIR_DOMAIN_TAINT_LAST } virDomainTaintFlags; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6132bc4a9a..3a0e3b6cec 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18737,6 +18737,8 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; + qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_GA_COMMAND, NULL); + agent = qemuDomainObjEnterAgent(vm); ret = qemuAgentArbitraryCommand(agent, cmd, &result, timeout); qemuDomainObjExitAgent(vm, agent); -- 2.13.6

2 1

[libvirt] [PATCH 0/5] libvirtd: Adjustments to startup and cleanup processing
by John Ferlan 16 Nov '17

16 Nov '17

Essentially a followup from the review of: daemon: fix termination/reload issues https://www.redhat.com/archives/libvir-list/2017-October/msg01347.html and in particular patch 3/3, a review which has exteneded into Nov.: https://www.redhat.com/archives/libvir-list/2017-November/msg00066.html Make a few adjustments as noted in the patches as an alternative to patch 3/3 from above. The cleanup path is essentially reordered in inverse order of startup. Other adjustments include virObjectUnref after attempts to place object into domain or server hash tables or linked lists. John Ferlan (5): libvirtd: Move pid_file_fd setup to before run_dir libvirtd: Alter order of virNetDaemonNew libvirtd: Alter refcnt processing for domain server objects libvirtd: Alter refcnt processing for server program objects libvirtd: Fix order of cleanup processing daemon/libvirtd.c | 95 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 30 deletions(-) -- 2.13.6

2 19

[libvirt] [PATCH 0/2] Fix storage driver crash
by John Ferlan 16 Nov '17

16 Nov '17

As described recently on list: https://www.redhat.com/archives/libvir-list/2017-November/msg00043.html and then discussed more in depth recently on OFTC #virt IRC, the thread run after a storageVolUpload is completed to refresh the volume and pool statistics could cause a crash if there was a storageVolCreateXML being run in a different thread that was taking a long time to build the volume. In the create/build case, the storage pool is unlocked while the build occurs, but before doing so "asyncjobs" is incremented to avoid certain other destructive operations such as PoolUndefine, PoolDestroy, PoolDelete, and PoolRefresh. The poolRefresh will clear and repopulate the pool volume list which is a bad thing to do since the create logic will have added to that list and be keeping track of what was added just in case the volume would need to be removed in the event of a build failure. The patches here will fix the case found and then alter the logic for another possible miscreant that would clear the volumes in a thread that needs to be run "later" than the normal processing for SCSI Fibre Channel volume recognition. John Ferlan (2): storage: Resolve storage driver crash scsi: Check for long running create in FCRefreshThread src/storage/storage_backend_scsi.c | 1 + src/storage/storage_driver.c | 9 +++++++++ 2 files changed, 10 insertions(+) -- 2.13.6

3 10

[libvirt] [PATCH go-xml] Add support for panic device
by zhenwei.pi 16 Nov '17

16 Nov '17

Add DomainAddressISA for panic device address. Add DomainPanic. Add test code. Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 38 ++++++++++++++++++++++++++++++++++++++ domain_test.go | 28 +++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/domain.go b/domain.go index f4ef35c..8086e28 100644 --- a/domain.go +++ b/domain.go @@ -312,11 +312,16 @@ type DomainAddressDIMM struct { Base *uint64 `xml:"base,attr"` } +type DomainAddressISA struct { + Iobase *uint `xml:"iobase,attr"` +} + type DomainAddress struct { USB *DomainAddressUSB PCI *DomainAddressPCI Drive *DomainAddressDrive DIMM *DomainAddressDIMM + ISA *DomainAddressISA } type DomainConsole struct { @@ -403,6 +408,12 @@ type DomainMemBalloon struct { Address *DomainAddress `xml:"address"` } +type DomainPanic struct { + XMLName xml.Name `xml:"panic"` + Model string `xml:"model,attr"` + Address *DomainAddress `xml:"address"` +} + type DomainSoundCodec struct { Type string `xml:"type,attr"` } @@ -486,6 +497,7 @@ type DomainDeviceList struct { Videos []DomainVideo `xml:"video"` Channels []DomainChannel `xml:"channel"` MemBalloon *DomainMemBalloon `xml:"memballoon"` + Panics []DomainPanic `xml:"panic"` Sounds []DomainSound `xml:"sound"` RNGs []DomainRNG `xml:"rng"` Hostdevs []DomainHostdev `xml:"hostdev"` @@ -1058,6 +1070,16 @@ func (a *DomainAddressDIMM) MarshalXML(e *xml.Encoder, start xml.StartElement) e return nil } +func (a *DomainAddressISA) MarshalXML(e *xml.Encoder, start xml.StartElement) error { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "isa", + }) + marshallUintAttr(&start, "iobase", a.Iobase, 16) + e.EncodeToken(start) + e.EncodeToken(start.End()) + return nil +} + func (a *DomainAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error { if a.USB != nil { return a.USB.MarshalXML(e, start) @@ -1067,6 +1089,8 @@ func (a *DomainAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error return a.Drive.MarshalXML(e, start) } else if a.DIMM != nil { return a.DIMM.MarshalXML(e, start) + } else if a.ISA != nil { + return a.ISA.MarshalXML(e, start) } else { return nil } @@ -1173,6 +1197,17 @@ func (a *DomainAddressDIMM) UnmarshalXML(d *xml.Decoder, start xml.StartElement) return nil } +func (a *DomainAddressISA) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + for _, attr := range start.Attr { + if attr.Name.Local == "iobase" { + if err := unmarshallUintAttr(attr.Value, &a.Iobase, 16); err != nil { + return err + } + } + } + return nil +} + func (a *DomainAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { var typ string d.Skip() @@ -1198,6 +1233,9 @@ func (a *DomainAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) err } else if typ == "dimm" { a.DIMM = &DomainAddressDIMM{} return a.DIMM.UnmarshalXML(d, start) + } else if typ == "isa" { + a.ISA = &DomainAddressISA{} + return a.ISA.UnmarshalXML(d, start) } return nil diff --git a/domain_test.go b/domain_test.go index 1ad5125..31787a5 100644 --- a/domain_test.go +++ b/domain_test.go @@ -45,6 +45,10 @@ type DriveAddress struct { Unit uint } +type ISAAddress struct { + Iobase uint +} + var uhciIndex uint = 0 var uhciAddr = PCIAddress{0, 0, 1, 2} @@ -53,6 +57,7 @@ var ifaceAddr = PCIAddress{0, 0, 4, 0} var videoAddr = PCIAddress{0, 0, 5, 0} var fsAddr = PCIAddress{0, 0, 6, 0} var balloonAddr = PCIAddress{0, 0, 7, 0} +var panicAddr = ISAAddress{0x505} var duplexAddr = PCIAddress{0, 0, 8, 0} var hostdevSCSI = DriveAddress{0, 0, 3, 0} @@ -303,6 +308,19 @@ var domainTestData = []struct { }, }, }, + Panics: []DomainPanic{ + DomainPanic{ + Model: "hyperv", + }, + DomainPanic{ + Model: "isa", + Address: &DomainAddress{ + ISA: &DomainAddressISA{ + Iobase: &panicAddr.Iobase, + }, + }, + }, + }, Consoles: []DomainConsole{ DomainConsole{ Type: "pty", @@ -433,6 +451,10 @@ var domainTestData = []struct { ` <memballoon model="virtio">`, ` <address type="pci" domain="0x0" bus="0x0" slot="0x7" function="0x0"></address>`, ` </memballoon>`, + ` <panic model="hyperv"></panic>`, + ` <panic model="isa">`, + ` <address type="isa" iobase="0x505"></address>`, + ` </panic>`, ` <sound model="ich6">`, ` <codec type="duplex"></codec>`, ` <address type="pci" domain="0x0" bus="0x0" slot="0x8" function="0x0"></address>`, @@ -1725,9 +1747,9 @@ var domainTestData = []struct { /* Host Bootloader -- bhyve, Xen */ { Object: &Domain{ - Type: "bhyve", - Name: "test", - Bootloader: "/usr/local/sbin/grub-bhyve", + Type: "bhyve", + Name: "test", + Bootloader: "/usr/local/sbin/grub-bhyve", BootloaderArgs: "-r cd0 -m /tmp/test-device.map -M 1024M linuxguest", }, Expected: []string{ -- 2.7.4

2 1

[libvirt] PATCH go-xml : add virtualport support
by Karol Czeryna 16 Nov '17

16 Nov '17

Hi guys! Working with terraform libvirt plugin I discovered lack of openvswitch support - but in libvirt-go there is no support for virtualport entry.. this patch adds virtualport support. diff --git a/network.go b/network.go index 10c4dfc..0f072ec 100644 --- a/network.go +++ b/network.go @@ -36,6 +36,16 @@ type NetworkBridge struct { MACTableManager string `xml:"macTableManager,attr,omitempty"` } +type VirtualPortParameters struct { + InterfaceID string `xml:"interfaceid,attr,omitempty"` + ProfileID string `xml:"profileid,attr,omitempty"` +} + +type VirtualPort struct { + Type string `xml:"type,attr,omitempty"` + Parameters []VirtualPortParameters `xml:"parameters,omitempty"` +} + type NetworkDomain struct { Name string `xml:"name,attr,omitempty"` LocalOnly string `xml:"localOnly,attr,omitempty"` @@ -152,6 +162,7 @@ type Network struct { UUID string `xml:"uuid,omitempty"` MAC *NetworkMAC `xml:"mac"` Bridge *NetworkBridge `xml:"bridge"` + VirtualPort *VirtualPort `xml:"virtualport"` Forward *NetworkForward `xml:"forward"` Domain *NetworkDomain `xml:"domain"` IPs []NetworkIP `xml:"ip"` diff --git a/network_test.go b/network_test.go index 3efb278..10cce66 100644 --- a/network_test.go +++ b/network_test.go @@ -65,6 +65,14 @@ var networkTestData = []struct { Bridge: &NetworkBridge{ Name: "virbr0", }, + VirtualPort: &VirtualPort{ + Type: "openvswitch", + Parameters: []VirtualPortParameters{ + VirtualPortParameters{ + InterfaceID: "09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f", + }, + }, + }, Forward: &NetworkForward{ Mode: "nat", NAT: &NetworkForwardNAT{ @@ -175,6 +183,9 @@ var networkTestData = []struct { `<network>`, ` <name>test</name>`, ` <bridge name="virbr0"></bridge>`, + ` <virtualport type="openvswitch">`, + ` <parameters interfaceid="09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f"></parameters>`, + ` </virtualport>`, ` <forward mode="nat">`, ` <nat>`, ` <address start="1.2.3.4" end="1.2.3.10"></address>`, Best, Karol

2 1

[libvirt] [PATCH go-xml] Support network backed serial interfaces
by Jeroen Simonetti 16 Nov '17

16 Nov '17

Adds network backing for a DomainChardevSource and protocol selection for serial device of type tcp. Signed-off-by: Jeroen Simonetti <jeroen(a)simonetti.nl> --- domain.go | 26 +++++++++++++++++--------- domain_test.go | 26 +++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/domain.go b/domain.go index f4ef35c..47e9dc6 100644 --- a/domain.go +++ b/domain.go @@ -256,9 +256,12 @@ type DomainInterface struct { } type DomainChardevSource struct { - Mode string `xml:"mode,attr,omitempty"` - Path string `xml:"path,attr"` - Append string `xml:"append,attr,omitempty"` + Mode string `xml:"mode,attr,omitempty"` + Path string `xml:"path,attr,omitempty"` + Append string `xml:"append,attr,omitempty"` + Host string `xml:"host,attr,omitempty"` + Service string `xml:"service,attr,omitempty"` + TLS string `xml:"tls,attr,omitempty"` } type DomainChardevTarget struct { @@ -329,12 +332,17 @@ type DomainConsole struct { } type DomainSerial struct { - XMLName xml.Name `xml:"serial"` - Type string `xml:"type,attr"` - Source *DomainChardevSource `xml:"source"` - Target *DomainSerialTarget `xml:"target"` - Alias *DomainAlias `xml:"alias"` - Address *DomainAddress `xml:"address"` + XMLName xml.Name `xml:"serial"` + Type string `xml:"type,attr"` + Source *DomainChardevSource `xml:"source"` + Protocol *DomainSerialProtocol `xml:"protocol"` + Target *DomainSerialTarget `xml:"target"` + Alias *DomainAlias `xml:"alias"` + Address *DomainAddress `xml:"address"` +} + +type DomainSerialProtocol struct { + Type string `xml:"type,attr"` } type DomainChannel struct { diff --git a/domain_test.go b/domain_test.go index 1ad5125..99d5022 100644 --- a/domain_test.go +++ b/domain_test.go @@ -330,6 +330,21 @@ var domainTestData = []struct { Port: &serialPort, }, }, + DomainSerial{ + Type: "tcp", + Source: &DomainChardevSource{ + Mode: "bind", + Host: "127.0.0.1", + Service: "1234", + TLS: "yes", + }, + Protocol: &DomainSerialProtocol{ + Type: "telnet", + }, + Target: &DomainSerialTarget{ + Port: &serialPort, + }, + }, }, Channels: []DomainChannel{ DomainChannel{ @@ -415,6 +430,11 @@ var domainTestData = []struct { ` <source path="/tmp/serial.log" append="off"></source>`, ` <target port="0"></target>`, ` </serial>`, + ` <serial type="tcp">`, + ` <source mode="bind" host="127.0.0.1" service="1234" tls="yes"></source>`, + ` <protocol type="telnet"></protocol>`, + ` <target port="0"></target>`, + ` </serial>`, ` <console type="pty">`, ` <target type="virtio" port="0"></target>`, ` </console>`, @@ -1725,9 +1745,9 @@ var domainTestData = []struct { /* Host Bootloader -- bhyve, Xen */ { Object: &Domain{ - Type: "bhyve", - Name: "test", - Bootloader: "/usr/local/sbin/grub-bhyve", + Type: "bhyve", + Name: "test", + Bootloader: "/usr/local/sbin/grub-bhyve", BootloaderArgs: "-r cd0 -m /tmp/test-device.map -M 1024M linuxguest", }, Expected: []string{ -- 2.15.0

2 1

[libvirt] [PATCH] virsh: fixing wrong datatype of 'set-lifcycle-action' command options.
by Julio Faracco 16 Nov '17

16 Nov '17

The 'set-lifcycle-action' is throwing a weird error after executing it with the '--help' option. The command output is showing the options 'type' and 'action' are as optional, but they aren't. Both are required. virsh # set-lifecycle-action --help ... SYNOPSIS set-lifecycle-action <domain> [--type <string>] [--action <string>] ... ... OPTIONS [--domain] <string> domain name, id or uuid error: internal error: bad options in command: 'set-lifecycle-action' After applying this patch, both arguments are required now. virsh # set-lifecycle-action --help ... SYNOPSIS set-lifecycle-action <domain> <type> <action> [--config] ... Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1509870 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 42d5526..bf96f2e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5532,12 +5532,12 @@ static const vshCmdInfo info_setLifecycleAction[] = { static const vshCmdOptDef opts_setLifecycleAction[] = { VIRSH_COMMON_OPT_DOMAIN_FULL, {.name = "type", - .type = VSH_OT_STRING, + .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, .help = N_("lifecycle type to modify") }, {.name = "action", - .type = VSH_OT_STRING, + .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, .help = N_("lifecycle action to set") }, -- 2.7.4

2 1

[libvirt] [PATCH] qemu: don't goto cleanup when qemuDomainRemoveDevice failed at function qemuProcessUpdateDevices
by xinhua.Cao 16 Nov '17

16 Nov '17

Function qemuProcessUpdateDevices was called at qemuProcessReconnect when we detach net device lively and killed libvirtd service at middle. qemu detached the device but libvirtd don't save it at runDir. when libvirtd restart, libvirtd will detach net device but qemu will return fail because device was not found. then libvirtd qemuProcessReconnect failed and goto error. libvirtd kill qemu. To avoid qemu is killed by libvirtd, qemuDomainRemoveDevice will not return failed. --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6d242b1..9f9393b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3234,7 +3234,7 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver, if (!virStringListHasString(qemuDevices, *tmp) && virDomainDefFindDevice(vm->def, *tmp, &dev, false) == 0 && qemuDomainRemoveDevice(driver, vm, &dev) < 0) { - goto cleanup; + VIR_WARN("failed to remove device %s at reconnect process", *tmp); } tmp++; } -- 2.8.3

1 0

[libvirt] [PATCH 0/2] Add 'l2-cache-size' property to specify maximum size of the L2 table cache for qcow2 image
by Lin Ma 16 Nov '17

16 Nov '17

Lin Ma (2): caps: Add capability for maximum size of the qcow2 L2 table cache qemu: Add support for 'l2-cache-size' property of qcow2 docs/formatdomain.html.in | 11 +++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 11 +++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 18 ++++++++++++ .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-l2-cache-size.args | 24 +++++++++++++++ .../qemuxml2argv-disk-drive-l2-cache-size.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-disk-drive-l2-cache-size.xml | 34 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 29 files changed, 164 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-l2-cache-size.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-l2-cache-size.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-l2-cache-size.xml -- 2.9.2

4 7

[libvirt] [PATCH] qemuBuildDeviceAddressStr: Prefer default alias for PCI bus
by Michal Privoznik 15 Nov '17

15 Nov '17

https://bugzilla.redhat.com/show_bug.cgi?id=1434451 Just like in 9324f67a572f9b32 we need to put default pci-root alias onto the command line instead of the one provided by user. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eb72db33b..affad43e1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -318,16 +318,25 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI && cont->idx == info->addr.pci.bus) { - contAlias = cont->info.alias; contIsPHB = virDomainControllerIsPSeriesPHB(cont); contTargetIndex = cont->opts.pciopts.targetIndex; - if (!contAlias) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device alias was not set for PCI " - "controller with index %u required " - "for device at address %s"), - info->addr.pci.bus, devStr); - goto cleanup; + + /* When domain has builtin pci-root controller we don't put it + * onto cmd line. Therefore we can't set its alias. In that + * case, use the default one. */ + if (!qemuDomainIsPSeries(domainDef) && + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { + contAlias = "pci.0"; + } else { + contAlias = cont->info.alias; + if (!contAlias) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Device alias was not set for PCI " + "controller with index %u required " + "for device at address %s"), + info->addr.pci.bus, devStr); + goto cleanup; + } } break; } -- 2.13.6

2 1

[libvirt] [PATCH 0/2] virtlo(ck|g)d: Two simple improvements
by Erik Skultety 15 Nov '17

15 Nov '17

Erik Skultety (2): daemon: virtlogd: Drop the server shortcut ref pointer daemon: virtlockd: Call virNetDaemonGetServer regardless of post exec src/locking/lock_daemon.c | 5 +++-- src/logging/log_daemon.c | 54 ++++++++++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 24 deletions(-) -- 2.13.6

2 3

[libvirt] [PATCH] hooks: Fix a wrong description
by Chen Hanxiao 15 Nov '17

15 Nov '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> In the definition of virHookQemuOpType and virHookNetworkOpType, we should use 'stopped' rather than 'shutdown'. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- docs/hooks.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hooks.html.in b/docs/hooks.html.in index 05156c30c..2c4c39b77 100644 --- a/docs/hooks.html.in +++ b/docs/hooks.html.in @@ -316,7 +316,7 @@ executes <b>prior</b> to the object (guest or network) being created. This allows the object start operation to be aborted if the script returns indicating failure.<br/><br/></li> - <li>The "shutdown" operation for the guest and network hook scripts, + <li>The "stopped" operation for the guest and network hook scripts, executes <b>after</b> the object (guest or network) has stopped. If the hook script indicates failure in its return, the shut down of the object cannot be aborted because it has already been performed. -- 2.13.6

2 1

[libvirt] [PATCH] qemuBuildDriveDevStr: Prefer default aliases for IDE bus
by Michal Privoznik 14 Nov '17

14 Nov '17

https://bugzilla.redhat.com/show_bug.cgi?id=1434451 When testing user aliases it was discovered that for 440fx machine type which has default IDE bus builtin, domain cannot start if IDE controller has the user provided alias. This is because for 440fx we don't put the IDE controller onto the command line (since it is builtin) and therefore any device that is plugged onto the bus must use the default alias. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 14 +++++++++++--- tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 364196783..6cc77df2e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1886,9 +1886,17 @@ qemuBuildDriveDevStr(const virDomainDef *def, virBufferAddLit(&opt, "ide-drive"); } - if (!(contAlias = virDomainControllerAliasFind(def, VIR_DOMAIN_CONTROLLER_TYPE_IDE, - disk->info.addr.drive.controller))) - goto error; + /* When domain has builtin IDE controller we don't put it onto cmd + * line. Therefore we can't set its alias. In that case, use the + * default one. */ + if (qemuDomainHasBuiltinIDE(def)) { + contAlias = "ide"; + } else { + if (!(contAlias = virDomainControllerAliasFind(def, + VIR_DOMAIN_CONTROLLER_TYPE_IDE, + disk->info.addr.drive.controller))) + goto error; + } virBufferAsprintf(&opt, ",bus=%s.%d,unit=%d", contAlias, disk->info.addr.drive.bus, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args index 62fbd567b..1719c1bc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args @@ -44,8 +44,8 @@ id=drive-ua-myEncryptedDisk1 \ id=ua-myEncryptedDisk1 \ -drive file=/home/zippy/tmp/install-amd64-minimal-20140619.iso,format=raw,\ if=none,media=cdrom,id=drive-ua-WhatAnAwesomeCDROM,readonly=on,cache=none \ --device ide-drive,bus=ua-DoesAnybodyStillUseIDE.1,unit=0,\ -drive=drive-ua-WhatAnAwesomeCDROM,id=ua-WhatAnAwesomeCDROM \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ua-WhatAnAwesomeCDROM,\ +id=ua-WhatAnAwesomeCDROM \ -device virtio-net-pci,vlan=0,id=ua-CheckoutThisNIC,mac=52:54:00:d6:c0:0b,\ bus=pci.0,addr=0x3 \ -net tap,fd=3,vlan=0,name=hostua-CheckoutThisNIC \ -- 2.13.6

3 4

[libvirt] [PATCH 0/4] qemu: Enable configuration of HPT resizing for pSeries guests
by Andrea Bolognani 14 Nov '17

14 Nov '17

Applies on top of https://www.redhat.com/archives/libvir-list/2017-November/msg00176.html Andrea Bolognani (4): qemu: Enable configuration of HPT resizing for pSeries guests tests: Add tests for configuration of HPT resizing docs: Document configuration of HPT resizing news: Update for configuration of HPT resizing docs/formatdomain.html.in | 13 +++++- docs/news.xml | 10 +++++ docs/schemas/domaincommon.rng | 15 +++++++ src/conf/domain_conf.c | 46 +++++++++++++++++++++- src/conf/domain_conf.h | 12 ++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 8 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 20 ++++++++++ src/qemu/qemu_domain.c | 8 ++++ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + ...qemuxml2argv-pseries-hpt-resizing-disabled.args | 20 ++++++++++ .../qemuxml2argv-pseries-hpt-resizing-disabled.xml | 19 +++++++++ .../qemuxml2argv-pseries-hpt-resizing-enabled.args | 20 ++++++++++ .../qemuxml2argv-pseries-hpt-resizing-enabled.xml | 19 +++++++++ ...l2argv-pseries-hpt-resizing-invalid-machine.xml | 18 +++++++++ ...qemuxml2argv-pseries-hpt-resizing-required.args | 20 ++++++++++ .../qemuxml2argv-pseries-hpt-resizing-required.xml | 19 +++++++++ tests/qemuxml2argvtest.c | 20 ++++++++++ ...emuxml2xmlout-pseries-hpt-resizing-disabled.xml | 28 +++++++++++++ ...qemuxml2xmlout-pseries-hpt-resizing-enabled.xml | 28 +++++++++++++ ...emuxml2xmlout-pseries-hpt-resizing-required.xml | 28 +++++++++++++ tests/qemuxml2xmltest.c | 13 ++++++ 23 files changed, 385 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-enabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-invalid-machine.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-required.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hpt-resizing-required.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hpt-resizing-required.xml -- 2.13.6

2 10

[libvirt] [PATCH] vircapstest: Avoid (im)possible strcmp call with NULL argument
by Jiri Denemark 14 Nov '17

14 Nov '17

Some compiler may get confused and decide we are calling strcmp with NULL argument from test_virCapsDomainDataLookupLXC. Although this does not really happen since the call is guarded with (data->machinetype != expect_machinetype), using STRNEQ_NULLABLE is easier to understand, less fragile, and doing so makes sure strcmp is never called with NULL argument. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/vircapstest.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 95829133d0..05ec802f35 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -188,11 +188,10 @@ doCapsCompare(virCapsPtr caps, goto error; } - if (data->machinetype != expect_machinetype && - STRNEQ(data->machinetype, expect_machinetype)) { + if (STRNEQ_NULLABLE(data->machinetype, expect_machinetype)) { fprintf(stderr, "data->machinetype=%s doesn't match " "expect_machinetype=%s\n", - data->machinetype, expect_machinetype); + NULLSTR(data->machinetype), NULLSTR(expect_machinetype)); goto error; } -- 2.15.0

2 1

[libvirt] [PATCH go-xml] Add support for panic device
by zhenwei.pi 14 Nov '17

14 Nov '17

Add DomainAddressISA for panic device address. Add DomainPanic. Add test code. Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 38 ++++++++++++++++++++++++++++++++++++++ domain_test.go | 28 +++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/domain.go b/domain.go index f4ef35c..8086e28 100644 --- a/domain.go +++ b/domain.go @@ -312,11 +312,16 @@ type DomainAddressDIMM struct { Base *uint64 `xml:"base,attr"` } +type DomainAddressISA struct { + Iobase *uint `xml:"iobase,attr"` +} + type DomainAddress struct { USB *DomainAddressUSB PCI *DomainAddressPCI Drive *DomainAddressDrive DIMM *DomainAddressDIMM + ISA *DomainAddressISA } type DomainConsole struct { @@ -403,6 +408,12 @@ type DomainMemBalloon struct { Address *DomainAddress `xml:"address"` } +type DomainPanic struct { + XMLName xml.Name `xml:"panic"` + Model string `xml:"model,attr"` + Address *DomainAddress `xml:"address"` +} + type DomainSoundCodec struct { Type string `xml:"type,attr"` } @@ -486,6 +497,7 @@ type DomainDeviceList struct { Videos []DomainVideo `xml:"video"` Channels []DomainChannel `xml:"channel"` MemBalloon *DomainMemBalloon `xml:"memballoon"` + Panics []DomainPanic `xml:"panic"` Sounds []DomainSound `xml:"sound"` RNGs []DomainRNG `xml:"rng"` Hostdevs []DomainHostdev `xml:"hostdev"` @@ -1058,6 +1070,16 @@ func (a *DomainAddressDIMM) MarshalXML(e *xml.Encoder, start xml.StartElement) e return nil } +func (a *DomainAddressISA) MarshalXML(e *xml.Encoder, start xml.StartElement) error { + start.Attr = append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "isa", + }) + marshallUintAttr(&start, "iobase", a.Iobase, 16) + e.EncodeToken(start) + e.EncodeToken(start.End()) + return nil +} + func (a *DomainAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error { if a.USB != nil { return a.USB.MarshalXML(e, start) @@ -1067,6 +1089,8 @@ func (a *DomainAddress) MarshalXML(e *xml.Encoder, start xml.StartElement) error return a.Drive.MarshalXML(e, start) } else if a.DIMM != nil { return a.DIMM.MarshalXML(e, start) + } else if a.ISA != nil { + return a.ISA.MarshalXML(e, start) } else { return nil } @@ -1173,6 +1197,17 @@ func (a *DomainAddressDIMM) UnmarshalXML(d *xml.Decoder, start xml.StartElement) return nil } +func (a *DomainAddressISA) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { + for _, attr := range start.Attr { + if attr.Name.Local == "iobase" { + if err := unmarshallUintAttr(attr.Value, &a.Iobase, 16); err != nil { + return err + } + } + } + return nil +} + func (a *DomainAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { var typ string d.Skip() @@ -1198,6 +1233,9 @@ func (a *DomainAddress) UnmarshalXML(d *xml.Decoder, start xml.StartElement) err } else if typ == "dimm" { a.DIMM = &DomainAddressDIMM{} return a.DIMM.UnmarshalXML(d, start) + } else if typ == "isa" { + a.ISA = &DomainAddressISA{} + return a.ISA.UnmarshalXML(d, start) } return nil diff --git a/domain_test.go b/domain_test.go index 1ad5125..31787a5 100644 --- a/domain_test.go +++ b/domain_test.go @@ -45,6 +45,10 @@ type DriveAddress struct { Unit uint } +type ISAAddress struct { + Iobase uint +} + var uhciIndex uint = 0 var uhciAddr = PCIAddress{0, 0, 1, 2} @@ -53,6 +57,7 @@ var ifaceAddr = PCIAddress{0, 0, 4, 0} var videoAddr = PCIAddress{0, 0, 5, 0} var fsAddr = PCIAddress{0, 0, 6, 0} var balloonAddr = PCIAddress{0, 0, 7, 0} +var panicAddr = ISAAddress{0x505} var duplexAddr = PCIAddress{0, 0, 8, 0} var hostdevSCSI = DriveAddress{0, 0, 3, 0} @@ -303,6 +308,19 @@ var domainTestData = []struct { }, }, }, + Panics: []DomainPanic{ + DomainPanic{ + Model: "hyperv", + }, + DomainPanic{ + Model: "isa", + Address: &DomainAddress{ + ISA: &DomainAddressISA{ + Iobase: &panicAddr.Iobase, + }, + }, + }, + }, Consoles: []DomainConsole{ DomainConsole{ Type: "pty", @@ -433,6 +451,10 @@ var domainTestData = []struct { ` <memballoon model="virtio">`, ` <address type="pci" domain="0x0" bus="0x0" slot="0x7" function="0x0"></address>`, ` </memballoon>`, + ` <panic model="hyperv"></panic>`, + ` <panic model="isa">`, + ` <address type="isa" iobase="0x505"></address>`, + ` </panic>`, ` <sound model="ich6">`, ` <codec type="duplex"></codec>`, ` <address type="pci" domain="0x0" bus="0x0" slot="0x8" function="0x0"></address>`, @@ -1725,9 +1747,9 @@ var domainTestData = []struct { /* Host Bootloader -- bhyve, Xen */ { Object: &Domain{ - Type: "bhyve", - Name: "test", - Bootloader: "/usr/local/sbin/grub-bhyve", + Type: "bhyve", + Name: "test", + Bootloader: "/usr/local/sbin/grub-bhyve", BootloaderArgs: "-r cd0 -m /tmp/test-device.map -M 1024M linuxguest", }, Expected: []string{ -- 2.7.4

1 0

[libvirt] [PATCH] virhostcpu: Report correct topolgy info on host with deconfigured core
by Nitesh Konkar 14 Nov '17

14 Nov '17

The host which has a deconfigured core is treated as though the topology is not correct and the SMT is not reliable. Which is not true, so report the topology correctly by detecting if the host is actually in a proper SMT mode with the deconfigured core. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Steps to reproduce: This is what `virsh capabilities` shows in a 10-core POWER8 system (8 threads per core): $ virsh capabilities | grep threads <topology sockets='1' cores='10' threads='8'/> There are 10 CPUs online, given SMT is off (`ppc64_cpu --smt=off`): $ cat /sys/devices/system/cpu/online 0,8,16,24,32,40,48,56,64,72 Now, if one core is disabled/offlined (e.g., the last one, number 72)... $ echo 0 | sudo tee /sys/devices/system/cpu/cpu72/online Then this messes up with `virsh capabilities` number of cores (now 80) and threads (now 1) : $ virsh capabilities | grep threads <topology sockets='1' cores='80' threads='1'/> It goes back to normal if that CPU is enabled/onlined again: $ echo 1 | sudo tee /sys/devices/system/cpu/cpu72/online 1 $ virsh capabilities | grep threads <topology sockets='1' cores='10' threads='8'/> src/util/virhostcpu.c | 8 ++++++-- tests/virhostcpudata/linux-ppc64-deconf-cpus.expected | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c485a97..5301583 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -524,6 +524,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, DIR *nodedir = NULL; struct dirent *nodedirent = NULL; int nodecpus, nodecores, nodesockets, nodethreads, offline = 0; + int total_online_cpus = 0; int threads_per_subcore = 0; unsigned int node; int ret = -1; @@ -623,6 +624,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, if (!online_cpus_map) goto cleanup; + total_online_cpus = virBitmapCountBits(online_cpus_map); + /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the * core, node, socket, thread and topology information from /sys */ @@ -746,10 +749,11 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, * the nodeinfo structure isn't designed to carry the full topology so * we're going to lie about the detected topology to notify the user * to check the host capabilities for the actual topology. */ - if ((*nodes * + if (((*nodes * *sockets * *cores * - *threads) != (*cpus + offline)) { + *threads) != (*cpus + offline)) && + ((total_online_cpus * threads_per_subcore) != (*cpus + offline))) { *nodes = 1; *sockets = 1; *cores = *cpus + offline; diff --git a/tests/virhostcpudata/linux-ppc64-deconf-cpus.expected b/tests/virhostcpudata/linux-ppc64-deconf-cpus.expected index 113bfa8..7998a8f 100644 --- a/tests/virhostcpudata/linux-ppc64-deconf-cpus.expected +++ b/tests/virhostcpudata/linux-ppc64-deconf-cpus.expected @@ -1 +1 @@ -CPUs: 80/80, MHz: 3690, Nodes: 1, Sockets: 1, Cores: 80, Threads: 1 +CPUs: 80/96, MHz: 3690, Nodes: 4, Sockets: 1, Cores: 3, Threads: 8 -- 1.8.3.1

1 0

[libvirt] [PATCH v2 1/2] remote: set neventCallbacks to zero at DEREG_CB
by xinhua.Cao 14 Nov '17

14 Nov '17

set neventCallbacks to zero after VIR_FREE(eventCallbacks) was called --- daemon/remote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/remote.c b/daemon/remote.c index 07557e9..cbcb6e8 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1686,6 +1686,7 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r VIR_WARN("unexpected %s event deregister failure", name); \ } \ VIR_FREE(eventCallbacks); \ + neventCallbacks = 0; \ } while (0); /* -- 2.8.3

3 8

[libvirt] [PATCH] qemu: Properly report errors from qemuDomainFixupCPUs
by Jiri Denemark 13 Nov '17

13 Nov '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6d7827220e..a36e157529 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10227,7 +10227,7 @@ qemuDomainFixupCPUs(virDomainObjPtr vm, virCPUDefPtr fixedCPU = NULL; virCPUDefPtr fixedOrig = NULL; virArch arch = vm->def->os.arch; - int ret = 0; + int ret = -1; if (!ARCH_IS_X86(arch)) return 0; -- 2.15.0

2 1

[libvirt] [PATCH] Revert "virNetDevSupportBandwidth: Enable QoS for vhostuser"
by Michal Privoznik 13 Nov '17

13 Nov '17

https://bugzilla.redhat.com/show_bug.cgi?id=1497410 This reverts commit bc8a99ef06417a2303ccab455f9f045e2a617916. The vhostuser is not a TAP. Therefore our QoS code is not able to set any bandwidth. I don't really understand what I was thinking. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/netdev_bandwidth_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index c37828065..30f988953 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -46,9 +46,9 @@ static inline bool virNetDevSupportBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_ETHERNET: - case VIR_DOMAIN_NET_TYPE_VHOSTUSER: return true; case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: -- 2.13.6

2 2

[libvirt] [PATCH] conf: Fix message when maximum vCPU count is less than current
by Peter Krempa 13 Nov '17

13 Nov '17

Reword the message and drop the numbers (which were reversed) from it so that it actually makes sense. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1509151 --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 77c20c697..64f8df1be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1505,9 +1505,9 @@ virDomainDefSetVcpus(virDomainDefPtr def, size_t i; if (vcpus > def->maxvcpus) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("maxvcpus must not be less than current vcpus (%u < %zu)"), - vcpus, def->maxvcpus); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("maximum vCPU count must not be less than current " + "vCPU count")); return -1; } -- 2.14.3

2 2

[libvirt] [PATCH] news: add entries for specifying distance between vNUMA cells
by Jim Fehlig 13 Nov '17

13 Nov '17

Add two new entries under new features for 3.10.0. One advertising support for specifying distance between vNUMA cells and another advertising Xen's support for vNUMA configuration. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c7023c43b..3966710ee 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -35,6 +35,26 @@ <libvirt> <release version="v3.10.0" date="unreleased"> <section title="New features"> + <change> + <summary> + conf: Support defining distances between virtual NUMA cells + </summary> + <description> + A NUMA hardware architecture supports the notion of distances + between NUMA cells. This can now be specified using the + <code><distances></code> element within the NUMA cell + configuration. + </description> + </change> + <change> + <summary> + Xen: Support defining vNUMA topology + </summary> + <description> + Xen now supports defining a virtual NUMA topology for VMs, + including specifying distances between NUMA cells. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.15.0

2 1

[libvirt] [PATCH v6 0/4] numa: describe sibling nodes distances
by Wim Ten Have 13 Nov '17

13 Nov '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch extends guest domain administration adding support to advertise node sibling distances when configuring NUMA guests also referred to as vNUMA (Virtual NUMA). NUMA (Non-Uniform Memory Access), a method of configuring a cluster of nodes within a single multiprocessing system such that it shares processor local memory amongst others improving performance and the ability of the system to be expanded. A NUMA system could be illustrated as shown below. Within this 4-NODE system, every socket is equipped with its own distinct memory and some with I/O. Access to memory or I/O on remote nodes is only possible through the "Interconnect". This results in different performance for local and remote resources. In contrast to NUMA we recognize the flat SMP system where no concept of local or remote resource exists. The disadvantage of high socket count SMP systems is that the shared bus can easily become a performance bottleneck under high activity. +-------------+-------+ +-------+-------------+ |NODE0| | | | | |NODE3| | | CPU00 | CPU03 | | CPU12 | CPU15 | | | | | | | | | | | Mem +--- Socket0 ---<-------->--- Socket3 ---+ Mem | | | | | | | | | +-----+ CPU01 | CPU02 | | CPU13 | CPU14 | | | I/O | | | | | | | +-----+-------^-------+ +-------^-------+-----+ | | | Interconnect | | | +-------------v-------+ +-------v-------------+ |NODE1| | | | | |NODE2| | | CPU04 | CPU07 | | CPU08 | CPU11 | | | | | | | | | | | Mem +--- Socket1 ---<-------->--- Socket2 ---+ Mem | | | | | | | | | +-----+ CPU05 | CPU06 | | CPU09 | CPU10 | | | I/O | | | | | | | +-----+-------+-------+ +-------+-------+-----+ NUMA adds an intermediate level of memory shared amongst a few cores per socket as illustrated above, so that data accesses do not have to travel over a single bus. Unfortunately the way NUMA does this adds its own limitations. This, as visualized in the illustration above, happens when data is stored in memory associated with Socket2 and is accessed by a CPU (core) in Socket0. The processors use the "Interconnect" path to access resource on other nodes. These "Interconnect" hops add data access delays. It is therefore in our interest to describe the relative distances between nodes. The relative distances between nodes are described in the system's SLIT (System Locality Distance Information Table) which is part of the ACPI (Advanced Configuration and Power Interface) specification. On Linux systems the SLIT detail can be listed with help of the 'numactl -H' command. The above guest would show the following output. [root@f25 ~]# numactl -H available: 4 nodes (0-3) node 0 cpus: 0 1 2 3 node 0 size: 2007 MB node 0 free: 1931 MB node 1 cpus: 4 5 6 7 node 1 size: 1951 MB node 1 free: 1902 MB node 2 cpus: 8 9 10 11 node 2 size: 1998 MB node 2 free: 1910 MB node 3 cpus: 12 13 14 15 node 3 size: 2015 MB node 3 free: 1907 MB node distances: node 0 1 2 3 0: 10 21 31 21 1: 21 10 21 31 2: 31 21 10 21 3: 21 31 21 10 These patches extend core libvirt's XML description of NUMA cells to include NUMA distance information and propagate it to Xen guests via libxl. Recently qemu landed support for constructing the SLIT since commit 0f203430dd ("numa: Allow setting NUMA distance for different NUMA nodes"). The core libvirt extensions in this patch set could be used to propagate NUMA distances to qemu quests in the future. Wim ten Have (4): numa: describe siblings distances within cells xenconfig: add domxml conversions for xen-xl libxl: vnuma support xlconfigtest: add tests for numa cell sibling distances docs/formatdomain.html.in | 63 +++- docs/schemas/basictypes.rng | 7 + docs/schemas/cputypes.rng | 18 ++ src/conf/numa_conf.c | 328 +++++++++++++++++++- src/conf/numa_conf.h | 25 ++ src/libvirt_private.syms | 5 + src/libxl/libxl_conf.c | 119 ++++++++ src/libxl/libxl_domain.c | 7 +- src/xenconfig/xen_xl.c | 335 +++++++++++++++++++++ tests/libxlxml2domconfigdata/basic-hvm.json | 95 +++++- tests/libxlxml2domconfigdata/basic-hvm.xml | 66 +++- tests/virmocklibxl.c | 13 + .../test-fullvirt-vnuma-autocomplete.cfg | 26 ++ .../test-fullvirt-vnuma-autocomplete.xml | 85 ++++++ .../test-fullvirt-vnuma-nodistances.cfg | 26 ++ .../test-fullvirt-vnuma-nodistances.xml | 53 ++++ .../test-fullvirt-vnuma-partialdist.cfg | 26 ++ .../test-fullvirt-vnuma-partialdist.xml | 60 ++++ tests/xlconfigdata/test-fullvirt-vnuma.cfg | 26 ++ tests/xlconfigdata/test-fullvirt-vnuma.xml | 81 +++++ tests/xlconfigtest.c | 6 + 21 files changed, 1461 insertions(+), 9 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.xml -- 2.13.6

3 11

[libvirt] [PATCH v4] vhost-user: add support reconnect for vhost-user ports
by ZhiPeng Lu 13 Nov '17

13 Nov '17

For vhost-user ports, Open vSwitch acts as the server and QEMU the client. When OVS crashes or restarts, the QEMU process should be reconnected to OVS. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v1->v2: - modify xml format v2->v3: - fix commit message syntax - reimplemente functions and the struct about reconnect v3->v4: - revert reimplemente functions and the struct about reconnect docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 26 ++-- src/conf/domain_conf.c | 158 ++++++++++++--------- .../qemuxml2argv-net-vhostuser-multiq.args | 12 +- .../qemuxml2argv-net-vhostuser-multiq.xml | 11 +- 5 files changed, 127 insertions(+), 87 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 92e14a9..7ea72ed 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5756,7 +5756,9 @@ qemu-kvm -net nic,model=? /dev/null </interface> <interface type='vhostuser'> <mac address='52:54:00:3b:83:1b'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> <model type='virtio'/> <driver queues='5'/> </interface> @@ -5772,6 +5774,9 @@ qemu-kvm -net nic,model=? /dev/null are supported. vhost-user requires the virtio model type, thus the <code><model></code> element is mandatory. + <span class="since">Since 3.10.0</span> the element has an optional + attribute <code>reconnect</code> which configures reconnect timeout + (in seconds) if the connection is lost. </p> <h5><a id="elementNwfilter">Traffic filtering with NWFilter</a></h5> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9cec1a0..66b9758 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2399,6 +2399,18 @@ </attribute> </optional> </define> + <define name="reconnect"> + <element name="reconnect"> + <attribute name="enabled"> + <ref name="virYesNo"/> + </attribute> + <optional> + <attribute name="timeout"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </define> <!-- An interface description can either be of type bridge in which case @@ -2460,6 +2472,9 @@ <value>client</value> </choice> </attribute> + <optional> + <ref name="reconnect"/> + </optional> <empty/> </element> <ref name="interface-options"/> @@ -3708,16 +3723,7 @@ </attribute> </optional> <optional> - <element name="reconnect"> - <attribute name="enabled"> - <ref name="virYesNo"/> - </attribute> - <optional> - <attribute name="timeout"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </element> + <ref name="reconnect"/> </optional> <zeroOrMore> <ref name='devSeclabel'/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f9ae057..be3374d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10584,6 +10584,56 @@ virDomainNetAppendIPAddress(virDomainNetDefPtr def, return -1; } +static int +virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + int ret = -1; + int tmpVal; + char *tmp = NULL; + xmlNodePtr saveNode = ctxt->node; + xmlNodePtr cur; + + ctxt->node = node; + + if ((cur = virXPathNode("./reconnect", ctxt))) { + if ((tmp = virXMLPropString(cur, "enabled"))) { + if ((tmpVal = virTristateBoolTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid reconnect enabled value: '%s'"), + tmp); + goto cleanup; + } + def->enabled = tmpVal; + VIR_FREE(tmp); + } + + if (def->enabled == VIR_TRISTATE_BOOL_YES) { + if ((tmp = virXMLPropString(cur, "timeout"))) { + if (virStrToLong_ui(tmp, NULL, 10, &def->timeout) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid reconnect timeout value: '%s'"), + tmp); + goto cleanup; + } + VIR_FREE(tmp); + } else { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing timeout for chardev with " + "reconnect enabled")); + goto cleanup; + } + } + } + + ret = 0; + cleanup: + ctxt->node = saveNode; + VIR_FREE(tmp); + return ret; +} + /* Parse the XML definition for a network interface * @param node XML nodeset to parse for net definition * @return 0 on success, -1 on failure @@ -10638,6 +10688,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; + virDomainChrSourceReconnectDef reconnect = {0}; int rv, val; if (VIR_ALLOC(def) < 0) @@ -10719,11 +10770,14 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } } else if (!vhostuser_path && !vhostuser_mode && !vhostuser_type - && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER && - virXMLNodeNameEqual(cur, "source")) { + && def->type == VIR_DOMAIN_NET_TYPE_VHOSTUSER + && virXMLNodeNameEqual(cur, "source")) { vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); + if (virDomainChrSourceReconnectDefParseXML(&reconnect, cur, ctxt) < 0) + goto error; + } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10945,8 +10999,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; + if (reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for <interface type='vhostuser'>")); + goto error; + } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; + def->data.vhostuser->data.nix.reconnect.enabled = reconnect.enabled; + def->data.vhostuser->data.nix.reconnect.timeout = reconnect.timeout; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -11608,57 +11670,6 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, return ret; } -static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, - xmlNodePtr node, - xmlXPathContextPtr ctxt) -{ - int ret = -1; - int tmpVal; - char *tmp = NULL; - xmlNodePtr saveNode = ctxt->node; - xmlNodePtr cur; - - ctxt->node = node; - - if ((cur = virXPathNode("./reconnect", ctxt))) { - if ((tmp = virXMLPropString(cur, "enabled"))) { - if ((tmpVal = virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect enabled value: '%s'"), - tmp); - goto cleanup; - } - def->enabled = tmpVal; - VIR_FREE(tmp); - } - - if (def->enabled == VIR_TRISTATE_BOOL_YES) { - if ((tmp = virXMLPropString(cur, "timeout"))) { - if (virStrToLong_ui(tmp, NULL, 10, &def->timeout) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect timeout value: '%s'"), - tmp); - goto cleanup; - } - VIR_FREE(tmp); - } else { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing timeout for chardev with " - "reconnect enabled")); - goto cleanup; - } - } - } - - ret = 0; - cleanup: - ctxt->node = saveNode; - VIR_FREE(tmp); - return ret; -} - - typedef enum { VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT, VIR_DOMAIN_CHR_SOURCE_MODE_BIND, @@ -23399,6 +23410,21 @@ virDomainVirtioNetDriverFormat(char **outstr, return 0; } +static void +virDomainChrSourceReconnectDefFormat(virBufferPtr buf, + virDomainChrSourceReconnectDefPtr def) +{ + if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) + return; + + virBufferAsprintf(buf, "<reconnect enabled='%s'", + virTristateBoolTypeToString(def->enabled)); + + if (def->enabled == VIR_TRISTATE_BOOL_YES) + virBufferAsprintf(buf, " timeout='%u'", def->timeout); + + virBufferAddLit(buf, "/>\n"); +} int virDomainNetDefFormat(virBufferPtr buf, @@ -23493,6 +23519,14 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.vhostuser->data.nix.listen ? "server" : "client"); sourceLines++; + if (def->data.vhostuser->data.nix.reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + virBufferAdjustIndent(buf, 2); + virDomainChrSourceReconnectDefFormat(buf, &def->data.vhostuser->data.nix.reconnect); + virBufferAdjustIndent(buf, -2); + } + } break; @@ -23725,24 +23759,6 @@ virDomainChrAttrsDefFormat(virBufferPtr buf, return 0; } - -static void -virDomainChrSourceReconnectDefFormat(virBufferPtr buf, - virDomainChrSourceReconnectDefPtr def) -{ - if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) - return; - - virBufferAsprintf(buf, "<reconnect enabled='%s'", - virTristateBoolTypeToString(def->enabled)); - - if (def->enabled == VIR_TRISTATE_BOOL_YES) - virBufferAsprintf(buf, " timeout='%u'", def->timeout); - - virBufferAddLit(buf, "/>\n"); -} - - static int virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefPtr def, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index b69ebd8..f2aec7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -32,7 +32,11 @@ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock \ --netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ --device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ -mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 +-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=10 \ +-netdev vhost-user,chardev=charnet3,id=hostnet3 \ +-device virtio-net-pci,netdev=hostnet3,id=net3,\ +mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 \ +-chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \ +-netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \ +-device virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,\ +mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x7 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index d5c42fe..a30cce6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -40,7 +40,16 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> + <model type='virtio'/> + </interface> + <interface type='vhostuser'> + <mac address='52:54:00:ee:96:6e'/> + <source type='unix' path='/tmp/vhost3.sock' mode='client'> + <reconnect enabled='no'/> + </source> <model type='virtio'/> <driver queues='4'/> </interface> -- 1.8.3.1

1 0