- Devel - libvirt List Archives

[libvirt] """virsh schedinfo [--weight number] domain""" doesn't work with virsh(libxl) for managing Xen domains.
by Volo M. 28 Sep '16

28 Sep '16

Hi Devs, We're using Centos 7 Xen hypervisors and try to use Libvirt(libxl) for managing Xen guest domains. We noticed that we can't set cpu weight values for Xen domains with libvirt (tested for libvirt v.1.3 and v.2.2) even though its possible to do with XL toolkit. [root@hv1xen ~]# virsh schedinfo --domain rtp6a88apsm3or --cap=5 Scheduler : credit weight : 1000 [root@hv1xen ~]# virsh schedinfo --domain rtp6a88apsm3or --weight=50 Scheduler : credit error: invalid scheduler option: weight We noticed in documentation for 'virsh' like this https://linux.die.net/man/1/virsh that the cpu weight option is going to be deprecated: *"""Note*: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now *DEPRECATED* . """ Can you please clarify why it's been deprecated and what should be used instead for scheduling and limitation of CPU for Xen domains with Libvirt? We like Libvirt very much and don't want to apply some awkward workarounds like simultaneous using Libvirt and XL toolkit. Any suggestion here? Thanks.

2 1

[libvirt] [PATCH v3 0/4] libxl: channels support
by Joao Martins 27 Sep '16

27 Sep '16

Hey, This v3 from channel series with latest comments addressed. Difference to qemu driver would be only the autogenerated path being slightly different. Channels have been on xen toolstack since Xen 4.5 and this small series adds support for it, including xenconfig conversion and appropriate tests. After this series it's possible to do this: (assuming correct configuration of qemu agent in the guest) $ cat domain.xml | grep -a1 channel | head -n 5 | tail -n 4 <channel type='unix'> <source mode='bind' path='/tmp/channel'/> <target type='xen' name='org.qemu.guest_agent.0'/> </channel> $ virsh create domain.xml $ echo '{"execute":"guest-network-get-interfaces"}' | socat stdio,ignoreeof unix-connect:/tmp/channel {"execute":"guest-network-get-interfaces"} {"return": [{"name": "lo", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "127.0.0.1", "prefix": 8}, {"ip-address-type": "ipv6", "ip-address": "::1", "prefix": 128}], "hardware-address": "00:00:00:00:00:00"}, {"name": "eth0", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "10.100.0.6", "prefix": 24}, {"ip-address-type": "ipv6", "ip-address": "fe80::216:3eff:fe40:88eb", "prefix": 64}], "hardware-address": "00:16:3e:40:88:eb"}, {"name": "sit0"}]} Thanks, Joao Joao Martins (4): conf: add xen type for channels libxl: channels support xenconfig: channels conversion support xlconfigtest: add test for channel conversion docs/formatdomain.html.in | 10 ++ docs/schemas/domaincommon.rng | 11 ++ src/conf/domain_conf.c | 18 +++- src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 110 +++++++++++++++++++ src/libxl/libxl_conf.h | 3 + src/libxl/libxl_domain.c | 43 +++++++- src/libxl/libxl_driver.c | 7 ++ src/qemu/qemu_command.c | 1 + src/xenconfig/xen_xl.c | 176 +++++++++++++++++++++++++++++++ tests/xlconfigdata/test-channel-pty.cfg | 13 +++ tests/xlconfigdata/test-channel-pty.xml | 33 ++++++ tests/xlconfigdata/test-channel-unix.cfg | 13 +++ tests/xlconfigdata/test-channel-unix.xml | 34 ++++++ tests/xlconfigtest.c | 4 + 15 files changed, 472 insertions(+), 5 deletions(-) create mode 100644 tests/xlconfigdata/test-channel-pty.cfg create mode 100644 tests/xlconfigdata/test-channel-pty.xml create mode 100644 tests/xlconfigdata/test-channel-unix.cfg create mode 100644 tests/xlconfigdata/test-channel-unix.xml -- 2.1.4

2 10

[libvirt] [PATCH v2] qemu: Fix crash in qemucapsprobe
by Jiri Denemark 27 Sep '16

27 Sep '16

