- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Support chardevs with ARM virt machines
by Christoffer Dall 26 Jun '17

26 Jun '17

The function to check if -chardev is supported by QEMU was written a long time ago, where adding chardevs did not make sense on the fixed ARM platforms. Since then, we now have a general purpose virt platform, which should support plugging in any device over PCIe which is supported in a similar fashion on x86. Signed-off-by: Christoffer Dall <cdall(a)linaro.org> --- src/qemu/qemu_capabilities.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7f22492..1348af7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5507,6 +5507,11 @@ virQEMUCapsSupportsChardev(const virDomainDef *def, if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; + /* The virt machine has a PCIe bus and allows plugging in the same type of + * devices as x86 systems do on a PCIe bus. */ + if (qemuDomainIsVirt(def)) + return true; + /* This may not be true for all ARM machine types, but at least * the only supported non-virtio serial devices of vexpress and versatile * don't have the -chardev property wired up. */ -- 2.9.0

4 10

[libvirt] [PATCH 1/2] lxc: add support for docker-json Memory and VCPU conversion
by Venkat Datta N H 26 Jun '17

26 Jun '17

Docker Memory and VCPU configuration is converted to fit for LXC container XML configuration --- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/lxc/lxc_driver.c | 13 ++- src/lxc/lxc_native.h | 1 + src/lxc/lxc_native_docker.c | 112 ++++++++++++++++++ src/lxc/lxc_native_docker.h | 30 +++++ tests/Makefile.am | 8 +- .../dockerjson2xmldata-simple.json | 36 ++++++ .../dockerjson2xmldata-simple.xml | 15 +++ tests/dockerjson2xmltest.c | 127 +++++++++++++++++++++ 10 files changed, 338 insertions(+), 6 deletions(-) create mode 100644 src/lxc/lxc_native_docker.c create mode 100644 src/lxc/lxc_native_docker.h create mode 100644 tests/dockerjson2xmldata/dockerjson2xmldata-simple.json create mode 100644 tests/dockerjson2xmldata/dockerjson2xmldata-simple.xml create mode 100644 tests/dockerjson2xmltest.c diff --git a/po/POTFILES.in b/po/POTFILES.in index 275df1f..098be9f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -111,6 +111,7 @@ src/lxc/lxc_driver.c src/lxc/lxc_fuse.c src/lxc/lxc_hostdev.c src/lxc/lxc_native.c +src/lxc/lxc_native_docker.c src/lxc/lxc_process.c src/network/bridge_driver.c src/network/bridge_driver_linux.c diff --git a/src/Makefile.am b/src/Makefile.am index eae32dc..53d1bca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -839,6 +839,7 @@ LXC_DRIVER_SOURCES = \ lxc/lxc_process.c lxc/lxc_process.h \ lxc/lxc_fuse.c lxc/lxc_fuse.h \ lxc/lxc_native.c lxc/lxc_native.h \ + lxc/lxc_native_docker.c lxc/lxc_native_docker.h \ lxc/lxc_driver.c lxc/lxc_driver.h LXC_CONTROLLER_SOURCES = \ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 22c8b58..0f5a7870 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -53,6 +53,7 @@ #include "lxc_driver.h" #include "lxc_native.h" #include "lxc_process.h" +#include "lxc_native_docker.h" #include "viralloc.h" #include "virnetdevbridge.h" #include "virnetdevveth.h" @@ -1062,15 +1063,17 @@ static char *lxcConnectDomainXMLFromNative(virConnectPtr conn, if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0) goto cleanup; - if (STRNEQ(nativeFormat, LXC_CONFIG_FORMAT)) { + if (STREQ(nativeFormat, DOCKER_CONFIG_FORMAT)) { + if (!(def = dockerParseJSONConfig(caps, driver->xmlopt, nativeConfig))) + goto cleanup; + } else if (STREQ(nativeFormat, LXC_CONFIG_FORMAT)) { + if (!(def = lxcParseConfigString(nativeConfig, caps, driver->xmlopt))) + goto cleanup; + } else { virReportError(VIR_ERR_INVALID_ARG, _("unsupported config type %s"), nativeFormat); goto cleanup; } - - if (!(def = lxcParseConfigString(nativeConfig, caps, driver->xmlopt))) - goto cleanup; - xml = virDomainDefFormat(def, caps, 0); cleanup: diff --git a/src/lxc/lxc_native.h b/src/lxc/lxc_native.h index 15fa0d5..88263ae 100644 --- a/src/lxc/lxc_native.h +++ b/src/lxc/lxc_native.h @@ -26,6 +26,7 @@ # include "domain_conf.h" # define LXC_CONFIG_FORMAT "lxc-tools" +# define DOCKER_CONFIG_FORMAT "docker" virDomainDefPtr lxcParseConfigString(const char *config, virCapsPtr caps, diff --git a/src/lxc/lxc_native_docker.c b/src/lxc/lxc_native_docker.c new file mode 100644 index 0000000..a278309 --- /dev/null +++ b/src/lxc/lxc_native_docker.c @@ -0,0 +1,112 @@ +/* + * lxc_native_docker.c: LXC native docker configuration import + * + * Copyright (C) 2017 Venkat Datta N H + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Venkat Datta N H <nhvenkatdatta(a)gmail.com> + */ +#include <config.h> +#include "util/viralloc.h" +#include "util/virfile.h" +#include "util/virstring.h" +#include "util/virconf.h" +#include "util/virjson.h" +#include "util/virutil.h" +#include "virerror.h" +#include "virlog.h" +#include "conf/domain_conf.h" +#include "lxc_native_docker.h" +#include "secret_conf.h" +#define VIR_FROM_THIS VIR_FROM_LXC +VIR_LOG_INIT("lxc.lxc_native_docker"); + +static int dockerParseVCpus(virDomainDefPtr dom, + virDomainXMLOptionPtr xmlopt, + virJSONValuePtr prop) +{ + int vcpus; + + if (virJSONValueObjectGetNumberInt(prop, "CpuShares", &vcpus) != 0) + return -1; + + if (virDomainDefSetVcpusMax(dom, vcpus, xmlopt) < 0) + return -1; + + if (virDomainDefSetVcpus(dom, vcpus) < 0) + return -1; + + return 0; +} + +static int dockerParseMem(virDomainDefPtr dom, + virJSONValuePtr prop) +{ + unsigned long long mem; + + if (virJSONValueObjectGetNumberUlong(prop, "Memory", &mem) != 0) + return -1; + + virDomainDefSetMemoryTotal(dom, mem / 1024); + dom->mem.cur_balloon = mem / 1024; + + return 0; +} + +virDomainDefPtr dockerParseJSONConfig(virCapsPtr caps ATTRIBUTE_UNUSED, + virDomainXMLOptionPtr xmlopt, + const char *config) +{ + virJSONValuePtr json_obj; + virJSONValuePtr host_config; + + if (!(json_obj = virJSONValueFromString(config))) + return NULL; + + virDomainDefPtr def; + + if (!(def = virDomainDefNew())) + goto error; + + def->id = -1; + def->mem.cur_balloon = 64*1024; + virDomainDefSetMemoryTotal(def, def->mem.cur_balloon); + + if ((host_config = virJSONValueObjectGetObject(json_obj, "HostConfig")) != NULL) { + if (dockerParseVCpus(def, xmlopt, host_config) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse VCpu")); + goto error; + } + + if (dockerParseMem(def, host_config) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to parse Memory")); + goto error; + } + } + + def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_UTC; + def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART; + def->onCrash = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; + def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY; + def->virtType = VIR_DOMAIN_VIRT_LXC; + def->os.type = VIR_DOMAIN_OSTYPE_EXE; + + return def; + + error: + virDomainDefFree(def); + return NULL; +} diff --git a/src/lxc/lxc_native_docker.h b/src/lxc/lxc_native_docker.h new file mode 100644 index 0000000..40285f9 --- /dev/null +++ b/src/lxc/lxc_native_docker.h @@ -0,0 +1,30 @@ +/* + * lxc_native_docker.h: header file for LXC native docker configuration + * + * Copyright (C) 2017 Venkat Datta N H + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Venkat Datta N H <nhvenkatdatta(a)gmail.com> + */ +#ifndef __LXC_NATIVE_DOCKER_H__ +# define __LXC_NATIVE_DOCKER_H__ +# include "domain_conf.h" + +virDomainDefPtr dockerParseJSONConfig(virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + const char *config); + +#endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 19986dc..3beb634 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -93,6 +93,7 @@ EXTRA_DIST = \ capabilityschemadata \ commanddata \ cputestdata \ + dockerjson2xmldata \ domaincapsschemadata \ domainconfdata \ domainschemadata \ @@ -295,7 +296,7 @@ test_libraries += libqemumonitortestutils.la \ endif WITH_QEMU if WITH_LXC -test_programs += lxcxml2xmltest lxcconf2xmltest +test_programs += lxcxml2xmltest lxcconf2xmltest dockerjson2xmltest endif WITH_LXC if WITH_OPENVZ @@ -693,6 +694,11 @@ lxcconf2xmltest_SOURCES = \ lxcconf2xmltest.c testutilslxc.c testutilslxc.h \ testutils.c testutils.h lxcconf2xmltest_LDADD = $(lxc_LDADDS) + +dockerjson2xmltest_SOURCES = \ + dockerjson2xmltest.c testutilslxc.c testutilslxc.h \ + testutils.c testutils.h +dockerjson2xmltest_LDADD = $(lxc_LDADDS) else ! WITH_LXC EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h endif ! WITH_LXC diff --git a/tests/dockerjson2xmldata/dockerjson2xmldata-simple.json b/tests/dockerjson2xmldata/dockerjson2xmldata-simple.json new file mode 100644 index 0000000..63470be --- /dev/null +++ b/tests/dockerjson2xmldata/dockerjson2xmldata-simple.json @@ -0,0 +1,36 @@ +{ + "Id": "dbb1ae21dac15973d66e6c2b8516d270b32ca766e0cf7551d8b7973513e5f079", + "Created": "2017-05-25T18:55:17.922934825Z", + "Path": "/bin/bash", + "Args": [], + "HostConfig": { + "Binds": null, + "ContainerIDFile": "", + "LogConfig": { + "Type": "json-file", + "Config": {} + }, + "NetworkMode": "default", + "PortBindings": {}, + "ShmSize": 67108864, + "Runtime": "runc", + "Isolation": "", + "CpuShares": 2, + "Memory": 1073741824, + "CgroupParent": "", + "CpuPeriod": 0, + "CpuQuota": 0, + "CpusetCpus": "", + "CpusetMems": "", + "KernelMemory": 0, + "MemoryReservation": 0, + "MemorySwap": -1, + "MemorySwappiness": -1, + "PidsLimit": 0, + "Ulimits": null, + "CpuCount": 0, + "CpuPercent": 0, + "IOMaximumIOps": 0, + "IOMaximumBandwidth": 0 + } +} diff --git a/tests/dockerjson2xmldata/dockerjson2xmldata-simple.xml b/tests/dockerjson2xmldata/dockerjson2xmldata-simple.xml new file mode 100644 index 0000000..8be1ace --- /dev/null +++ b/tests/dockerjson2xmldata/dockerjson2xmldata-simple.xml @@ -0,0 +1,15 @@ +<domain type='lxc'> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type>exe</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + </devices> +</domain> diff --git a/tests/dockerjson2xmltest.c b/tests/dockerjson2xmltest.c new file mode 100644 index 0000000..41c46a1 --- /dev/null +++ b/tests/dockerjson2xmltest.c @@ -0,0 +1,127 @@ +#include <config.h> + +#include "testutils.h" + +#ifdef WITH_LXC + +# include "lxc/lxc_native_docker.h" +# include "lxc/lxc_conf.h" +# include "testutilslxc.h" + +# define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; +static virDomainXMLOptionPtr xmlopt; + +static int testSanitizeDef(virDomainDefPtr vmdef) +{ + /* Remove UUID randomness */ + if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", vmdef->uuid) < 0) + return -1; + return 0; +} + +static int +testCompareXMLToConfigFiles(const char *xmlfile, + const char *configfile, + bool expectError) +{ + int ret = -1; + char *config = NULL; + char *actualxml = NULL; + virDomainDefPtr vmdef = NULL; + + if (virTestLoadFile(configfile, &config) < 0) + goto fail; + + vmdef = dockerParseJSONConfig(caps, xmlopt, config); + + if (vmdef && expectError) { + if (testSanitizeDef(vmdef) < 0) + goto fail; + + if (!(actualxml = virDomainDefFormat(vmdef, caps, 0))) + goto fail; + + if (virTestCompareToFile(actualxml, xmlfile) < 0) + goto fail; + } + + ret = 0; + + fail: + VIR_FREE(actualxml); + VIR_FREE(config); + virDomainDefFree(vmdef); + return ret; +} + +struct testInfo { + const char *name; + bool expectError; +}; + +static int +testCompareXMLToConfigHelper(const void *data) +{ + int result = -1; + const struct testInfo *info = data; + char *xml = NULL; + char *config = NULL; + + if (virAsprintf(&xml, "%s/dockerjson2xmldata/dockerjson2xmldata-%s.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&config, "%s/dockerjson2xmldata/dockerjson2xmldata-%s.json", + abs_srcdir, info->name) < 0) + goto cleanup; + + result = testCompareXMLToConfigFiles(xml, config, info->expectError); + + cleanup: + VIR_FREE(xml); + VIR_FREE(config); + return result; +} + +static int +mymain(void) +{ + int ret = EXIT_SUCCESS; + + if (!(caps = testLXCCapsInit())) + return EXIT_FAILURE; + + if (!(xmlopt = lxcDomainXMLConfInit())) { + virObjectUnref(caps); + return EXIT_FAILURE; + } + + +# define DO_TEST(name, expectError) \ + do { \ + const struct testInfo info = { name, expectError }; \ + if (virTestRun("DOCKER JSON-2-XML " name, \ + testCompareXMLToConfigHelper, \ + &info) < 0) \ + ret = EXIT_FAILURE; \ + } while (0) + + DO_TEST("simple", true); + + virObjectUnref(xmlopt); + virObjectUnref(caps); + + return ret; +} + +VIR_TEST_MAIN(mymain) + +#else + +int +main(void) +{ + return EXIT_AM_SKIP; +} + +#endif /* WITH_LXC */ -- 2.7.4

3 4

Re: [libvirt] [PATCH] qemu: Support chardevs with ARM virt machines
by Andrew Jones 26 Jun '17

26 Jun '17

On Sun, 2017-06-25 at 13:46 +0200, Christoffer Dall wrote: >>On Sun, Jun 25, 2017 at 4:07 AM, Andrea Bolognani <abologna redhat com> wrote: >> On Sat, 2017-06-24 at 16:07 +0200, Christoffer Dall wrote: >>> > The way I see it, the bug is about libvirt being unable to >>> > launch guests which use the <console><log> feature, and with >>> > that in mind your patch is correct but doesn't solve the >>> > issue, because even thought that specific error is gone you >>> > immediately run into a different one and your guest is still >>> > unable to start. >>> >>> I didn't experience this, it was actually working on my end. I wonder >>> if it's related to the QEMU version, where I seem to remember we >>> changed what some serial options turned into. But I for sure did not >>> see "-device isa-serial..." on the command line, so maybe not. >> >> That's very different from the behavior I'm seeing, and I >> can't figure out why that would be the case. That's why >> having your QEMU command line would be very useful. >> >> As for differences in QEMU binaries, there might be some >> capability that I haven't considered and influences the >> generated command line. I'll look into that. > >Cool, I'll have a look as well and will document my complete >environment, then hopefully we can diff with yours and see where this >ISA thing shows up. It's likely a pci-serial vs. isa-serial device getting created. Something like -device pcie-root-port,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \ -chardev stdio,logfile=logfile,id=chardev0,logappend=off \ -device pci-serial,chardev=chardev0,bus=pci.3,addr=0x0 works for me, but only with upstream (not RHEL) qemu, and when adding console=ttyS0 to the guest kernel command line. So far we haven't wanted the pci-serial device in AArch64 RHEL qemu, as we didn't see a need for it. Is there any reason it should be supported other than it allows the logfile feature to work? As Andrea pointed out, in [1], I wrote that I think the logfile feature should work even with the default PL011 serial console. Thanks, drew [1] https://bugzilla.redhat.com/show_bug.cgi?id=1456882#c4

2 1

[libvirt] [PATCH] nodedev: udev: Drop udev monitor fd check in udevEventHandleCallback
by Erik Skultety 26 Jun '17

26 Jun '17

We do perform that magical check every time an event is received, but unless we explicitly unref'd or disconnected the monitor, we should not get a spurious event from a different source. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- This is just a poke patch, since I also checked libudev's source and still fail to understand why we need that check. Unless entered by *_monitor_unref with the last reference or with *monitor_disconnect, libudev doesn't change the fd arbitrarily. So the only reason for us to check for that would be if we disconnected from our side, but didn't unregister the callback in which case it was our responsibility to clean up properly and we shouldn't get to the callback in the first place. Thanks for comments in advance. src/node_device/node_device_udev.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 174124a1b..7820c49c4 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1602,24 +1602,15 @@ nodeStateCleanup(void) static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, - int fd, + int fd ATTRIBUTE_UNUSED, int events ATTRIBUTE_UNUSED, void *data ATTRIBUTE_UNUSED) { struct udev_device *device = NULL; struct udev_monitor *udev_monitor = DRV_STATE_UDEV_MONITOR(driver); const char *action = NULL; - int udev_fd = -1; nodeDeviceLock(); - udev_fd = udev_monitor_get_fd(udev_monitor); - if (fd != udev_fd) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("File descriptor returned by udev %d does not " - "match node device file descriptor %d"), - fd, udev_fd); - goto cleanup; - } device = udev_monitor_receive_device(udev_monitor); if (device == NULL) { -- 2.13.2

2 2

[libvirt] [PATCH go-xml] support virtualport for interface and add test code
by ZhenweiPi 26 Jun '17

26 Jun '17

--- domain.go | 29 +++++++++++++++++------------ domain_test.go | 4 ++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/domain.go b/domain.go index eb7ff9e..ecb8550 100644 --- a/domain.go +++ b/domain.go @@ -185,19 +185,24 @@ type DomainInterfaceDriver struct { Queues uint `xml:"queues,attr,omitempty"` } +type DomainInterfaceVirtualport struct { + Type string `xml:"type,attr"` +} + type DomainInterface struct { - XMLName xml.Name `xml:"interface"` - Type string `xml:"type,attr"` - MAC *DomainInterfaceMAC `xml:"mac"` - Model *DomainInterfaceModel `xml:"model"` - Source *DomainInterfaceSource `xml:"source"` - Target *DomainInterfaceTarget `xml:"target"` - Alias *DomainInterfaceAlias `xml:"alias"` - Link *DomainInterfaceLink `xml:"link"` - Boot *DomainDeviceBoot `xml:"boot"` - Script *DomainInterfaceScript `xml:"script"` - Driver *DomainInterfaceDriver `xml:"driver"` - Address *DomainAddress `xml:"address"` + XMLName xml.Name `xml:"interface"` + Type string `xml:"type,attr"` + MAC *DomainInterfaceMAC `xml:"mac"` + Model *DomainInterfaceModel `xml:"model"` + Source *DomainInterfaceSource `xml:"source"` + Target *DomainInterfaceTarget `xml:"target"` + Alias *DomainInterfaceAlias `xml:"alias"` + Link *DomainInterfaceLink `xml:"link"` + Boot *DomainDeviceBoot `xml:"boot"` + Script *DomainInterfaceScript `xml:"script"` + Driver *DomainInterfaceDriver `xml:"driver"` + Virtualport *DomainInterfaceVirtualport `xml:"virtualport"` + Address *DomainAddress `xml:"address"` } type DomainChardevSource struct { diff --git a/domain_test.go b/domain_test.go index 6b37719..9de725c 100644 --- a/domain_test.go +++ b/domain_test.go @@ -565,6 +565,9 @@ var domainTestData = []struct { Model: &DomainInterfaceModel{ Type: "virtio", }, + Virtualport: &DomainInterfaceVirtualport{ + Type: "openvswitch", + }, }, }, }, @@ -577,6 +580,7 @@ var domainTestData = []struct { ` <interface type="network">`, ` <mac address="00:11:22:33:44:55"></mac>`, ` <model type="virtio"></model>`, + ` <virtualport type="openvswitch"></virtualport>`, ` </interface>`, ` </devices>`, `</domain>`, -- 2.7.4

2 1

[libvirt] [PATCH go-xml] add append attr for chardev
by zhenwei.pi 26 Jun '17

26 Jun '17

--- domain.go | 5 +++-- domain_test.go | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/domain.go b/domain.go index 82bf728..00231b2 100644 --- a/domain.go +++ b/domain.go @@ -227,8 +227,9 @@ type DomainInterface struct { } type DomainChardevSource struct { - Mode string `xml:"mode,attr"` - Path string `xml:"path,attr"` + Mode string `xml:"mode,attr,omitempty"` + Path string `xml:"path,attr"` + Append string `xml:"append,attr,omitempty"` } type DomainChardevTarget struct { diff --git a/domain_test.go b/domain_test.go index 122aada..f50f1fd 100644 --- a/domain_test.go +++ b/domain_test.go @@ -297,6 +297,16 @@ var domainTestData = []struct { Port: &serialPort, }, }, + DomainSerial{ + Type: "file", + Source: &DomainChardevSource{ + Path: "/tmp/serial.log", + Append: "off", + }, + Target: &DomainSerialTarget{ + Port: &serialPort, + }, + }, }, Channels: []DomainChannel{ DomainChannel{ @@ -332,6 +342,10 @@ var domainTestData = []struct { ` <serial type="pty">`, ` <target type="isa" port="0"></target>`, ` </serial>`, + ` <serial type="file">`, + ` <source path="/tmp/serial.log" append="off"></source>`, + ` <target port="0"></target>`, + ` </serial>`, ` <console type="pty">`, ` <target type="virtio" port="0"></target>`, ` </console>`, -- 2.7.4

2 1

[libvirt] [PATCH] qemu: Avoid fd leak on incoming tunneled migration
by Jiri Denemark 26 Jun '17

26 Jun '17

While qemuProcessIncomingDefNew takes an fd argument and stores it in qemuProcessIncomingDef structure, the caller is still responsible for closing the file descriptor. Introduced by commit v1.2.21-140-ge7c6f4575. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 1 - src/qemu/qemu_process.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8129dcd40..c23fffef2 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2690,7 +2690,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, listenAddress, port, dataFD[0]))) goto stopjob; - dataFD[0] = -1; /* the FD is now owned by incoming */ if (qemuProcessPrepareDomain(dconn, driver, vm, VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fa9990e5d..443ec88fe 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4169,6 +4169,9 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDefPtr inc) * This function does not copy @path, the caller is responsible for keeping * the @path pointer valid during the lifetime of the allocated * qemuProcessIncomingDef structure. + * + * The caller is responsible for closing @fd, calling + * qemuProcessIncomingDefFree will NOT close it. */ qemuProcessIncomingDefPtr qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, -- 2.13.1

2 2

[libvirt] [PATCH] README: Remove unnecessary empty line
by Andrea Bolognani 26 Jun '17

26 Jun '17

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 1035bcf..d0ce149 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,6 @@ $ make $ make install ``` - The libvirt code relies on a large number of 3rd party libraries. These will be detected during execution of the configure script and a summary printed which lists any missing (optional) dependencies. -- 2.7.5

1 0

[libvirt] [PATCH v2] util: Extract locale-related fixes into separate functions
by Peter Krempa 26 Jun '17

26 Jun '17

From: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virstring.c | 114 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 39 deletions(-) v2: - fixed Martin's laziness ... oh wait. diff --git a/src/util/virstring.c b/src/util/virstring.c index feea5be05..9b54bd6fb 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -521,19 +521,81 @@ virStrToLong_ullp(char const *s, char **end_ptr, int base, /* In case thread-safe locales are available */ #if HAVE_NEWLOCALE -static locale_t virLocale; +typedef locale_t virLocale; +static virLocale virLocaleRaw; static int virLocaleOnceInit(void) { - virLocale = newlocale(LC_ALL_MASK, "C", (locale_t)0); - if (!virLocale) + virLocaleRaw = newlocale(LC_ALL_MASK, "C", (locale_t)0); + if (!virLocaleRaw) return -1; return 0; } VIR_ONCE_GLOBAL_INIT(virLocale); -#endif + +/** + * virLocaleSetRaw: + * + * @oldlocale: set to old locale pointer + * + * Sets the locale to 'C' to allow operating on non-localized objects. + * Returns 0 on success -1 on error. + */ +static int +virLocaleSetRaw(virLocale *oldlocale) +{ + if (virLocaleInitialize() < 0) + return -1; + *oldlocale = uselocale(virLocaleRaw); + return 0; +} + +static void +virLocaleRevert(virLocale *oldlocale) +{ + uselocale(*oldlocale); +} + +static void +virLocaleFixupRadix(char **strp ATTRIBUTE_UNUSED) +{ +} + +#else /* !HAVE_NEWLOCALE */ + +typedef int virLocale; + +static int +virLocaleSetRaw(virLocale *oldlocale ATTRIBUTE_UNUSED) +{ + return 0; +} + +static void +virLocaleRevert(virLocale *oldlocale ATTRIBUTE_UNUSED) +{ +} + +static void +virLocaleFixupRadix(char **strp) +{ + char *radix, *tmp; + struct lconv *lc; + + lc = localeconv(); + radix = lc->decimal_point; + tmp = strstr(*strp, radix); + if (tmp) { + *tmp = '.'; + if (strlen(radix) > 1) + memmove(tmp + 1, tmp + strlen(radix), strlen(*strp) - (tmp - *strp)); + } +} + +#endif /* !HAVE_NEWLOCALE */ + /** * virStrToDouble @@ -547,22 +609,17 @@ virStrToDouble(char const *s, char **end_ptr, double *result) { + virLocale oldlocale; double val; char *p; int err; errno = 0; -#if HAVE_NEWLOCALE - locale_t old_loc; - if (virLocaleInitialize() < 0) + if (virLocaleSetRaw(&oldlocale) < 0) return -1; - - old_loc = uselocale(virLocale); -#endif val = strtod(s, &p); /* exempt from syntax-check */ -#if HAVE_NEWLOCALE - uselocale(old_loc); -#endif + virLocaleRevert(&oldlocale); + err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; @@ -582,38 +639,17 @@ virStrToDouble(char const *s, int virDoubleToStr(char **strp, double number) { + virLocale oldlocale; int ret = -1; -#if HAVE_NEWLOCALE - - locale_t old_loc; - - if (virLocaleInitialize() < 0) - goto error; + if (virLocaleSetRaw(&oldlocale) < 0) + return -1; - old_loc = uselocale(virLocale); ret = virAsprintf(strp, "%lf", number); - uselocale(old_loc); - -#else - char *radix, *tmp; - struct lconv *lc; + virLocaleRevert(&oldlocale); + virLocaleFixupRadix(strp); - if ((ret = virAsprintf(strp, "%lf", number) < 0)) - goto error; - - lc = localeconv(); - radix = lc->decimal_point; - tmp = strstr(*strp, radix); - if (tmp) { - *tmp = '.'; - if (strlen(radix) > 1) - memmove(tmp + 1, tmp + strlen(radix), strlen(*strp) - (tmp - *strp)); - } - -#endif /* HAVE_NEWLOCALE */ - error: return ret; } -- 2.12.2

3 2

[libvirt] [PATCH] HACKING: Refresh after changes to source file
by Andrea Bolognani 26 Jun '17

26 Jun '17

Commit 79c1900fc1eb changed docs/hacking.html.in, but *of course* I forgot once again to update the text-only version of the file at the same time. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. HACKING | 54 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/HACKING b/HACKING index b78a9ae..1d9f3f1 100644 --- a/HACKING +++ b/HACKING @@ -43,27 +43,49 @@ post your patches: git pull --rebase (fix any conflicts) git send-email --cover-letter --no-chain-reply-to --annotate \ - --to=libvir-list(a)redhat.com master + --confirm=always --to=libvir-list(a)redhat.com master -(Note that the "git send-email" subcommand may not be in the main git package +For a single patch you can omit "--cover-letter", but a series of two or more +patches needs a cover letter. + +Note that the "git send-email" subcommand may not be in the main git package and using it may require installation of a separate package, for example the -"git-email" package in Fedora.) For a single patch you can omit -"--cover-letter", but a series of two or more patches needs a cover letter. If -you get tired of typing "--to=libvir-list(a)redhat.com" designation you can set -it in git config: +"git-email" package in Fedora and Debian. If this is your first time using +"git send-email", you might need to configure it to point it to your SMTP +server with something like: + + git config --global sendemail.smtpServer stmp.youremailprovider.net + +If you get tired of typing "--to=libvir-list(a)redhat.com" all the time, you can +configure that to be automatically handled as well: git config sendemail.to libvir-list(a)redhat.com -Please follow this as close as you can, especially the rebase and git -send-email part, as it makes life easier for other developers to review your -patch set. One should avoid sending patches as attachments, but rather send -them in email body along with commit message. If a developer is sending -another version of the patch (e.g. to address review comments), they are -advised to note differences to previous versions after the "---" line in the -patch so that it helps reviewers but doesn't become part of git history. -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). +As a rule, patches should be sent to the mailing list only: all developers are +subscribed to libvir-list and read it regularly, so please don't CC individual +developers unless they've explicitly asked you to. + +Avoid using mail clients for sending patches, as most of them will mangle the +messages in some way, making them unusable for our purposes. Gmail and other +Web-based mail clients are particularly bad at this. + +If everything went well, your patch should show up on the libvir-list archives +<https://www.redhat.com/archives/libvir-list/> in a matter of minutes; if you +still can't find it on there after an hour or so, you should double-check your +setup. Note that your very first post to the mailing list will be subject to +moderation, and it's not uncommon for that to take around a day. + +Please follow this as close as you can, especially the rebase and "git +send-email" part, as it makes life easier for other developers to review your +patch set. + +One should avoid sending patches as attachments, but rather send them in email +body along with commit message. If a developer is sending another version of +the patch (e.g. to address review comments), they are advised to note +differences to previous versions after the "---" line in the patch so that it +helps reviewers but doesn't become part of git history. 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 -- 2.7.5

1 0