- Devel - libvirt List Archives

[libvirt] [PATCH go-xml] Added Storage Pool XML scheme.
by Alexey Slaykovsky 05 Jan '17

05 Jan '17

Signed-off-by: Alexey Slaykovsky <aslaikov(a)redhat.com> --- storage.go | 114 +++++++++++++++++++++++++++ storage_test.go | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 354 insertions(+) create mode 100644 storage.go create mode 100644 storage_test.go diff --git a/storage.go b/storage.go new file mode 100644 index 0000000..b45f58e --- /dev/null +++ b/storage.go @@ -0,0 +1,114 @@ +/* + * 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 Red Hat, Inc. + * + */ + +package libvirtxml + +import "encoding/xml" + +type StoragePoolTargetPermissions struct { + Owner string `xml:"owner"` + Group string `xml:"group"` + Mode string `xml:"mode"` + Label string `xml:"label"` +} + +type StoragePoolTarget struct { + Path string `xml:"path"` + Permissions *StoragePoolTargetPermissions `xml:"permissions"` +} + +type StoragePoolSourceHost struct { + Name string `xml:"name,attr"` +} + +type StoragePoolSourceDevice struct { + Path string `xml:"path,attr"` + PartSeparator string `xml:"part_separator,attr,omitempty"` +} + +type StoragePoolSourceAuthSecret struct { + Usage string `xml:"usage,attr"` +} + +type StoragePoolSourceAuth struct { + Type string `xml:"type,attr"` + Username string `xml:"username,attr"` + Secret *StoragePoolSourceAuthSecret `xml:"secret"` +} + +type StoragePoolSourceVendor struct { + Name string `xml:"name,attr"` +} + +type StoragePoolSourceProduct struct { + Name string `xml:"name,attr"` +} + +type StoragePoolSourceFormat struct { + Type string `xml:"type,attr"` +} + +type StoragePoolSourceAdapterParentAddrAddress struct { + Domain string `xml:"domain,attr"` + Bus string `xml:"bus,attr"` + Slot string `xml:"slot,attr"` + Addr string `xml:"addr,attr"` +} + +type StoragePoolSourceAdapterParentAddr struct { + UniqueID uint64 `xml:"unique_id,attr"` + Address *StoragePoolSourceAdapterParentAddrAddress `xml:"address"` +} + +type StoragePoolSourceAdapter struct { + Type string `xml:"type,attr"` + Name string `xml:"name,attr,omitempty"` + Parent string `xml:"parent,attr,omitempty"` + WWNN string `xml:"wwnn,attr,omitempty"` + WWPN string `xml:"wwpn,attr,omitempty"` + ParentAddr *StoragePoolSourceAdapterParentAddr `xml:"parentaddr"` +} + +type StoragePoolSource struct { + Host *StoragePoolSourceHost `xml:"host"` + Device *StoragePoolSourceDevice `xml:"device"` + Auth *StoragePoolSourceAuth `xml:"auth"` + Vendor *StoragePoolSourceVendor `xml:"vendor"` + Product *StoragePoolSourceProduct `xml:"product"` + Format *StoragePoolSourceFormat `xml:"format"` + Adapter *StoragePoolSourceAdapter `xml:"adapter"` +} + +type StoragePool struct { + XMLName xml.Name `xml:"pool"` + Type string `xml:"type,attr"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Allocation uint64 `xml:"allocation,omitempty"` + Capacity uint64 `xml:"capacity,omitempty"` + Available uint64 `xml:"available,omitempty"` + Target *StoragePoolTarget `xml:"target"` + Source *StoragePoolSource `xml:"source"` +} diff --git a/storage_test.go b/storage_test.go new file mode 100644 index 0000000..f08eefe --- /dev/null +++ b/storage_test.go @@ -0,0 +1,240 @@ +/* + * 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 Red Hat, Inc. + * + */ + +package libvirtxml + +import ( + "encoding/xml" + "strings" + "testing" +) + +var storageTestData = []struct { + Object *StoragePool + Expected []string +}{ + { + Object: &StoragePool{ + Type: "dir", + Name: "pool", + UUID: "3e3fce45-4f53-4fa7-bb32-11f34168b82b", + Allocation: 1000000, + Capacity: 5000000, + Available: 3000000, + }, + Expected: []string{ + `<pool type="dir">`, + ` <name>pool</name>`, + ` <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>`, + ` <allocation>1000000</allocation>`, + ` <capacity>5000000</capacity>`, + ` <available>3000000</available>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "iscsi", + Name: "pool", + Source: &StoragePoolSource{ + Host: &StoragePoolSourceHost{ + Name: "host.example.com", + }, + Device: &StoragePoolSourceDevice{ + Path: "pool.example.com:iscsi-pool", + }, + Auth: &StoragePoolSourceAuth{ + Type: "chap", + Username: "username", + Secret: &StoragePoolSourceAuthSecret{ + Usage: "cluster", + }, + }, + Vendor: &StoragePoolSourceVendor{ + Name: "vendor", + }, + Product: &StoragePoolSourceProduct{ + Name: "product", + }, + }, + }, + Expected: []string{ + `<pool type="iscsi">`, + ` <name>pool</name>`, + ` <source>`, + ` <host name="host.example.com"></host>`, + ` <device path="pool.example.com:iscsi-pool"></device>`, + ` <auth type="chap" username="username">`, + ` <secret usage="cluster"></secret>`, + ` </auth>`, + ` <vendor name="vendor"></vendor>`, + ` <product name="product"></product>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "disk", + Name: "pool", + Source: &StoragePoolSource{ + Device: &StoragePoolSourceDevice{ + Path: "/dev/mapper/pool", + PartSeparator: "no", + }, + Format: &StoragePoolSourceFormat{ + Type: "gpt", + }, + }, + }, + Expected: []string{ + `<pool type="disk">`, + ` <name>pool</name>`, + ` <source>`, + ` <device path="/dev/mapper/pool" part_separator="no"></device>`, + ` <format type="gpt"></format>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "scsi", + Name: "pool", + Source: &StoragePoolSource{ + Adapter: &StoragePoolSourceAdapter{ + Type: "scsi_host", + Name: "scsi_host", + }, + }, + }, + Expected: []string{ + `<pool type="scsi">`, + ` <name>pool</name>`, + ` <source>`, + ` <adapter type="scsi_host" name="scsi_host"></adapter>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "scsi", + Name: "pool", + Source: &StoragePoolSource{ + Adapter: &StoragePoolSourceAdapter{ + Type: "scsi_host", + ParentAddr: &StoragePoolSourceAdapterParentAddr{ + UniqueID: 1, + Address: &StoragePoolSourceAdapterParentAddrAddress{ + Domain: "0x0000", + Bus: "0x00", + Slot: "0x1f", + Addr: "0x2", + }, + }, + }, + }, + }, + Expected: []string{ + `<pool type="scsi">`, + ` <name>pool</name>`, + ` <source>`, + ` <adapter type="scsi_host">`, + ` <parentaddr unique_id="1">`, + ` <address domain="0x0000" bus="0x00" slot="0x1f" addr="0x2"></address>`, + ` </parentaddr>`, + ` </adapter>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "fs", + Name: "pool", + Source: &StoragePoolSource{ + Adapter: &StoragePoolSourceAdapter{ + Type: "fc_host", + Parent: "scsi_parent", + WWNN: "20000000c9831b4b", + WWPN: "10000000c9831b4b", + }, + }, + }, + Expected: []string{ + `<pool type="fs">`, + ` <name>pool</name>`, + ` <source>`, + ` <adapter type="fc_host" parent="scsi_parent" wwnn="20000000c9831b4b" wwpn="10000000c9831b4b"></adapter>`, + ` </source>`, + `</pool>`, + }, + }, + { + Object: &StoragePool{ + Type: "dir", + Name: "pool", + Target: &StoragePoolTarget{ + Path: "/pool", + Permissions: &StoragePoolTargetPermissions{ + Owner: "1", + Group: "1", + Mode: "0744", + Label: "pool", + }, + }, + }, + Expected: []string{ + `<pool type="dir">`, + ` <name>pool</name>`, + ` <target>`, + ` <path>/pool</path>`, + ` <permissions>`, + ` <owner>1</owner>`, + ` <group>1</group>`, + ` <mode>0744</mode>`, + ` <label>pool</label>`, + ` </permissions>`, + ` </target>`, + `</pool>`, + }, + }, +} + +func TestStorage(t *testing.T) { + for _, test := range storageTestData { + doc, err := xml.MarshalIndent(test.Object, "", " ") + if err != nil { + t.Fatal(err) + } + + expect := strings.Join(test.Expected, "\n") + + if string(doc) != expect { + t.Fatal("Bad xml:\n", string(doc), "\n does not match\n", expect, "\n") + } + } +} -- 2.11.0