The qemucapsprobe helper calls virQEMUCapsNewForBinaryInternal with caps == NULL, causing the following crash: Program received signal SIGSEGV, Segmentation fault. #0 0x00007ffff788775f in virQEMUCapsInitHostCPUModel (qemuCaps=qemuCaps@entry=0x649680, host=host@entry=0x10) at src/qemu/qemu_capabilities.c:2969 #1 0x00007ffff7889dbf in virQEMUCapsNewForBinaryInternal (caps=caps@entry=0x0, binary=<optimized out>, libDir=libDir@entry=0x4033f6 "/tmp", cacheDir=cacheDir@entry=0x0, runUid=runUid@entry=4294967295, runGid=runGid@entry=4294967295, qmpOnly=true) at src/qemu/qemu_capabilities.c:4039 #2 0x0000000000401702 in main (argc=2, argv=0x7fffffffd968) at tests/qemucapsprobe.c:73 Caused by v2.2.0-182-g68c7011. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 15 +++++++++------ src/qemu/qemu_capspriv.h | 2 +- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4d859c4..cc8ec58 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2962,14 +2962,17 @@ virQEMUCapsCPUFilterFeatures(const char *name, void virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, - virCapsHostPtr host) + virCapsPtr caps) { virCPUDefPtr cpu = NULL; - if (!virQEMUCapsGuestIsNative(host->arch, qemuCaps->arch)) + if (!caps) + return; + + if (!virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch)) goto error; - if (host->cpu && host->cpu->model) { + if (caps->host.cpu && caps->host.cpu->model) { if (VIR_ALLOC(cpu) < 0) goto error; @@ -2978,7 +2981,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, cpu->mode = VIR_CPU_MODE_CUSTOM; cpu->match = VIR_CPU_MATCH_EXACT; - if (virCPUDefCopyModelFilter(cpu, host->cpu, true, + if (virCPUDefCopyModelFilter(cpu, caps->host.cpu, true, virQEMUCapsCPUFilterFeatures, NULL) < 0) goto error; } @@ -3248,7 +3251,7 @@ virQEMUCapsLoadCache(virCapsPtr caps, } VIR_FREE(nodes); - virQEMUCapsInitHostCPUModel(qemuCaps, &caps->host); + virQEMUCapsInitHostCPUModel(qemuCaps, caps); ret = 0; cleanup: @@ -4036,7 +4039,7 @@ virQEMUCapsNewForBinaryInternal(virCapsPtr caps, virQEMUCapsRememberCached(qemuCaps, cacheDir) < 0) goto error; - virQEMUCapsInitHostCPUModel(qemuCaps, &caps->host); + virQEMUCapsInitHostCPUModel(qemuCaps, caps); } cleanup: diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 22c5a8a..fab2c2a 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -64,5 +64,5 @@ virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps, void virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, - virCapsHostPtr host); + virCapsPtr caps); #endif diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0af71a1..4b9ecb8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -357,7 +357,7 @@ testUpdateQEMUCaps(const struct testInfo *info, if (testAddCPUModels(info->qemuCaps, info->skipLegacyCPUs) < 0) goto cleanup; - virQEMUCapsInitHostCPUModel(info->qemuCaps, &caps->host); + virQEMUCapsInitHostCPUModel(info->qemuCaps, caps); virQEMUCapsFilterByMachineType(info->qemuCaps, vm->def->os.machine); -- 2.10.0

2 1

[libvirt] [PATCH v2 0/8] Pass the path of compress program (redo)
by John Ferlan 27 Sep '16

27 Sep '16

v1: http://www.redhat.com/archives/libvir-list/2016-September/msg00971.html Changes in v2: 1. Create a patch 5 which alters the qemuGetCompressionProgram to take a new const char * parameter which will be used in the warning message as the %s image format "style" (dump, save, snapshot) for both messages. Also removed the unnecessary translated message marker _() for the VIR_WARN message. 2. Alter former patch 5 to pass the style ("save" or "snapshot") as an argument for the altered virReportError messages which now will take a parameter that describe their style. For one message it keeps it constant, for the other it adds the style into the message. 3. Alter former patches 6 and 7 to account for the new argument (no real changes, just handling merge conflicts). (from patch 1's cover) Rather than try to describe what I was thinking about for the passing the compress program directly series from Chen Hanxiao: http://www.redhat.com/archives/libvir-list/2016-September/msg00677.html and http://www.redhat.com/archives/libvir-list/2016-August/msg01237.html I took the liberty of creating my own set of patches which should end in the more or less same result. The primary benefit is not calling virFileInPath twice since we already get it at least once for the various compressed program callers, let's pass what we originally found. John Ferlan (8): qemu: Move getCompressionType qemu: Adjust doCoreDump to call getCompressionType qemu: Introduce helper qemuGetCompressionProgram qemu: Remove getCompressionType qemu: Alter qemuGetCompressionProgram warning message qemu: Use qemuGetCompressionProgram for error paths qemu: Remove qemuCompressProgramAvailable qemu: Get/return compressedpath program src/qemu/qemu_driver.c | 241 ++++++++++++++++++++++++------------------------- 1 file changed, 117 insertions(+), 124 deletions(-) -- 2.7.4

3 13

[libvirt] [PATCH] libxl: find virDomainObj in libxlDomainShutdownThread
by Jim Fehlig 27 Sep '16

27 Sep '16

libxl events are delivered to libvirt via the libxlDomainEventHandler callback registered with libxl. Documenation in $xensrc/tools/libxl/libxl_event.h states that the callback "may occur on any thread in which the application calls libxl". This can result in deadlock since many of the libvirt callees of libxl hold a lock on the virDomainObj they are working on. When the callback is invoked, it attempts to find a virDomainObj corresponding to the domain ID provided by libxl. Searching the domain obj list results in locking each obj before checking if it is active, and its ID equals the requested ID. Deadlock is possible when attempting to lock an obj that is already locked further up the call stack. Indeed, Max Ustermann reported an instance of this deadlock https://www.redhat.com/archives/libvir-list/2015-November/msg00130.html Guido Rossmueller also recently stumbled across it https://www.redhat.com/archives/libvir-list/2016-September/msg00287.html Fix the deadlock by moving the lookup of virDomainObj to the libxlDomainShutdownThread. After this patch, libxl events are enqueued on the libvirt side and processed by dedicated thread, avoiding the described deadlock. Reported-by: Max Ustermann <ustermann78(a)web.de> Reported-by: Guido Rossmueller <Guido.Rossmueller(a)gdata.de> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Essentially this is a V2 of https://www.redhat.com/archives/libvir-list/2015-November/msg00520.html But that patch is nearly a year old and "V2" takes a completely different (and IMO much better) approach to fixing the deadlock. src/libxl/libxl_domain.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 43f4a7f..a472751 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -421,7 +421,6 @@ virDomainDefParserConfig libxlDomainDefParserConfig = { struct libxlShutdownThreadInfo { libxlDriverPrivatePtr driver; - virDomainObjPtr vm; libxl_event *event; }; @@ -430,7 +429,7 @@ static void libxlDomainShutdownThread(void *opaque) { struct libxlShutdownThreadInfo *shutdown_info = opaque; - virDomainObjPtr vm = shutdown_info->vm; + virDomainObjPtr vm = NULL; libxl_event *ev = shutdown_info->event; libxlDriverPrivatePtr driver = shutdown_info->driver; virObjectEventPtr dom_event = NULL; @@ -439,6 +438,12 @@ libxlDomainShutdownThread(void *opaque) cfg = libxlDriverConfigGet(driver); + vm = virDomainObjListFindByIDRef(driver->domains, ev->domid); + if (!vm) { + VIR_INFO("Received event for unknown domain ID %d", ev->domid); + goto cleanup; + } + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) goto cleanup; @@ -547,7 +552,6 @@ void libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) { libxlDriverPrivatePtr driver = data; - virDomainObjPtr vm = NULL; libxl_shutdown_reason xl_reason = event->u.domain_shutdown.shutdown_reason; struct libxlShutdownThreadInfo *shutdown_info = NULL; virThread thread; @@ -565,12 +569,6 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) if (xl_reason == LIBXL_SHUTDOWN_REASON_SUSPEND) goto error; - vm = virDomainObjListFindByIDRef(driver->domains, event->domid); - if (!vm) { - VIR_INFO("Received event for unknown domain ID %d", event->domid); - goto error; - } - /* * Start a thread to handle shutdown. We don't want to be tying up * libxl's event machinery by doing a potentially lengthy shutdown. @@ -579,7 +577,6 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) goto error; shutdown_info->driver = driver; - shutdown_info->vm = vm; shutdown_info->event = (libxl_event *)event; if (virThreadCreate(&thread, false, libxlDomainShutdownThread, shutdown_info) < 0) { @@ -591,7 +588,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) } /* - * VM is unlocked and libxl_event freed in shutdown thread + * libxlShutdownThreadInfo and libxl_event are freed in shutdown thread */ return; @@ -600,7 +597,6 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) /* Cast away any const */ libxl_event_free(cfg->ctx, (libxl_event *)event); virObjectUnref(cfg); - virDomainObjEndAPI(&vm); VIR_FREE(shutdown_info); } -- 2.6.6

2 2

[libvirt] [PATCH] qemu: Fix crash in qemucapsprobe
by Jiri Denemark 27 Sep '16

27 Sep '16

The qemucapsprobe helper calls virQEMUCapsInitHostCPUModel with caps == NULL, causing the following crash: Program received signal SIGSEGV, Segmentation fault. #0 0x00007ffff788775f in virQEMUCapsInitHostCPUModel (qemuCaps=qemuCaps@entry=0x649680, host=host@entry=0x10) at src/qemu/qemu_capabilities.c:2969 #1 0x00007ffff7889dbf in virQEMUCapsNewForBinaryInternal (caps=caps@entry=0x0, binary=<optimized out>, libDir=libDir@entry=0x4033f6 "/tmp", cacheDir=cacheDir@entry=0x0, runUid=runUid@entry=4294967295, runGid=runGid@entry=4294967295, qmpOnly=true) at src/qemu/qemu_capabilities.c:4039 #2 0x0000000000401702 in main (argc=2, argv=0x7fffffffd968) at tests/qemucapsprobe.c:73 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4d859c4..73a7fd4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4036,7 +4036,8 @@ virQEMUCapsNewForBinaryInternal(virCapsPtr caps, virQEMUCapsRememberCached(qemuCaps, cacheDir) < 0) goto error; - virQEMUCapsInitHostCPUModel(qemuCaps, &caps->host); + if (caps) + virQEMUCapsInitHostCPUModel(qemuCaps, &caps->host); } cleanup: -- 2.10.0

3 3

[libvirt] [PATCH] virsh domdisplay: introduce '--all' for showing all possible graphical display
by Chen Hanxiao 27 Sep '16