3 2

[libvirt] [PATCH] docs: Reference the right config option
by Martin Kletzander 05 Jan '17

05 Jan '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial docs/auth.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index 487c3aad798b..08feacc2e313 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -173,7 +173,7 @@ the libvirt daemon. <h2><a name="ACL_server_polkit">UNIX socket PolicyKit auth</a></h2> <p> If libvirt contains support for PolicyKit, then access control options are -more advanced. The <code>unix_sock_auth</code> parameter will default to +more advanced. The <code>auth_unix_rw</code> parameter will default to <code>polkit</code>, and the file permissions will default to <code>0777</code> even on the RW socket. Upon connecting to the socket, the client application will be required to identify itself with PolicyKit. The default policy for the -- 2.11.0

1 0

[libvirt] [PATCH 0/2] Fix some nits
by Martin Kletzander 05 Jan '17

05 Jan '17

Martin Kletzander (2): util: Don't lie in virFileGetMount*Subtree's docstrings qemu: Remove /dev mount info properly src/qemu/qemu_domain.c | 9 ++++----- src/util/virfile.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) -- 2.11.0

2 3

[libvirt] [libivrt] storage: Two iSCSI node records may cause refreshing iscsi pool failed
by Shichangkuo 05 Jan '17

05 Jan '17

Hi, John When starting an iscsi storage pool, libvirt will execute “iscsiadm --mode node --portal 192.168.0.42 --targetname iqn.2003-10.com.xxxx --op new”, which is called by virISCSINodeNew. This will add an iSCSI node record. The record file is /etc/iscsi/nodes/iqn.2003-10.com.xxxx/192.168.0.42,3260. When we already executed "iscsiadm --mode discovery --type sendtargets --portal 192.168.0.42 --op new", another iSCSI node record will be produced in /etc/iscsi/nodes/iqn.2003-10.com.xxxx/192.168.0.42,3260,1/default. Then two iscsi sessions, as [2] and [3], will be logged in when we start the pool. Device of session [2] is /dev/sde, and device of session [3] is /dev/sdf. But there is only one path in /dev/disk/by-path, let's assume it is /dev/sdf. Refreshing storage pool will choose first session, like [2], and libvirt will find sde NOT sdf in /dev/disk/by-path. We will not find sde, then no volumes is found in the pool. I think the root reason is we have two iSCSI node records. Can we use "iscsiadm --mode discovery --type sendtargets --portal 192.168.0.42 --op new" in virISCSINodeNew? diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 504ffbd..a8a8644 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -469,9 +469,9 @@ virISCSINodeNew(const char *portal, int ret = -1; cmd = virCommandNewArgList(ISCSIADM, - "--mode", "node", + "--mode", "discovery", + "--type", "sendtargets", "--portal", portal, - "--targetname", target, "--op", "new", NULL); Thanks, Changkuo. ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有杭州华三通信技术有限公司的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

2 1

[libvirt] [PATCH] internal: Simplify STREQ_NULLABLE
by Michal Privoznik 05 Jan '17

05 Jan '17

Our STREQ_NULLABLE and STRNEQ_NULLABLE macros are too complicated. This was a result of some broken version of gcc. However, that is long gone and therefore we can simplify the macros. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/internal.h | 4 ++-- tests/virstringtest.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/internal.h b/src/internal.h index d8cc5adc3..334659d32 100644 --- a/src/internal.h +++ b/src/internal.h @@ -92,9 +92,9 @@ # define STRSKIP(a, b) (STRPREFIX(a, b) ? (a) + strlen(b) : NULL) # define STREQ_NULLABLE(a, b) \ - ((a) ? (b) && STREQ((a) ? (a) : "", (b) ? (b) : "") : !(b)) + ((a) ? (b) && STREQ((a), (b)) : !(b)) # define STRNEQ_NULLABLE(a, b) \ - ((a) ? !(b) || STRNEQ((a) ? (a) : "", (b) ? (b) : "") : !!(b)) + ((a) ? !(b) || STRNEQ((a), (b)) : !!(b)) # define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) # define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array))) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 1d660b798..db1731f96 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -34,6 +34,53 @@ VIR_LOG_INIT("tests.stringtest"); +struct testStreqData { + const char *a; + const char *b; +}; + +static int testStreq(const void *args) +{ + const struct testStreqData *data = args; + int ret = -1; + bool equal = true; + bool streq_rv, strneq_rv; + size_t i; + + if ((size_t) data->a ^ (size_t) data->b) + equal = false; + if (data->a && data->b) { + for (i = 0; data->a[i] != '\0'; i++) { + if (data->b[i] == '\0' || + data->a[i] != data->b[i]) { + equal = false; + break; + } + } + } + + streq_rv = STREQ_NULLABLE(data->a, data->b); + strneq_rv = STRNEQ_NULLABLE(data->a, data->b); + + if (streq_rv != equal) { + virFilePrintf(stderr, + "STREQ not working correctly. Expected %d got %d", + (int) equal, (int) streq_rv); + goto cleanup; + } + + if (strneq_rv == equal) { + virFilePrintf(stderr, + "STRNEQ not working correctly. Expected %d got %d", + (int) equal, (int) strneq_rv); + goto cleanup; + } + + ret = 0; + cleanup: + return ret; +} + struct testSplitData { const char *string; const char *delim; @@ -651,6 +698,20 @@ mymain(void) { int ret = 0; +#define TEST_STREQ(aa, bb) \ + do { \ + struct testStreqData streqData = {.a = aa, .b = bb}; \ + if (virTestRun("Streq", testStreq, &streqData) < 0) \ + ret = -1; \ + } while (0) + + TEST_STREQ("hello", "world"); + TEST_STREQ(NULL, NULL); + TEST_STREQ(NULL, ""); + TEST_STREQ("", NULL); + TEST_STREQ("", ""); + TEST_STREQ("hello", "hello"); + #define TEST_SPLIT(str, del, max, toks) \ do { \ struct testSplitData splitData = { \ -- 2.11.0

2 2

[libvirt] [PATCH 0/3] Improve release notes process
by Andrea Bolognani 05 Jan '17

05 Jan '17