27 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> For one VM, it could have more than one graphical display. Such as we coud add both vnc and spice display to a VM. This patch introduces '--all' for showing all possible type of graphical display for a active VM. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3829b17..7194153 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10648,6 +10648,10 @@ static const vshCmdOptDef opts_domdisplay[] = { .help = N_("select particular graphical display " "(e.g. \"vnc\", \"spice\", \"rdp\")") }, + {.name = "all", + .type = VSH_OT_BOOL, + .help = N_("show all possible graphical displays") + }, {.name = NULL} }; @@ -10671,6 +10675,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) int tmp; int flags = 0; bool params = false; + bool all = false; const char *xpath_fmt = "string(/domain/devices/graphics[@type='%s']/%s)"; virSocketAddr addr; @@ -10685,6 +10690,9 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "include-password")) flags |= VIR_DOMAIN_XML_SECURE; + if (vshCommandOptBool(cmd, "all")) + all = true; + if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) goto cleanup; @@ -10845,7 +10853,15 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* We got what we came for so return successfully */ ret = true; - break; + if (!all) { + break; + } else { + VIR_FREE(xpath); + VIR_FREE(passwd); + VIR_FREE(listen_addr); + VIR_FREE(output); + vshPrint(ctl, "\n"); + } } if (!ret) { -- 1.8.3.1

2 2

[libvirt] [PATCH] mingw: Package cputypes.rng for mingw32 too
by Jiri Denemark 27 Sep '16

27 Sep '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. mingw-libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index c8476d9..c9bf503 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -210,6 +210,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %dir %{mingw32_datadir}/libvirt/schemas/ %{mingw32_datadir}/libvirt/schemas/basictypes.rng %{mingw32_datadir}/libvirt/schemas/capability.rng +%{mingw32_datadir}/libvirt/schemas/cputypes.rng %{mingw32_datadir}/libvirt/schemas/domain.rng %{mingw32_datadir}/libvirt/schemas/domaincaps.rng %{mingw32_datadir}/libvirt/schemas/domaincommon.rng -- 2.10.0

1 0

[libvirt] [PATCH] mingw: Package cputypes.rng
by Jiri Denemark 27 Sep '16

27 Sep '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. mingw-libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 5c7183f..c8476d9 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -292,6 +292,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %dir %{mingw64_datadir}/libvirt/schemas/ %{mingw64_datadir}/libvirt/schemas/basictypes.rng %{mingw64_datadir}/libvirt/schemas/capability.rng +%{mingw64_datadir}/libvirt/schemas/cputypes.rng %{mingw64_datadir}/libvirt/schemas/domain.rng %{mingw64_datadir}/libvirt/schemas/domaincaps.rng %{mingw64_datadir}/libvirt/schemas/domaincommon.rng -- 2.10.0

1 0

[libvirt] [PATCH] spec: Package cputypes.rng
by Jiri Denemark 27 Sep '16

27 Sep '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index a389e88..00b95b8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1814,6 +1814,7 @@ exit 0 %{_datadir}/libvirt/schemas/basictypes.rng %{_datadir}/libvirt/schemas/capability.rng +%{_datadir}/libvirt/schemas/cputypes.rng %{_datadir}/libvirt/schemas/domain.rng %{_datadir}/libvirt/schemas/domaincaps.rng %{_datadir}/libvirt/schemas/domaincommon.rng -- 2.10.0

1 0

[libvirt] [PATCH] qemu: make qemuGetCompressionProgram return int not an enum
by Daniel P. Berrange 27 Sep '16

27 Sep '16

enum types are unsigned and the qemuGetCompressionProgram function can return -1 on error. It is therefore inappropriate to return an enum type. This fixes a build error where the internal 'ret' variable was used in a comparison with -1 ../../src/qemu/qemu_driver.c: In function 'qemuGetCompressionProgram': ../../src/qemu/qemu_driver.c:3280:5: error: comparison of unsigned expression < 0 is always false [-Werror=type-limits] ../../src/qemu/qemu_driver.c:3289:5: error: comparison of unsigned expression < 0 is always false [-Werror=type-limits] cc1: all warnings being treated as errors Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a CI broken build fix. src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index eaea96f..7873a68 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3264,13 +3264,13 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, * no there was an error, then just return RAW * indicating none. */ -static virQEMUSaveFormat ATTRIBUTE_NONNULL(2) +static int ATTRIBUTE_NONNULL(2) qemuGetCompressionProgram(const char *imageFormat, char **compresspath, const char *styleFormat, bool use_raw_on_fail) { - virQEMUSaveFormat ret; + int ret; *compresspath = NULL; -- 2.7.4

2 1

[libvirt] Plan for next release
by Daniel Veillard 27 Sep '16

27 Sep '16

Time flies, I didn't realized we were that close from the end of the month. So if we want to have 2.3.0 for next Monday I think we should start the freeze today, possibly tonight. Does this work ? Sorry for late notice, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Fix coding style issues.
by Nitesh Konkar 26 Sep '16

26 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/uml/uml_conf.h | 2 +- src/vbox/vbox_common.h | 2 +- tests/qemumonitorjsontest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index 9a45d10..5da55e5 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -35,7 +35,7 @@ # include "vircommand.h" # include "virhash.h" -# define umlDebug(fmt, ...) do {} while(0) +# define umlDebug(fmt, ...) do {} while (0) # define UML_CPUMASK_LEN CPU_SETSIZE diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index c8787c3..b178878 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -435,6 +435,6 @@ typedef nsISupports IKeyboard; } else { \ result = -1; \ } \ - } while(0) + } while (0) #endif /* VBOX_COMMON_H */ diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index cbc39c6..9823a9d 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -721,7 +721,7 @@ testQemuMonitorJSONAttachChardev(const void *data) goto cleanup; \ if (qemuMonitorAttachCharDev(qemuMonitorTestGetMonitor(test), \ chrID, &chr) < 0) \ - ret = fail ? ret : -1; \ + ret = fail ? ret : -1; \ else \ ret = fail ? -1 : ret; \ -- 2.1.0

2 1

[libvirt] virsh can list ("virsh list" is empty) Guest domains created by "xl create DomU"
by Volo M. 26 Sep '16

26 Sep '16

Hi, We use Centos 7 Xen hypervisor, start VMs with xl toolkit (libxl), but we can't list with "virsh list" command DomUs created with "xl create ..." command. Can anybody, please, explain why this happens? Why does it work like this? It worked before with "libvirt+xm" toolkits, but xm toolkit was deprecated for latest Xen sortware on Centos 7. Can this be fixed ever? Thank you. Example: [root@c7xen2 ~]# xl create /onapp/config/w62tp7db1txk12 ... [root@c7xen2 ~]# xl list Name ID Mem VCPUs State Time(s) Domain-0 0 400 2 r----- 102.0 w62tp7db1txk12 1 512 1 -b---- 2.6 [root@c7xen2 ~]# virsh list Id Name State ---------------------------------------------------- 0 Domain-0 running [root@c7xen2 ~]#

2 1

[libvirt] [PATCH v2 0/4] libxl: channels support
by Joao Martins 26 Sep '16

26 Sep '16

Hey, This v2 from channel series. Since v1 path is now autogenerated as needed, and a few other comments from Jim that were addressed. Difference to qemu driver would be only the autogenerated path being slightly different. Channels have been on xen toolstack since Xen 4.5 and this small series adds support for it, including xenconfig conversion and appropriate tests. After this series it's possible to do this: (assuming correct configuration of qemu agent in the guest) $ cat domain.xml | grep -a1 channel | head -n 5 | tail -n 4 <channel type='unix'> <source mode='bind' path='/tmp/channel'/> <target type='xen' name='org.qemu.guest_agent.0'/> </channel> $ virsh create domain.xml $ echo '{"execute":"guest-network-get-interfaces"}' | socat stdio,ignoreeof unix-connect:/tmp/channel {"execute":"guest-network-get-interfaces"} {"return": [{"name": "lo", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "127.0.0.1", "prefix": 8}, {"ip-address-type": "ipv6", "ip-address": "::1", "prefix": 128}], "hardware-address": "00:00:00:00:00:00"}, {"name": "eth0", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "10.100.0.6", "prefix": 24}, {"ip-address-type": "ipv6", "ip-address": "fe80::216:3eff:fe40:88eb", "prefix": 64}], "hardware-address": "00:16:3e:40:88:eb"}, {"name": "sit0"}]} Thanks, Joao Joao Martins (4): conf: add xen type for channels libxl: channels support xenconfig: channels conversion support xlconfigtest: add test for channel conversion docs/schemas/domaincommon.rng | 11 ++ src/conf/domain_conf.c | 18 +++- src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 120 ++++++++++++++++++++- src/libxl/libxl_conf.h | 4 +- src/libxl/libxl_domain.c | 44 +++++++- src/libxl/libxl_driver.c | 7 ++ src/qemu/qemu_command.c | 1 + src/xenconfig/xen_xl.c | 176 +++++++++++++++++++++++++++++++ tests/xlconfigdata/test-channel-pty.cfg | 13 +++ tests/xlconfigdata/test-channel-pty.xml | 33 ++++++ tests/xlconfigdata/test-channel-unix.cfg | 13 +++ tests/xlconfigdata/test-channel-unix.xml | 34 ++++++ tests/xlconfigtest.c | 4 + 14 files changed, 471 insertions(+), 8 deletions(-) create mode 100644 tests/xlconfigdata/test-channel-pty.cfg create mode 100644 tests/xlconfigdata/test-channel-pty.xml create mode 100644 tests/xlconfigdata/test-channel-unix.cfg create mode 100644 tests/xlconfigdata/test-channel-unix.xml -- 2.1.4

2 17

[libvirt] [PATCH v7 0/5] Add native TLS encrypted chardev TCP support
by John Ferlan 26 Sep '16

26 Sep '16

v6: http://www.redhat.com/archives/libvir-list/2016-September/msg00302.html Differences over v6 - rather than disable on specific chardev's, modify the code to be need to enable by setting tls='yes' for the chardev John Ferlan (5): domain: Add optional 'tls' attribute for TCP chardev conf: Introduce {default|chardev}_tls_x509_secret_uuid qemu: Introduce qemuDomainChardevPrivatePtr qemu: Add a secret object to/for a chardev tcp with secret qemu: Add the ability to hotplug a secret object for TCP chardev TLS docs/formatdomain.html.in | 21 +++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 51 ++++++-- src/conf/domain_conf.h | 5 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 24 ++++ src/qemu/qemu_command.c | 35 ++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_conf.c | 22 ++++ src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 143 ++++++++++++++++++++- src/qemu/qemu_domain.h | 30 ++++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 64 ++++++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 6 +- src/qemu/test_libvirtd_qemu.aug.in | 2 + src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- tests/qemuhotplugtest.c | 2 +- ...emuxml2argv-serial-tcp-tlsx509-chardev-tls.args | 30 +++++ ...qemuxml2argv-serial-tcp-tlsx509-chardev-tls.xml | 50 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 2 +- ...xml2argv-serial-tcp-tlsx509-secret-chardev.args | 38 ++++++ ...uxml2argv-serial-tcp-tlsx509-secret-chardev.xml | 50 +++++++ tests/qemuxml2argvtest.c | 22 ++++ ...muxml2xmlout-serial-tcp-tlsx509-chardev-tls.xml | 1 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 32 files changed, 593 insertions(+), 36 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-tls.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-tls.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-tls.xml -- 2.7.4

2 10

[libvirt] [PATCH] storage_backend_rbd: remove unnessary translated message marker
by Chen Hanxiao 26 Sep '16

26 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Remove unnessary translated message marker _() for the VIR_WARN messages. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/storage/storage_backend_rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4dd4b24..21693c4 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -427,7 +427,7 @@ virStorageBackendRBDRefreshPool(virConnectPtr conn, if (len >= 0) break; if (len != -ERANGE) { - VIR_WARN("%s", _("A problem occurred while listing RBD images")); + VIR_WARN("%s", "A problem occurred while listing RBD images"); goto cleanup; } VIR_FREE(names); @@ -582,7 +582,7 @@ virStorageBackendRBDDeleteVol(virConnectPtr conn, VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name); if (flags & VIR_STORAGE_VOL_DELETE_ZEROED) - VIR_WARN("%s", _("This storage backend does not support zeroed removal of volumes")); + VIR_WARN("%s", "This storage backend does not support zeroed removal of volumes"); if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; -- 1.8.3.1

2 1

[libvirt] [PATCH] Fix Typos
by Nitesh Konkar 26 Sep '16

26 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/esx/esx_vi.c | 2 +- src/libvirt-nodedev.c | 2 +- src/openvz/openvz_conf.c | 2 +- tools/virt-admin.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index a28ac7b..8586e3f 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1110,7 +1110,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, * FIXME: Actually this should be detected by really calling * QueryVirtualDiskUuid and checking if a NotImplemented fault is * returned. But currently we don't deserialized the details of a - * possbile fault and therefore we don't know if the fault was a + * possible fault and therefore we don't know if the fault was a * NotImplemented fault or not. */ ctx->hasQueryVirtualDiskUuid = true; diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 59f020b..6ea14b3 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -636,7 +636,7 @@ virNodeDeviceReAttach(virNodeDevicePtr dev) * virNodeDeviceReset: * @dev: pointer to the node device * - * Reset a previously dettached node device to the node before or + * Reset a previously detached node device to the node before or * after assigning it to a guest. * * The exact reset semantics depends on the hypervisor and device diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 9b820a9..65c441e 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -762,7 +762,7 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value) /* * Read parameter from container config * - * value will be freed before a new value is assined to it, the caller is + * value will be freed before a new value is assigned to it, the caller is * responsible for freeing it afterwards. * * sample: 133, "OSTEMPLATE", &value diff --git a/tools/virt-admin.c b/tools/virt-admin.c index b749acb..b1e0c49 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -109,7 +109,7 @@ vshAdmGetTimeStr(vshControl *ctl, time_t then, char **result) * vshAdmCatchDisconnect: * * We get here when the connection was closed. Unlike virsh, we do not save - * the fact that the event was raised, sice there is virAdmConnectIsAlive to + * the fact that the event was raised, since there is virAdmConnectIsAlive to * check if the communication channel has not been closed by remote party. */ static void -- 2.1.0

2 1

[libvirt] [PATCH v2 00/11] Couple of migration fixes
by Michal Privoznik 26 Sep '16

26 Sep '16

v2 of: https://www.redhat.com/archives/libvir-list/2016-September/msg00802.html diff to v1: - Instead of introducing vir*Opaque() APIs, just add parseOpaque argument to everything that needs it - Pass qemuCaps directly instead of domain object Michal Privoznik (11): virDomainDefPostParse: Introduce @parseOpaque argument virDomainDefParseNode: Introduce @parseOpaque argument virDomainDefParse{File,String}: Introduce @parseOpaque argument virDomainDefCopy: Introduce @parseOpaque argument qemuDomainDefPostParse: Fetch qemuCaps from domain object conf: Extend virDomainDeviceDefPostParse for parseOpaque qemuDomainDeviceDefPostParse: Fetch caps from domain object conf: Extend virDomainDefAssignAddressesCallback for parseOpaque qemuDomainDefAssignAddresses: Fetch caps from domain object domain_conf: Introduce VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE conf: Skip post parse callbacks when creating copy src/bhyve/bhyve_domain.c | 6 ++-- src/bhyve/bhyve_driver.c | 6 ++-- src/conf/domain_conf.c | 60 ++++++++++++++++++++++++++++------------ src/conf/domain_conf.h | 40 +++++++++++++++++++-------- src/conf/snapshot_conf.c | 2 +- src/conf/virdomainobjlist.c | 2 +- src/esx/esx_driver.c | 4 +-- src/libxl/libxl_domain.c | 12 ++++---- src/libxl/libxl_driver.c | 6 ++-- src/libxl/libxl_migration.c | 3 ++ src/lxc/lxc_domain.c | 6 ++-- src/lxc/lxc_driver.c | 4 +-- src/lxc/lxc_native.c | 2 +- src/openvz/openvz_driver.c | 11 +++++--- src/phyp/phyp_driver.c | 7 +++-- src/qemu/qemu_domain.c | 54 +++++++++++++++++++++++------------- src/qemu/qemu_driver.c | 23 +++++++-------- src/qemu/qemu_migration.c | 8 +++--- src/qemu/qemu_parse_command.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 13 +++++---- src/uml/uml_driver.c | 10 ++++--- src/vbox/vbox_common.c | 8 ++++-- src/vmware/vmware_driver.c | 10 ++++--- src/vmx/vmx.c | 8 ++++-- src/vz/vz_driver.c | 9 ++++-- src/xen/xen_driver.c | 11 +++++--- src/xen/xm_internal.c | 1 + src/xenapi/xenapi_driver.c | 8 ++++-- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 2 +- tests/bhyvexml2argvtest.c | 2 +- tests/domainconftest.c | 2 +- tests/qemuagenttest.c | 2 +- tests/qemuhotplugtest.c | 1 + tests/qemuxml2argvtest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/testutils.c | 2 +- tests/xlconfigtest.c | 4 +-- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 43 files changed, 231 insertions(+), 136 deletions(-) -- 2.8.4

2 23

[libvirt] [PATCH 0/2] Fix virsh save-restore/migration with memory hotplug.
by Nitesh Konkar 26 Sep '16

26 Sep '16

Virsh restore/migration fails on a VM which has gone through a series of memory attach and detach where the sequence of detach is random(not in LIFO order). With memory hotplug, the dimms are looked up using the object-id and so, the restore/migration fails because the qemu command that gets generated has memdev and id values which wouldn't exist for the given slotid. This patch ensures that the source and destination would always have same memdev-objectid-slotid values. Steps to hit the issue: 1. Hot add two memory dimms twice. virsh attach-device VMName memHotplug.xml --live virsh attach-device VMName memHotplug.xml --live 2. cat memHotplug.xml <memory model='dimm' > <target> <size unit='MiB'>128</size> <node>0</node> </target> </memory> 3. Now hot unplug the first memory module attached. virsh detach-device VMName detach.xml --live 4. cat detach.xml <memory model='dimm'> <target> <size unit='MiB'>128</size> <node>0</node> </target> <alias name='dimm0'/> <address type='dimm' slot='0' base='0x100000000'/> </memory> 5.Save the VM and then restore. Restore fails.. virsh save VMName ./VMName.vmsav virsh restore ./VMName.vmsav Error: Unknown ramblock "memdimm1". 6. Example qemu log without current patch. dimm,node=0,memdev=memdimm0,id=dimm0,slot=1,addr=4429185024 -object memory-backend-ram,id=memdimm1,size=134217728 -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=2,addr=4563402752 -object memory-backend-ram,id=memdimm2,size=134217728 -device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=3,addr=4697620480 -object memory-backend-ram,id=memdimm3,size=134217728 -device pc-dimm,node=0,memdev=memdimm3,id=dimm3,slot=4,addr=4831838208 -object memory-backend-ram,id=memdimm4,size=134217728 -device pc-dimm,node=0,memdev=memdimm4,id=dimm4,slot=5,addr=4966055936 7. With the current patch we have kept the dimm name as dimmX where X=slot number.In such a case the memdev and id generated are always correct w.r.t the slotid and the virsh restore/ migrate succeeds. dimm,node=0,memdev=memdimm1,id=dimm1,slot=1,addr=4429185024 -object memory-backend-ram,id=memdimm2,size=134217728 -device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2,addr=4563402752 -object memory-backend-ram,id=memdimm3,size=134217728 -device pc-dimm,node=0,memdev=memdimm3,id=dimm3,slot=3,addr=4697620480 -object memory-backend-ram,id=memdimm4,size=134217728 -device pc-dimm,node=0,memdev=memdimm4,id=dimm4,slot=4,addr=4831838208 -object memory-backend-ram,id=memdimm5,size=134217728 -device pc-dimm,node=0,memdev=memdimm5,id=dimm5,slot=5,addr=4966055936 Nitesh Konkar (2): qemu_alias:Set dimm alias name to dimmX where X=slot number. tests/qemuxml2argvdata:Add a testcase src/qemu/qemu_alias.c | 51 +++++++++--- .../qemuxml2argv-memory-hotplug-dimm-alias.args | 35 ++++++++ .../qemuxml2argv-memory-hotplug-dimm-alias.xml | 94 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 4 files changed, 172 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml -- 1.9.3

2 3

[libvirt] [PATCH] qemuDomainUpdateDeviceConfig: Allow full disk update
by Michal Privoznik 26 Sep '16

26 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1368417 So far, when it comes to 'virsh update-device --config' of disks we are limiting ourselves for just the disk source update and just for CDROMs and floppies. This makes no sense. Especially if you look around and see that we already allow full update to graphics and net devices. So let's just take whatever XML user wants to have there and replace our internal definition with it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2efaa2a..b5abb0c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8104,35 +8104,23 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, unsigned int parse_flags, virDomainXMLOptionPtr xmlopt) { - virDomainDiskDefPtr orig, disk; + virDomainDiskDefPtr newDisk; virDomainGraphicsDefPtr newGraphics; virDomainNetDefPtr net; int pos; switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: - disk = dev->data.disk; - if (!(orig = virDomainDiskByName(vmdef, disk->dst, false))) { + newDisk = dev->data.disk; + if ((pos = virDomainDiskIndexByName(vmdef, newDisk->dst, false)) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("target %s doesn't exist."), disk->dst); + _("target %s doesn't exist."), newDisk->dst); return -1; } - if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM) && - !(orig->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("this disk doesn't support update")); - return -1; - } - /* - * Update 'orig' - * We allow updating src/type//driverType/cachemode/ - */ - orig->cachemode = disk->cachemode; - orig->startupPolicy = disk->startupPolicy; - virStorageSourceFree(orig->src); - orig->src = disk->src; - disk->src = NULL; + virDomainDiskDefFree(vmdef->disks[pos]); + vmdef->disks[pos] = newDisk; + dev->data.disk = NULL; break; case VIR_DOMAIN_DEVICE_GRAPHICS: -- 2.8.4

3 2

[libvirt] [PATCH 2/2] tests/qemuxml2argvdata:Add a testcase
by Nitesh Konkar 25 Sep '16

25 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- .../qemuxml2argv-memory-hotplug-dimm-alias.args | 35 ++++++++ .../qemuxml2argv-memory-hotplug-dimm-alias.xml | 94 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 131 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args new file mode 100644 index 0000000..0e9f8e0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/home/usr/qemu/x86_64-softmmu/qemu-system-x86_64 \ +-name Fedora \ +-S \ +-M pc-i440fx-2.7 \ +-m size=1048576k,slots=32,maxmem=3145728k \ +-smp 8,maxcpus=160,sockets=40,cores=2,threads=2 \ +-numa node,nodeid=0,cpus=0-3,mem=512 \ +-numa node,nodeid=1,cpus=4-7,mem=512 \ +-object memory-backend-ram,id=memdimm2,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2,addr=4563402752 \ +-object memory-backend-ram,id=memdimm4,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm4,id=dimm4,slot=4,addr=4966055936 \ +-object memory-backend-ram,id=memdimm0,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ +-object memory-backend-ram,id=memdimm1,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1,addr=4429185024 \ +-object memory-backend-ram,id=memdimm3,size=134217728 \ +-device pc-dimm,node=0,memdev=memdimm3,id=dimm3,slot=3,addr=4697620480 \ +-uuid aecf3e5e-6f9a-42a3-9d6a-223a75569a66 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-Fedora/monitor.sock,server,nowait \ +-boot c \ +-usb \ +-drive file=/home/nitesh/Fedora24.qcow2,format=qcow2,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-serial pty \ +-device usb-mouse,id=input0,bus=usb.0,port=1 \ +-vga cirrus \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml new file mode 100644 index 0000000..9c0625d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-alias.xml @@ -0,0 +1,94 @@ +<domain type='kvm'> + <name>Fedora</name> + <uuid>aecf3e5e-6f9a-42a3-9d6a-223a75569a66</uuid> + <maxMemory slots='32' unit='KiB'>3145728</maxMemory> + <memory unit='KiB'>1703936</memory> + <currentMemory unit='KiB'>1572864</currentMemory> + <vcpu placement='static' current='8'>160</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.7'>hvm</type> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + </features> + <cpu> + <topology sockets='40' cores='2' threads='2'/> + <numa> + <cell id='0' cpus='0-3' memory='524288' unit='KiB'/> + <cell id='1' cpus='4-7' memory='524288' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/home/usr/qemu/x86_64-softmmu/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/home/nitesh/Fedora24.qcow2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='usb'> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </memballoon> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='2' base='0x110000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='4' base='0x128000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='0' base='0x100000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='1' base='0x108000000'/> + </memory> + <memory model='dimm'> + <target> + <size unit='KiB'>131072</size> + <node>0</node> + </target> + <address type='dimm' slot='3' base='0x118000000'/> + </memory> + </devices> + <seclabel type='none' model='none'/> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index aaf00c2..a592c40 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1992,6 +1992,8 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("memory-hotplug-dimm-alias", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, + QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("machine-aeskeywrap-on-caps", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_AES_KEY_WRAP, -- 1.9.3

1 0

[libvirt] [libvirt-php][PATCH] libvirt_domain_get_screenshot_api: Don't unlink screenshot file on success
by Michal Privoznik 24 Sep '16

24 Sep '16

In 5120ba28a2021 I've tried to fix couple of problems with this API (all kinds of resource leaks, bad conditions to some checks and so on). However, my clumsy fix introduced unlink even to a success path so after all callers were left with a non-existent path to screenshot file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-php.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 7916d07..693f911 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -4790,7 +4790,6 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) VIRT_ADD_ASSOC_STRING(return_value, "file", fileNew); VIRT_ADD_ASSOC_STRING(return_value, "mime", "image/png"); } else { - unlink(file); close(fd); fd = -1; VIRT_ADD_ASSOC_STRING(return_value, "file", file); -- 2.8.4

1 0

[libvirt] [libvirt-php][PATCH 00/14] Fix code styling in libvirt-php
by Katerina Koukiou 24 Sep '16

24 Sep '16

Fixed some basic code styling issues in libvirt-php.c that made the code hard to read. Katerina Koukiou (14): libvirt-php.c: Fix coding style issues: space required after ',' libvirt-php.c: Fix coding style issues: spaces required around '==', '>=', '<=' etc. libvirt-php.c: Fix coding style issues: space prohibited between function name and open parenthesis '(' libvirt-php.c: Fix coding style issues: remove unwanted spaces after '(' and before ')' libvirt-php.c: Fix code styling issues: no space needed after '[' and before ']' libvirt-php.c: Fix code styling issues: if then else statement style issues libvirt-php.c: Fix coding style issues with braces libvirt-php.c Fix coding style issues with if statements libvirt-php.c: Fix coding style issues: space required around '=' in assignments libvirt-php.c: Fix code styling issues with for loops libvirt-php.c: Fix coding style issues: "(foo*)" should be "(foo *)" libvirt-php.c: Fix coding style issues with operators libvirt-php.c: Fix coding style issues with extra/less spaces libvirt-php.c: Fix coding style issues in macros src/libvirt-php.c | 2220 ++++++++++++++++++++++++++--------------------------- 1 file changed, 1101 insertions(+), 1119 deletions(-) -- 2.7.3

2 15

[libvirt] [PATCH] libxl: increase usbdevice list only when finding such an input device
by Cédric Bosdonnat 23 Sep '16

23 Sep '16

If passing an empty usbdevice_list to libxl, qemu will always get an -usb parameter for HVM guests with only non-USB input devices. This causes qemu to crash when passing pvusb device on HVM guests. The solution is to allocate the list only when an item to put in it is found. --- src/libxl/libxl_conf.c | 58 ++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 306e441..f85f005 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -298,6 +298,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_build_info *b_info = &d_config->b_info; int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; size_t i; + size_t nusbdevice = 0; libxl_domain_build_info_init(b_info); @@ -469,47 +470,54 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_defbool_set(&b_info->u.hvm.vnc.enable, 0); libxl_defbool_set(&b_info->u.hvm.sdl.enable, 0); - if (def->ninputs) { + for (i = 0; i < def->ninputs; i++) { + char **usbdevice; + + if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) + continue; + #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - if (VIR_ALLOC_N(b_info->u.hvm.usbdevice_list, def->ninputs+1) < 0) + if (VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) return -1; #else - if (def->ninputs > 1) { + if (i > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("libxenlight supports only one input device")); return -1; } #endif - for (i = 0; i < def->ninputs; i++) { - char **usbdevice; - - if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_USB) - continue; #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST - usbdevice = &b_info->u.hvm.usbdevice_list[i]; + usbdevice = &b_info->u.hvm.usbdevice_list[i]; #else - usbdevice = &b_info->u.hvm.usbdevice; + usbdevice = &b_info->u.hvm.usbdevice; #endif - switch (def->inputs[i]->type) { - case VIR_DOMAIN_INPUT_TYPE_MOUSE: - VIR_FREE(*usbdevice); - if (VIR_STRDUP(*usbdevice, "mouse") < 0) - return -1; - break; - case VIR_DOMAIN_INPUT_TYPE_TABLET: - VIR_FREE(*usbdevice); - if (VIR_STRDUP(*usbdevice, "tablet") < 0) - return -1; - break; - default: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Unknown input device type")); + switch (def->inputs[i]->type) { + case VIR_DOMAIN_INPUT_TYPE_MOUSE: + VIR_FREE(*usbdevice); + if (VIR_STRDUP(*usbdevice, "mouse") < 0) return -1; - } + break; + case VIR_DOMAIN_INPUT_TYPE_TABLET: + VIR_FREE(*usbdevice); + if (VIR_STRDUP(*usbdevice, "tablet") < 0) + return -1; + break; + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unknown input device type")); + return -1; } } +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST + if (nusbdevice > 0 && + VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1) < 0) { + VIR_DISPOSE_N(b_info->u.hvm.usbdevice_list, nusbdevice); + return -1; + } +#endif + /* Allow libxl to calculate shadow memory requirements */ b_info->shadow_memkb = libxl_get_required_shadow_memory(b_info->max_memkb, -- 2.9.3

2 1