The release note process we have had in place since v2.5.0 was never meant to be anything more than a stop-gap measure until a better solution was devised. I believe this series implements exactly that better solution :) Andrea Bolognani (3): NEWS: Improve building pipeline NEWS: Reformat at generation time docs: Document the release notes process for contributors .gitignore | 1 + Makefile.am | 16 ++-- docs/Makefile.am | 22 ++++- docs/NEWS.xsl | 61 +++++++++++++ docs/hacking.html.in | 8 ++ docs/news.html.in | 157 -------------------------------- docs/news.xml | 241 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/news.xsl | 103 ++++++++++++++------- docs/reformat-news.py | 111 +++++++++++++++++++++++ 9 files changed, 521 insertions(+), 199 deletions(-) create mode 100644 docs/NEWS.xsl delete mode 100644 docs/news.html.in create mode 100644 docs/news.xml create mode 100755 docs/reformat-news.py -- 2.7.4

2 12

[libvirt] [PATCH go-xml] Added domain OS struct and tests
by Alexey Slaykovsky 05 Jan '17

05 Jan '17

Signed-off-by: Alexey Slaykovsky <aslaikov(a)redhat.com> --- domain.go | 68 ++++++++++++++++++++++++ domain_test.go | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+) diff --git a/domain.go b/domain.go index c98908e..ec2bd02 100644 --- a/domain.go +++ b/domain.go @@ -126,6 +126,69 @@ type DomainMemory struct { Unit string `xml:"unit,attr"` } +type DomainOSType struct { + Arch string `xml:"arch,attr"` + Machine string `xml:"machine,attr"` + Type string `xml:",chardata"` +} + +type DomainSMBios struct { + Mode string `xml:"mode,attr"` +} + +type DomainNVRam struct { + NVRam string `xml:",chardata"` + Template string `xml:"template,attr"` +} + +type DomainBootDevice struct { + Dev string `xml:"dev,attr"` +} + +type DomainBootMenu struct { + Enabled string `xml:"enabled,attr"` + Timeout string `xml:"timeout,attr"` +} + +type DomainSysInfo struct { + Type string `xml:"type,attr"` + System []DomainSysInfoEntry `xml:"system>entry"` + BIOS []DomainSysInfoEntry `xml:"bios>entry"` + BaseBoard []DomainSysInfoEntry `xml:"baseBoard>entry"` +} + +type DomainSysInfoEntry struct { + Name string `xml:"name,attr"` + Value string `xml:",chardata"` +} + +type DomainBIOS struct { + UseSerial string `xml:"useserial,attr"` + RebootTimeout string `xml:"rebootTimeout,attr"` +} + +type DomainLoader struct { + Path string `xml:",chardata"` + Readonly string `xml:"readonly,attr"` + Secure string `xml:"secure,attr"` + Type string `xml:"type,attr"` +} + +type DomainOS struct { + Type *DomainOSType `xml:"type"` + Loader *DomainLoader `xml:"loader"` + NVRam *DomainNVRam `xml:"nvram"` + Kernel string `xml:"kernel,omitempty"` + Initrd string `xml:"initrd,omitempty"` + KernelArgs string `xml:"cmdline,omitempty"` + BootDevices []DomainBootDevice `xml:"boot"` + BootMenu *DomainBootMenu `xml:"bootmenu"` + SMBios *DomainSMBios `xml:"smbios"` + BIOS *DomainBIOS `xml:"bios"` + Init string `xml:"init,omitempty"` + InitArgs []string `xml:"initarg"` +} + type Domain struct { XMLName xml.Name `xml:"domain"` Type string `xml:"type,attr"` @@ -134,4 +197,9 @@ type Domain struct { Memory *DomainMemory `xml:"memory"` CurrentMemory *DomainMemory `xml:"currentMemory"` Devices *DomainDeviceList `xml:"devices"` + OS *DomainOS `xml:"os"` + SysInfo *DomainSysInfo `xml:"sysinfo"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` } diff --git a/domain_test.go b/domain_test.go index e403aeb..ae262e5 100644 --- a/domain_test.go +++ b/domain_test.go @@ -121,6 +121,170 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Memory: &DomainMemory{ + Unit: "KiB", + Value: "8192", + }, + CurrentMemory: &DomainMemory{ + Unit: "KiB", + Value: "4096", + }, + OS: &DomainOS{ + Type: &DomainOSType{ + Arch: "x86_64", + Machine: "pc", + Type: "hvm", + }, + BootDevices: []DomainBootDevice{ + DomainBootDevice{ + Dev: "hd", + }, + }, + Loader: &DomainLoader{ + Readonly: "yes", + Secure: "no", + Type: "rom", + Path: "/loader", + }, + SMBios: &DomainSMBios{ + Mode: "sysinfo", + }, + BIOS: &DomainBIOS{ + UseSerial: "yes", + RebootTimeout: "0", + }, + Init: "/bin/systemd", + InitArgs: []string{ + "--unit", + "emergency.service", + }, + }, + SysInfo: &DomainSysInfo{ + Type: "smbios", + BIOS: []DomainSysInfoEntry{ + DomainSysInfoEntry{ + Name: "vendor", + Value: "vendor", + }, + }, + System: []DomainSysInfoEntry{ + DomainSysInfoEntry{ + Name: "manufacturer", + Value: "manufacturer", + }, + DomainSysInfoEntry{ + Name: "product", + Value: "product", + }, + DomainSysInfoEntry{ + Name: "version", + Value: "version", + }, + }, + BaseBoard: []DomainSysInfoEntry{ + DomainSysInfoEntry{ + Name: "manufacturer", + Value: "manufacturer", + }, + DomainSysInfoEntry{ + Name: "product", + Value: "product", + }, + DomainSysInfoEntry{ + Name: "version", + Value: "version", + }, + DomainSysInfoEntry{ + Name: "serial", + Value: "serial", + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <memory unit="KiB">8192</memory>`, + ` <currentMemory unit="KiB">4096</currentMemory>`, + ` <os>`, + ` <type arch="x86_64" machine="pc">hvm</type>`, + ` <loader readonly="yes" secure="no" type="rom">/loader</loader>`, + ` <boot dev="hd"></boot>`, + ` <smbios mode="sysinfo"></smbios>`, + ` <bios useserial="yes" rebootTimeout="0"></bios>`, + ` <init>/bin/systemd</init>`, + ` <initarg>--unit</initarg>`, + ` <initarg>emergency.service</initarg>`, + ` </os>`, + ` <sysinfo type="smbios">`, + ` <system>`, + ` <entry name="manufacturer">manufacturer</entry>`, + ` <entry name="product">product</entry>`, + ` <entry name="version">version</entry>`, + ` </system>`, + ` <bios>`, + ` <entry name="vendor">vendor</entry>`, + ` </bios>`, + ` <baseBoard>`, + ` <entry name="manufacturer">manufacturer</entry>`, + ` <entry name="product">product</entry>`, + ` <entry name="version">version</entry>`, + ` <entry name="serial">serial</entry>`, + ` </baseBoard>`, + ` </sysinfo>`, + `</domain>`, + }, + }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + OS: &DomainOS{ + NVRam: &DomainNVRam{ + Template: "/t.fd", + NVRam: "/vars.fd", + }, + BootMenu: &DomainBootMenu{ + Enabled: "yes", + Timeout: "3000", + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <os>`, + ` <nvram template="/t.fd">/vars.fd</nvram>`, + ` <bootmenu enabled="yes" timeout="3000"></bootmenu>`, + ` </os>`, + `</domain>`, + }, + }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + OS: &DomainOS{ + Kernel: "/vmlinuz", + Initrd: "/initrd", + KernelArgs: "arg", + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <os>`, + ` <kernel>/vmlinuz</kernel>`, + ` <initrd>/initrd</initrd>`, + ` <cmdline>arg</cmdline>`, + ` </os>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.11.0

3 2

[libvirt] [PATCH go-xml] Added domain OS struct and tests
by Alexey Slaykovsky 05 Jan '17

05 Jan '17

Signed-off-by: Alexey Slaykovsky <aslaikov(a)redhat.com> --- domain.go | 68 ++++++++++++++++++++++++ domain_test.go | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+) diff --git a/domain.go b/domain.go index c98908e..25155ee 100644 --- a/domain.go +++ b/domain.go @@ -126,6 +126,69 @@ type DomainMemory struct { Unit string `xml:"unit,attr"` } +type DomainOSType struct { + Arch string `xml:"arch,attr"` + Machine string `xml:"machine,attr"` + Type string `xml:",chardata"` +} + +type DomainSMBios struct { + Mode string `xml:"mode,attr"` +} + +type DomainNVRam struct { + NVRam string `xml:",chardata"` + Template string `xml:"template,attr,omitempty"` +} + +type DomainBootDevice struct { + Dev string `xml:"dev,attr"` +} + +type DomainBootMenu struct { + Enabled string `xml:"enabled,attr"` + Timeout string `xml:"timeout,attr,omitempty"` +} + +type DomainSysInfo struct { + Type string `xml:"type,attr"` + System []DomainEntry `xml:"system>entry"` + BIOS []DomainEntry `xml:"bios>entry"` + BaseBoard []DomainEntry `xml:"baseBoard>entry"` +} + +type DomainEntry struct { + Name string `xml:"name,attr"` + Value string `xml:",chardata"` +} + +type DomainBIOS struct { + UseSerial string `xml:"useserial,attr"` + RebootTimeout string `xml:"rebootTimeout,attr"` +} + +type DomainLoader struct { + Path string `xml:",chardata"` + Readonly string `xml:"readonly,attr"` + Secure string `xml:"secure,attr"` + Type string `xml:"type,attr"` +} + +type DomainOS struct { + Type *DomainOSType `xml:"type"` + Loader *DomainLoader `xml:"loader,omitempty"` + NVRam *DomainNVRam `xml:"nvram"` + Kernel string `xml:"kernel,omitempty"` + Initrd string `xml:"initrd,omitempty"` + KernelArgs string `xml:"cmdline,omitempty"` + BootDevices []DomainBootDevice `xml:"boot"` + BootMenu *DomainBootMenu `xml:"bootmenu,omitempty"` + SMBios *DomainSMBios `xml:"smbios,omitempty"` + BIOS *DomainBIOS `xml:"bios,omitempty"` + Init string `xml:"init,omitempty"` + InitArgs []string `xml:"initarg,omitempty"` +} + type Domain struct { XMLName xml.Name `xml:"domain"` Type string `xml:"type,attr"` @@ -134,4 +197,9 @@ type Domain struct { Memory *DomainMemory `xml:"memory"` CurrentMemory *DomainMemory `xml:"currentMemory"` Devices *DomainDeviceList `xml:"devices"` + OS *DomainOS `xml:"os,omitempty"` + SysInfo *DomainSysInfo `xml:"sysinfo,omitempty"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` } diff --git a/domain_test.go b/domain_test.go index e403aeb..8ee9699 100644 --- a/domain_test.go +++ b/domain_test.go @@ -121,6 +121,170 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Memory: &DomainMemory{ + Unit: "KiB", + Value: "8192", + }, + CurrentMemory: &DomainMemory{ + Unit: "KiB", + Value: "4096", + }, + OS: &DomainOS{ + Type: &DomainOSType{ + Arch: "x86_64", + Machine: "pc", + Type: "hvm", + }, + BootDevices: []DomainBootDevice{ + DomainBootDevice{ + Dev: "hd", + }, + }, + Loader: &DomainLoader{ + Readonly: "yes", + Secure: "no", + Type: "rom", + Path: "/loader", + }, + SMBios: &DomainSMBios{ + Mode: "sysinfo", + }, + BIOS: &DomainBIOS{ + UseSerial: "yes", + RebootTimeout: "0", + }, + Init: "/bin/systemd", + InitArgs: []string{ + "--unit", + "emergency.service", + }, + }, + SysInfo: &DomainSysInfo{ + Type: "smbios", + BIOS: []DomainEntry{ + DomainEntry{ + Name: "vendor", + Value: "vendor", + }, + }, + System: []DomainEntry{ + DomainEntry{ + Name: "manufacturer", + Value: "manufacturer", + }, + DomainEntry{ + Name: "product", + Value: "product", + }, + DomainEntry{ + Name: "version", + Value: "version", + }, + }, + BaseBoard: []DomainEntry{ + DomainEntry{ + Name: "manufacturer", + Value: "manufacturer", + }, + DomainEntry{ + Name: "product", + Value: "product", + }, + DomainEntry{ + Name: "version", + Value: "version", + }, + DomainEntry{ + Name: "serial", + Value: "serial", + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <memory unit="KiB">8192</memory>`, + ` <currentMemory unit="KiB">4096</currentMemory>`, + ` <os>`, + ` <type arch="x86_64" machine="pc">hvm</type>`, + ` <loader readonly="yes" secure="no" type="rom">/loader</loader>`, + ` <boot dev="hd"></boot>`, + ` <smbios mode="sysinfo"></smbios>`, + ` <bios useserial="yes" rebootTimeout="0"></bios>`, + ` <init>/bin/systemd</init>`, + ` <initarg>--unit</initarg>`, + ` <initarg>emergency.service</initarg>`, + ` </os>`, + ` <sysinfo type="smbios">`, + ` <system>`, + ` <entry name="manufacturer">manufacturer</entry>`, + ` <entry name="product">product</entry>`, + ` <entry name="version">version</entry>`, + ` </system>`, + ` <bios>`, + ` <entry name="vendor">vendor</entry>`, + ` </bios>`, + ` <baseBoard>`, + ` <entry name="manufacturer">manufacturer</entry>`, + ` <entry name="product">product</entry>`, + ` <entry name="version">version</entry>`, + ` <entry name="serial">serial</entry>`, + ` </baseBoard>`, + ` </sysinfo>`, + `</domain>`, + }, + }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + OS: &DomainOS{ + NVRam: &DomainNVRam{ + Template: "/t.fd", + NVRam: "/vars.fd", + }, + BootMenu: &DomainBootMenu{ + Enabled: "yes", + Timeout: "3000", + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <os>`, + ` <nvram template="/t.fd">/vars.fd</nvram>`, + ` <bootmenu enabled="yes" timeout="3000"></bootmenu>`, + ` </os>`, + `</domain>`, + }, + }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + OS: &DomainOS{ + Kernel: "/vmlinuz", + Initrd: "/initrd", + KernelArgs: "arg", + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <os>`, + ` <kernel>/vmlinuz</kernel>`, + ` <initrd>/initrd</initrd>`, + ` <cmdline>arg</cmdline>`, + ` </os>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.11.0

3 2

[libvirt] libvirt failed to spawn with namespace
by Qiao, Liyong 05 Jan '17

05 Jan '17

Hi Michal Build with the latest libvirt source code, I found failed to spawn a qemu process, not sure if something wrong with my environment, can you please help to take a look at it? After build the latest (3.0.0) libvirt, found failed to start an existed domain. root@s2600wt:/home/taget/qemu# virsh start kvm02 error: Failed to start domain kvm02 error: internal error: Process exited prior to exec: libvirt: QEMU Driver error : Unable to move /dev/mqueue mount: Invalid argument then I found you had some code get merged, and required to use /dev/mqueue so mount it then start the domain again: mount -t mqueue none /dev/mqueue root@s2600wt:/home/taget/qemu# virsh start kvm02 error: Failed to start domain kvm02 error: An error occurred, but the cause is unknown some debug log are: … 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/var/run/libvirt/qemu/kvm02.dev/ mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakeParentPath:2971 : path=/var/run/libvirt/qemu/kvm02.dev//hpet 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/var/run/libvirt/qemu/kvm02.dev/ mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakeParentPath:2971 : path=/var/run/libvirt/qemu/kvm02.dev//vfio/vfio 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/var/run/libvirt/qemu/kvm02.dev//vfio mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/var/run/libvirt/qemu/kvm02.dev/ mode=0777 2017-01-05 07:48:44.195+0000: 37227: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7f7dc812fad0 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllDisks:7076 : Setting up disks 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllDisks:7085 : Setup all disks 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllHostdevs:7124 : Setting up hostdevs 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllHostdevs:7131 : Setup all hostdevs 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllChardevs:7155 : Setting up chardevs 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllChardevs:7163 : Setup all chardevs 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllInputs:7231 : Setting up disks 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllInputs:7238 : Setup all disks 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllRNGs:7270 : Setting up RNGs 2017-01-05 07:48:44.195+0000: 37227: debug : qemuDomainSetupAllRNGs:7278 : Setup all RNGs 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/dev/pts mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/dev mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/dev/shm mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/dev mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/dev/mqueue mode=0777 2017-01-05 07:48:44.195+0000: 37227: debug : virFileMakePathHelper:2899 : path=/dev mode=0777 2017-01-05 07:48:44.195+0000: 37227: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7f7dc812fad0 2017-01-05 07:48:44.195+0000: 37227: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7f7dc812fad0 2017-01-05 07:48:44.195+0000: 37227: debug : qemuProcessHook:2693 : Hook complete ret=0 2017-01-05 07:48:44.195+0000: 37227: debug : virExec:699 : Done hook 0 2017-01-05 07:48:44.195+0000: 37227: debug : virExec:736 : Setting child uid:gid to 0:0 with caps 0 2017-01-05 07:48:44.195+0000: 37227: debug : virCommandHandshakeChild:435 : Notifying parent for handshake start on 25 2017-01-05 07:48:44.195+0000: 37227: debug : virCommandHandshakeChild:443 : Waiting on parent for handshake complete on 26 libvirt: error : libvirtd quit during handshake: Input/output error 2017-01-05 07:48:44.216+0000: shutting down, reason=failed /\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ I work on the latest libvirt git tree. commit 866641d4c5706413393913fdb3bb1cd077683d21 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Sat Dec 24 17:55:48 2016 +0100 NEWS: Update after qemu namespace fix Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> Best Regards Eli Qiao(乔立勇）OpenStack Core team OTC Intel. --

2 4

[libvirt] [PATCH] qemuProcessLaunch: fix indentation
by Michal Privoznik 05 Jan '17

05 Jan '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7d283fb5f7..d8593ba837 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5582,10 +5582,10 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; VIR_DEBUG("Setting domain security labels"); - if (qemuSecuritySetAllLabel(driver, - vm, - incoming ? incoming->path : NULL) < 0) - goto cleanup; + if (qemuSecuritySetAllLabel(driver, + vm, + incoming ? incoming->path : NULL) < 0) + goto cleanup; /* Security manager labeled all devices, therefore * if any operation from now on fails, we need to ask the caller to -- 2.11.0

1 0

[libvirt] Loosing lxc guests when restarting libvirt
by Christian Ehrhardt 05 Jan '17

05 Jan '17

Hi, I found an issue in libvirt related to libvirt-lxc, but fail to find the root cause. The TL;DR is: libvirt-lxc guests get killed on libvirt restart due to "internal error: No valid cgroup for machine" It was able to reproduce libvirt 1.3.1, 2.4 and 2.5 as packages in Ubuntu and Debian. I wanted to ask for two things: - wider coverage where this does reproduce - your expertise on the case itself. Steps to reproduce: 1. Spawn new KVM Guest of your choice 2. install test dependencies $ apt-get install libvirt-daemon-system libvirt-clients libxml2-utils # or package managers / package names of your chosen os 3. run the following sequence as root export LIBVIRT_DEFAULT_URI=lxc:/// cat << EOF > /tmp/smoke-lxc.xml <domain type='lxc'> <name>sl</name> <memory unit='KiB'>256000</memory> <currentMemory unit='KiB'>256000</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type>exe</type> <init>/bin/bash</init> </os> <features> <privnet/> </features> <clock offset='utc'/> <devices> <emulator>/usr/lib/libvirt/libvirt_lxc</emulator> <filesystem type='mount' accessmode='passthrough'> <source dir='/'/> <target dir='/'/> </filesystem> <console type='pty'> <target type='lxc' port='0'/> </console> </devices> </domain> EOF virsh define /tmp/smoke-lxc.xml virsh start sl virsh list --all # is running now /etc/init.d/libvirtd restart virsh list --all # is no more running, but it should Way more background and detail can be found at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848317 -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

4 5

[libvirt] [PATCH] Changes to support Veritas HyperScale (VxHS) block device protocol with qemu-kvm
by Ashish Mittal 05 Jan '17

05 Jan '17

Sample XML for a vxhs vdisk is as follows: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'> <host name='192.168.0.1' port='9999'/> </source> <backingStore/> <target dev='vda' bus='virtio'/> <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> Signed-off-by: Ashish Mittal <Ashish.Mittal(a)veritas.com> --- docs/formatdomain.html.in | 12 ++++++-- docs/schemas/domaincommon.rng | 1 + src/qemu/qemu_command.c | 4 +++ src/qemu/qemu_driver.c | 3 ++ src/qemu/qemu_parse_command.c | 25 ++++++++++++++++ src/util/virstoragefile.c | 4 ++- src/util/virstoragefile.h | 1 + .../qemuxml2argv-disk-drive-network-vxhs.args | 23 +++++++++++++++ .../qemuxml2argv-disk-drive-network-vxhs.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 10 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 11b3330..ade35a3 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2276,9 +2276,9 @@ <dd> The <code>protocol</code> attribute specifies the protocol to access to the requested image. Possible values are "nbd", - "iscsi", "rbd", "sheepdog" or "gluster". If the - <code>protocol</code> attribute is "rbd", "sheepdog" or - "gluster", an additional attribute <code>name</code> is + "iscsi", "rbd", "sheepdog", "gluster" or "vxhs". If the + <code>protocol</code> attribute is "rbd", "sheepdog", "gluster" + or "vxhs", an additional attribute <code>name</code> is mandatory to specify which volume/image will be used. For "nbd", the <code>name</code> attribute is optional. For "iscsi" (<span class="since">since 1.0.4</span>), the <code>name</code> @@ -2388,6 +2388,12 @@ <td> one or more (<span class="since">Since 2.1.0</span>), just one prior to that </td> <td> 24007 </td> </tr> + <tr> + <td> vxhs </td> + <td> a server running Veritas HyperScale daemon </td> + <td> only one </td> + <td> 9999 </td> + </tr> </table> <p> gluster supports "tcp", "rdma", "unix" as valid values for the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 19d45fd..e569e0a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1464,6 +1464,7 @@ <value>ftp</value> <value>ftps</value> <value>tftp</value> + <value>vxhs</value> </choice> </attribute> <optional> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4a5fce3..c7b95aa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -491,6 +491,9 @@ qemuNetworkDriveGetPort(int protocol, /* no default port specified */ return 0; + case VIR_STORAGE_NET_PROTOCOL_VXHS: + return 9999; + case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: @@ -1034,6 +1037,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: + case VIR_STORAGE_NET_PROTOCOL_VXHS: ret = qemuBuildNetworkDriveURI(src, secinfo); break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a82e58b..4910004 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13724,6 +13724,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " @@ -13787,6 +13788,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external active snapshots are not supported on " @@ -13932,6 +13934,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("internal inactive snapshots are not supported on " diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index c3b27aa..f2edc28 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -263,6 +263,16 @@ qemuParseNBDString(virDomainDiskDefPtr disk) return -1; } +static int +qemuParseVxHSString(virDomainDiskDefPtr def) +{ + virURIPtr uri = NULL; + + if (!(uri = virURIParse(def->src->path))) + return -1; + + return qemuParseDriveURIString(def, uri, "vxhs"); +} /* * This method takes a string representing a QEMU command line ARGV set @@ -737,6 +747,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_STRDUP(def->src->path, vdi) < 0) goto error; } + } else if (STRPREFIX(def->src->path, "vxhs:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; + + if (qemuParseVxHSString(def) < 0) + goto error; } else { def->src->type = VIR_STORAGE_TYPE_FILE; } @@ -1933,6 +1949,10 @@ qemuParseCommandLine(virCapsPtr caps, disk->src->type = VIR_STORAGE_TYPE_NETWORK; disk->src->protocol = VIR_STORAGE_NET_PROTOCOL_SHEEPDOG; val += strlen("sheepdog:"); + } else if (STRPREFIX(val, "vxhs:")) { + disk->src->type = VIR_STORAGE_TYPE_NETWORK; + disk->src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; + val += strlen("vxhs:"); } else { disk->src->type = VIR_STORAGE_TYPE_FILE; } @@ -2009,6 +2029,11 @@ qemuParseCommandLine(virCapsPtr caps, goto error; break; + case VIR_STORAGE_NET_PROTOCOL_VXHS: + if (qemuParseVxHSString(disk) < 0) + goto error; + + break; case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 272db67..a730a01 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -86,7 +86,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, "ftp", "ftps", "tftp", - "ssh") + "ssh", + "vxhs") VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", @@ -2634,6 +2635,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SSH: + case VIR_STORAGE_NET_PROTOCOL_VXHS: virReportError(VIR_ERR_INTERNAL_ERROR, _("malformed backing store path for protocol %s"), protocol); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 3d09468..88dff36 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -132,6 +132,7 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_FTPS, VIR_STORAGE_NET_PROTOCOL_TFTP, VIR_STORAGE_NET_PROTOCOL_SSH, + VIR_STORAGE_NET_PROTOCOL_VXHS, VIR_STORAGE_NET_PROTOCOL_LAST } virStorageNetProtocol; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args new file mode 100644 index 0000000..3d37b00 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args @@ -0,0 +1,23 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu qemu32 \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=vxhs://192.168.0.1:9999/eb90327c-8302-4725-9e1b-4e85ed4dc251,\ +format=raw,if=none,id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml new file mode 100644 index 0000000..45c807f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml @@ -0,0 +1,34 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw' cache='none'/> + <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'> + <host name='192.168.0.1' port='9999'/> + </source> + <backingStore/> + <target dev='vda' bus='virtio'/> + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> + <alias name='virtio-disk0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1ee8402..d94e3f2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -869,6 +869,7 @@ mymain(void) # endif DO_TEST("disk-drive-network-rbd-ipv6", NONE); DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); + DO_TEST("disk-drive-network-vxhs", NONE); DO_TEST("disk-drive-no-boot", QEMU_CAPS_BOOTINDEX); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", -- 2.5.5

4 8

[libvirt] [PATCH] qemu: snapshot: restart CPUs when recover from interrupted snapshot job
by Wangjing (King, Euler) 05 Jan '17

05 Jan '17

If we restart libvirtd while VM was doing external memory snapshot, VM's state be updated to paused as a result of running a migration-to-file operation, and then VM will be left as paused state. In this case we must restart the VM's CPUs to resume it. Signed-off-by: Wang King <king.wang(a)huawei.com> --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index afe3cac..7d283fb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3093,7 +3093,8 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, (job->asyncJob == QEMU_ASYNC_JOB_SAVE && reason == VIR_DOMAIN_PAUSED_SAVE) || (job->asyncJob == QEMU_ASYNC_JOB_SNAPSHOT && - reason == VIR_DOMAIN_PAUSED_SNAPSHOT) || + (reason == VIR_DOMAIN_PAUSED_SNAPSHOT || + reason == VIR_DOMAIN_PAUSED_MIGRATION)) || reason == VIR_DOMAIN_PAUSED_UNKNOWN)) { if (qemuProcessStartCPUs(driver, vm, conn, VIR_DOMAIN_RUNNING_UNPAUSED, -- 2.8.3

2 1

[libvirt] GSoC 2017
by Michal Privoznik 05 Jan '17

05 Jan '17

Hey, so we are approaching opening date for submitting orgnaization applications [1]. In order to have perfect application we need to show Google a list of ideas that students can work on (like they couldn't google it up, right? ;-)). You can find the list here [2]. Let me ask you kindly to go through it and: a) add whatever idea you feel is appropriate, b) if you have an idea but don't feel like mentoring, leave the 'Mentor' field empty and I will find somebody. There is still plenty of time left (I'll probably fill out the application form at the end of the month), but please don't leave it until the last hour. There were some changes to the program discussed on the Mentor Summit, but I don't see anything announced yet, so stay tuned. As for our organization, historically we had 1:N mapping of mentors and students (one mentor could have had one or more students). But last year we tried out 2:1 mapping and I found it better so probably we will stick to co-mentoring this year too (as everything, it's recommended not required). Happy new year! Michal 1: https://developers.google.com/open-source/gsoc/timeline 2: http://wiki.libvirt.org/page/Google_Summer_of_Code_2017

2 1

[libvirt] [PATCH] qemu: snapshot: restart CPUs when recover from interrupted snapshot job
by Wang King 05 Jan '17

05 Jan '17

If we restart libvirtd while VM was doing external memory snapshot, VM's state be updated to paused as a result of running a migration-to-file operation, and then VM will be left as paused state. In this case we must restart the VM's CPUs to resume it. Signed-off-by: Wang King <king.wang(a)huawei.com> --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index afe3cac..7d283fb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3093,7 +3093,8 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, (job->asyncJob == QEMU_ASYNC_JOB_SAVE && reason == VIR_DOMAIN_PAUSED_SAVE) || (job->asyncJob == QEMU_ASYNC_JOB_SNAPSHOT && - reason == VIR_DOMAIN_PAUSED_SNAPSHOT) || + (reason == VIR_DOMAIN_PAUSED_SNAPSHOT || + reason == VIR_DOMAIN_PAUSED_MIGRATION)) || reason == VIR_DOMAIN_PAUSED_UNKNOWN)) { if (qemuProcessStartCPUs(driver, vm, conn, VIR_DOMAIN_RUNNING_UNPAUSED, -- 2.8.3

1 0

[libvirt] xml config nested
by 放牛班的春天 05 Jan '17

05 Jan '17

How to configure libvirt, so qemu-kvm support nested virtualization, virtual machine installed operating system is windows_7_ultimate_sp1_x64_dvd_618537.iso, configure libvirt xml file is as follows: <cpu mode='custom' match='exact'> <model fallback='allow'>core2duo</model> <feature policy='require' name='vmx'/> </cpu> or <cpu mode='host-model'> <model fallback='allow'/> </cpu> or <cpu mode='host-passthrough'> <topology sockets='2' cores='2' threads='2'/> </cpu> We install libvirt in centos 7, qemu-kvm version is: [Root @ localhost libexec] # ./qemu-kvm --version QEMU emulator version 2.6.0 (qemu-kvm-ev-2.6.0-27.1.el7), Copyright (c) 2003-2008 Fabrice Bellard Above is the basic environment and libvirt configuration, but in this environment to install the internal implementation of the following windows7 virtual machine kernel interface calls are as follows: if (!FeatrueControlMsr.fields.enable_vmxon) { MyWriteFile(FileHanle, "Bios设置没有开启虚拟化\n", strlen("Bios设置没有开启虚拟化\n"), &ReturnLen); MyCloseFile(FileHanle); KdPrint(("Bios设置没有开启虚拟化")); return FALSE; } in conclusion: Through this kernel interface to determine the result is: Bios settings do not turn on virtualization How to solve this problem? Hope to get your help. thank you very much。

1 0

[libvirt] [PATCH] NEWS: Remove spurious period
by Andrea Bolognani 04 Jan '17

04 Jan '17

All other entries in the release notes omit the leading period, and so should this one in order to maintain consistency. --- Pushed as trivial. docs/news.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.html.in b/docs/news.html.in index e544cfa..c222075 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -70,7 +70,7 @@ <li>qemu: Enable mount namespace<br/> To avoid funny races with udev relabelling devices under our hands and to enhance security, libvirt now spawns each qemu process with its own - <code>/dev</code>.</li> + <code>/dev</code></li> </ul> </li> </ul> -- 2.7.4

1 0

[libvirt] [PATCH] NEWS: Update after qemu namespace fix
by Michal Privoznik 04 Jan '17

04 Jan '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under my-christmas-gift-to-libvirt rule. docs/news.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index 36c7d3d66..e544cfa38 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -67,6 +67,10 @@ The chardev detection code has been improved and can now handle this configuration properly </li> + <li>qemu: Enable mount namespace<br/> + To avoid funny races with udev relabelling devices under our hands and + to enhance security, libvirt now spawns each qemu process with its own + <code>/dev</code>.</li> </ul> </li> </ul> -- 2.11.0

4 3

[libvirt] [PATCH] qemu: snapshot: Resume VM after live snapshot
by Peter Krempa 04 Jan '17

04 Jan '17

Commit 4b951d1e38259ff5d03e9eedb65095eead8099e1 missed the fact that the VM needs to be resumed after a live external checkpoint (memory snapshot) where the cpus would be paused by the migration rather than libvirt. --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b359e7757..675a4d0e7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14503,6 +14503,9 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, * atomic flag now says whether we need to pause, and a * capability bit says whether to use transaction. */ + if (memory) + resume = true; + if ((memory && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_LIVE)) || (!memory && atomic && !transaction)) { if (qemuProcessStopCPUs(driver, vm, VIR_DOMAIN_PAUSED_SNAPSHOT, -- 2.11.0

2 1

[libvirt] Issue with libvirtd
by Faysal Ali 04 Jan '17

04 Jan '17

Hi I have a CentOS 7.3 server where I am running KVM with few virtual machines. I noticed this being repeated regularly in /var/log/messages *libvirtd[1956]: End of file while reading data: Input/output error* Anyone have seen that happening ?? Any idea where should I dig more ?? Br. Umar

2 1

[libvirt] [PATCH] HACKING: Reduce vertical whitespace
by Andrea Bolognani 04 Jan '17

04 Jan '17

When generating the plain text version of the contributor guidelines we add a ludicrous amount of vertical whitespace in some spots. Tweak the XSLT stylesheet and regenerate the now much better looking file. --- I still think the plain text HACKING file should just be a very minimal stub explaining potential contributors how to build the HTML version and pointing them to it, but that's a discussion to have (again) another day: as long as we're generating this file, it might as well look good :) HACKING | 32 -------------------------------- docs/hacking2.xsl | 13 ++++--------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/HACKING b/HACKING index 1952856..c2cb037 100644 --- a/HACKING +++ b/HACKING @@ -14,21 +14,15 @@ General tips for contributing patches (1) Discuss any large changes on the mailing list first. Post patches early and listen to feedback. - - (2) Official upstream repository is kept in git ("git://libvirt.org/libvirt.git") and is browsable along with other libvirt-related repositories (e.g. libvirt-python) online <http://libvirt.org/git/>. - - (3) Patches to translations are maintained via the zanata project <https://fedora.zanata.org/>. If you want to fix a translation in a .po file, join the appropriate language team. The libvirt release process automatically pulls the latest version of each translation file from zanata. - - (4) Post patches using "git send-email", with git rename detection enabled. You need a one-time setup of: @@ -71,8 +65,6 @@ Moreover, such patch needs to be prefixed correctly with "--subject-prefix=PATCHv2" appended to "git send-email" (substitute "v2" with the correct version if needed though). - - (5) In your commit message, make the summary line reasonably short (60 characters is typical), followed by a blank line, followed by any longer description of why your patch makes sense. If the patch fixes a regression, and you know what @@ -83,8 +75,6 @@ You can use 'git shortlog -30' to get an idea of typical summary lines. Libvirt does not currently attach any meaning to Signed-off-by: lines, so it is up to you if you want to include or omit them in the commit message. - - (6) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together. Moreover, please keep in mind that it's @@ -94,13 +84,9 @@ of a series, but intermediate patches must compile and not cause test-suite failures (this is to preserve the usefulness of "git bisect", among other things). - - (7) Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions. - - (8) Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror. This is done automatically for a git checkout; from a tarball, use: @@ -163,8 +149,6 @@ the file is stored. VIR_TEST_FILE_ACCESS=1 VIR_TEST_FILE_ACCESS_OUTPUT="/tmp/file_access.txt" ./qemuxml2argvtest - - (9) The Valgrind test should produce similar output to "make check". If the output has traces within libvirt API's, then investigation is required in order to determine the cause of the issue. Output such as the following indicates some @@ -239,15 +223,9 @@ to "tests/.valgrind.supp" in order to suppress the warning: obj:*/lib*/ld-2.*so* } - - (10) Update tests and/or documentation, particularly if you are adding a new feature or changing the output of a program. - - - - There is more on this subject, including lots of links to background reading on the subject, on Richard Jones' guide to working with open source projects <http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/>. @@ -585,8 +563,6 @@ true) ...". Rather, write "if (seen)...". - - Of course, take all of the above with a grain of salt. If you're about to use some system interface that requires a type like "size_t", "pid_t" or "off_t", use matching types for any corresponding variables. @@ -698,8 +674,6 @@ size: - - File handling ============= Usage of the "fdopen()", "close()", "fclose()" APIs is deprecated in libvirt @@ -743,8 +717,6 @@ APIs, use the macros from virfile.h - - String comparisons ================== Do not use the strcmp, strncmp, etc functions directly. Instead use one of the @@ -792,8 +764,6 @@ following semantically named macros - - String copying ============== Do not use the strncpy function. According to the man page, it does *not* @@ -962,8 +932,6 @@ by further potentially failing calls. You should almost certainly be using a conditional and a block instead of a goto. Perhaps some of your function's logic would be better pulled out into a helper function. - - Although libvirt does not encourage the Linux kernel wind/unwind style of multiple labels, there's a good general discussion of the issue archived at KernelTrap <http://kerneltrap.org/node/553/2131> diff --git a/docs/hacking2.xsl b/docs/hacking2.xsl index 1c9271f..3595b7e 100644 --- a/docs/hacking2.xsl +++ b/docs/hacking2.xsl @@ -37,6 +37,8 @@ from docs/hacking.html.in! <xsl:value-of select="normalize-space(.)"/> <xsl:text> </xsl:text>====================== + + </xsl:template> @@ -93,20 +95,13 @@ from docs/hacking.html.in! -<xsl:template match="html:ol|html:ul|html:p"> +<xsl:template match="html:p"> <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> </xsl:template> -<xsl:template match="html:ol/html:li"> -<xsl:choose> -<xsl:when test=".//node()[position()=last()]/self::pre">(<xsl:value-of select="position()"/>) <xsl:apply-templates/> -</xsl:when> - -<xsl:otherwise>(<xsl:value-of select="position()"/>) <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/> -</xsl:otherwise> -</xsl:choose> +<xsl:template match="html:ol/html:li">(<xsl:value-of select="position()"/>) <xsl:apply-templates/> </xsl:template> -- 2.7.4

2 2

[libvirt] [PATCH 0/3] qemu: Couple of namespace fixes
by Michal Privoznik 04 Jan '17

04 Jan '17

*** BLURB HERE *** Michal Privoznik (3): qemu: Handle EEXIST gracefully in qemuDomainCreateDevice qemuDomainAttachDeviceMknodHelper: unlink() not so often qemuDomainCreateDevice: Be more careful about device path src/qemu/qemu_domain.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) -- 2.11.0

2 7

[libvirt] [PATCH] HACKING: Regenerate
by Andrea Bolognani 04 Jan '17

04 Jan '17

When updating the source file in commit bd4f4d168660, I forgot that we also store the generated plain text version in git and didn't regenerate it. I also missed one spot that required an additional <p> tag, so fix both mistakes in one go. --- Pushed as trivial. This is the second time I have to clean up after myself today: clearly not my best morning ever. /me pours more coffee HACKING | 10 ++++++++++ docs/hacking.html.in | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/HACKING b/HACKING index 3656411..1952856 100644 --- a/HACKING +++ b/HACKING @@ -14,15 +14,21 @@ General tips for contributing patches (1) Discuss any large changes on the mailing list first. Post patches early and listen to feedback. + + (2) Official upstream repository is kept in git ("git://libvirt.org/libvirt.git") and is browsable along with other libvirt-related repositories (e.g. libvirt-python) online <http://libvirt.org/git/>. + + (3) Patches to translations are maintained via the zanata project <https://fedora.zanata.org/>. If you want to fix a translation in a .po file, join the appropriate language team. The libvirt release process automatically pulls the latest version of each translation file from zanata. + + (4) Post patches using "git send-email", with git rename detection enabled. You need a one-time setup of: @@ -93,6 +99,8 @@ things). (7) Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions. + + (8) Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror. This is done automatically for a git checkout; from a tarball, use: @@ -238,6 +246,8 @@ feature or changing the output of a program. + + There is more on this subject, including lots of links to background reading on the subject, on Richard Jones' guide to working with open source projects <http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/>. diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 13b3640..47475a2 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -289,8 +289,11 @@ } </pre> </li> - <li>Update tests and/or documentation, particularly if you are adding - a new feature or changing the output of a program.</li> + + <li> + <p>Update tests and/or documentation, particularly if you are adding + a new feature or changing the output of a program.</p> + </li> </ol> <p> -- 2.7.4

1 0

[libvirt] [PATCH] docs: Add missing <p> elements
by Andrea Bolognani 04 Jan '17

04 Jan '17

Some of the <li> elements in the "General tips for contributing patches" section were missing the corresponding inner <p> element, so they ended up all lumped together. --- Pushed as trivial. docs/hacking.html.in | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 5f19143..13b3640 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -8,20 +8,26 @@ <h2><a name="patches">General tips for contributing patches</a></h2> <ol> - <li>Discuss any large changes on the mailing list first. Post patches - early and listen to feedback.</li> + <li> + <p>Discuss any large changes on the mailing list first. Post patches + early and listen to feedback.</p> + </li> - <li>Official upstream repository is kept in git + <li> + <p>Official upstream repository is kept in git (<code>git://libvirt.org/libvirt.git</code>) and is browsable along with other libvirt-related repositories - (e.g. libvirt-python) <a href="http://libvirt.org/git/">online</a>.</li> + (e.g. libvirt-python) <a href="http://libvirt.org/git/">online</a>.</p> + </li> - <li>Patches to translations are maintained via + <li> + <p>Patches to translations are maintained via the <a href="https://fedora.zanata.org/">zanata project</a>. If you want to fix a translation in a .po file, join the appropriate language team. The libvirt release process automatically pulls the latest version of each translation - file from zanata.</li> + file from zanata.</p> + </li> <li><p>Post patches using "git send-email", with git rename detection enabled. You need a one-time setup of:</p> @@ -98,8 +104,11 @@ of <code>git bisect</code>, among other things).</p> </li> - <li>Make sure your patches apply against libvirt GIT. Developers - only follow GIT and don't care much about released versions.</li> + <li> + <p>Make sure your patches apply against libvirt GIT. Developers + only follow GIT and don't care much about released versions.</p> + </li> + <li><p>Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror. This is done automatically for a git checkout; from a -- 2.7.4

1 0

[libvirt] [PATCH] docs: fix list of domain states in virsh manpage
by Laine Stump 04 Jan '17

04 Jan '17

The virsh manpage lists "shutdown" and "dying" as two of the possible domain states that could be listed in the output of the "virsh list" command. However, a domain that is being shutdown will be listed as "in shutdown", and the "dying" state doesn't even exist (and never has, as far as I can tell from looking through git history - it was shown in the original import of the virsh.pod file in 2006; there was no VIR_DOMAIN_DYING state then, there wasn't one when those lines of virsh.pod were tweaked in 2008, and there still isn't one today. Apparently it was just something that sounded like a good idea to someone at some time, but was never implemented...) Resolves: https://bugzilla.redhat.com/1408778 --- tools/virsh.pod | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 940c646..73b3b09 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -440,7 +440,7 @@ running B<virsh suspend>. When in a paused state the domain will still consume allocated resources like memory, but will not be eligible for scheduling by the hypervisor. -=item B<shutdown> +=item B<in shutdown> The domain is in the process of shutting down, i.e. the guest operating system has been notified and should be in the process of stopping its operations @@ -457,11 +457,6 @@ The domain has crashed, which is always a violent ending. Usually this state can only occur if the domain has been configured not to restart on crash. -=item B<dying> - -The domain is in process of dying, but hasn't completely shutdown or -crashed. - =item B<pmsuspended> The domain has been suspended by guest power management, e.g. entered -- 2.7.4

2 1