- Devel - libvirt List Archives

[libvirt] [PATCH 00/14] introduce virDomainSetLifecycleAction() API
by Pavel Hrdina 19 Oct '17

19 Oct '17

Pavel Hrdina (14): conf: rename lifecycle enum values to correspond with typedef keyword conf: rename virDomainLifecycleAction enum functions conf: introduce virDomainLifecycle enum to list all lifecycle types conf: merge virDomainLifecycleCrashAction with virDomainLifecycleAction qemu: pass virDomainObjPtr to qemuBuildCommandLine qemu: pass priv data to qemuBuildMonitorCommandLine qemu: pass priv data to qemuBuildPMCommandLine qemu: pass priv data to qemuBuildMasterKeyCommandLine qemu: pass priv data instead of qemuCaps and autoNodeset lib: introduce virDomainSetLifecycleAction() API virsh: introduce set-lifecycle-action command qemu: move detection whether to use -no-reboot to qemu_domain qemu: send allowReboot in migration cookie qemu: implement virDomainSetLifecycleAction() API docs/formatdomain.html.in | 6 +++ include/libvirt/libvirt-domain.h | 28 ++++++++++ src/conf/domain_conf.c | 84 ++++++++++++++++++++++++----- src/conf/domain_conf.h | 26 ++------- src/driver-hypervisor.h | 7 +++ src/libvirt-domain.c | 60 +++++++++++++++++++++ src/libvirt_private.syms | 7 ++- src/libvirt_public.syms | 5 ++ src/libxl/libxl_conf.c | 43 ++++----------- src/libxl/libxl_domain.c | 40 +++++++------- src/lxc/lxc_native.c | 6 +-- src/qemu/qemu_command.c | 93 +++++++++++++------------------- src/qemu/qemu_command.h | 11 +--- src/qemu/qemu_domain.c | 40 ++++++++++++++ src/qemu/qemu_domain.h | 9 ++++ src/qemu/qemu_driver.c | 112 +++++++++++++++++++++++++++++++++++---- src/qemu/qemu_migration.c | 7 ++- src/qemu/qemu_migration_cookie.c | 25 ++++++++- src/qemu/qemu_migration_cookie.h | 5 ++ src/qemu/qemu_parse_command.c | 8 +-- src/qemu/qemu_process.c | 53 ++++++++++++------ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 ++++- src/test/test_driver.c | 8 +-- src/vmx/vmx.c | 6 +-- src/vz/vz_sdk.c | 12 ++--- src/xenapi/xenapi_utils.c | 40 +++++++------- src/xenapi/xenapi_utils.h | 4 +- src/xenconfig/xen_common.c | 12 ++--- src/xenconfig/xen_sxpr.c | 18 +++---- tests/qemuxml2xmltest.c | 3 +- tools/virsh-domain.c | 102 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++ 33 files changed, 658 insertions(+), 244 deletions(-) -- 2.13.6

2 22

[libvirt] [PATCH] bhyve: Fix build
by Jiri Denemark 19 Oct '17

19 Oct '17

Commit v3.8.0-95-gfd885a06a dropped nmodels parameter from several APIs in src/cpu/cpu.h, but failed to update all callers. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed under the build-breaker rule. src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index c096b5562..5c432b25e 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1433,7 +1433,7 @@ bhyveConnectBaselineCPU(virConnectPtr conn, if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; - if (!(cpu = cpuBaseline(cpus, ncpus, NULL, 0, + if (!(cpu = cpuBaseline(cpus, ncpus, NULL, !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE)))) goto cleanup; -- 2.14.2

1 0

[libvirt] [CFP] Virt & IaaS Devroom at FOSDEM18
by Stefan Hajnoczi 18 Oct '17

18 Oct '17

I am excited to announce that the call for proposals is now open for the Virtualization & IaaS devroom at the upcoming FOSDEM 2018, to be hosted on February 3 and 4, 2018. This year will mark FOSDEM’s 18th anniversary as one of the longest-running free and open source software developer events, attracting thousands of developers and users from all over the world. FOSDEM will be held once again in Brussels, Belgium, on February 3 & 4, 2018. This devroom is a collaborative effort, and is organized by dedicated folks from projects such as OpenStack, Xen Project, oVirt, QEMU, KVM, libvirt, and Foreman. We would like to invite all those who are involved in these fields to submit your proposals by December 1st, 2017. About the Devroom The Virtualization & IaaS devroom will feature session topics such as open source hypervisors and virtual machine managers such as Xen Project, KVM, bhyve, and VirtualBox, and Infrastructure-as-a-Service projects such as Apache CloudStack, OpenStack, oVirt, QEMU, OpenNebula, and Ganeti. This devroom will host presentations that focus on topics of shared interest, such as KVM; libvirt; shared storage; virtualized networking; cloud security; clustering and high availability; interfacing with multiple hypervisors; hyperconverged deployments; and scaling across hundreds or thousands of servers. Presentations in this devroom will be aimed at developers working on these platforms who are looking to collaborate and improve shared infrastructure or solve common problems. We seek topics that encourage dialog between projects and continued work post-FOSDEM. Important Dates Submission deadline: 01 December 2017 Acceptance notifications: 14 December 2017 Final schedule announcement: 21 December 2017 Devroom: 03 and 04 February 2018 (two days- different rooms) Submit Your Proposal All submissions must be made via the Pentabarf event planning site[1]. If you have not used Pentabarf before, you will need to create an account. If you submitted proposals for FOSDEM in previous years, you can use your existing account. After creating the account, select Create Event to start the submission process. Make sure to select Virtualization and IaaS devroom from the Track list. Please fill out all the required fields, and provide a meaningful abstract and description of your proposed session. Submission Guidelines We expect more proposals than we can possibly accept, so it is vitally important that you submit your proposal on or before the deadline. Late submissions are unlikely to be considered. All presentation slots are 45 minutes, with 35 minutes planned for presentations, and 10 minutes for Q&A. All presentations will be recorded and made available under Creative Commons licenses. In the Submission notes field, please indicate that you agree that your presentation will be licensed under the CC-By-SA-4.0 or CC-By-4.0 license and that you agree to have your presentation recorded. For example: "If my presentation is accepted for FOSDEM, I hereby agree to license all recordings, slides, and other associated materials under the Creative Commons Attribution Share-Alike 4.0 International License. Sincerely, <NAME>." In the Submission notes field, please also confirm that if your talk is accepted, you will be able to attend FOSDEM and deliver your presentation. We will not consider proposals from prospective speakers who are unsure whether they will be able to secure funds for travel and lodging to attend FOSDEM. (Sadly, we are not able to offer travel funding for prospective speakers.) Speaker Mentoring Program As a part of the rising efforts to grow our communities and encourage a diverse and inclusive conference ecosystem, we're happy to announce that we'll be offering mentoring for new speakers. Our mentors can help you with tasks such as reviewing your abstract, reviewing your presentation outline or slides, or practicing your talk with you. You may apply to the mentoring program as a newcomer speaker if you: Never presented before or Presented only lightning talks or Presented full-length talks at small meetups (<50 ppl) Submission Guidelines Mentored presentations will have 25-minute slots, where 20 minutes will include the presentation and 5 minutes will be reserved for questions. The number of newcomer session slots is limited, so we will probably not be able to accept all applications. You must submit your talk and abstract to apply for the mentoring program, our mentors are volunteering their time and will happily provide feedback but won't write your presentation for you! If you are experiencing problems with Pentabarf, the proposal submission interface, or have other questions, you can email our devroom mailing list[2] and we will try to help you. How to Apply In addition to agreeing to video recording and confirming that you can attend FOSDEM in case your session is accepted, please write "speaker mentoring program application" in the "Submission notes" field, and list any prior speaking experience or other relevant information for your application. Call for Mentors Interested in mentoring newcomer speakers? We'd love to have your help! Please email iaas-virt-devroom at lists.fosdem.org with a short speaker biography and any specific fields of expertise (for example, KVM, OpenStack, storage, etc.) so that we can match you with a newcomer speaker from a similar field. Estimated time investment can be as low as a 5-10 hours in total, usually distributed weekly or bi-weekly. Never mentored a newcomer speaker but interested to try? As the mentoring program coordinator, email Brian Proffitt[3] and he will be happy to answer your questions! Code of Conduct Following the release of the updated code of conduct for FOSDEM, we'd like to remind all speakers and attendees that all of the presentations and discussions in our devroom are held under the guidelines set in the CoC and we expect attendees, speakers, and volunteers to follow the CoC at all times. If you submit a proposal and it is accepted, you will be required to confirm that you accept the FOSDEM CoC. If you have any questions about the CoC or wish to have one of the devroom organizers review your presentation slides or any other content for CoC compliance, please email us and we will do our best to assist you. Call for Volunteers We are also looking for volunteers to help run the devroom. We need assistance watching time for the speakers, and helping with video for the devroom. Please contact me, Brian Proffitt, for more information. Questions? If you have any questions about this devroom, please send your questions to our devroom mailing list. You can also subscribe to the list to receive updates about important dates, session announcements, and to connect with other attendees. See you all at FOSDEM! [1] <https://penta.fosdem.org/submission/FOSDEM18> https://penta.fosdem.org/submission/FOSDEM18 [2] iaas-virt-devroom at lists.fosdem.org <https://lists.fosdem.org/listinfo/fosdem> [3] bkp at redhat.com

1 0

[libvirt] [PATCH] virsh: domifaddr: clarify description of --full option
by Chen Hanxiao 18 Oct '17

18 Oct '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Option --full will always display the name and MAC address of the interface. Both virsh help and virsh man page didn't mention that. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain-monitor.c | 2 +- tools/virsh.pod | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 4c50155e1..35d04b22a 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2153,7 +2153,7 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "full", .type = VSH_OT_BOOL, .flags = VSH_OFLAG_NONE, - .help = N_("display full fields")}, + .help = N_("always display names and MACs of interfaces")}, {.name = "source", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, diff --git a/tools/virsh.pod b/tools/virsh.pod index 9304ca525..db1ede880 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -766,9 +766,9 @@ addresses, or limited output just for one interface if I<interface> is specified. Note that I<interface> can be driver dependent, it can be the name within guest OS or the name you would see in domain XML. Moreover, the whole command may require a guest agent to be configured for the queried domain under -some drivers, notably qemu. If I<--full> is specified, the interface name is -always displayed when the interface has multiple addresses or alias, otherwise -it only displays the interface name for the first address, and "-" for the +some drivers, notably qemu. If I<--full> is specified, the interface name and MAC +address is always displayed when the interface has multiple addresses or alias, +otherwise it only displays the interface name for the first address, and "-" for the others. The I<--source> argument specifies what data source to use for the addresses, currently one of 'lease' to read DHCP leases, or 'agent' to query the guest OS via an agent. If unspecified, 'lease' is the default. -- 2.13.5

2 1

[libvirt] [PATCH v5 0/6] Work around the kernel mdev uevent race in nodedev
by Erik Skultety 18 Oct '17

18 Oct '17

v4: https://www.redhat.com/archives/libvir-list/2017-September/msg00532.html Since v4: - fixed the reviewer's notes in 1/7 - dropped the original 2/7 because of converting the udev private data into a lockable object - current 2/6 is a new patch reworking our current locking approach of the udev private data where we only relied on the driver global lock, after this patch, private data are going to be a self-lockable object - dropped the event counting from 4/7, the thread now reads everything it can until it gets EAGAIN/EWOULDBLOCK from libudev, which renders enablement/disablement of event loop fd polling unnecessary -> other minor adjustments raised during review -> dropped our udev fd sanity check from the worker thread, since the thread will encounter a libudev error sooner or later, so the sanity check inside the worker thread wouldn't really make a difference Erik Skultety (6): nodedev: Introduce udevEventMonitorSanityCheck helper function (ACKed) nodedev: udev: Convert udev private data to a lockable object (NEW) udev: Split udevEventHandleCallback in two functions (2/6 necessary changes) udev: Convert udevEventHandleThread to an actual thread routine (reworked) util: Introduce virFileWaitForExists (unchanged && ACKed) nodedev: Work around the uevent race by hooking up virFileWaitForAccess (unchanged && ACKed) src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 281 ++++++++++++++++++++++++++++--------- src/node_device/node_device_udev.h | 3 - src/util/virfile.c | 31 ++++ src/util/virfile.h | 2 + 5 files changed, 249 insertions(+), 69 deletions(-) -- 2.13.6

2 15

[libvirt] [PATCH 0/3] fix crash on libvirtd termination
by Nikolay Shirokovskiy 18 Oct '17

18 Oct '17

Libvirtd termination can crash. One can use [2] patch to trigger it. Call domstats function and send TERM to libvirtd. You'd probably see stacktrace [1]. The problem is that threads with clients requests are joined after drivers cleanup. This patch series address this issue. [1] Crash stacktrace Program received signal SIGSEGV, Segmentation fault. Thread 5 (Thread 0x7fffe6a4d700 (LWP 921916)): #0 0x00007fffd9cb3f14 in qemuDomainObjBeginJobInternal (driver=driver@entry=0x7fffcc103e40, obj=obj@entry=0x7fffcc1a6ca0, job=job@entry=QEMU_JOB_QUERY, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE) at qemu/qemu_domain.c:4114 #1 0x00007fffd9cb82ab in qemuDomainObjBeginJob (driver=driver@entry=0x7fffcc103e40, obj=obj@entry=0x7fffcc1a6ca0, job=job@entry=QEMU_JOB_QUERY) at qemu/qemu_domain.c:4240 #2 0x00007fffd9d23094 in qemuConnectGetAllDomainStats (conn=0x7fffcc1bc140, doms=<optimized out>, ndoms=<optimized out>, stats=127, retStats=0x7fffe6a4cb10, flags=<optimized out>) at qemu/qemu_driver.c:20116 #3 0x00007ffff744a166 in virDomainListGetStats (doms=0x7fffa8000a10, stats=0, retStats=retStats@entry=0x7fffe6a4cb10, flags=0) at libvirt-domain.c:11592 #4 0x000055555557af15 in remoteDispatchConnectGetAllDomainStats (server=<optimized out>, msg=<optimized out>, ret=0x7fffa80008e0, args=0x7fffa80008c0, rerr=0x7fffe6a4cc50, client=<optimized out>) at remote.c:6532 #5 remoteDispatchConnectGetAllDomainStatsHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7fffe6a4cc50, args=0x7fffa80008c0, ret=0x7fffa80008e0) at remote_dispatch.h:615 #6 0x00007ffff74abba2 in virNetServerProgramDispatchCall (msg=0x55555583bf50, client=0x55555583c580, server=0x555555810f40, prog=0x55555583a140) at rpc/virnetserverprogram.c:437 #7 virNetServerProgramDispatch (prog=0x55555583a140, server=server@entry=0x555555810f40, client=0x55555583c580, msg=0x55555583bf50) at rpc/virnetserverprogram.c:307 #8 0x00005555555ae10d in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x555555810f40) at rpc/virnetserver.c:148 #9 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x555555810f40) at rpc/virnetserver.c:169 #10 0x00007ffff7390fd1 in virThreadPoolWorker (opaque=opaque@entry=0x5555558057a0) at util/virthreadpool.c:167 #11 0x00007ffff7390358 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #12 0x00007ffff457be25 in start_thread () from /lib64/libpthread.so.0 #13 0x00007ffff42a934d in clone () from /lib64/libc.so.6 Thread 1 (Thread 0x7ffff7fae880 (LWP 921909)): #0 0x00007ffff457f945 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007ffff73905c6 in virCondWait (c=<optimized out>, m=<optimized out>) at util/virthread.c:154 #2 0x00007ffff73911e0 in virThreadPoolFree (pool=0x555555811030) at util/virthreadpool.c:290 #3 0x00005555555adb44 in virNetServerDispose (obj=0x555555810f40) at rpc/virnetserver.c:767 #4 0x00007ffff736f62b in virObjectUnref (anyobj=<optimized out>) at util/virobject.c:356 #5 0x00007ffff7343e19 in virHashFree (table=0x55555581ba40) at util/virhash.c:318 #6 0x00007ffff74a46b5 in virNetDaemonDispose (obj=0x555555812c50) at rpc/virnetdaemon.c:105 #7 0x00007ffff736f62b in virObjectUnref (anyobj=anyobj@entry=0x555555812c50) at util/virobject.c:356 #8 0x0000555555570479 in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1539 [2] patch to trigger crash # diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c # index cf5e4ad..39a57aa 100644 # --- a/src/qemu/qemu_driver.c # +++ b/src/qemu/qemu_driver.c # @@ -20144,6 +20144,8 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, # domflags = 0; # vm = vms[i]; # # + sleep(5); # + # virObjectLock(vm); # # if (HAVE_JOB(privflags) && Nikolay Shirokovskiy (3): daemon: finish threads on close qemu: monitor: check monitor not closed on send qemu: implement state driver shutdown function daemon/libvirtd.c | 2 ++ src/driver-state.h | 4 ++++ src/libvirt.c | 18 ++++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 27 +++++++++++++-------------- src/rpc/virnetserver.c | 5 +++-- 8 files changed, 81 insertions(+), 16 deletions(-) -- 1.8.3.1

2 9

[libvirt] [PATCH 0/2] Clean up some forgotten tabs from our source files
by Erik Skultety 18 Oct '17

18 Oct '17

I don't think a reliable syntax-check rule checking tab spacing can be used, but I can of course be proven wrong. Erik Skultety (2): maint: Replace tabs with spaces in all source files in repo maint: Remove not-so-much informative block commentaries daemon/remote.c | 7 - docs/search.php.code.in | 350 ++++++++++++++++++++++---------------------- include/libvirt/virterror.h | 278 +++++++++++++++++------------------ src/bhyve/bhyve_monitor.c | 2 +- src/bhyve/bhyve_process.c | 2 +- src/conf/node_device_conf.h | 52 +++---- src/conf/nwfilter_conf.h | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnodedeviceobj.h | 4 +- src/network/bridge_driver.c | 2 - src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_monitor.h | 2 +- src/util/viraudit.h | 4 +- src/util/virconf.c | 35 +---- src/util/virconf.h | 10 +- src/util/virerror.h | 5 - src/util/virsysinfo.c | 2 +- src/util/virxml.c | 8 +- src/vbox/vbox_XPCOMCGlue.c | 9 -- src/xen/xen_driver.h | 2 +- src/xen/xen_hypervisor.c | 168 ++++++++++----------- src/xen/xen_hypervisor.h | 2 +- src/xen/xend_internal.c | 23 +-- src/xen/xend_internal.h | 8 +- src/xen/xs_internal.c | 18 +-- src/xen/xs_internal.h | 14 +- src/xenconfig/xen_sxpr.c | 5 - 27 files changed, 468 insertions(+), 556 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] qemu: Move qemuFreeKeywords into qemu_parse_command.c
by Kothapally Madhu Pavan 17 Oct '17

17 Oct '17

Move qemuFreeKeywords into qemu_parse_command.c as qemuKeywordsFree and call it rather than inline code in multiple places. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_monitor_json.c | 15 ++----------- src/qemu/qemu_parse_command.c | 52 ++++++++++++++++--------------------------- src/qemu/qemu_parse_command.h | 5 +++++ 3 files changed, 26 insertions(+), 46 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5546d1a..af66967 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -468,17 +468,6 @@ qemuMonitorJSONMakeCommandRaw(bool wrap, const char *cmdname, ...) #define qemuMonitorJSONMakeCommand(cmdname, ...) \ qemuMonitorJSONMakeCommandRaw(false, cmdname, __VA_ARGS__) -static void -qemuFreeKeywords(int nkeywords, char **keywords, char **values) -{ - size_t i; - for (i = 0; i < nkeywords; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); - } - VIR_FREE(keywords); - VIR_FREE(values); -} static virJSONValuePtr qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) @@ -513,11 +502,11 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) } } - qemuFreeKeywords(nkeywords, keywords, values); + qemuKeywordsFree(nkeywords, keywords, values); return ret; error: - qemuFreeKeywords(nkeywords, keywords, values); + qemuKeywordsFree(nkeywords, keywords, values); virJSONValueFree(ret); return NULL; } diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 9f739ae..d5ea5aa 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -381,6 +381,20 @@ static const char *qemuFindEnv(char **progenv, return NULL; } + +void +qemuKeywordsFree(int nkeywords, char **keywords, char **values) +{ + size_t i; + for (i = 0; i < nkeywords; i++) { + VIR_FREE(keywords[i]); + VIR_FREE(values[i]); + } + VIR_FREE(keywords); + VIR_FREE(values); +} + + /* * Takes a string containing a set of key=value,key=value,key... * parameters and splits them up, returning two arrays with @@ -401,7 +415,6 @@ qemuParseKeywords(const char *str, char **values = NULL; const char *start = str; const char *end; - size_t i; *retkeywords = NULL; *retvalues = NULL; @@ -479,12 +492,7 @@ qemuParseKeywords(const char *str, return 0; error: - for (i = 0; i < keywordCount; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); - } - VIR_FREE(keywords); - VIR_FREE(values); + qemuKeywordsFree(keywordCount, keywords, values); return -1; } @@ -949,12 +957,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, } cleanup: - for (i = 0; i < nkeywords; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); - } - VIR_FREE(keywords); - VIR_FREE(values); + qemuKeywordsFree(nkeywords, keywords, values); return def; error: @@ -1132,12 +1135,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, virDomainNetGenerateMAC(xmlopt, &def->mac); cleanup: - for (i = 0; i < nkeywords; i++) { - VIR_FREE(keywords[i]); - VIR_FREE(values[i]); - } - VIR_FREE(keywords); - VIR_FREE(values); + qemuKeywordsFree(nkeywords, keywords, values); return def; error: @@ -1704,13 +1702,7 @@ qemuParseCommandLineMem(virDomainDefPtr dom, ret = 0; cleanup: - for (i = 0; i < nkws; i++) { - VIR_FREE(kws[i]); - VIR_FREE(vals[i]); - } - VIR_FREE(kws); - VIR_FREE(vals); - + qemuKeywordsFree(nkws, kws, vals); return ret; } @@ -1795,13 +1787,7 @@ qemuParseCommandLineSmp(virDomainDefPtr dom, ret = 0; cleanup: - for (i = 0; i < nkws; i++) { - VIR_FREE(kws[i]); - VIR_FREE(vals[i]); - } - VIR_FREE(kws); - VIR_FREE(vals); - + qemuKeywordsFree(nkws, kws, vals); return ret; syntax: diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h index ed65342..4c553f2 100644 --- a/src/qemu/qemu_parse_command.h +++ b/src/qemu/qemu_parse_command.h @@ -43,6 +43,11 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, virDomainChrSourceDefPtr *monConfig, bool *monJSON); +void +qemuKeywordsFree(int nkeywords, + char **keywords, + char **values); + int qemuParseKeywords(const char *str, char ***retkeywords, -- 2.7.4

2 1

[libvirt] [PATCH 0/3] misc fixes and improvements for backing chain and block devices (blockdev-add saga)
by Peter Krempa 17 Oct '17

17 Oct '17

See individual patches please. Peter Krempa (3): qemu: command: Separate wrapping of disk backend props to 'file' object qemu: block: Add support for file/block/dir storage to JSON disk src generator util: storagefile: Track whether a virStorageSource was auto-detected src/qemu/qemu_block.c | 20 +++++++++----------- src/qemu/qemu_command.c | 27 ++++++++++++++++++++++++++- src/util/virstoragefile.c | 3 +++ src/util/virstoragefile.h | 2 ++ 4 files changed, 40 insertions(+), 12 deletions(-) -- 2.14.1

2 5

[libvirt] [PATCH 0/4] Add the ability to LUKS encrypt during LV creation
by John Ferlan 17 Oct '17

17 Oct '17

Patches should hopefully speak for themselves. John Ferlan (4): storage: Extract out the LVCREATE storage: Introduce virStorageBackendCreateVolUsingQemuImg storage: Allow creation of a LUKS using logical volume docs: Add news article docs/news.xml | 13 ++++++ src/storage/storage_backend_logical.c | 74 +++++++++++++++++++---------------- src/storage/storage_util.c | 42 ++++++++++++++++++++ src/storage/storage_util.h | 8 ++++ 4 files changed, 104 insertions(+), 33 deletions(-) -- 2.13.6

1 5

[libvirt] [PATCH 0/3] vbox: Update VRDE server port handling.
by Dawid Zamirski 17 Oct '17

17 Oct '17

Hello, The following patches improve how VRDE is handled by libvirt vbox driver: * When autoport=yes, it will now set the VRDE server to a port range 3389-3689, thus when muliple VMs are started with autoport=yes, they will use non-conflicting ports from this port range - previously all VMs would try to use the default 3389 * When dumping display configuration to XML, first try to read the VRDE port using VRDEServerInfo which provides the "effective" port that the VM is using. Otherwise, fall back to read it from VRDEServer property. * Fix the documentation on RDP wher the descriptions of multiUser and replaceUser were swapped. Dawid Zamirski (3): vbox: Make autoport set RDP port range. vbox: Read runtime RDP port and handle autoport. docs: Fix multiUser/replaceUser in RDP display doc. docs/formatdomain.html.in | 4 +- src/vbox/vbox_common.c | 3 +- src/vbox/vbox_tmpl.c | 151 ++++++++++++++++++++++++++++++------------ src/vbox/vbox_uniformed_api.h | 2 +- 4 files changed, 112 insertions(+), 48 deletions(-) -- 2.14.2

2 6

[libvirt] [PATCH 0/3] qemu: Parse CPU stepping from query-cpu-model-expansion
by Jiri Denemark 17 Oct '17

17 Oct '17

Even though only family and model are used for matching CPUID data with CPU models from cpu_map.xml, stepping is used by x86DataFilterTSX which is supposed to disable TSX on CPU models with broken TSX support. This series applies on top of "Fix host-model if the chosen CPU model has more features in QEMU compared to our cpu_map.xml" series I sent a week ago. Jiri Denemark (3): qemu: Parse CPU stepping from query-cpu-model-expansion cputest: Update Xeon-E7-8890 data cputest: Add query-cpu-definitions reply for Xeon-E7-8890 src/cpu/cpu_x86.c | 16 +- src/cpu/cpu_x86.h | 3 +- src/qemu/qemu_capabilities.c | 5 +- tests/cputest.c | 2 +- .../x86_64-cpuid-Xeon-E7-8890-disabled.xml | 6 + .../x86_64-cpuid-Xeon-E7-8890-enabled.xml | 9 + .../cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml | 14 + tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json | 521 +++++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml | 6 +- 9 files changed, 569 insertions(+), 13 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json -- 2.14.2

2 5

[libvirt] [PATCH] conf: fix use of uninitialized variable
by Nikolay Shirokovskiy 17 Oct '17

17 Oct '17

If same boot order is specified twice (or more) in domain xml we call free for uninitiaziled loadparm on cleanup in virDomainDeviceBootParseXML and SIGABRT (or similar) as a result. --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 516f9fa..25d48f9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6188,7 +6188,7 @@ virDomainDeviceBootParseXML(xmlNodePtr node, virHashTablePtr bootHash) { char *order; - char *loadparm; + char *loadparm = NULL; int ret = -1; if (!(order = virXMLPropString(node, "order"))) { -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] vz: build fixes
by Nikolay Shirokovskiy 17 Oct '17

17 Oct '17

Nikolay Shirokovskiy (2): vz: missing pieces for fd885a06 for vz driver vz: fix typo for 0d3d020b src/vz/vz_driver.c | 4 ++-- src/vz/vz_sdk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.8.3.1

3 4

[libvirt] [libvirt-jenkins-ci PATCH 0/5] Add unattended guest installation support
by Andrea Bolognani 17 Oct '17

17 Oct '17

I, for one, welcome our new robot overlords. Andrea Bolognani (5): ansible: Remove bootstrap phase ansible: Introduce the 'manage' tool ansible: Add unattended installation support ansible: Update documentation guests: Rename from 'ansible' ansible/Makefile | 12 -- ansible/README.markdown | 60 ---------- ansible/bootstrap.yml | 15 --- {ansible => guests}/.gitignore | 0 guests/README.markdown | 80 +++++++++++++ {ansible => guests}/ansible.cfg | 0 guests/group_vars/all/install.yml | 10 ++ {ansible => guests}/group_vars/all/main.yml | 1 + guests/host_vars/libvirt-centos-6/install.yml | 3 + .../host_vars/libvirt-centos-6/main.yml | 0 .../host_vars/libvirt-centos-6/vault.yml | 0 guests/host_vars/libvirt-centos-7/install.yml | 3 + .../host_vars/libvirt-centos-7/main.yml | 0 .../host_vars/libvirt-centos-7/vault.yml | 0 guests/host_vars/libvirt-debian-8/install.yml | 3 + .../host_vars/libvirt-debian-8/main.yml | 0 .../host_vars/libvirt-debian-8/vault.yml | 0 guests/host_vars/libvirt-debian-9/install.yml | 3 + .../host_vars/libvirt-debian-9/main.yml | 0 .../host_vars/libvirt-debian-9/vault.yml | 0 guests/host_vars/libvirt-fedora-25/install.yml | 3 + .../host_vars/libvirt-fedora-25/main.yml | 0 .../host_vars/libvirt-fedora-25/vault.yml | 0 guests/host_vars/libvirt-fedora-26/install.yml | 3 + .../host_vars/libvirt-fedora-26/main.yml | 0 .../host_vars/libvirt-fedora-26/vault.yml | 0 .../host_vars/libvirt-fedora-rawhide/install.yml | 3 + .../host_vars/libvirt-fedora-rawhide/main.yml | 0 .../host_vars/libvirt-fedora-rawhide/vault.yml | 0 .../host_vars/libvirt-freebsd-10/main.yml | 0 .../host_vars/libvirt-freebsd-10/vault.yml | 0 .../host_vars/libvirt-freebsd-11/main.yml | 0 .../host_vars/libvirt-freebsd-11/vault.yml | 0 guests/host_vars/libvirt-ubuntu-12/install.yml | 3 + .../host_vars/libvirt-ubuntu-12/main.yml | 0 .../host_vars/libvirt-ubuntu-12/vault.yml | 0 guests/host_vars/libvirt-ubuntu-14/install.yml | 3 + .../host_vars/libvirt-ubuntu-14/main.yml | 0 .../host_vars/libvirt-ubuntu-14/vault.yml | 0 guests/host_vars/libvirt-ubuntu-16/install.yml | 3 + .../host_vars/libvirt-ubuntu-16/main.yml | 0 .../host_vars/libvirt-ubuntu-16/vault.yml | 0 {ansible => guests}/inventory | 0 guests/kickstart.cfg | 60 ++++++++++ guests/manage | 131 +++++++++++++++++++++ guests/preseed.cfg | 85 +++++++++++++ {ansible => guests}/site.yml | 8 ++ {ansible => guests}/tasks/base.yml | 0 {ansible => guests}/tasks/bootstrap.yml | 0 {ansible => guests}/tasks/compat.yml | 0 {ansible => guests}/tasks/jenkins.yml | 0 {ansible => guests}/tasks/packages.yml | 0 {ansible => guests}/templates/jenkins.service.j2 | 0 {ansible => guests}/vars/mappings.yml | 0 {ansible => guests}/vars/projects/base.yml | 0 {ansible => guests}/vars/projects/jenkins.yml | 0 {ansible => guests}/vars/projects/libosinfo.yml | 0 {ansible => guests}/vars/projects/libvirt-cim.yml | 0 {ansible => guests}/vars/projects/libvirt-glib.yml | 0 .../vars/projects/libvirt-go-xml.yml | 0 {ansible => guests}/vars/projects/libvirt-go.yml | 0 {ansible => guests}/vars/projects/libvirt-perl.yml | 0 .../vars/projects/libvirt-python.yml | 0 .../vars/projects/libvirt-sandbox.yml | 0 {ansible => guests}/vars/projects/libvirt-tck.yml | 0 {ansible => guests}/vars/projects/libvirt.yml | 0 .../vars/projects/osinfo-db-tools.yml | 0 {ansible => guests}/vars/projects/osinfo-db.yml | 0 {ansible => guests}/vars/projects/virt-manager.yml | 0 {ansible => guests}/vars/projects/virt-viewer.yml | 0 70 files changed, 405 insertions(+), 87 deletions(-) delete mode 100644 ansible/Makefile delete mode 100644 ansible/README.markdown delete mode 100644 ansible/bootstrap.yml rename {ansible => guests}/.gitignore (100%) create mode 100644 guests/README.markdown rename {ansible => guests}/ansible.cfg (100%) create mode 100644 guests/group_vars/all/install.yml rename {ansible => guests}/group_vars/all/main.yml (91%) create mode 100644 guests/host_vars/libvirt-centos-6/install.yml rename {ansible => guests}/host_vars/libvirt-centos-6/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-centos-6/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-centos-7/install.yml rename {ansible => guests}/host_vars/libvirt-centos-7/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-centos-7/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-debian-8/install.yml rename {ansible => guests}/host_vars/libvirt-debian-8/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-debian-8/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-debian-9/install.yml rename {ansible => guests}/host_vars/libvirt-debian-9/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-debian-9/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-fedora-25/install.yml rename {ansible => guests}/host_vars/libvirt-fedora-25/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-fedora-25/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-fedora-26/install.yml rename {ansible => guests}/host_vars/libvirt-fedora-26/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-fedora-26/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-fedora-rawhide/install.yml rename {ansible => guests}/host_vars/libvirt-fedora-rawhide/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-fedora-rawhide/vault.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-10/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-10/vault.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-11/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-11/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-ubuntu-12/install.yml rename {ansible => guests}/host_vars/libvirt-ubuntu-12/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-ubuntu-12/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-ubuntu-14/install.yml rename {ansible => guests}/host_vars/libvirt-ubuntu-14/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-ubuntu-14/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-ubuntu-16/install.yml rename {ansible => guests}/host_vars/libvirt-ubuntu-16/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-ubuntu-16/vault.yml (100%) rename {ansible => guests}/inventory (100%) create mode 100644 guests/kickstart.cfg create mode 100755 guests/manage create mode 100644 guests/preseed.cfg rename {ansible => guests}/site.yml (83%) rename {ansible => guests}/tasks/base.yml (100%) rename {ansible => guests}/tasks/bootstrap.yml (100%) rename {ansible => guests}/tasks/compat.yml (100%) rename {ansible => guests}/tasks/jenkins.yml (100%) rename {ansible => guests}/tasks/packages.yml (100%) rename {ansible => guests}/templates/jenkins.service.j2 (100%) rename {ansible => guests}/vars/mappings.yml (100%) rename {ansible => guests}/vars/projects/base.yml (100%) rename {ansible => guests}/vars/projects/jenkins.yml (100%) rename {ansible => guests}/vars/projects/libosinfo.yml (100%) rename {ansible => guests}/vars/projects/libvirt-cim.yml (100%) rename {ansible => guests}/vars/projects/libvirt-glib.yml (100%) rename {ansible => guests}/vars/projects/libvirt-go-xml.yml (100%) rename {ansible => guests}/vars/projects/libvirt-go.yml (100%) rename {ansible => guests}/vars/projects/libvirt-perl.yml (100%) rename {ansible => guests}/vars/projects/libvirt-python.yml (100%) rename {ansible => guests}/vars/projects/libvirt-sandbox.yml (100%) rename {ansible => guests}/vars/projects/libvirt-tck.yml (100%) rename {ansible => guests}/vars/projects/libvirt.yml (100%) rename {ansible => guests}/vars/projects/osinfo-db-tools.yml (100%) rename {ansible => guests}/vars/projects/osinfo-db.yml (100%) rename {ansible => guests}/vars/projects/virt-manager.yml (100%) rename {ansible => guests}/vars/projects/virt-viewer.yml (100%) -- 2.13.6

3 19

[libvirt] [PATCH] docs: remove duplicate https links
by Ján Tomko 17 Oct '17

17 Oct '17

Commit e371b3b changed all the links to libvirt.org to use https. Remove the leftover 'http' links from downloads page, since they point to https anyway. --- Pushed as trivial. docs/downloads.html.in | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 640b51480..6657e21d0 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -28,7 +28,6 @@ <td>libvirt</td> <td> <a href="ftp://libvirt.org/libvirt/">ftp</a> - <a href="https://libvirt.org/sources/">http</a> <a href="https://libvirt.org/sources/">https</a> </td> <td> @@ -50,7 +49,6 @@ <td>C#</td> <td> <a href="ftp://libvirt.org/libvirt/csharp/">ftp</a> - <a href="https://libvirt.org/sources/csharp/">http</a> <a href="https://libvirt.org/sources/csharp/">https</a> </td> <td> @@ -66,7 +64,6 @@ <td>Go</td> <td> <a href="ftp://libvirt.org/libvirt/go/">ftp</a> - <a href="https://libvirt.org/sources/go/">http</a> <a href="https://libvirt.org/sources/go/">https</a> </td> <td> @@ -84,7 +81,6 @@ <td>Java</td> <td> <a href="ftp://libvirt.org/libvirt/java/">ftp</a> - <a href="https://libvirt.org/sources/java/">http</a> <a href="https://libvirt.org/sources/java/">https</a> </td> <td> @@ -100,7 +96,6 @@ <td>OCaml</td> <td> <a href="ftp://libvirt.org/libvirt/ocaml/">ftp</a> - <a href="https://libvirt.org/sources/ocaml/">http</a> <a href="https://libvirt.org/sources/ocaml/">https</a> </td> <td> @@ -133,7 +128,6 @@ <td>PHP</td> <td> <a href="ftp://libvirt.org/libvirt/php/">ftp</a> - <a href="https://libvirt.org/sources/php/">http</a> <a href="https://libvirt.org/sources/php/">https</a> </td> <td> @@ -149,7 +143,6 @@ <td>Python</td> <td> <a href="ftp://libvirt.org/libvirt/python/">ftp</a> - <a href="https://libvirt.org/sources/python/">http</a> <a href="https://libvirt.org/sources/python/">https</a> <a href="https://pypi.python.org/pypi/libvirt-python">pypi</a> </td> @@ -166,7 +159,6 @@ <td>Ruby</td> <td> <a href="ftp://libvirt.org/libvirt/ruby/">ftp</a> - <a href="https://libvirt.org/sources/ruby/">http</a> <a href="https://libvirt.org/sources/ruby/">https</a> </td> <td> @@ -182,7 +174,6 @@ <td>Rust</td> <td> <a href="ftp://libvirt.org/libvirt/rust/">ftp</a> - <a href="https://libvirt.org/sources/rust/">http</a> <a href="https://libvirt.org/sources/rust/">https</a> </td> <td> @@ -201,7 +192,6 @@ <td>GLib / GConfig / GObject</td> <td> <a href="ftp://libvirt.org/libvirt/glib/">ftp</a> - <a href="https://libvirt.org/sources/glib/">http</a> <a href="https://libvirt.org/sources/glib/">https</a> </td> <td> @@ -217,7 +207,6 @@ <td>Go XML</td> <td> <a href="ftp://libvirt.org/libvirt/go/">ftp</a> - <a href="https://libvirt.org/sources/go/">http</a> <a href="https://libvirt.org/sources/go/">https</a> </td> <td> @@ -235,7 +224,6 @@ <td>Console Proxy</td> <td> <a href="ftp://libvirt.org/libvirt/consoleproxy/">ftp</a> - <a href="https://libvirt.org/sources/consoleproxy/">http</a> <a href="https://libvirt.org/sources/consoleproxy/">https</a> </td> <td> @@ -251,7 +239,6 @@ <td>CIM provider</td> <td> <a href="ftp://libvirt.org/libvirt/CIM/">ftp</a> - <a href="https://libvirt.org/sources/CIM/">http</a> <a href="https://libvirt.org/sources/CIM/">https</a> </td> <td> @@ -267,7 +254,6 @@ <td>CIM utils</td> <td> <a href="ftp://libvirt.org/libvirt/CIM/">ftp</a> - <a href="https://libvirt.org/sources/CIM/">http</a> <a href="https://libvirt.org/sources/CIM/">https</a> </td> <td> @@ -283,7 +269,6 @@ <td>SNMP</td> <td> <a href="ftp://libvirt.org/libvirt/snmp/">ftp</a> - <a href="https://libvirt.org/sources/snmp/">http</a> <a href="https://libvirt.org/sources/snmp/">https</a> </td> <td> @@ -299,7 +284,6 @@ <td>Application Sandbox</td> <td> <a href="ftp://libvirt.org/libvirt/sandbox/">ftp</a> - <a href="https://libvirt.org/sources/sandbox/">http</a> <a href="https://libvirt.org/sources/sandbox/">https</a> </td> <td> @@ -318,7 +302,6 @@ <td>TCK</td> <td> <a href="ftp://libvirt.org/libvirt/tck/">ftp</a> - <a href="https://libvirt.org/sources/tck/">http</a> <a href="https://libvirt.org/sources/tck/">https</a> </td> <td> -- 2.13.0

2 1

[libvirt] [PATCH 0/4] qemu: Fix CPU model broken by older libvirt
by Jiri Denemark 17 Oct '17

17 Oct '17

When libvirt older than 3.9.0 reconnected to a running domain started by old libvirt it could have messed up the expansion of host-model by adding features QEMU does not support (such as cmt). This series fixes the reconnection code and adds a hack which fixes CPU definitions which were broken by older libvirt. https://bugzilla.redhat.com/show_bug.cgi?id=1495171 Jiri Denemark (4): qemu: Separate CPU updating code from qemuProcessReconnect conf: Introduce virCPUDefFindFeature qemu: Filter CPU features when using host CPU qemu: Fix CPU model broken by older libvirt src/conf/cpu_conf.c | 40 +++++++++++++++-------- src/conf/cpu_conf.h | 4 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 +++ src/qemu/qemu_driver.c | 14 ++++++++ src/qemu/qemu_process.c | 83 ++++++++++++++++++++++++++++++++++-------------- 7 files changed, 186 insertions(+), 36 deletions(-) -- 2.14.2

3 15

[libvirt] [libvirt-jenkins-ci PATCH 0/2] ansible: Improve service management
by Andrea Bolognani 17 Oct '17

17 Oct '17

Rely on built-in functionality instead of reinventing the wheel. Andrea Bolognani (2): ansible: Use systemd module ansible: Use built-in init system detection ansible/tasks/jenkins.yml | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) -- 2.13.6

2 3

[libvirt] [PATCH] qemu: Check QEMU error on failed migration
by Jiri Denemark 17 Oct '17

17 Oct '17

When migration fails, QEMU may provide a description of the error in the reply to query-migrate QMP command. We can fetch this error and use it instead of the generic "unexpectedly failed" message. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_migration.c | 36 +++++++++++++++++++++++------------- src/qemu/qemu_migration.h | 3 ++- src/qemu/qemu_monitor.c | 8 ++++++-- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 18 ++++++++++++++---- src/qemu/qemu_monitor_json.h | 3 ++- tests/qemumonitorjsontest.c | 29 ++++++++++++++++++++++++++--- 8 files changed, 77 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7c6f1674a9..cc79d7d4e9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13130,7 +13130,8 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver, jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) { if (events && jobInfo->status != QEMU_DOMAIN_JOB_STATUS_ACTIVE && - qemuMigrationFetchStats(driver, vm, QEMU_ASYNC_JOB_NONE, jobInfo) < 0) + qemuMigrationFetchStats(driver, vm, QEMU_ASYNC_JOB_NONE, + jobInfo, NULL) < 0) goto cleanup; if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE && diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dd60071bfd..b286d68061 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1382,7 +1382,8 @@ int qemuMigrationFetchStats(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, - qemuDomainJobInfoPtr jobInfo) + qemuDomainJobInfoPtr jobInfo, + char **error) { qemuDomainObjPrivatePtr priv = vm->privateData; qemuMonitorMigrationStats stats; @@ -1391,7 +1392,7 @@ qemuMigrationFetchStats(virQEMUDriverPtr driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - rv = qemuMonitorGetMigrationStats(priv->mon, &stats); + rv = qemuMonitorGetMigrationStats(priv->mon, &stats, error); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) return -1; @@ -1427,12 +1428,15 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = priv->job.current; - + char *error = NULL; bool events = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT); + int ret = -1; - if (!events && - qemuMigrationFetchStats(driver, vm, asyncJob, jobInfo) < 0) - return -1; + if (!events || + jobInfo->stats.status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { + if (qemuMigrationFetchStats(driver, vm, asyncJob, jobInfo, &error) < 0) + return -1; + } qemuMigrationUpdateJobType(jobInfo); @@ -1440,17 +1444,18 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, case QEMU_DOMAIN_JOB_STATUS_NONE: virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), qemuMigrationJobName(vm), _("is not active")); - return -1; + goto cleanup; case QEMU_DOMAIN_JOB_STATUS_FAILED: virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), - qemuMigrationJobName(vm), _("unexpectedly failed")); - return -1; + qemuMigrationJobName(vm), + error ? error : _("unexpectedly failed")); + goto cleanup; case QEMU_DOMAIN_JOB_STATUS_CANCELED: virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), qemuMigrationJobName(vm), _("canceled by client")); - return -1; + goto cleanup; case QEMU_DOMAIN_JOB_STATUS_COMPLETED: case QEMU_DOMAIN_JOB_STATUS_ACTIVE: @@ -1459,7 +1464,12 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, case QEMU_DOMAIN_JOB_STATUS_POSTCOPY: break; } - return 0; + + ret = 0; + + cleanup: + VIR_FREE(error); + return ret; } @@ -1577,7 +1587,7 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, } if (events) - ignore_value(qemuMigrationFetchStats(driver, vm, asyncJob, jobInfo)); + ignore_value(qemuMigrationFetchStats(driver, vm, asyncJob, jobInfo, NULL)); qemuDomainJobInfoUpdateTime(jobInfo); qemuDomainJobInfoUpdateDowntime(jobInfo); @@ -3177,7 +3187,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, if (virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_POSTCOPY && qemuMigrationFetchStats(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - jobInfo) < 0) + jobInfo, NULL) < 0) VIR_WARN("Could not refresh migration statistics"); qemuDomainJobInfoUpdateTime(jobInfo); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 57c747934d..63a4325624 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -282,7 +282,8 @@ int qemuMigrationFetchStats(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, - qemuDomainJobInfoPtr jobInfo); + qemuDomainJobInfoPtr jobInfo, + char **error); int qemuMigrationErrorInit(virQEMUDriverPtr driver); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7a26785878..551cbb77c7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2632,12 +2632,16 @@ qemuMonitorSetMigrationParams(qemuMonitorPtr mon, int qemuMonitorGetMigrationStats(qemuMonitorPtr mon, - qemuMonitorMigrationStatsPtr stats) + qemuMonitorMigrationStatsPtr stats, + char **error) { QEMU_CHECK_MONITOR(mon); + if (error) + *error = NULL; + if (mon->json) - return qemuMonitorJSONGetMigrationStats(mon, stats); + return qemuMonitorJSONGetMigrationStats(mon, stats, error); else return qemuMonitorTextGetMigrationStats(mon, stats); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d9c27acaef..ed57589db1 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -695,7 +695,8 @@ struct _qemuMonitorMigrationStats { }; int qemuMonitorGetMigrationStats(qemuMonitorPtr mon, - qemuMonitorMigrationStatsPtr stats); + qemuMonitorMigrationStatsPtr stats, + char **error); typedef enum { QEMU_MONITOR_MIGRATION_CAPS_XBZRLE, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a9070fe636..a4b7708b99 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2792,7 +2792,8 @@ qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon, static int qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, - qemuMonitorMigrationStatsPtr stats) + qemuMonitorMigrationStatsPtr stats, + char **error) { virJSONValuePtr ret; virJSONValuePtr ram; @@ -2801,6 +2802,7 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, const char *statusstr; int rc; double mbps; + const char *tmp; ret = virJSONValueObjectGetObject(reply, "return"); @@ -2839,11 +2841,18 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, switch ((qemuMonitorMigrationStatus) stats->status) { case QEMU_MONITOR_MIGRATION_STATUS_INACTIVE: case QEMU_MONITOR_MIGRATION_STATUS_SETUP: - case QEMU_MONITOR_MIGRATION_STATUS_ERROR: case QEMU_MONITOR_MIGRATION_STATUS_CANCELLED: case QEMU_MONITOR_MIGRATION_STATUS_LAST: break; + case QEMU_MONITOR_MIGRATION_STATUS_ERROR: + if (error) { + tmp = virJSONValueObjectGetString(ret, "error-desc"); + if (tmp && VIR_STRDUP(*error, tmp) < 0) + return -1; + } + break; + case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE: case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY: case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED: @@ -2987,7 +2996,8 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, - qemuMonitorMigrationStatsPtr stats) + qemuMonitorMigrationStatsPtr stats, + char **error) { int ret = -1; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-migrate", @@ -3005,7 +3015,7 @@ int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (qemuMonitorJSONGetMigrationStatsReply(reply, stats) < 0) + if (qemuMonitorJSONGetMigrationStatsReply(reply, stats, error) < 0) goto cleanup; ret = 0; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index f418c74264..7c45be6725 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -141,7 +141,8 @@ int qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon, qemuMonitorMigrationParamsPtr params); int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, - qemuMonitorMigrationStatsPtr stats); + qemuMonitorMigrationStatsPtr stats, + char **error); int qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, char ***capabilities); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index df3ef0a932..475fd270e1 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1907,6 +1907,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *data) qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); int ret = -1; qemuMonitorMigrationStats stats, expectedStats; + char *error = NULL; if (!test) return -1; @@ -1931,21 +1932,43 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *data) " }" " }," " \"id\": \"libvirt-13\"" + "}") < 0 || + qemuMonitorTestAddItem(test, "query-migrate", + "{" + " \"return\": {" + " \"status\": \"failed\"," + " \"error-desc\": \"It's broken\"" + " }," + " \"id\": \"libvirt-14\"" "}") < 0) goto cleanup; - if (qemuMonitorJSONGetMigrationStats(qemuMonitorTestGetMonitor(test), &stats) < 0) + if (qemuMonitorJSONGetMigrationStats(qemuMonitorTestGetMonitor(test), + &stats, &error) < 0) goto cleanup; - if (memcmp(&stats, &expectedStats, sizeof(stats)) != 0) { + if (memcmp(&stats, &expectedStats, sizeof(stats)) != 0 || error) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "Invalid migration status"); + "Invalid migration statistics"); + goto cleanup; + } + + memset(&stats, 0, sizeof(stats)); + if (qemuMonitorJSONGetMigrationStats(qemuMonitorTestGetMonitor(test), + &stats, &error) < 0) + goto cleanup; + + if (stats.status != QEMU_MONITOR_MIGRATION_STATUS_ERROR || + STRNEQ_NULLABLE(error, "It's broken")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "Invalid failed migration status"); goto cleanup; } ret = 0; cleanup: qemuMonitorTestFree(test); + VIR_FREE(error); return ret; } -- 2.14.2

2 2

[libvirt] [PATCH v2 0/3] Hyper-V driver fixes
by Ladi Prosek 17 Oct '17

17 Oct '17

Fixes a couple of minor issues in the Hyper-V driver found by code inspection. v1->v2: * Removed an "Invalid query" virReportError instead of adding a new one because virBufferCheckError already reports a meaningful error (Daniel) Ladi Prosek (3): hyperv: Fix hypervInitConnection error reporting hyperv: Escape WQL queries hyperv: Map Limit to max_memory and VirtualQuantity to cur_balloon src/hyperv/hyperv_driver.c | 104 ++++++++++++++++++++++----------------------- src/hyperv/hyperv_wmi.c | 3 +- src/util/virbuffer.c | 18 ++++++++ src/util/virbuffer.h | 3 ++ 4 files changed, 74 insertions(+), 54 deletions(-) -- 2.13.5

2 8

[libvirt] [PATCH 0/9] virStorageSource and backing chain refactors and fixes (blockdev-add saga)
by Peter Krempa 17 Oct '17

17 Oct '17

This series fixes and improves storage of backing store indexes and of the completness of the backing chain in the XML. Peter Krempa (9): conf: domain: Simplify return from backing store parser conf: Make backing store index optional util: storage: Store backing chain index in virStorageSource util: storage: use stored index to lookup disks util: storagefile: Tolerate NULL path when looking up volume in chain storage: Fill in 'type' field for virStorageSource in storage driver test: set 'type' field of virStorageSource util: storagefile: Add helpers to check presence of backing store Terminate backing chains explicitly docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 57 ++++++++++---------- src/conf/storage_conf.c | 9 +++- src/libvirt_private.syms | 2 + src/qemu/qemu_block.c | 4 +- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_domain.c | 6 +-- src/qemu/qemu_driver.c | 21 ++++++-- src/security/security_dac.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend_gluster.c | 2 + src/storage/storage_backend_logical.c | 3 +- src/storage/storage_source.c | 57 ++++++++++---------- src/storage/storage_util.c | 14 ++--- src/util/virstoragefile.c | 62 ++++++++++++++-------- src/util/virstoragefile.h | 7 +++ .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 1 - ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 - ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 1 - ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 - ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 - .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 1 - ...-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 2 - .../qemuhotplug-base-live+disk-scsi.xml | 1 - .../qemuhotplug-base-live+disk-usb.xml | 1 - .../qemuhotplug-base-live+disk-virtio.xml | 1 - ...se-without-scsi-controller-live+disk-scsi-2.xml | 1 - ...otplug-console-compat-2-live+console-virtio.xml | 2 - .../qemuhotplug-console-compat-2-live.xml | 2 - .../qemuxml2xmlout-channel-virtio-state-active.xml | 1 - .../qemuxml2xmlout-disk-active-commit.xml | 1 - .../qemuxml2xmlout-disk-backing-chains-active.xml | 5 -- .../qemuxml2xmlout-disk-mirror-active.xml | 4 -- .../qemuxml2xmlout-disk-mirror-old.xml | 4 -- .../qemuxml2xmlout-seclabel-static-labelskip.xml | 1 - tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 1 - tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 1 - tests/sexpr2xmldata/sexpr2xml-curmem.xml | 1 - .../sexpr2xml-disk-block-shareable.xml | 1 - tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 1 - .../sexpr2xml-disk-drv-blktap-qcow.xml | 1 - .../sexpr2xml-disk-drv-blktap-raw.xml | 1 - .../sexpr2xml-disk-drv-blktap2-raw.xml | 1 - tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 1 - tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 1 - tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 - .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 - .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 - .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 - tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 - tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 1 - tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 1 - tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 1 - tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 - tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 1 - .../sexpr2xml-pv-bootloader-cmdline.xml | 1 - tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 1 - tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 1 - tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 1 - .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 1 - tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 1 - .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 1 - tests/sexpr2xmldata/sexpr2xml-pv.xml | 1 - tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 2 - tests/virstoragetest.c | 3 +- 86 files changed, 159 insertions(+), 213 deletions(-) -- 2.14.1

2 22

[libvirt] [PATCH v3] qemu: argv: parse qemu commandline memory arguments
by Kothapally Madhu Pavan 16 Oct '17

16 Oct '17

Existing qemuParseCommandLineMem() will parse "-m 4G" format string. This patch allows it to parse "-m size=8126464k,slots=32,maxmem=33554432k" format along with existing format. And adds a testcase to validate the changes. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_parse_command.c | 89 +++++++++++++++++++--- .../qemuargv2xml-mem-scale-maxmemory.args | 22 ++++++ .../qemuargv2xml-mem-scale-maxmemory.xml | 38 +++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 138 insertions(+), 12 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 37e1149..cd2a32a 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1629,26 +1629,91 @@ static int qemuParseCommandLineMem(virDomainDefPtr dom, const char *val) { - unsigned long long mem; + unsigned long long mem = 0; + unsigned long long size = 0; + unsigned long long maxmem = 0; + unsigned int slots = 0; char *end; + size_t i; + int nkws; + char **kws; + char **vals; + int n; + int ret = -1; - if (virStrToLong_ull(val, &end, 10, &mem) < 0) { + if (qemuParseKeywords(val, &kws, &vals, &nkws, 1) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse memory level '%s'"), val); - return -1; + _("cannot parse memory '%s'"), val); + goto cleanup; } - if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot scale memory: %s"), - virGetLastErrorMessage()); - return -1; + for (i = 0; i < nkws; i++) { + if (vals[i] == NULL) { + if (i > 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory '%s'"), val); + goto cleanup; + } + if (virStrToLong_ull(kws[i], &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), kws[i]); + goto cleanup; + } + if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot scale memory: %s"), + virGetLastErrorMessage()); + goto cleanup; + } + + size = mem; + + } else { + if (STREQ(kws[i], "size") || STREQ(kws[i], "maxmem")) { + if (virStrToLong_ull(vals[i], &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), vals[i]); + goto cleanup; + } + if (virScaleInteger(&mem, end, 1024*1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot scale memory: %s"), + virGetLastErrorMessage()); + goto cleanup; + } + + STREQ(kws[i], "size") ? (size = mem) : (maxmem = mem); + + } + if (STREQ(kws[i], "slots")) { + if (virStrToLong_i(vals[i], &end, 10, &n) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse slots value '%s'"), vals[i]); + goto cleanup; + } + + slots = n; + + } + } } - virDomainDefSetMemoryTotal(dom, mem / 1024); - dom->mem.cur_balloon = mem / 1024; + virDomainDefSetMemoryTotal(dom, size / 1024); + dom->mem.cur_balloon = size / 1024; + dom->mem.memory_slots = slots; + dom->mem.max_memory = maxmem / 1024; - return 0; + ret = 0; + + cleanup: + for (i = 0; i < nkws; i++) { + VIR_FREE(kws[i]); + VIR_FREE(vals[i]); + } + VIR_FREE(kws); + VIR_FREE(vals); + + return ret; } diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args new file mode 100644 index 0000000..7bce841 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 8G,slots=16,maxmem=16G \ +-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml new file mode 100644 index 0000000..44431d8 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale-maxmemory.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>16777216</maxMemory> + <memory unit='KiB'>8388608</memory> + <currentMemory unit='KiB'>8388608</currentMemory> + <vcpu placement='static' current='1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <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> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 1adbcfe..e35726e 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -265,6 +265,7 @@ mymain(void) DO_TEST("hostdev-pci-address"); DO_TEST("mem-scale"); + DO_TEST("mem-scale-maxmemory"); DO_TEST("smp"); DO_TEST("hyperv"); -- 1.8.3.1

2 1

[libvirt] LSN-2017-0002 - TLS certificate verification disabled for clients
by Daniel P. Berrange 16 Oct '17

16 Oct '17

Libvirt Security Notice: LSN-2017-0002 ====================================== Summary: TLS certificate verification disabled for clients Reported on: 20171005 Published on: 20171016 Fixed on: 20171016 Reported by: Daniel P. Berrange <berrange(a)redhat.com> Patched by: Daniel P. Berrange <berrange(a)redhat.com> See also: CVE-2017-1000256 Description ----------- The default_tls_x509_verify (and related) parameters in qemu.conf control whether the TLS servers in QEMU request & verify certificates from clients. This works as a simple access control system for QEMU servers by requiring the CA to issue certs to permitted clients. This use of client certificates is disabled by default, since it requires extra work to issue client certificates. Unfortunately the libvirt code was using these configuration parameters when setting up both TLS clients and servers in QEMU. The result was that TLS clients for character devices and disk devices had verification turned off, meaning they would ignore any errors while validating the server certificate. Impact ------ A MITM attacker can attack any client connection made by QEMU's character devices and disk devices which have TLS enabled. The attacker can send an arbitrary certificate back to the client QEMU and it will ignore all errors that result during validation. Workaround ---------- Enable the 'default_tls_x509_verify' parameter in qemu.conf restart libvirtd. This will trigger libvirt to turn on certificate verification in QEMU clients. Unfortunately this will also turn on use of client certificates in QEMU servers. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v2.3.0 Broken in: v2.4.0 Broken in: v2.5.0 Broken in: v3.0.0 Broken in: v3.1.0 Broken in: v3.2.0 Broken in: v3.3.0 Broken in: v3.4.0 Broken in: v3.5.0 Broken in: v3.6.0 Broken in: v3.7.0 Broken in: v3.8.0 Fixed in: v3.9.0 Broken by: ce61c16450d4992612d1fc6f39a39e79bfccead5 Fixed by: 441d3eb6d1be940a67ce45a286602a967601b157 Branch: v3.0-maint Broken by: ce61c16450d4992612d1fc6f39a39e79bfccead5 Fixed by: 16daadc708be65c2681f54d33ac4004ccaf6e82d Branch: v3.2-maint Broken in: v3.2.1 Broken by: ce61c16450d4992612d1fc6f39a39e79bfccead5 Fixed by: 9e6bc47bb541d8eea10cdd5704ea7f5e699bf0ba Branch: v3.7-maint Broken by: ce61c16450d4992612d1fc6f39a39e79bfccead5 Fixed by: dc6c41798d1eb5c52c75365ffa22f7672709dfa7 Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] qemu: ensure TLS clients always verify the server certificate
by Daniel P. Berrange 16 Oct '17

16 Oct '17

The default_tls_x509_verify (and related) parameters in qemu.conf control whether the QEMU TLS servers request & verify certificates from clients. This works as a simple access control system for servers by requiring the CA to issue certs to permitted clients. This use of client certificates is disabled by default, since it requires extra work to issue client certificates. Unfortunately the code was using this configuration parameter when setting up both TLS clients and servers in QEMU. The result was that TLS clients for character devices and disk devices had verification turned off, meaning they would ignore errors while validating the server certificate. This allows for trivial MITM attacks between client and server, as any certificate returned by the attacker will be accepted by the client. This is assigned CVE-2017-1000256 / LSN-2017-0002 Reviewed-by: Eric Blake <eblake(a)redhat.com> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a off-list reviewed security fix. src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args | 2 +- .../qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 46f0bdd18c..f68b82d083 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -721,7 +721,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, if (virJSONValueObjectCreate(propsret, "s:dir", path, "s:endpoint", (isListen ? "server": "client"), - "b:verify-peer", verifypeer, + "b:verify-peer", (isListen ? verifypeer : true), NULL) < 0) goto cleanup; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args index 5aff7734e1..ab5f7e27f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args @@ -26,7 +26,7 @@ server,nowait \ localport=1111 \ -device isa-serial,chardev=charserial0,id=serial0 \ -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\ -endpoint=client,verify-peer=no \ +endpoint=client,verify-peer=yes \ -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\ tls-creds=objcharserial1_tls0 \ -device isa-serial,chardev=charserial1,id=serial1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args index 91f1fe0cde..2567abbfad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args @@ -31,7 +31,7 @@ localport=1111 \ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\ -endpoint=client,verify-peer=no,passwordid=charserial1-secret0 \ +endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \ -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\ tls-creds=objcharserial1_tls0 \ -device isa-serial,chardev=charserial1,id=serial1 \ -- 2.13.5

1 0

[libvirt] [PATCH go-xml] let disk source omitempty for ejecting cdrom/floppy
by zhenwei.pi 16 Oct '17

16 Oct '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain.go b/domain.go index bacab11..f9d567d 100644 --- a/domain.go +++ b/domain.go @@ -117,7 +117,7 @@ type DomainDisk struct { Snapshot string `xml:"snapshot,attr,omitempty"` Driver *DomainDiskDriver `xml:"driver"` Auth *DomainDiskAuth `xml:"auth"` - Source *DomainDiskSource `xml:"source"` + Source *DomainDiskSource `xml:"source,omitempty"` Target *DomainDiskTarget `xml:"target"` IOTune *DomainDiskIOTune `xml:"iotune"` Serial string `xml:"serial,omitempty"` -- 2.7.4

2 1

[libvirt] [PATCH] qemu: change monitor.sock from /var/lib/libvirt/qemu/domain-*** to /var/run/libvirt/qemu/domain-***
by xinhua.Cao 16 Oct '17

16 Oct '17

directory /var/lib alway is Persistence directory, but in redhat system, /var/run is memory directory. our running domain xml is saved at /var/run/libvirt/qemu. so if we cold reset system, the /var/run/libvirt/qemu directory is clear, but /var/lib/libvirt/qemu/domain-*** is saved. so there have same /var/run/libvirt/qemu/domain-*** directory will be left over at system cold reset. --- src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed27a91..1b42ae5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1646,7 +1646,7 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, if (!priv->libDir && virAsprintf(&priv->libDir, "%s/domain-%s", - cfg->libDir, vm->def->name) < 0) + cfg->stateDir, vm->def->name) < 0) goto cleanup; if (!priv->channelTargetDir && @@ -1674,7 +1674,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, goto cleanup; if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname) < 0) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->stateDir, domname) < 0) goto cleanup; if (!priv->channelTargetDir && -- 2.8.3

4 5

[libvirt] [PATCH] virDomainInterfaceStats: Accept MAC addresses properly
by Michal Privoznik 14 Oct '17

14 Oct '17

https://bugzilla.redhat.com/show_bug.cgi?id=1497396 In 0d3d020ba6c4f I've added capability to accept MAC addresses for the API too. However, the implementation was faulty. It needs to lookup the corresponding interface in the domain definition and pass the ifname instead of MAC address. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 08b0f0317..2230343b0 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4982,7 +4982,7 @@ libxlDomainInterfaceStats(virDomainPtr dom, if (!(net = virDomainNetFind(vm->def, device))) goto endjob; - if (virNetDevTapInterfaceStats(device, stats, + if (virNetDevTapInterfaceStats(net->ifname, stats, !virDomainNetTypeSharesHostView(net)) < 0) goto endjob; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 6cf499367..b3f6f064f 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2875,7 +2875,7 @@ lxcDomainInterfaceStats(virDomainPtr dom, if (!(net = virDomainNetFind(vm->def, device))) goto endjob; - if (virNetDevTapInterfaceStats(device, stats, + if (virNetDevTapInterfaceStats(net->ifname, stats, !virDomainNetTypeSharesHostView(net)) < 0) goto endjob; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index ffd64da04..9bd73d85c 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2009,7 +2009,7 @@ openvzDomainInterfaceStats(virDomainPtr dom, if (!(net = virDomainNetFind(vm->def, device))) goto cleanup; - if (virNetDevTapInterfaceStats(device, stats, + if (virNetDevTapInterfaceStats(net->ifname, stats, !virDomainNetTypeSharesHostView(net)) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7b79c0950..260184ce8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11044,10 +11044,10 @@ qemuDomainInterfaceStats(virDomainPtr dom, goto cleanup; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { - if (virNetDevOpenvswitchInterfaceStats(device, stats) < 0) + if (virNetDevOpenvswitchInterfaceStats(net->ifname, stats) < 0) goto cleanup; } else { - if (virNetDevTapInterfaceStats(device, stats, + if (virNetDevTapInterfaceStats(net->ifname, stats, !virDomainNetTypeSharesHostView(net)) < 0) goto cleanup; } -- 2.13.6

2 2

[libvirt] [PATCH] nodedev: Fix missing network devices
by John Ferlan 13 Oct '17

13 Oct '17

Commit id '8708ca01c' added a check to determine whether the NIC had Switchdev capabilities; however, in doing so inadvertently would cause network devices without a PCI device to not be added to the node device database. Thus, network devices having a "computer" as a parent, such as "net_lo*", "net_virbr*", "net_tun*", "net_vnet*", etc. were not added. Alter the check to not even check for Switchdev bits if no PCI device found. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Found this gem while running the Avocado test suite while doing some other work. It's only 3.8.0 that'll have the missing devices. src/util/virnetdev.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5060d051dc..41ef65d882 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3236,6 +3236,14 @@ virNetDevSwitchdevFeature(const char *ifname, if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0) goto cleanup; + pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : + virNetDevGetPCIDevice(ifname); + /* No PCI device, then no feature bit to check/add */ + if (pci_device_ptr == NULL) { + ret = 0; + goto cleanup; + } + if (!(nl_msg = nlmsg_alloc_simple(family_id, NLM_F_REQUEST | NLM_F_ACK))) { virReportOOMError(); @@ -3248,11 +3256,6 @@ virNetDevSwitchdevFeature(const char *ifname, gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET; gmsgh->version = DEVLINK_GENL_VERSION; - pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : - virNetDevGetPCIDevice(ifname); - if (pci_device_ptr == NULL) - goto cleanup; - pci_name = virPCIDeviceGetName(pci_device_ptr); if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0 || -- 2.13.6

2 1

[libvirt] [PATCH 0/4] virDomainInterfaceStats: Accept MAC address too
by Michal Privoznik 13 Oct '17

13 Oct '17

*** BLURB HERE *** Michal Privoznik (4): virsh: Document limitation of domifstat virDomainInterfaceStats: Accept MAC address too virsh: Deal with multiple matching devices in domif-getlink virDomainNetFind: Report error if no device found include/libvirt/libvirt-domain.h | 2 +- src/conf/domain_conf.c | 18 ++++++++++-------- src/driver-hypervisor.h | 2 +- src/libvirt-domain.c | 15 ++++++++------- src/libxl/libxl_driver.c | 9 +++------ src/lxc/lxc_driver.c | 9 +++------ src/openvz/openvz_driver.c | 9 +++------ src/qemu/qemu_driver.c | 27 +++++++-------------------- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- src/test/test_driver.c | 12 +++++------- src/vz/vz_driver.c | 4 ++-- src/vz/vz_sdk.c | 9 +++++++-- src/xen/xen_driver.c | 8 ++++++-- tools/virsh-domain-monitor.c | 5 ++++- tools/virsh.pod | 5 ++++- 16 files changed, 66 insertions(+), 72 deletions(-) -- 2.13.6

2 11

[libvirt] dynamic DRAM base for ArmVirtQemu
by Laszlo Ersek 13 Oct '17

13 Oct '17

Hi Ard, Leif, the current physical memory map of the "virt" machine type doesn't leave much room for ECAM / MMCONFIG, which limits the number of PCI Express root ports and downstream ports (each port takes a separate bus number, and each bus number eats up a chunk of the ECAM area). Also, each port can only accommodate a single PCI Express device. In practice this limits the number of (hot-pluggable) PCIe devices to approx. 16, which is deemed by some "not scaleable enough". (For devices that only need to be cold-plugged, they can be placed directly on the root complex, as integrated devices, possibly grouping them into multifunction devices even; so those don't need bus numbers.) In order to grow the MMCONFIG area (and for some other reasons possibly), the phys memmap of "virt" should be shuffled around a bit. This affects the "system" DRAM too. One idea is to keep the current system DRAM base at 1GB, but limit its size to 1GB. And, if there's more DRAM, use another, disjoint address range for that, above 4GB. This would be easy to support for ArmVirtQemu (basically nothing new would be necessary), as the high area would be handled transparently by "ArmVirtPkg/HighMemDxe". However, this appears to present complications for QEMU. (I don't exactly know what complications -- I would be very happy to hear them, in detail.) Another idea is to move *the* system DRAM base to a different guest-phys address. (Likely using a different version of the "virt" machine type, or even a different machine type entirely.) This would not be compatible with current ArmVirtQemu, which hard-codes the system DRAM base in several, quite brittle / sensitive, locations. (More on this later -- that's going to be the larger part of my email anyway.) In order to handle the new base in ArmVirtQemu, two approaches are possible: change the hard-coded address(es), or cope with the address dynamically. Changing the hard-coded addresses is easy for edk2 contributors (just add a new build flag like -D DRAM_BASE_AT_XXX_GB, and dependent on it, set a number of fixed-at-build PCDs to new values). For RHEL downstream, this is not an un-attractive option, as we are free to break compatibility at this time. For upstream users and other distros however, it likely wouldn't be convenient, because "old" ArmVirtQemu firmware wouldn't boot on the "new" machine type, and vice versa. (If we can agree that the above "boundary" in firmwares and machine types is widely tolerable, then we need not discuss the rest of this email.) Finally, coping with "any" system DRAM base address in ArmVirtQemu is both the most flexible for users, and the most difficult to implement. When QEMU launches the guest, the base of the system DRAM (which equals the location of the DTB too) is exposed in the x0 register. The challenge is to make everything in the earliest phases of ArmVirtQemu to adapt to this value dynamically, and to propagate the value to further parts of the firmware. I've been looking into this for a few days now and would like to pick your minds on what I've found. ( As a side note, I know (superficially) of Ard's ArmVirtXen and ArmVirtQemuKernel work. If I understand correctly, Ard has turned some of the PCDs I'm about to discuss into "patchable" ones, from "fixed-at-build". The difference in storage is that these constants are now placed in the final firmware image such that they are externally patchable, just before "deployment". Because the ArmVirtXen and ArmVirtQemuKernel firmware binaries are loaded into DRAM immediately, this self-patching -- based on the initial value of x0 -- is feasible, in the earliest part of the firmware. (I'm not saying "easy" -- to the contrary; but it's feasible.) However, ArmVirtQemu is launched from pflash; its SEC and PEI phases execute-in-place from pflash (until MemoryInitPeim installs the permanent PEI RAM, and the PEI_CORE relocates the HOB list, itself, and the PEIMs into DRAM). Therefore the SEC and PEI phases of ArmVirtQemu cannot be patched like this, i.e., through patchable PCDs. (Unless, of course, the patching is implemented in QEMU itself -- but I don't think that's probable). ) Now, exactly because SEC and PEI execute in place from pflash, their execution (= instruction fetches) are not affected by different initial x0 values. However, the following are affected: - the initial stack, - the base address of the initial DTB, - the location of the permanent PEI RAM. In ArmVirtQemu, these are represented by the following PCDs (all fixed-at-build currently): - PcdCPUCoresStackBase - PcdDeviceTreeInitialBaseAddress - PcdSystemMemoryBase I've attempted to audit each of these PCDs. (I should note in advance that I focused on their use *only* in the ArmVirtQemu firmware platform, and only on AARCH64. I ignored ARM32, and ArmVirtXen and ArmVirtQemuKernel. We obviously must not regress those other arches / platforms by messing with these PCDs, but this is only a "feasibility study" for now.) (1) PcdCPUCoresStackBase The PCD's current value is, from "ArmVirtPkg/ArmVirtQemu.dsc": > [PcdsFixedAtBuild.common] > gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x4007c000 That is, 496KB above the start of the DRAM (which is at 1GB currently). This leaves enough room for the initial DTB (placed at the start of DRAM). The PCD is used widely by the SECURITY_CORE (=SEC) module of ArmVirtQemu, namely: ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf The PCD is used by no other module. * The stack is set up in ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S under the label ASM_PFX(MainEntryPoint). This is where the initial value of x0 should be considered first, replacing the use of "PcdCPUCoresStackBase" with something like x0 + 0x7c000 (I don't grok aarch64 assembly, so any help with the implementation would be greatly appreciated (if this approach is feasible at all).) * Once we're done with the assembly magic, we enter the CEntryPoint() function, and the following tree of calls occurs: CEntryPoint() [ArmPlatformPkg/PrePeiCore/PrePeiCore.c] PrimaryMain() [ArmPlatformPkg/PrePeiCore/MainUniCore.c] CreatePpiList() [ArmPlatformPkg/PrePeiCore/PrePeiCore.c] PeiCoreEntryPoint() * The CEntryPoint() function *currently* takes two parameters from the assembly entry logic, > VOID > CEntryPoint ( > IN UINTN MpId, > IN EFI_PEI_CORE_ENTRY_POINT PeiCoreEntryPoint > ) The PeiCoreEntryPoint parameter is the function pointer that is going to be invoked at the bottom of the call tree, displayed above. The assembly code in "PrePeiCoreEntryPoint.S" fetches the value from the flash image. (I'm spelling this out just to clarify the last line in the call tree.) - The parameter list of the CEntryPoint() function should be extended with IN UINT64 MemoryBase, IN UINT64 StackBase - the assembly code should pass the initial value of x0 in "MemoryBase", - and the stack base (i.e., (x0 + 0x7c000)) in "StackBase". * Then, the PrimaryMain() function is invoked: > VOID > EFIAPI > PrimaryMain ( > IN EFI_PEI_CORE_ENTRY_POINT PeiCoreEntryPoint > ) This function does the following: (1a) it creates a PPI list *in DRAM*, at PcdCPUCoresStackBase, by calling CreatePpiList(), (1b) right above the PPI list, it marks the DRAM area to be used as temporary SEC/PEI stack/heap, (1c) it enters the PEI_CORE, by calling PeiCoreEntryPoint(), passing it the above-calculated locations, *and* the PPI list also constructed above. Now, PrimaryMain()'s parameter list should also be extended with IN UINT64 MemoryBase, IN UINT64 StackBase and the "StackBase" parameter should replace "PcdCPUCoresStackBase" in the (1a) and (1b) calculations. In addition, this is where we have the opportunity (and obligation) to propagate the "MemoryBase" value to *all* of the PEI phase. The way SEC propagates *custom* information to PEI is via the PPI list parameter of PeiCoreEntryPoint(). Unlike CEntryPoint() and PrimaryMain(), PeiCoreEntryPoint() has a standardized function prototype: MdePkg/Include/Pi/PiPeiCis.h > typedef > VOID > (EFIAPI *EFI_PEI_CORE_ENTRY_POINT)( > IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData, > IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList > ); (See also the comment block on the typedef! It's super informative.) The "SecCoreData" pointer passes the information that we calculated in (1b). And the "PpiList" pointer passes the PPI list from (1a). * Therefore, if we have to modify the CreatePpiList() function too: > VOID > CreatePpiList ( > OUT UINTN *PpiListSize, > OUT EFI_PEI_PPI_DESCRIPTOR **PpiList > ) This function currently concatenates two *constant* (in-flash) PPI lists. One comes from the variable gCommonPpiTable [ArmPlatformPkg/PrePeiCore/PrePeiCore.c] and the other is returned by the function ArmPlatformGetPlatformPpiList() [ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c] The concatenated list is placed into DRAM, at "PcdCPUCoresStackBase". The point here is that both *input* PPI lists are *constant*, they come from pflash, and don't have the "MemoryBase" information. Therefore, - the parameter list of CreatePpiList() should be extended with IN UINT64 MemoryBase, IN UINT64 StackBase - CreatePpiList() should store the concatenated list at "StackBase", not "PcdCPUCoresStackBase", - and CreatePpiList() should append *two more* PPI descriptors (with separate, custom GUIDs, to be defined by us), where the first's "EFI_PEI_PPI_DESCRIPTOR.Ppi" (of type pointer-to-void) would point *directly* at "MemoryBase", for advertizing the memory base; and the second would point to the same, but advertize the initial DTB base address. (We'd have two distinct PPIs for completeness.) Then interested PEIMs could locate these PPIs by GUID in the PEI phase, and learn about the "MemoryBase" / initial DTB base address values. * Now, clearly, this is quite a few changes to the ArmPlatformPkg/PrePeiCore module, which is likely used as the SEC phase of a bunch of other ARM platforms. Should we copy "ArmPlatformPkg/PrePeiCore" under ArmVirtPkg for this kind of customization? (2) PcdDeviceTreeInitialBaseAddress ( Before discussing this PCD, I have to digress a bit. Namely, the ArmPlatformLib class, defined in ArmPlatformPkg/Include/Library/ArmPlatformLib.h is unfortunately a very confusing lib class. It is a dumping ground for random "platform" functions. The catch is that some of these functions are meant to be invoked from SEC, exclusively, while some other functions are meant to be invoked from PEI, exclusively. The end result is that, if a given ArmPlatformLib instance implements a *PEI-only* function with various PCD, PPI, and GUID dependencies, then the exact same, *bogus*, dependencies will show up in the build report file for the SECURITY_CORE module as well. Simply because the SEC module links against the same library instance, for the sake of the SEC-only functions. Never mind that the SEC module never *calls* those PEI-only functions that incur said dependencies. This makes dependency analysis, based on the build report file, very cumbersome. The ArmPlatformLib class should be split into SEC-only and PEI-only lib classes. ) "PcdDeviceTreeInitialBaseAddress" is currently set in "ArmVirtPkg/ArmVirtQemu.dsc" as follows: > [PcdsFixedAtBuild.common] > # initial location of the device tree blob passed by QEMU -- base of DRAM > gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 "PcdDeviceTreeInitialBaseAddress" is used in three library instances: (2a) ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c (2b) ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c (2c) ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c (2a) "ArmVirtPlatformLib.inf" is built into SEC, discussed above: ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf and also into the following two PEIMs: ArmPlatformPkg/PlatformPei/PlatformPeim.inf ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf The function in ArmVirtPlatformLib that fetches "PcdDeviceTreeInitialBaseAddress", namely ArmPlatformInitializeSystemMemory(), is *only* called from the entry point function of MemoryInitPeim, InitializeMemory(). (See my gripe above about the ArmPlatformLib class -- SEC's apparent dependency on this PCD is bogus!) I.e., we have the following call tree: InitializeMemory() [ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c] ArmPlatformInitializeSystemMemory() [ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c] PcdGet64 (PcdDeviceTreeInitialBaseAddress) Consequently, given that the only reference to "PcdDeviceTreeInitialBaseAddress" is made from within PEI, we can replace the PcdGet64() call with a PeiServicesLocatePpi() call, and grab the initial device tree base address from our custom PPI. (2b) "EarlyFdtPL011SerialPortLib.inf" is a SerialPortLib instance that parses the UART base address from the initial DTB on every SerialPortWrite() call: SerialPortWrite() [ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c] SerialPortGetBaseAddress() [ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c] PcdGet64 (PcdDeviceTreeInitialBaseAddress) PL011UartWrite() [ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c] The library instance is linked into: - SEC: ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf - PEI_CORE: MdeModulePkg/Core/Pei/PeiMain.inf - and all 6 PEIMs included by ArmVirtQemu: ArmPkg/Drivers/CpuPei/CpuPei.inf ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf ArmPlatformPkg/PlatformPei/PlatformPeim.inf MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf MdeModulePkg/Universal/PCD/Pei/Pcd.inf MdeModulePkg/Universal/Variable/Pei/VariablePei.inf It is not used by other modules. If we replaced the "PcdDeviceTreeInitialBaseAddress" access in SerialPortGetBaseAddress() with a PeiServicesLocatePpi() call, then the PEI_CORE and PEIM modules would remain functional. (See again the comment block on EFI_PEI_CORE_ENTRY_POINT in "MdePkg/Include/Pi/PiPeiCis.h" -- the PEI_CORE itself is allowed to use the PPIs originally exported by SEC.) However, SEC couldn't use a library instance like this -- there's no way to search for a PPI in SEC. In other words, the SerialPortLib class is unsuitable for such use in SEC. I don't know how to solve this, other than by hard-coding the UART base address with a fixed-at-build PCD, in a custom SerialPortLib instance. :/ (2c) The "PlatformPeiLib.inf" instance used with ArmVirtQemu copies the initial DTB into its final (page-allocated) place, in the PlatformPeim() function: InitializePlatformPeim() [ArmPlatformPkg/PlatformPei/PlatformPeim.c] PlatformPeim() [ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c] PcdGet64 (PcdDeviceTreeInitialBaseAddress) We can again replace the PcdGet64() with a PeiServicesLocatePpi() call. (No other module uses this PlatformPeiLib instance.) (3) PcdSystemMemoryBase Comes currently from "ArmVirtPkg/ArmVirtQemu.dsc": > [PcdsFixedAtBuild.common] > # System Memory Base -- fixed at 0x4000_0000 > gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 Based on the build report file, the following modules depend on this PCD, directly, or via library instances: - SEC: ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf - PEIM: ArmPlatformPkg/PlatformPei/PlatformPeim.inf - PEIM: ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf The last two (i.e., the PEIMs) can use PeiServicesLocatePpi() in place of "PcdSystemMemoryBase". The first module (SEC) seems to inherit the dependency on "PcdSystemMemoryBase" via ArmVirtPlatformLib. In ArmVirtPlatformLib, we consume the PCD in two spots: (3a) in the ArmPlatformInitializeSystemMemory() function. Referring back to my notes in (2a), this function is never called from SEC, so we can use PeiServicesLocatePpi(), for grabbing the DRAM base. (3b) The ArmPlatformGetVirtualMemoryMap() function is the other consumer. This function appears to be called on the following path, as part of ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf *only*: InitializeMemory() [ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c] MemoryPeim() [ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c] InitMmu() [ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c] ArmPlatformGetVirtualMemoryMap() [ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c] PcdGet64 (PcdSystemMemoryBase) Because this PCD consumption site is again never reached in SEC, we can replace it with PeiServicesLocatePpi(). Summary: - The end goal is to clear out all appearances of PcdCPUCoresStackBase, PcdDeviceTreeInitialBaseAddress, and PcdSystemMemoryBase from the ArmVirtQemu build report file. The first PCD should be replaced by a plain calculation in SEC, from x0, and the other two should be replaced by custom PPIs that SEC produces (passing them to the PEI_CORE). - I'd need help with the assembly code in SEC ("ArmPlatformPkg/PrePeiCore/AArch64/PrePeiCoreEntryPoint.S"). - The changes are intrusive enough -- for ArmPlatformPkg, and for the ArmVirtXen and ArmVirtQemuKernel platforms under ArmVirtPkg -- to justify deep-copying a number of modules, specifically for ArmVirtQemu. - In ArmVirtQemu, SEC would lose serial output, unless we hard-coded the PL011 UART base address. Neither the DebugLib nor the SerialPortLib APIs can take auxiliary data as function parameters, and in SEC, we have *none* of: writeable global variables, HOBs, *searchable* PPIs, dynamic PCDs. The only way to pass information is via the stack, and the DebugLib and SerialPortLib APIs are unsuited for that. Thoughts? Thanks Laszlo

4 5

[libvirt] [PATCH 00/23] Fix host-model if the chosen CPU model has more features in QEMU compared to our cpu_map.xml
by Jiri Denemark 13 Oct '17

13 Oct '17

When decoding CPUID data to virCPUDef we need to be careful about using a CPU model which cannot be directly used on the current host. Normally, libvirt would notice the features which prevent the model from being usable and it would disable them in the computed virCPUDef, but this won't work in case the definition of the CPU model in QEMU contains more features than what we have in cpu_map.xml. We need to count with the usability blockers we got from QEMU and explicitly disable all of them to make the computed virCPUDef usable. https://bugzilla.redhat.com/show_bug.cgi?id=1464832 Jiri Denemark (23): util: Introduce virStringListCopy conf: Add usability blockers to virDomainCapsCPUModel qemu: Store CPU usability blockers in caps cache qemu: Parse unavailable features for CPU models cpu: Use virDomainCapsCPUModelsPtr in cpu driver APIs cpu: Drop unused parameter from cpuDecode cpu: Return model from virCPUModelIsAllowed cpu_x86: Move x86FeatureFind* to avoid forward prototypes cpu_x86: Disable blockers from unusable CPU models cputest: Replace json bool with enum cputest: Avoid calling json_reformat in cpu-parse.sh cputest: Print correct feature in virCPUUpdateLive test cputest: Test CPU usability blockers cputest: Separate QEMUCaps creation from cpuTestCPUIDJson build: Export virCPUModelIsAllowed private API cputest: Use CPU models from QEMU when available cputest: Add query-cpu-definitions reply for Core-i5-2540M cputest: Add CPUID data for Intel(R) Xeon(R) CPU E7-4830 cputest: Add query-cpu-definitions reply for Xeon-E7-4830 cputest: Update Xeon-E3-1245 data cputest: Add query-cpu-definitions reply for Xeon-E3-1245 cputest: Update Core-i7-2600 data cputest: Make a crippled version of Core-i7-2600 src/conf/domain_capabilities.c | 30 +- src/conf/domain_capabilities.h | 7 +- src/cpu/cpu.c | 95 +- src/cpu/cpu.h | 31 +- src/cpu/cpu_arm.c | 3 +- src/cpu/cpu_ppc64.c | 14 +- src/cpu/cpu_x86.c | 108 +- src/libvirt_private.syms | 1 + src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_capabilities.c | 123 +-- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_capspriv.h | 5 + src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 26 +- src/qemu/qemu_process.c | 9 +- src/test/test_driver.c | 2 +- src/util/virstring.c | 37 + src/util/virstring.h | 3 + tests/cputest.c | 324 ++++-- tests/cputestdata/cpu-cpuid.py | 26 +- tests/cputestdata/cpu-gather.sh | 1 + tests/cputestdata/cpu-parse.sh | 2 +- tests/cputestdata/cpu-reformat.py | 9 + tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json | 362 +++++++ .../x86_64-cpuid-Core-i7-2600-disabled.xml | 1 - .../x86_64-cpuid-Core-i7-2600-enabled.xml | 1 + .../cputestdata/x86_64-cpuid-Core-i7-2600-json.xml | 1 + ...x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml | 6 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 25 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 25 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 11 + .../x86_64-cpuid-Core-i7-2600-xsaveopt.json | 615 +++++++++++ .../x86_64-cpuid-Core-i7-2600-xsaveopt.xml | 33 + tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 496 ++++++++- tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml | 6 +- .../x86_64-cpuid-Xeon-E3-1245-disabled.xml | 1 - .../x86_64-cpuid-Xeon-E3-1245-enabled.xml | 2 +- .../cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json | 712 +++++++++---- tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml | 7 +- .../x86_64-cpuid-Xeon-E7-4830-disabled.xml | 5 + .../x86_64-cpuid-Xeon-E7-4830-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E7-4830-guest.xml | 28 + .../cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml | 29 + .../cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml | 14 + tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json | 657 ++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml | 30 + tests/domaincapstest.c | 6 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1102 ++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 236 ++++- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 154 ++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 154 ++- 56 files changed, 4927 insertions(+), 680 deletions(-) create mode 100755 tests/cputestdata/cpu-reformat.py create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml -- 2.14.2

2 65

[libvirt] [PATCH] Use https:// links for most sites
by Daniel P. Berrange 13 Oct '17

13 Oct '17

This adds a rule to require https links for the libvirt, qemu and kvm websites. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 20 +++++++++ configure.ac | 2 +- daemon/libvirtd.conf | 2 +- daemon/libvirtd.init.in | 4 +- daemon/libvirtd.pod | 6 +-- daemon/libvirtd.service.in | 2 +- daemon/virt-guest-shutdown.target | 2 +- docs/404.html.in | 2 +- docs/aclpolkit.html.in | 2 +- docs/api_extension.html.in | 2 +- docs/apps.html.in | 2 +- docs/bindings.html.in | 10 ++--- docs/csharp.html.in | 6 +-- docs/devguide.html.in | 14 +++--- docs/devhelp/html.xsl | 4 +- docs/docs.html.in | 4 +- docs/downloads.html.in | 92 +++++++++++++++++++-------------------- docs/drvlxc.html.in | 2 +- docs/drvqemu.html.in | 8 ++-- docs/formatdomain.html.in | 2 +- docs/hacking.html.in | 2 +- docs/internals/eventloop.html.in | 4 +- docs/java.html.in | 12 ++--- docs/news-2005.html.in | 2 +- docs/news-2006.html.in | 2 +- docs/news-2007.html.in | 4 +- docs/news-2008.html.in | 2 +- docs/news-2009.html.in | 2 +- docs/news-2010.html.in | 2 +- docs/news-2011.html.in | 2 +- docs/news-2012.html.in | 2 +- docs/news-2013.html.in | 2 +- docs/news-2014.html.in | 2 +- docs/news-2015.html.in | 2 +- docs/news-2016.html.in | 2 +- docs/news-html.xsl | 2 +- docs/php.html.in | 6 +-- docs/securityprocess.html.in | 2 +- docs/testapi.html.in | 4 +- docs/testsuites.html.in | 4 +- docs/testtck.html.in | 2 +- docs/virshcmdref.html.in | 24 +++++----- docs/windows.html.in | 2 +- src/access/genpolkit.pl | 2 +- src/libvirt.c | 6 +-- src/locking/virtlockd.pod | 6 +-- src/locking/virtlockd.service.in | 2 +- src/logging/virtlogd.pod | 6 +-- src/logging/virtlogd.service.in | 2 +- src/qemu/qemu_command.c | 2 +- src/util/virstoragefile.c | 2 +- tests/virconfdata/libvirtd.conf | 2 +- tests/virconfdata/libvirtd.out | 2 +- tools/libvirt-guests.init.in | 4 +- tools/libvirt-guests.service.in | 2 +- tools/virsh.c | 2 +- tools/virsh.pod | 40 ++++++++--------- tools/virt-admin.c | 2 +- tools/virt-admin.pod | 8 ++-- tools/virt-host-validate.pod | 4 +- tools/virt-login-shell.pod | 6 +-- tools/virt-pki-validate.in | 10 ++--- tools/virt-pki-validate.pod | 6 +-- tools/virt-sanlock-cleanup.pod | 6 +-- tools/virt-xml-validate.pod | 6 +-- tools/wireshark/README.md | 2 +- 66 files changed, 214 insertions(+), 194 deletions(-) diff --git a/cfg.mk b/cfg.mk index 0f4065b98a..e0e52a0786 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1020,6 +1020,26 @@ sc_prohibit_obj_free_apis_in_virsh: halt='avoid using virDomain(Snapshot)Free in virsh, use virsh-prefixed wrappers instead' \ $(_sc_search_regexp) +https_sites = www.libvirt.org +https_sites += libvirt.org +https_sites += security.libvirt.org +https_sites += qemu.org +https_sites += www.qemu.org +https_sites += wiki.qemu.org +https_sites += linux-kvm.org +https_sites += www.linux-kvm.org + +https_re= ($(subst $(space),|,$(https_sites))) + +foo: + echo "$(https_re)" + +sc_prohibit_http_urls: + @prohibit='http://$(https_re)' \ + exclude="/schemas/" \ + halt='Links must use https:// protocol' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/configure.ac b/configure.ac index 4f420cf8d9..ebe3318e07 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [3.9.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [3.9.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index 8a1b3a92db..8e0c0d96d2 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -1,6 +1,6 @@ # Master libvirt daemon configuration file # -# For further information consult http://libvirt.org/format.html +# For further information consult https://libvirt.org/format.html # # NOTE: the tests/daemon-conf regression test script requires # that each "PARAMETER = VALUE" line in this file have the parameter diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 164732905d..d81dca6f2e 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -14,7 +14,7 @@ # Short-Description: daemon for libvirt virtualization API # Description: This is a daemon for managing guest instances # and libvirt virtual networks -# See http://libvirt.org +# See https://libvirt.org ### END INIT INFO # the following is chkconfig init header @@ -24,7 +24,7 @@ # chkconfig: 345 97 03 # description: This is a daemon for managing guest instances \ # and libvirt virtual networks \ -# See http://libvirt.org +# See https://libvirt.org # # processname: libvirtd # pidfile: @localstatedir@/run/libvirtd.pid diff --git a/daemon/libvirtd.pod b/daemon/libvirtd.pod index 8d3fbd13d2..4721e0f4ec 100644 --- a/daemon/libvirtd.pod +++ b/daemon/libvirtd.pod @@ -166,7 +166,7 @@ Please report all bugs you discover. This should be done via either: =item a) the mailing list -L<http://libvirt.org/contact.html> +L<https://libvirt.org/contact.html> =item or, @@ -174,7 +174,7 @@ B<> =item b) the bug tracker -L<http://libvirt.org/bugs.html> +L<https://libvirt.org/bugs.html> =item Alternatively, you may report bugs to your software distributor / vendor. @@ -199,6 +199,6 @@ PURPOSE =head1 SEE ALSO L<virsh(1)>, L<virt-install(1)>, L<virt-xml-validate(1)>, L<virt-top(1)>, -L<virt-df(1)>, L<http://www.libvirt.org/> +L<virt-df(1)>, L<https://www.libvirt.org/> =cut diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index fbaf02f3bf..c189f5e653 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -15,7 +15,7 @@ After=apparmor.service After=local-fs.target After=remote-fs.target Documentation=man:libvirtd(8) -Documentation=http://libvirt.org +Documentation=https://libvirt.org [Service] Type=notify diff --git a/daemon/virt-guest-shutdown.target b/daemon/virt-guest-shutdown.target index bf876527b5..25d4aaa267 100644 --- a/daemon/virt-guest-shutdown.target +++ b/daemon/virt-guest-shutdown.target @@ -1,3 +1,3 @@ [Unit] Description=Libvirt guests shutdown -Documentation=http://libvirt.org +Documentation=https://libvirt.org diff --git a/docs/404.html.in b/docs/404.html.in index bdffff601b..0ac76f125a 100644 --- a/docs/404.html.in +++ b/docs/404.html.in @@ -9,7 +9,7 @@ page you were looking for. You might want to try </p> <ul> - <li>going back to the <a href="http://libvirt.org/">home page</a> to find + <li>going back to the <a href="https://libvirt.org/">home page</a> to find a collection of links to interesting pages on this site</li> <li>using the search box at the top right corner of the screen to locate the content on this site or mailing list archives</li> diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 05e3b88150..0e3c8e971f 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -354,7 +354,7 @@ polkit.addRule(function(action, subject) { <p> See - <a href="http://libvirt.org/git/?p=libvirt.git;a=tree;f=examples/polkit;hb=HEAD">source code</a> + <a href="https://libvirt.org/git/?p=libvirt.git;a=tree;f=examples/polkit;hb=HEAD">source code</a> for a more complex example. </p> diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 3b37e7bec6..9beec07602 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -44,7 +44,7 @@ </p> <p> - <a href="http://libvirt.org/downloads.html">http://libvirt.org/downloads.html</a> + <a href="https://libvirt.org/downloads.html">https://libvirt.org/downloads.html</a> </p> <p> diff --git a/docs/apps.html.in b/docs/apps.html.in index df473636ea..60edeb3af4 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -327,7 +327,7 @@ Allows using simple ruby objects to manipulate hypervisors, guests, storage, network etc. It is based on top of - the <a href="http://libvirt.org/ruby">native ruby bindings</a>. + the <a href="https://libvirt.org/ruby">native ruby bindings</a>. </dd> </dl> diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 203934b6aa..733c89bc20 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -24,7 +24,7 @@ </li> <li> <strong>OCaml</strong>: Richard Jones develops - <a href="http://libvirt.org/ocaml/">OCaml bindings</a>. + <a href="https://libvirt.org/ocaml/">OCaml bindings</a>. </li> <li> <strong>Perl</strong>: Daniel Berrange develops @@ -33,7 +33,7 @@ <li> <p> <strong>PHP</strong>: Radek Hladik started developing - <a href="http://libvirt.org/php">PHP bindings</a> in 2010. + <a href="https://libvirt.org/php">PHP bindings</a> in 2010. </p> <p> In February 2011 the binding development has been moved to the libvirt.org website as @@ -43,13 +43,13 @@ The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information, including information on posting patches to libvirt-php, please refer - to the <a href="http://libvirt.org/php">PHP bindings</a> site. + to the <a href="https://libvirt.org/php">PHP bindings</a> site. </p> </li> <li> <p> <strong>Python</strong>: Libvirt's python bindings are split to a - separate <a href="http://libvirt.org/git/?p=libvirt-python.git">package</a> + separate <a href="https://libvirt.org/git/?p=libvirt-python.git">package</a> since version 1.2.0, older versions came with direct support for the Python language. </p> @@ -70,7 +70,7 @@ </li> <li> <strong>Ruby</strong>: Chris Lalancette develops - <a href="http://libvirt.org/ruby/">Ruby bindings</a>. + <a href="https://libvirt.org/ruby/">Ruby bindings</a>. </li> </ul> diff --git a/docs/csharp.html.in b/docs/csharp.html.in index 2f85fd2b7b..fcca255072 100644 --- a/docs/csharp.html.in +++ b/docs/csharp.html.in @@ -38,7 +38,7 @@ <ul> <li><a href="ftp://libvirt.org/libvirt/csharp/">libvirt.org FTP server</a></li> - <li><a href="http://libvirt.org/sources/csharp/">libvirt.org HTTP server</a></li> + <li><a href="https://libvirt.org/sources/csharp/">libvirt.org HTTP server</a></li> </ul> --> @@ -46,7 +46,7 @@ <p> The C# bindings source code is maintained in a <a href="http://git-scm.com/">git</a> repository available on - <a href="http://libvirt.org/git/">libvirt.org</a>: + <a href="https://libvirt.org/git/">libvirt.org</a>: </p> <pre> @@ -58,7 +58,7 @@ git clone git://libvirt.org/libvirt-csharp.git </p> <pre> -<a href="http://libvirt.org/git/?p=libvirt-csharp.git;a=summary">http://libvirt.org/git/?p=libvirt-csharp.git;a=summary</a> +<a href="https://libvirt.org/git/?p=libvirt-csharp.git;a=summary">https://libvirt.org/git/?p=libvirt-csharp.git;a=summary</a> </pre> <h2><a id="usage">Usage</a></h2> diff --git a/docs/devguide.html.in b/docs/devguide.html.in index b949f04a16..f460f1dd58 100644 --- a/docs/devguide.html.in +++ b/docs/devguide.html.in @@ -12,10 +12,10 @@ </p> <ul> - <li><a href="http://libvirt.org/docs/libvirt-appdev-guide/en-US/html/">Application Development Guide (C language) HTML</a></li> - <li><a href="http://libvirt.org/docs/libvirt-appdev-guide/en-US/pdf/">Application Development Guide (C language) PDF</a></li> - <li><a href="http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/html/">Application Development Guide (Python language) HTML</a></li> - <li><a href="http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/pdf/">Application Development Guide (Python language) PDF</a></li> + <li><a href="https://libvirt.org/docs/libvirt-appdev-guide/en-US/html/">Application Development Guide (C language) HTML</a></li> + <li><a href="https://libvirt.org/docs/libvirt-appdev-guide/en-US/pdf/">Application Development Guide (C language) PDF</a></li> + <li><a href="https://libvirt.org/docs/libvirt-appdev-guide-python/en-US/html/">Application Development Guide (Python language) HTML</a></li> + <li><a href="https://libvirt.org/docs/libvirt-appdev-guide-python/en-US/pdf/">Application Development Guide (Python language) PDF</a></li> </ul> <h2>Contributing content</h2> @@ -29,13 +29,13 @@ <pre> # C language -$ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git">git://libvirt.org/libvirt-appdev-guide.git</a> +$ git clone <a href="https://libvirt.org/git/?p=libvirt-appdev-guide.git">git://libvirt.org/libvirt-appdev-guide.git</a> # Python language -$ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide-python.git">git://libvirt.org/libvirt-appdev-guide-python.git</a> +$ git clone <a href="https://libvirt.org/git/?p=libvirt-appdev-guide-python.git">git://libvirt.org/libvirt-appdev-guide-python.git</a> # Publican Style/Theme -$ git clone <a href="http://libvirt.org/git/?p=libvirt-publican.git">git://libvirt.org/libvirt-publican.git</a> +$ git clone <a href="https://libvirt.org/git/?p=libvirt-publican.git">git://libvirt.org/libvirt-publican.git</a> </pre> </body> diff --git a/docs/devhelp/html.xsl b/docs/devhelp/html.xsl index 5e063f3172..eb10e362bf 100644 --- a/docs/devhelp/html.xsl +++ b/docs/devhelp/html.xsl @@ -566,8 +566,8 @@ initially for the <a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index. paravirtualization</a> but should be able to integrate other virtualization mechanisms if needed.</p> <p> If you get lost searching for some specific API use, try -<a href="http://libvirt.org/search.php">the online search -engine</a> hosted on <a href="http://libvirt.org/">libvirt.org</a> +<a href="https://libvirt.org/search.php">the online search +engine</a> hosted on <a href="https://libvirt.org/">libvirt.org</a> it indexes the project page, the APIs as well as the mailing-list archives. </p> </body> </html> diff --git a/docs/docs.html.in b/docs/docs.html.in index f23809840c..931da85424 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -59,11 +59,11 @@ <a href="csharp.html">c#</a>, <a href="https://godoc.org/github.com/libvirt/libvirt-go">go</a>, <a href="java.html">java</a>, - <a href="http://libvirt.org/ocaml/">ocaml</a>. + <a href="https://libvirt.org/ocaml/">ocaml</a>. <a href="http://search.cpan.org/dist/Sys-Virt/">perl</a>, <a href="python.html">python</a>, <a href="php.html">php</a>, - <a href="http://libvirt.org/ruby/">ruby</a></dd> + <a href="https://libvirt.org/ruby/">ruby</a></dd> <dt><a href="format.html">XML schemas</a></dt> diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 94869c35c5..640b514803 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -28,11 +28,11 @@ <td>libvirt</td> <td> <a href="ftp://libvirt.org/libvirt/">ftp</a> - <a href="http://libvirt.org/sources/">http</a> + <a href="https://libvirt.org/sources/">http</a> <a href="https://libvirt.org/sources/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt">gitlab</a> @@ -50,11 +50,11 @@ <td>C#</td> <td> <a href="ftp://libvirt.org/libvirt/csharp/">ftp</a> - <a href="http://libvirt.org/sources/csharp/">http</a> + <a href="https://libvirt.org/sources/csharp/">http</a> <a href="https://libvirt.org/sources/csharp/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-csharp.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-csharp.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-csharp">gitlab</a> @@ -66,11 +66,11 @@ <td>Go</td> <td> <a href="ftp://libvirt.org/libvirt/go/">ftp</a> - <a href="http://libvirt.org/sources/go/">http</a> + <a href="https://libvirt.org/sources/go/">http</a> <a href="https://libvirt.org/sources/go/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-go.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-go">gitlab</a> @@ -84,11 +84,11 @@ <td>Java</td> <td> <a href="ftp://libvirt.org/libvirt/java/">ftp</a> - <a href="http://libvirt.org/sources/java/">http</a> + <a href="https://libvirt.org/sources/java/">http</a> <a href="https://libvirt.org/sources/java/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-java.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-java.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-java">gitlab</a> @@ -100,11 +100,11 @@ <td>OCaml</td> <td> <a href="ftp://libvirt.org/libvirt/ocaml/">ftp</a> - <a href="http://libvirt.org/sources/ocaml/">http</a> + <a href="https://libvirt.org/sources/ocaml/">http</a> <a href="https://libvirt.org/sources/ocaml/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-ocaml.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-ocaml.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-ocaml">gitlab</a> @@ -118,7 +118,7 @@ <a href="http://search.cpan.org/dist/Sys-Virt/">cpan</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-perl.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-perl.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-perl">gitlab</a> @@ -126,18 +126,18 @@ </td> <td> <a href="http://search.cpan.org/dist/Sys-Virt/">api ref</a> - <a href="http://libvirt.org/git/?p=libvirt-perl.git;a=blob;f=Changes;hb=HEAD">changes</a> + <a href="https://libvirt.org/git/?p=libvirt-perl.git;a=blob;f=Changes;hb=HEAD">changes</a> </td> </tr> <tr> <td>PHP</td> <td> <a href="ftp://libvirt.org/libvirt/php/">ftp</a> - <a href="http://libvirt.org/sources/php/">http</a> + <a href="https://libvirt.org/sources/php/">http</a> <a href="https://libvirt.org/sources/php/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-php">gitlab</a> @@ -149,12 +149,12 @@ <td>Python</td> <td> <a href="ftp://libvirt.org/libvirt/python/">ftp</a> - <a href="http://libvirt.org/sources/python/">http</a> + <a href="https://libvirt.org/sources/python/">http</a> <a href="https://libvirt.org/sources/python/">https</a> <a href="https://pypi.python.org/pypi/libvirt-python">pypi</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-python.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-python.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-python">gitlab</a> @@ -166,11 +166,11 @@ <td>Ruby</td> <td> <a href="ftp://libvirt.org/libvirt/ruby/">ftp</a> - <a href="http://libvirt.org/sources/ruby/">http</a> + <a href="https://libvirt.org/sources/ruby/">http</a> <a href="https://libvirt.org/sources/ruby/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=ruby-libvirt.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=ruby-libvirt.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/ruby-libvirt">gitlab</a> @@ -182,11 +182,11 @@ <td>Rust</td> <td> <a href="ftp://libvirt.org/libvirt/rust/">ftp</a> - <a href="http://libvirt.org/sources/rust/">http</a> + <a href="https://libvirt.org/sources/rust/">http</a> <a href="https://libvirt.org/sources/rust/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-rust">gitlab</a> @@ -201,11 +201,11 @@ <td>GLib / GConfig / GObject</td> <td> <a href="ftp://libvirt.org/libvirt/glib/">ftp</a> - <a href="http://libvirt.org/sources/glib/">http</a> + <a href="https://libvirt.org/sources/glib/">http</a> <a href="https://libvirt.org/sources/glib/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-glib.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-glib.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-glib">gitlab</a> @@ -217,11 +217,11 @@ <td>Go XML</td> <td> <a href="ftp://libvirt.org/libvirt/go/">ftp</a> - <a href="http://libvirt.org/sources/go/">http</a> + <a href="https://libvirt.org/sources/go/">http</a> <a href="https://libvirt.org/sources/go/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-go-xml.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-go-xml">gitlab</a> @@ -235,11 +235,11 @@ <td>Console Proxy</td> <td> <a href="ftp://libvirt.org/libvirt/consoleproxy/">ftp</a> - <a href="http://libvirt.org/sources/consoleproxy/">http</a> + <a href="https://libvirt.org/sources/consoleproxy/">http</a> <a href="https://libvirt.org/sources/consoleproxy/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-console-proxy.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-console-proxy.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-console-proxy">gitlab</a> @@ -251,11 +251,11 @@ <td>CIM provider</td> <td> <a href="ftp://libvirt.org/libvirt/CIM/">ftp</a> - <a href="http://libvirt.org/sources/CIM/">http</a> + <a href="https://libvirt.org/sources/CIM/">http</a> <a href="https://libvirt.org/sources/CIM/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-cim.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-cim.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-cim">gitlab</a> @@ -267,11 +267,11 @@ <td>CIM utils</td> <td> <a href="ftp://libvirt.org/libvirt/CIM/">ftp</a> - <a href="http://libvirt.org/sources/CIM/">http</a> + <a href="https://libvirt.org/sources/CIM/">http</a> <a href="https://libvirt.org/sources/CIM/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libcmpiutil.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libcmpiutil.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libcmpiutil">gitlab</a> @@ -283,11 +283,11 @@ <td>SNMP</td> <td> <a href="ftp://libvirt.org/libvirt/snmp/">ftp</a> - <a href="http://libvirt.org/sources/snmp/">http</a> + <a href="https://libvirt.org/sources/snmp/">http</a> <a href="https://libvirt.org/sources/snmp/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-snmp.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-snmp.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-snmp">gitlab</a> @@ -299,11 +299,11 @@ <td>Application Sandbox</td> <td> <a href="ftp://libvirt.org/libvirt/sandbox/">ftp</a> - <a href="http://libvirt.org/sources/sandbox/">http</a> + <a href="https://libvirt.org/sources/sandbox/">http</a> <a href="https://libvirt.org/sources/sandbox/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-sandbox.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-sandbox.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-sandbox">gitlab</a> @@ -318,11 +318,11 @@ <td>TCK</td> <td> <a href="ftp://libvirt.org/libvirt/tck/">ftp</a> - <a href="http://libvirt.org/sources/tck/">http</a> + <a href="https://libvirt.org/sources/tck/">http</a> <a href="https://libvirt.org/sources/tck/">https</a> </td> <td> - <a href="http://libvirt.org/git/?p=libvirt-tck.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-tck.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-tck">gitlab</a> @@ -334,7 +334,7 @@ <td>Test API</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=libvirt-test-API.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-test-API.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-test-API">gitlab</a> @@ -346,7 +346,7 @@ <td>Jenkins Config</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=libvirt-jenkins-ci.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-jenkins-ci.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-jenkins-ci">gitlab</a> @@ -358,7 +358,7 @@ <td>CIM Test</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=cimtest.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=cimtest.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/cimtest">gitlab</a> @@ -373,7 +373,7 @@ <td>Publican Brand</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=libvirt-publican.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-publican.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-publican">gitlab</a> @@ -385,7 +385,7 @@ <td>App Development Guide</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-appdev-guide">gitlab</a> @@ -397,7 +397,7 @@ <td>App Development Guide Python</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=libvirt-appdev-guide-python.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-appdev-guide-python.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-appdev-guide-python">gitlab</a> @@ -409,7 +409,7 @@ <td>virsh Command Reference</td> <td></td> <td> - <a href="http://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary">libvirt</a> + <a href="https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary">libvirt</a> </td> <td> <a href="https://gitlab.com/libvirt/libvirt-virshcmdref">gitlab</a> @@ -431,7 +431,7 @@ <ul> <li><a href="ftp://libvirt.org/libvirt/">libvirt.org FTP server</a></li> - <li><a href="http://libvirt.org/sources/">libvirt.org HTTP server</a></li> + <li><a href="https://libvirt.org/sources/">libvirt.org HTTP server</a></li> <li><a href="https://libvirt.org/sources/">libvirt.org HTTPS server</a></li> </ul> @@ -447,7 +447,7 @@ <ul> <li><a href="ftp://libvirt.org/libvirt/libvirt-git-snapshot.tar.xz">libvirt.org FTP server</a></li> - <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.xz">libvirt.org HTTP server</a></li> + <li><a href="https://libvirt.org/sources/libvirt-git-snapshot.tar.xz">libvirt.org HTTP server</a></li> </ul> <h2><a id="schedule">Primary release schedule</a></h2> @@ -529,7 +529,7 @@ <p> All modules maintained by the libvirt project have their primary - source available in the <a href="http://libvirt.org/git/">project GIT server</a>. + source available in the <a href="https://libvirt.org/git/">project GIT server</a>. Each module can be cloned anonymously using: </p> diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 58a336ed30..94c6b82cfd 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -601,7 +601,7 @@ rather than creating new network namespace for the container. In this case privn ignored. </p> <pre> -<domain type='lxc' xmlns:lxc='http://libvirt.org/schemas/domain/lxc/1.0'> +<domain type='lxc' xmlns:lxc='https://libvirt.org/schemas/domain/lxc/1.0'> ... <lxc:namespace> <lxc:sharenet type='netns' value='red'/> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index a775f29792..e2a0797cfb 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -15,11 +15,11 @@ <ul> <li> - The <a href="http://www.linux-kvm.org/">KVM</a> Linux + The <a href="https://www.linux-kvm.org/">KVM</a> Linux hypervisor </li> <li> - The <a href="http://wiki.qemu.org/Index.html">QEMU</a> emulator + The <a href="https://wiki.qemu.org/Index.html">QEMU</a> emulator </li> </ul> @@ -546,7 +546,7 @@ $ virsh domxml-to-native qemu-argv demo.xml (<span class="since">Since 0.8.3</span>). In order to use the XML additions, it is necessary to issue an XML namespace request (the special <code>xmlns:<i>name</i></code> attribute) that - pulls in <code>http://libvirt.org/schemas/domain/qemu/1.0</code>; + pulls in <code>https://libvirt.org/schemas/domain/qemu/1.0</code>; typically, the namespace is given the name of <code>qemu</code>. With the namespace in place, it is then possible to add an element <code><qemu:commandline></code> @@ -566,7 +566,7 @@ $ virsh domxml-to-native qemu-argv demo.xml and optional <code>value</code>.</dd> </dl> <p>Example:</p><pre> -<domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> +<domain type='qemu' xmlns:qemu='https://libvirt.org/schemas/domain/qemu/1.0'> <name>QEmu-fedora-i686</name> <memory>219200</memory> <os> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c0e3c22213..b93ace7cba 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5224,7 +5224,7 @@ qemu-kvm -net nic,model=? /dev/null <dd> The optional <code>queues</code> attribute controls the number of queues to be used for either - <a href="http://www.linux-kvm.org/page/Multiqueue"> Multiqueue + <a href="https://www.linux-kvm.org/page/Multiqueue"> Multiqueue virtio-net</a> or <a href="#elementVhostuser">vhost-user</a> network interfaces. Use of multiple packet processing queues requires the interface having the <code><model type='virtio'/></code> diff --git a/docs/hacking.html.in b/docs/hacking.html.in index c33a27c232..6cadfb8343 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -17,7 +17,7 @@ <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>.</p> + (e.g. libvirt-python) <a href="https://libvirt.org/git/">online</a>.</p> </li> <li> diff --git a/docs/internals/eventloop.html.in b/docs/internals/eventloop.html.in index 2d99f59471..3e62d5ca53 100644 --- a/docs/internals/eventloop.html.in +++ b/docs/internals/eventloop.html.in @@ -29,7 +29,7 @@ not waiting for direct user input and have no graphical interface. Such as Libvirt.</p> - <img alt="event loop" src="http://libvirt.org/git/?p=libvirt-media.git;a=blob_plain;f=png/event_loop_s…"/> + <img alt="event loop" src="https://libvirt.org/git/?p=libvirt-media.git;a=blob_plain;f=png/event_loop_…"/> <p>In Libvirt this approach is used in combination with <code>poll(2)</code> as all the communication with its @@ -70,7 +70,7 @@ acceptable for Libvirt. Therefore we have came up with the following solution.</p> - <img alt="event loop" src="http://libvirt.org/git/?p=libvirt-media.git;a=blob_plain;f=png/event_loop_w…"/> + <img alt="event loop" src="https://libvirt.org/git/?p=libvirt-media.git;a=blob_plain;f=png/event_loop_…"/> <p>The event loop does only necessary minimum and hand over message processing to another thread. In fact, there can be diff --git a/docs/java.html.in b/docs/java.html.in index 06cf7034f6..333583427c 100644 --- a/docs/java.html.in +++ b/docs/java.html.in @@ -16,17 +16,17 @@ <ul> <li><a href="ftp://libvirt.org/libvirt/java/">libvirt.org FTP server</a></li> -<li><a href="http://libvirt.org/sources/java/">libvirt.org HTTP server</a></li> +<li><a href="https://libvirt.org/sources/java/">libvirt.org HTTP server</a></li> </ul> <h3>Maven</h3> -<p>A maven repository is located at <a href="http://www.libvirt.org/maven2/">http://www.libvirt.org/maven2/</a> +<p>A maven repository is located at <a href="https://libvirt.org/maven2/">https://libvirt.org/maven2/</a> which you can use to include this in your maven projects.</p> <h2>GIT source repository</h2> <p> The Java bindings code source is now maintained in a <a href="http://git-scm.com/">git</a> repository available on -<a href="http://libvirt.org/git/">libvirt.org</a>: +<a href="https://libvirt.org/git/">libvirt.org</a>: </p> <pre> git clone git://libvirt.org/libvirt-java.git @@ -36,7 +36,7 @@ It can also be browsed at </p> <pre> -<a href="http://libvirt.org/git/?p=libvirt-java.git;a=summary">http://libvirt.org/git/?p=libvirt-java.git;a=summary</a> +<a href="https://libvirt.org/git/?p=libvirt-java.git;a=summary">https://libvirt.org/git/?p=libvirt-java.git;a=summary</a> </pre> <p></p> @@ -120,7 +120,7 @@ lower case, for example the C functions:</p> <code>virDomain.setMaxMemory(long memory)</code> </p> <p> There is of course some functions where the mapping is less direct -and using extra classes to map complex arguments. The <a href="http://libvirt.org/sources/java/javadoc">Javadoc</a> is available online or as +and using extra classes to map complex arguments. The <a href="https://libvirt.org/sources/java/javadoc">Javadoc</a> is available online or as part of a separate libvirt-java-javadoc package.</p> <p>So let's look at a simple example inspired from the <code>test.java</code> test found in <code>src</code> in the source tree:</p> @@ -164,7 +164,7 @@ from the C API, the only points to notice are:</p> <pre><repositories> <repository> <id>libvirt-org</id> - <url>http://libvirt.org/maven2</url> + <url>https://libvirt.org/maven2</url> </repository> </repositories></pre> diff --git a/docs/news-2005.html.in b/docs/news-2005.html.in index 44d8c4cc47..8d6dc150d3 100644 --- a/docs/news-2005.html.in +++ b/docs/news-2005.html.in @@ -11,7 +11,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2006.html.in b/docs/news-2006.html.in index 6556d4fed0..7463d7bad3 100644 --- a/docs/news-2006.html.in +++ b/docs/news-2006.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2007.html.in b/docs/news-2007.html.in index c12449abf4..14099936fd 100644 --- a/docs/news-2007.html.in +++ b/docs/news-2007.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> @@ -257,7 +257,7 @@ <ul> <li>Features:<br/> Secure Remote support (Richard Jones). - See <a href="http://libvirt.org/remote.html">the remote page</a> of the documentation<br/> + See <a href="https://libvirt.org/remote.html">the remote page</a> of the documentation<br/> </li> <li>Documentation:<br/> diff --git a/docs/news-2008.html.in b/docs/news-2008.html.in index aefbf3873f..28f3b98d82 100644 --- a/docs/news-2008.html.in +++ b/docs/news-2008.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2009.html.in b/docs/news-2009.html.in index 0824b0bbef..9c0df7a82f 100644 --- a/docs/news-2009.html.in +++ b/docs/news-2009.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2010.html.in b/docs/news-2010.html.in index 013ebaf56e..8d9ee1dea4 100644 --- a/docs/news-2010.html.in +++ b/docs/news-2010.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2011.html.in b/docs/news-2011.html.in index cea716556d..f59bb196cd 100644 --- a/docs/news-2011.html.in +++ b/docs/news-2011.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2012.html.in b/docs/news-2012.html.in index e419a2ef05..ede85c41c7 100644 --- a/docs/news-2012.html.in +++ b/docs/news-2012.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2013.html.in b/docs/news-2013.html.in index 50c200ebd3..6cc3bca2ff 100644 --- a/docs/news-2013.html.in +++ b/docs/news-2013.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2014.html.in b/docs/news-2014.html.in index 8dfca90120..91a4f2f26f 100644 --- a/docs/news-2014.html.in +++ b/docs/news-2014.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2015.html.in b/docs/news-2015.html.in index cd3b638a90..bb71af1c46 100644 --- a/docs/news-2015.html.in +++ b/docs/news-2015.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-2016.html.in b/docs/news-2016.html.in index 3b804fc1a9..a7be451a2e 100644 --- a/docs/news-2016.html.in +++ b/docs/news-2016.html.in @@ -12,7 +12,7 @@ <p>It is also possible to just use the <a href="downloads.html">GIT version or snapshot</a>, contact the mailing list and check - the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> + the <a href="https://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> to gauge progress. </p> diff --git a/docs/news-html.xsl b/docs/news-html.xsl index 5baabc695a..4d40798028 100644 --- a/docs/news-html.xsl +++ b/docs/news-html.xsl @@ -25,7 +25,7 @@ <p>This is the list of official releases for libvirt, along with an overview of the changes introduced by each of them.</p> <p>For a more fine-grained view, use the - <a href="http://libvirt.org/git/?p=libvirt.git;a=log">git log</a>. + <a href="https://libvirt.org/git/?p=libvirt.git;a=log">git log</a>. </p> <xsl:apply-templates select="release"/> <p>Older libvirt releases didn't have proper release notes, diff --git a/docs/php.html.in b/docs/php.html.in index b2a372d484..2939b4bd17 100644 --- a/docs/php.html.in +++ b/docs/php.html.in @@ -11,7 +11,7 @@ <h2>Getting the source</h2> <p> The PHP bindings code source is now maintained in a <a href="http://git-scm.com/">git</a> repository available on -<a href="http://libvirt.org/git/">libvirt.org</a>: +<a href="https://libvirt.org/git/">libvirt.org</a>: </p> <pre> git clone git://libvirt.org/libvirt-php.git @@ -20,13 +20,13 @@ git clone git://libvirt.org/libvirt-php.git It can also be browsed at </p> <pre> -<a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">http://libvirt.org/git/?p=libvirt-php.git;a=summary</a> +<a href="https://libvirt.org/git/?p=libvirt-php.git;a=summary">https://libvirt.org/git/?p=libvirt-php.git;a=summary</a> </pre> <p></p> <h2>Project pages</h2> <p>Since February 2011 the project has its own pages hosted at libvirt.org. For more information on the project - please refer to <a href="http://libvirt.org/php">http://libvirt.org/php</a>. + please refer to <a href="https://libvirt.org/php">https://libvirt.org/php</a>. </p> diff --git a/docs/securityprocess.html.in b/docs/securityprocess.html.in index 1cf51b005c..2bab07bf39 100644 --- a/docs/securityprocess.html.in +++ b/docs/securityprocess.html.in @@ -107,7 +107,7 @@ <p> When an embargo expires, security issues will be announced on both - the libvirt development and announcement <a href="http://libvirt.org/contact.html#email">mailing lists</a>. + the libvirt development and announcement <a href="https://libvirt.org/contact.html#email">mailing lists</a>. </p> </body> </html> diff --git a/docs/testapi.html.in b/docs/testapi.html.in index 79ecd73ee0..dd0552c8fd 100644 --- a/docs/testapi.html.in +++ b/docs/testapi.html.in @@ -23,12 +23,12 @@ or more test case to define a given test scenario.</p> <p>For more details you can look at:</p> <ul> - <li> A <a href="http://libvirt.org/sources/libvirt-test-API/Libvirt-test-API.pdf">documentation PDF</a> + <li> A <a href="https://libvirt.org/sources/libvirt-test-API/Libvirt-test-API.pdf">documentation PDF</a> file describing the test suite and how to write test cases and test scenarios.</li> </ul> <p> Libvirt-test-API is maintained using - <a href="http://libvirt.org/git/?p=libvirt-test-API.git">a GIT + <a href="https://libvirt.org/git/?p=libvirt-test-API.git">a GIT repository</a>, and comment, patches and reviews are carried on the <a href="contact.html">libvir-list</a> development list.</p> </body> diff --git a/docs/testsuites.html.in b/docs/testsuites.html.in index eeb0e8e199..0bf4e38544 100644 --- a/docs/testsuites.html.in +++ b/docs/testsuites.html.in @@ -23,7 +23,7 @@ <a href="ftp://libvirt.org/libvirt/tck/">download</a>, as a <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libvirt-tck">package</a> in Fedora distributions, but best is probably to get - the <a href="http://libvirt.org/git/?p=libvirt-tck.git">version + the <a href="https://libvirt.org/git/?p=libvirt-tck.git">version from GIT</a>. </li> <li>the <a href="testapi.html">libvirt-test-API</a> is also a functional @@ -32,7 +32,7 @@ of libvirt. It is available separately as a <a href="ftp://libvirt.org/libvirt/libvirt-test-API/">download</a>, or directly get - the <a href="http://libvirt.org/git/?p=libvirt-test-API.git">version + the <a href="https://libvirt.org/git/?p=libvirt-test-API.git">version from GIT</a>. </li> </ul> diff --git a/docs/testtck.html.in b/docs/testtck.html.in index 458dcb3a0a..021b56e665 100644 --- a/docs/testtck.html.in +++ b/docs/testtck.html.in @@ -33,7 +33,7 @@ Fedora Feature.</li> </ul> <p> Libvirt-TCK is maintained using - <a href="http://libvirt.org/git/?p=libvirt-tck.git">a GIT + <a href="https://libvirt.org/git/?p=libvirt-tck.git">a GIT repository</a>, and comment, patches and reviews are carried on the <a href="contact.html">libvir-list</a> development list.</p> </body> diff --git a/docs/virshcmdref.html.in b/docs/virshcmdref.html.in index 1ca689a3d7..731d809f3c 100644 --- a/docs/virshcmdref.html.in +++ b/docs/virshcmdref.html.in @@ -30,10 +30,10 @@ <ul> <li> - <a href="http://libvirt.org/sources/virshcmdref/html/">Standard HTML format, multiple pages</a> + <a href="https://libvirt.org/sources/virshcmdref/html/">Standard HTML format, multiple pages</a> </li> <li> - <a href="http://libvirt.org/sources/virshcmdref/html-single/">HTML format, one long page</a> + <a href="https://libvirt.org/sources/virshcmdref/html-single/">HTML format, one long page</a> </li> </ul> @@ -46,21 +46,21 @@ <ul> <li> Standard HTML format, multiple pages - (<a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-html…">.tar.gz</a>) - (<a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-html…">.tar.bz2</a>) - (<a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-html…">.zip</a>) + (<a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-htm…">.tar.gz</a>) + (<a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-htm…">.tar.bz2</a>) + (<a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-htm…">.zip</a>) </li> <li> HTML format, one long page - (<a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-html…">.tar.gz</a>) - (<a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-html…">.tar.bz2</a>) - (<a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-html…">.zip</a>) + (<a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-htm…">.tar.gz</a>) + (<a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-htm…">.tar.bz2</a>) + (<a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1-htm…">.zip</a>) </li> <li> - <a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1.pdf">PDF format</a> + <a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1.pdf">PDF format</a> </li> <li> - <a href="http://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1.epub">ePub format</a> + <a href="https://libvirt.org/sources/virshcmdref/Virsh_Command_Reference-0.8.7-1.epub">ePub format</a> </li> </ul> @@ -68,7 +68,7 @@ <p> The DocBook source is maintained in a <a href="http://git-scm.com/">git</a> repository available on - <a href="http://libvirt.org/git/">libvirt.org</a>: + <a href="https://libvirt.org/git/">libvirt.org</a>: </p> <pre> @@ -80,7 +80,7 @@ git clone git://libvirt.org/libvirt-virshcmdref.git </p> <pre> -<a href="http://libvirt.org/git/?p=libvirt-virshcmdref.git">http://libvirt.org/git/?p=libvirt-virshcmdref.git</a> +<a href="https://libvirt.org/git/?p=libvirt-virshcmdref.git">https://libvirt.org/git/?p=libvirt-virshcmdref.git</a> </pre> </body> diff --git a/docs/windows.html.in b/docs/windows.html.in index 16c1aee615..df60940750 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -79,7 +79,7 @@ online here:<br /> </p> - <a href="http://libvirt.org/drvesx.html">http://libvirt.org/drvesx.html</a> + <a href="https://libvirt.org/drvesx.html">https://libvirt.org/drvesx.html</a> <h2><a id="tlscerts">TLS Certificates</a></h2> diff --git a/src/access/genpolkit.pl b/src/access/genpolkit.pl index 6258fd3a1e..968cb8c55c 100755 --- a/src/access/genpolkit.pl +++ b/src/access/genpolkit.pl @@ -81,7 +81,7 @@ print <<EOF; "http://www.freedesktop.org/software/polkit/policyconfig-1.dtd"> <policyconfig> <vendor>Libvirt Project</vendor> - <vendor_url>http://libvirt.org</vendor_url> + <vendor_url>https://libvirt.org</vendor_url> EOF foreach my $object (sort { $a cmp $b } keys %perms) { diff --git a/src/libvirt.c b/src/libvirt.c index 6d66fa43ef..536d56f0a5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1151,7 +1151,7 @@ virConnectOpenInternal(const char *name, * if not already running. This can be prevented by setting the * environment variable LIBVIRT_AUTOSTART=0 * - * URIs are documented at http://libvirt.org/uri.html + * URIs are documented at httsp://libvirt.org/uri.html * * virConnectClose should be used to release the resources after the connection * is no longer needed. @@ -1190,7 +1190,7 @@ virConnectOpen(const char *name) * See virConnectOpen for notes about environment variables which can * have an effect on opening drivers and freeing the connection resources * - * URIs are documented at http://libvirt.org/uri.html + * URIs are documented at https://libvirt.org/uri.html * * Returns a pointer to the hypervisor connection or NULL in case of error */ @@ -1228,7 +1228,7 @@ virConnectOpenReadOnly(const char *name) * See virConnectOpen for notes about environment variables which can * have an effect on opening drivers and freeing the connection resources * - * URIs are documented at http://libvirt.org/uri.html + * URIs are documented at https://libvirt.org/uri.html * * Returns a pointer to the hypervisor connection or NULL in case of error */ diff --git a/src/locking/virtlockd.pod b/src/locking/virtlockd.pod index 355d97404d..de0eb8ac18 100644 --- a/src/locking/virtlockd.pod +++ b/src/locking/virtlockd.pod @@ -128,7 +128,7 @@ Please report all bugs you discover. This should be done via either: =item a) the mailing list -L<http://libvirt.org/contact.html> +L<https://libvirt.org/contact.html> =item or, @@ -136,7 +136,7 @@ B<> =item b) the bug tracker -L<http://libvirt.org/bugs.html> +L<https://libvirt.org/bugs.html> =item Alternatively, you may report bugs to your software distributor / vendor. @@ -160,6 +160,6 @@ PURPOSE =head1 SEE ALSO -L<libvirtd(8)>, L<http://www.libvirt.org/> +L<libvirtd(8)>, L<https://libvirt.org/> =cut diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in index c369591267..928bf63fb2 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -3,7 +3,7 @@ Description=Virtual machine lock manager Requires=virtlockd.socket Before=libvirtd.service Documentation=man:virtlockd(8) -Documentation=http://libvirt.org +Documentation=https://libvirt.org [Service] EnvironmentFile=-/etc/sysconfig/virtlockd diff --git a/src/logging/virtlogd.pod b/src/logging/virtlogd.pod index 9e7212cfbe..5e44f84a85 100644 --- a/src/logging/virtlogd.pod +++ b/src/logging/virtlogd.pod @@ -128,7 +128,7 @@ Please report all bugs you discover. This should be done via either: =item a) the mailing list -L<http://libvirt.org/contact.html> +L<https://libvirt.org/contact.html> =item or, @@ -136,7 +136,7 @@ B<> =item b) the bug tracker -L<http://libvirt.org/bugs.html> +L<https://libvirt.org/bugs.html> =item Alternatively, you may report bugs to your software distributor / vendor. @@ -160,6 +160,6 @@ PURPOSE =head1 SEE ALSO -L<libvirtd(8)>, L<http://www.libvirt.org/> +L<libvirtd(8)>, L<https://libvirt.org/> =cut diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in index 8b67317cb1..ec7712bb9a 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -3,7 +3,7 @@ Description=Virtual machine log manager Requires=virtlogd.socket Before=libvirtd.service Documentation=man:virtlogd(8) -Documentation=http://libvirt.org +Documentation=https://libvirt.org [Service] EnvironmentFile=-/etc/sysconfig/virtlogd diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9c8bde49a8..46f0bdd18c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3809,7 +3809,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, */ virBufferAddLit(&buf, ",mq=on"); } else { - /* As advised at http://www.linux-kvm.org/page/Multiqueue + /* As advised at https://www.linux-kvm.org/page/Multiqueue * we should add vectors=2*N+2 where N is the vhostfdSize */ virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index dd44949403..de76719384 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -369,7 +369,7 @@ static struct FileTypeInfo const fileTypeInfo[] = { qcow2GetFeatures }, [VIR_STORAGE_FILE_QED] = { - /* http://wiki.qemu.org/Features/QED */ + /* https://wiki.qemu.org/Features/QED */ 0, "QED", NULL, LV_LITTLE_ENDIAN, -2, 0, {0}, QED_HDR_IMAGE_SIZE, 8, 1, NULL, qedGetBackingStore, NULL diff --git a/tests/virconfdata/libvirtd.conf b/tests/virconfdata/libvirtd.conf index 5029c4c2e7..ee57593109 100644 --- a/tests/virconfdata/libvirtd.conf +++ b/tests/virconfdata/libvirtd.conf @@ -1,6 +1,6 @@ # Master libvirt daemon configuration file # -# For further information consult http://libvirt.org/format.html +# For further information consult https://libvirt.org/format.html ################################################################# diff --git a/tests/virconfdata/libvirtd.out b/tests/virconfdata/libvirtd.out index 4d7ed47a90..e0b6f0a606 100644 --- a/tests/virconfdata/libvirtd.out +++ b/tests/virconfdata/libvirtd.out @@ -1,6 +1,6 @@ # Master libvirt daemon configuration file # -# For further information consult http://libvirt.org/format.html +# For further information consult https://libvirt.org/format.html ################################################################# # # Network connectivitiy controls diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in index 7709df3b96..495d4c7d1d 100644 --- a/tools/libvirt-guests.init.in +++ b/tools/libvirt-guests.init.in @@ -14,7 +14,7 @@ # Short-Description: suspend/resume libvirt guests on shutdown/boot # Description: This is a script for suspending active libvirt guests # on shutdown and resuming them on next boot -# See http://libvirt.org +# See https://libvirt.org ### END INIT INFO # the following is chkconfig init header @@ -24,7 +24,7 @@ # chkconfig: 345 99 01 # description: This is a script for suspending active libvirt guests \ # on shutdown and resuming them on next boot \ -# See http://libvirt.org +# See https://libvirt.org # exec @libexecdir@/libvirt-guests.sh "$@" diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 64a4c1129b..491ca62138 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -7,7 +7,7 @@ After=time-sync.target After=libvirtd.service After=virt-guest-shutdown.target Documentation=man:libvirtd(8) -Documentation=http://libvirt.org +Documentation=https://libvirt.org [Service] EnvironmentFile=-/etc/sysconfig/libvirt-guests diff --git a/tools/virsh.c b/tools/virsh.c index 527c1a4181..d1789f03ad 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -511,7 +511,7 @@ virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) { /* FIXME - list a copyright blurb, as in GNU programs? */ vshPrint(ctl, _("Virsh command line tool of libvirt %s\n"), VERSION); - vshPrint(ctl, _("See web site at %s\n\n"), "http://libvirt.org/"); + vshPrint(ctl, _("See web site at %s\n\n"), "https://libvirt.org/"); vshPrint(ctl, "%s", _("Compiled with support for:\n")); vshPrint(ctl, "%s", _(" Hypervisors:")); diff --git a/tools/virsh.pod b/tools/virsh.pod index 00d93781ac..4a2bf87023 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -249,7 +249,7 @@ Will print the current directory. is automatically run with the I<URI> parameter requested by the C<-c> option on the command line. The I<URI> parameter specifies how to connect to the hypervisor. The documentation page at -L<http://libvirt.org/uri.html> list the values supported, but the most +L<https://libvirt.org/uri.html> list the values supported, but the most common are: =over 4 @@ -275,7 +275,7 @@ connect to a local linux container To find the currently used URI, check the I<uri> command documented below. For remote access see the documentation page at -L<http://libvirt.org/uri.html> on how to make URIs. +L<https://libvirt.org/uri.html> on how to make URIs. The I<--readonly> option allows for read-only connection =item B<uri> @@ -350,7 +350,7 @@ we are currently connected to. This includes a section on the host capabilities in terms of CPU and features, and a set of description for each kind of guest which can be virtualized. For a more complete description see: - L<http://libvirt.org/formatcaps.html> + L<https://libvirt.org/formatcaps.html> The XML also show the NUMA topology information if available. =item B<domcapabilities> [I<virttype>] [I<emulatorbin>] @@ -590,7 +590,7 @@ contain either host or guest CPU definition. The host CPU definition is the <cpu> element and its contents as printed by B<capabilities> command. The guest CPU definition is the <cpu> element and its contents from domain XML definition. For more information on guest CPU definition see: -L<http://libvirt.org/formatdomain.html#elementsCPU>. If I<--error> is +L<https://libvirt.org/formatdomain.html#elementsCPU>. If I<--error> is specified, the command will return an error when the given CPU is incompatible with host CPU and a message providing more details about the incompatibility will be printed out. @@ -808,7 +808,7 @@ inbound or outbound bandwidth. I<average,peak,burst,floor> is the same as in command I<attach-interface>. Values for I<average>, I<peak> and I<floor> are expressed in kilobytes per second, while I<burst> is expressed in kilobytes in a single burst at I<peak> speed as described in the Network XML -documentation at L<http://libvirt.org/formatnetwork.html#elementQoS>. +documentation at L<https://libvirt.org/formatnetwork.html#elementQoS>. To clear inbound or outbound settings, use I<--inbound> or I<--outbound> respectfully with average value of zero. @@ -1892,7 +1892,7 @@ order to comply with local firewall policies. =back -See L<http://libvirt.org/migration.html#uris> for more details on +See L<https://libvirt.org/migration.html#uris> for more details on migration URIs. Optional I<graphicsuri> overrides connection parameters used for automatically @@ -2889,7 +2889,7 @@ is not available the processes will provide an exit code of 1. The following commands manipulate devices associated to domains. The I<domain> can be specified as a short integer, a name or a full UUID. To better understand the values allowed as options for the command -reading the documentation at L<http://libvirt.org/formatdomain.html> on the +reading the documentation at L<https://libvirt.org/formatdomain.html> on the format of the device sections to get the most accurate set of accepted values. =over 4 @@ -2900,7 +2900,7 @@ format of the device sections to get the most accurate set of accepted values. Attach a device to the domain, using a device definition in an XML file using a device definition element such as <disk> or <interface> as the top-level element. See the documentation at -L<http://libvirt.org/formatdomain.html#elementsDevices> to learn about +L<https://libvirt.org/formatdomain.html#elementsDevices> to learn about libvirt XML format for a device. If I<--config> is specified the command alters the persistent domain configuration with the device attach taking effect the next time libvirt starts the domain. @@ -3044,7 +3044,7 @@ specified. The other two I<peak> and I<burst> are optional, so are expressed in kilobytes per second, while I<burst> is expressed in kilobytes in a single burst at I<peak> speed as described in the Network XML documentation at -L<http://libvirt.org/formatnetwork.html#elementQoS>. +L<https://libvirt.org/formatnetwork.html#elementQoS>. B<--managed> is usable only for I<hostdev> type and tells libvirt that the interface should be managed, which means detached and reattached @@ -3143,7 +3143,7 @@ Update the characteristics of a device associated with I<domain>, based on the device definition in an XML I<file>. The I<--force> option can be used to force device update, e.g., to eject a CD-ROM even if it is locked/mounted in the domain. See the documentation at -L<http://libvirt.org/formatdomain.html#elementsDevices> to learn about +L<https://libvirt.org/formatdomain.html#elementsDevices> to learn about libvirt XML format for a device. If I<--live> is specified, affect a running domain. @@ -3209,7 +3209,7 @@ the host's hard disk controller where the guest's disk images live could cause the host system to lock up or reboot). For more information on node device definition see: -L<http://libvirt.org/formatnode.html>. +L<https://libvirt.org/formatnode.html>. Passthrough devices cannot be simultaneously used by the host and its guest domains, nor by multiple active guests at once. If the @@ -3312,7 +3312,7 @@ before the event. The following commands manipulate networks. Libvirt has the capability to define virtual networks which can then be used by domains and linked to actual network devices. For more detailed information about this feature -see the documentation at L<http://libvirt.org/formatnetwork.html> . Many +see the documentation at L<https://libvirt.org/formatnetwork.html> . Many of the commands for virtual networks are similar to the ones used for domains, but the way to name a virtual network is either by its name or UUID. @@ -3327,7 +3327,7 @@ The I<--disable> option disable autostarting. Create a transient (temporary) virtual network from an XML I<file> and instantiate (start) the network. -See the documentation at L<http://libvirt.org/formatnetwork.html> +See the documentation at L<https://libvirt.org/formatnetwork.html> to get a description of the XML network format used by libvirt. =item B<net-define> I<file> @@ -3600,7 +3600,7 @@ capability to manage various storage solutions, including files, raw partitions, and domain-specific formats, used to provide the storage volumes visible as devices within virtual machines. For more detailed information about this feature, see the documentation at -L<http://libvirt.org/formatstorage.html> . Many of the commands for +L<https://libvirt.org/formatstorage.html> . Many of the commands for pools are similar to the ones used for domains. =over 4 @@ -4171,7 +4171,7 @@ The following commands manipulate "secrets" (e.g. passwords, passphrases and encryption keys). Libvirt can store secrets independently from their use, and other objects (e.g. volumes or domains) can refer to the secrets for encryption or possibly other uses. Secrets are identified using a UUID. See -L<http://libvirt.org/formatsecret.html> for documentation of the XML format +L<https://libvirt.org/formatsecret.html> for documentation of the XML format used to represent properties of secrets. =over 4 @@ -4237,7 +4237,7 @@ disk, memory, and device state of a domain at a point-of-time, and save it for future use. They have many uses, from saving a "clean" copy of an OS image to saving a domain's state before a potentially destructive operation. Snapshots are identified with a unique name. See -L<http://libvirt.org/formatsnapshot.html> for documentation of the XML format +L<https://libvirt.org/formatsnapshot.html> for documentation of the XML format used to represent properties of snapshots. =over 4 @@ -4778,15 +4778,15 @@ Messages at level ERROR =back For further information about debugging options consult -L<http://libvirt.org/logging.html> +L<https://libvirt.org/logging.html> =back =head1 BUGS Report any bugs discovered to the libvirt community via the mailing -list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 AUTHORS @@ -4812,6 +4812,6 @@ PURPOSE =head1 SEE ALSO L<virt-install(1)>, L<virt-xml-validate(1)>, L<virt-top(1)>, L<virt-df(1)>, -L<http://www.libvirt.org/> +L<https://libvirt.org/> =cut diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 6157ed2d7c..6b3426ef6f 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1231,7 +1231,7 @@ vshAdmShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) { /* FIXME - list a copyright blurb, as in GNU programs? */ vshPrint(ctl, _("Virt-admin command line tool of libvirt %s\n"), VERSION); - vshPrint(ctl, _("See web site at %s\n\n"), "http://libvirt.org/"); + vshPrint(ctl, _("See web site at %s\n\n"), "https://libvirt.org/"); vshPrint(ctl, "%s", _("Compiled with support for:")); #ifdef WITH_LIBVIRTD diff --git a/tools/virt-admin.pod b/tools/virt-admin.pod index ef140824cb..3ddbbff934 100644 --- a/tools/virt-admin.pod +++ b/tools/virt-admin.pod @@ -456,15 +456,15 @@ Messages at level ERROR or above =back For further information about debugging options consult -L<http://libvirt.org/logging.html> +L<https://libvirt.org/logging.html> =back =head1 BUGS Report any bugs discovered to the libvirt community via the mailing -list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 AUTHORS @@ -488,6 +488,6 @@ PURPOSE =head1 SEE ALSO L<virsh(1)>, L<virt-xml-validate(1)>, L<virt-host-validate(1)>, -L<http://www.libvirt.org/> +L<https://libvirt.org/> =cut diff --git a/tools/virt-host-validate.pod b/tools/virt-host-validate.pod index 9101141752..121bb7ed7a 100644 --- a/tools/virt-host-validate.pod +++ b/tools/virt-host-validate.pod @@ -46,8 +46,8 @@ Daniel P. Berrange =head1 BUGS Report any bugs discovered to the libvirt community via the -mailing list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +mailing list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT diff --git a/tools/virt-login-shell.pod b/tools/virt-login-shell.pod index 9d61115417..1aaa1cfc7c 100644 --- a/tools/virt-login-shell.pod +++ b/tools/virt-login-shell.pod @@ -83,8 +83,8 @@ shell; for example, if libvirtd is not running. =head1 BUGS Report any bugs discovered to the libvirt community via the mailing -list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 AUTHORS @@ -107,6 +107,6 @@ PURPOSE =head1 SEE ALSO -L<virsh(1)>, L<http://www.libvirt.org/> +L<virsh(1)>, L<https://libvirt.org/> =cut diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 92df9ed379..206637abf0 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -2,7 +2,7 @@ # # This shell script checks the TLS certificates and options needed # for the secure client/server support of libvirt as documented at -# http://libvirt.org/remote.html#Remote_certificates +# https://libvirt.org/remote.html#Remote_certificates # # Copyright (C) 2009-2013 Red Hat, Inc. # @@ -166,7 +166,7 @@ if [ ! -f "$CA/cacert.pem" ] then echo the CA certificate $CA/cacert.pem is missing while it echo should be installed on both client and servers - echo "see http://libvirt.org/remote.html#Remote_TLS_CA" + echo "see https://libvirt.org/remote.html#Remote_TLS_CA" echo on how to install it exit 1 fi @@ -186,7 +186,7 @@ if [ "$ORG" = "" ] then echo the CA certificate $CA/cacert.pem does not define the organization echo it should probably regenerated - echo "see http://libvirt.org/remote.html#Remote_TLS_CA" + echo "see https://libvirt.org/remote.html#Remote_TLS_CA" echo on how to regenerate it exit 1 fi @@ -234,7 +234,7 @@ then else echo Did not find "$LIBVIRT/clientcert.pem" client certificate echo The machine cannot act as a client - echo "see http://libvirt.org/remote.html#Remote_TLS_client_certificates" + echo "see https://libvirt.org/remote.html#Remote_TLS_client_certificates" echo on how to regenerate it CLIENT=0 fi @@ -287,7 +287,7 @@ then else echo Did not find $LIBVIRT/servercert.pem server certificate echo The machine cannot act as a server - echo "see http://libvirt.org/remote.html#Remote_TLS_server_certificates" + echo "see https://libvirt.org/remote.html#Remote_TLS_server_certificates" echo on how to regenerate it SERVER=0 fi diff --git a/tools/virt-pki-validate.pod b/tools/virt-pki-validate.pod index 5f04318f04..5d44973fdc 100644 --- a/tools/virt-pki-validate.pod +++ b/tools/virt-pki-validate.pod @@ -39,8 +39,8 @@ Richard Jones =head1 BUGS Report any bugs discovered to the libvirt community via the -mailing list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +mailing list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT @@ -56,6 +56,6 @@ PURPOSE =head1 SEE ALSO -L<virsh(1)>, online PKI setup instructions L<http://libvirt.org/remote.html> +L<virsh(1)>, online PKI setup instructions L<https://libvirt.org/remote.html> =cut diff --git a/tools/virt-sanlock-cleanup.pod b/tools/virt-sanlock-cleanup.pod index f80a2818da..41012566a1 100644 --- a/tools/virt-sanlock-cleanup.pod +++ b/tools/virt-sanlock-cleanup.pod @@ -27,8 +27,8 @@ Daniel Berrange =head1 BUGS Report any bugs discovered to the libvirt community via the -mailing list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +mailing list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT @@ -44,6 +44,6 @@ PURPOSE =head1 SEE ALSO -L<virsh(1)>, online instructions L<http://libvirt.org/locking.html> +L<virsh(1)>, online instructions L<https://libvirt.org/locking.html> =cut diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod index 0a5b7db6e6..f8e67503fd 100644 --- a/tools/virt-xml-validate.pod +++ b/tools/virt-xml-validate.pod @@ -88,8 +88,8 @@ Daniel P.Berrange =head1 BUGS Report any bugs discovered to the libvirt community via the -mailing list L<http://libvirt.org/contact.html> or bug tracker -L<http://libvirt.org/bugs.html>. +mailing list L<https://libvirt.org/contact.html> or bug tracker +L<https://libvirt.org/bugs.html>. Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT @@ -106,6 +106,6 @@ PURPOSE =head1 SEE ALSO -L<virsh(1)>, online XML format descriptions L<http://libvirt.org/format.html> +L<virsh(1)>, online XML format descriptions L<https://libvirt.org/format.html> =cut diff --git a/tools/wireshark/README.md b/tools/wireshark/README.md index 9f4c9b6876..b7f40d0954 100644 --- a/tools/wireshark/README.md +++ b/tools/wireshark/README.md @@ -9,7 +9,7 @@ specification. See also: - http://www.google-melange.com/gsoc/project/google/gsoc2013/kawamuray/7001 -- http://wiki.qemu.org/Features/LibvirtWiresharkDissector +- https://wiki.qemu.org/Features/LibvirtWiresharkDissector Installation ============= -- 2.13.5

2 1

[libvirt] [PATCH] Remove obsolete TODO file
by Daniel P. Berrange 13 Oct '17

13 Oct '17

We stopped autogenerating a TODO file from RFE bugs a long time ago. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- TODO | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 TODO diff --git a/TODO b/TODO deleted file mode 100644 index 6843a17b35..0000000000 --- a/TODO +++ /dev/null @@ -1,22 +0,0 @@ - libvirt TODO list - ================= - -The TODO list changes frequently, so is maintained online -in the libvirt bugzilla - - http://bugzilla.redhat.com/ - -Search against - - Product: Virtualization Tools - Component: libvirt - Subject: RFE - -Or browse dependent bugs under - - https://bugzilla.redhat.com/show_bug.cgi?id=libvirtTodo - -Summarized reports automatically generated from bugzilla -and provided online at - - http://libvirt.org/todo.html -- 2.13.5

2 1

[libvirt] [PATCH] Add CII best practices badge
by Daniel P. Berrange 13 Oct '17

13 Oct '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5fed0fd874..1271843cb1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/libvirt/libvirt.svg)](https://travis-ci.org/l… + [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/355/badge)… Libvirt API for virtualization ============================== -- 2.13.5

2 2

[libvirt] [PATCH v2] interfaces: Convert virInterfaceObjList to virObjectRWLockable
by John Ferlan 13 Oct '17

13 Oct '17

Rather than a forward linked list, let's use the ObjectRWLockable object in order to manage the data. Requires numerous changes from List to Object management similar to many other drivers/vir*obj.c modules Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: https://www.redhat.com/archives/libvir-list/2017-October/msg00387.html Difference to v1 - separate out each of the virHashForEach callback helpers and *Data structures. src/conf/virinterfaceobj.c | 341 ++++++++++++++++++++++++++++++--------------- src/libvirt_private.syms | 1 - src/test/test_driver.c | 6 +- 3 files changed, 229 insertions(+), 119 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index e993b929d7..4bd371bb1e 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -25,6 +25,7 @@ #include "viralloc.h" #include "virerror.h" #include "virinterfaceobj.h" +#include "virhash.h" #include "virlog.h" #include "virstring.h" @@ -40,14 +41,19 @@ struct _virInterfaceObj { }; struct _virInterfaceObjList { - size_t count; - virInterfaceObjPtr *objs; + virObjectRWLockable parent; + + /* name string -> virInterfaceObj mapping + * for O(1), lockless lookup-by-name */ + virHashTable *objsName; }; /* virInterfaceObj manipulation */ static virClassPtr virInterfaceObjClass; +static virClassPtr virInterfaceObjListClass; static void virInterfaceObjDispose(void *obj); +static void virInterfaceObjListDispose(void *obj); static int virInterfaceObjOnceInit(void) @@ -58,6 +64,12 @@ virInterfaceObjOnceInit(void) virInterfaceObjDispose))) return -1; + if (!(virInterfaceObjListClass = virClassNew(virClassForObjectRWLockable(), + "virInterfaceObjList", + sizeof(virInterfaceObjList), + virInterfaceObjListDispose))) + return -1; + return 0; } @@ -130,119 +142,189 @@ virInterfaceObjListNew(void) { virInterfaceObjListPtr interfaces; - if (VIR_ALLOC(interfaces) < 0) + if (virInterfaceObjInitialize() < 0) return NULL; + + if (!(interfaces = virObjectRWLockableNew(virInterfaceObjListClass))) + return NULL; + + if (!(interfaces->objsName = virHashCreate(10, virObjectFreeHashData))) { + virObjectUnref(interfaces); + return NULL; + } + return interfaces; } +struct _virInterfaceObjForEachData { + bool wantActive; + const char *matchStr; + bool error; + int nElems; + int maxElems; + char **const elems; +}; + +static int +virInterfaceObjListFindByMACStringCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjForEachData *data = opaque; + + if (data->error) + return 0; + + if (data->nElems == data->maxElems) + return 0; + + virObjectLock(obj); + + if (STRCASEEQ(obj->def->mac, data->matchStr)) { + if (VIR_STRDUP(data->elems[data->nElems], data->matchStr) < 0) { + data->error = true; + goto cleanup; + } + data->nElems++; + } + + cleanup: + virObjectUnlock(obj); + return 0; +} + + int virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces, const char *mac, char **const matches, int maxmatches) { - size_t i; - int matchct = 0; + struct _virInterfaceObjForEachData data = { .matchStr = mac, + .error = false, + .nElems = 0, + .maxElems = maxmatches, + .elems = matches }; - for (i = 0; i < interfaces->count; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListFindByMACStringCb, + &data); + virObjectRWUnlock(interfaces); - virObjectLock(obj); - def = obj->def; - if (STRCASEEQ(def->mac, mac)) { - if (matchct < maxmatches) { - if (VIR_STRDUP(matches[matchct], def->name) < 0) { - virObjectUnlock(obj); - goto error; - } - matchct++; - } - } - virObjectUnlock(obj); - } - return matchct; + if (data.error) + goto error; + + return data.nElems; error: - while (--matchct >= 0) - VIR_FREE(matches[matchct]); + while (--data.nElems >= 0) + VIR_FREE(data.elems[data.nElems]); return -1; } +static virInterfaceObjPtr +virInterfaceObjListFindByNameLocked(virInterfaceObjListPtr interfaces, + const char *name) +{ + return virObjectRef(virHashLookup(interfaces->objsName, name)); +} + + virInterfaceObjPtr virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces, const char *name) { - size_t i; - - for (i = 0; i < interfaces->count; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; - + virInterfaceObjPtr obj; + virObjectRWLockRead(interfaces); + obj = virInterfaceObjListFindByNameLocked(interfaces, name); + virObjectRWUnlock(interfaces); + if (obj) virObjectLock(obj); - def = obj->def; - if (STREQ(def->name, name)) - return virObjectRef(obj); - virObjectUnlock(obj); - } - return NULL; + return obj; } void -virInterfaceObjListFree(virInterfaceObjListPtr interfaces) +virInterfaceObjListDispose(void *obj) +{ + virInterfaceObjListPtr interfaces = obj; + + virHashFree(interfaces->objsName); +} + + +struct _virInterfaceObjListCloneData { + bool error; + virInterfaceObjListPtr dest; +}; + +static int +virInterfaceObjListCloneCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) { - size_t i; + virInterfaceObjPtr srcObj = payload; + struct _virInterfaceObjListCloneData *data = opaque; + char *xml = NULL; + virInterfaceDefPtr backup = NULL; + virInterfaceObjPtr obj; + + if (data->error) + return 0; + + virObjectLock(srcObj); + + if (!(xml = virInterfaceDefFormat(srcObj->def))) + goto error; + + if (!(backup = virInterfaceDefParseString(xml))) + goto error; + VIR_FREE(xml); - for (i = 0; i < interfaces->count; i++) - virObjectUnref(interfaces->objs[i]); - VIR_FREE(interfaces->objs); - VIR_FREE(interfaces); + if (!(obj = virInterfaceObjListAssignDef(data->dest, backup))) + goto error; + virInterfaceObjEndAPI(&obj); + + virObjectUnlock(srcObj); + return 0; + + error: + data->error = true; + VIR_FREE(xml); + virInterfaceDefFree(backup); + virObjectUnlock(srcObj); + return 0; } virInterfaceObjListPtr virInterfaceObjListClone(virInterfaceObjListPtr interfaces) { - size_t i; - unsigned int cnt; - virInterfaceObjListPtr dest; + struct _virInterfaceObjListCloneData data = { .error = false, + .dest = NULL }; if (!interfaces) return NULL; - if (!(dest = virInterfaceObjListNew())) + if (!(data.dest = virInterfaceObjListNew())) return NULL; - cnt = interfaces->count; - for (i = 0; i < cnt; i++) { - virInterfaceObjPtr srcobj = interfaces->objs[i]; - virInterfaceDefPtr backup; - virInterfaceObjPtr obj; - char *xml = virInterfaceDefFormat(srcobj->def); + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListCloneCb, &data); + virObjectRWUnlock(interfaces); - if (!xml) - goto error; + if (data.error) + goto error; - if (!(backup = virInterfaceDefParseString(xml))) { - VIR_FREE(xml); - goto error; - } - - VIR_FREE(xml); - if (!(obj = virInterfaceObjListAssignDef(dest, backup))) - goto error; - virInterfaceObjEndAPI(&obj); - } - - return dest; + return data.dest; error: - virInterfaceObjListFree(dest); + virObjectUnref(data.dest); return NULL; } @@ -253,9 +335,11 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces, { virInterfaceObjPtr obj; - if ((obj = virInterfaceObjListFindByName(interfaces, def->name))) { + virObjectRWLockWrite(interfaces); + if ((obj = virInterfaceObjListFindByNameLocked(interfaces, def->name))) { virInterfaceDefFree(obj->def); obj->def = def; + virObjectRWUnlock(interfaces); return obj; } @@ -263,13 +347,19 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces, if (!(obj = virInterfaceObjNew())) return NULL; - if (VIR_APPEND_ELEMENT_COPY(interfaces->objs, - interfaces->count, obj) < 0) { - virInterfaceObjEndAPI(&obj); - return NULL; - } + if (virHashAddEntry(interfaces->objsName, def->name, obj) < 0) + goto error; + virObjectRef(obj); + obj->def = def; - return virObjectRef(obj); + virObjectRWUnlock(interfaces); + + return obj; + + error: + virInterfaceObjEndAPI(&obj); + virObjectRWUnlock(interfaces); + return NULL; } @@ -277,20 +367,48 @@ void virInterfaceObjListRemove(virInterfaceObjListPtr interfaces, virInterfaceObjPtr obj) { - size_t i; - + virObjectRef(obj); + virObjectUnlock(obj); + virObjectRWLockWrite(interfaces); + virObjectLock(obj); + virHashRemoveEntry(interfaces->objsName, obj->def->name); virObjectUnlock(obj); - for (i = 0; i < interfaces->count; i++) { - virObjectLock(interfaces->objs[i]); - if (interfaces->objs[i] == obj) { - virObjectUnlock(interfaces->objs[i]); - virObjectUnref(interfaces->objs[i]); - - VIR_DELETE_ELEMENT(interfaces->objs, i, interfaces->count); - break; + virObjectUnref(obj); + virObjectRWUnlock(interfaces); +} + + +static int +virInterfaceObjListForEachCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjForEachData *data = opaque; + + if (data->error) + return 0; + + if (data->maxElems >= 0 && data->nElems == data->maxElems) + return 0; + + virObjectLock(obj); + + if (data->wantActive != virInterfaceObjIsActive(obj)) + goto cleanup; + + if (data->elems) { + if (VIR_STRDUP(data->elems[data->nElems], obj->def->name) < 0) { + data->error = true; + goto cleanup; } - virObjectUnlock(interfaces->objs[i]); } + + data->nElems++; + + cleanup: + virObjectUnlock(obj); + return 0; } @@ -298,18 +416,17 @@ int virInterfaceObjListNumOfInterfaces(virInterfaceObjListPtr interfaces, bool wantActive) { - size_t i; - int ninterfaces = 0; + struct _virInterfaceObjForEachData data = { .wantActive = wantActive, + .error = false, + .nElems = 0, + .maxElems = -1, + .elems = NULL }; - for (i = 0; (i < interfaces->count); i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virObjectLock(obj); - if (wantActive == virInterfaceObjIsActive(obj)) - ninterfaces++; - virObjectUnlock(obj); - } + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListForEachCb, &data); + virObjectRWUnlock(interfaces); - return ninterfaces; + return data.nElems; } @@ -319,30 +436,24 @@ virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces, char **const names, int maxnames) { - int nnames = 0; - size_t i; + struct _virInterfaceObjForEachData data = { .wantActive = wantActive, + .error = false, + .nElems = 0, + .maxElems = maxnames, + .elems = names }; - for (i = 0; i < interfaces->count && nnames < maxnames; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListForEachCb, &data); + virObjectRWUnlock(interfaces); - virObjectLock(obj); - def = obj->def; - if (wantActive == virInterfaceObjIsActive(obj)) { - if (VIR_STRDUP(names[nnames], def->name) < 0) { - virObjectUnlock(obj); - goto failure; - } - nnames++; - } - virObjectUnlock(obj); - } + if (data.error) + goto error; - return nnames; + return data.nElems; - failure: - while (--nnames >= 0) - VIR_FREE(names[nnames]); + error: + while (--data.nElems >= 0) + VIR_FREE(data.elems[data.nElems]); return -1; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 26c5ddb405..9133199895 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -932,7 +932,6 @@ virInterfaceObjListAssignDef; virInterfaceObjListClone; virInterfaceObjListFindByMACString; virInterfaceObjListFindByName; -virInterfaceObjListFree; virInterfaceObjListGetNames; virInterfaceObjListNew; virInterfaceObjListNumOfInterfaces; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1c48347994..14bba7494c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -154,7 +154,7 @@ testDriverFree(testDriverPtr driver) virObjectUnref(driver->domains); virNodeDeviceObjListFree(driver->devs); virObjectUnref(driver->networks); - virInterfaceObjListFree(driver->ifaces); + virObjectUnref(driver->ifaces); virStoragePoolObjListFree(&driver->pools); virObjectUnref(driver->eventState); virMutexUnlock(&driver->lock); @@ -3880,7 +3880,7 @@ testInterfaceChangeCommit(virConnectPtr conn, goto cleanup; } - virInterfaceObjListFree(privconn->backupIfaces); + virObjectUnref(privconn->backupIfaces); privconn->transaction_running = false; ret = 0; @@ -3910,7 +3910,7 @@ testInterfaceChangeRollback(virConnectPtr conn, goto cleanup; } - virInterfaceObjListFree(privconn->ifaces); + virObjectUnref(privconn->ifaces); privconn->ifaces = privconn->backupIfaces; privconn->backupIfaces = NULL; -- 2.13.6

1 1

[libvirt] [PATCH] interfaces: Convert virInterfaceObjList to virObjectRWLockable
by John Ferlan 13 Oct '17

13 Oct '17

Rather than a forward linked list, let's use the ObjectRWLockable object in order to manage the data. Requires numerous changes from List to Object management similar to many other drivers/vir*obj.c modules Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- For some reason I thought I had already done this, but guess I hadn't, so figured I may as well. Uses the RWLockable too. Passed the avocado test suite too. src/conf/virinterfaceobj.c | 341 ++++++++++++++++++++++++++++++--------------- src/libvirt_private.syms | 1 - src/test/test_driver.c | 6 +- 3 files changed, 229 insertions(+), 119 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index e993b929d7..4bd371bb1e 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -25,6 +25,7 @@ #include "viralloc.h" #include "virerror.h" #include "virinterfaceobj.h" +#include "virhash.h" #include "virlog.h" #include "virstring.h" @@ -40,14 +41,19 @@ struct _virInterfaceObj { }; struct _virInterfaceObjList { - size_t count; - virInterfaceObjPtr *objs; + virObjectRWLockable parent; + + /* name string -> virInterfaceObj mapping + * for O(1), lockless lookup-by-name */ + virHashTable *objsName; }; /* virInterfaceObj manipulation */ static virClassPtr virInterfaceObjClass; +static virClassPtr virInterfaceObjListClass; static void virInterfaceObjDispose(void *obj); +static void virInterfaceObjListDispose(void *obj); static int virInterfaceObjOnceInit(void) @@ -58,6 +64,12 @@ virInterfaceObjOnceInit(void) virInterfaceObjDispose))) return -1; + if (!(virInterfaceObjListClass = virClassNew(virClassForObjectRWLockable(), + "virInterfaceObjList", + sizeof(virInterfaceObjList), + virInterfaceObjListDispose))) + return -1; + return 0; } @@ -130,119 +142,189 @@ virInterfaceObjListNew(void) { virInterfaceObjListPtr interfaces; - if (VIR_ALLOC(interfaces) < 0) + if (virInterfaceObjInitialize() < 0) return NULL; + + if (!(interfaces = virObjectRWLockableNew(virInterfaceObjListClass))) + return NULL; + + if (!(interfaces->objsName = virHashCreate(10, virObjectFreeHashData))) { + virObjectUnref(interfaces); + return NULL; + } + return interfaces; } +struct _virInterfaceObjForEachData { + bool wantActive; + const char *matchStr; + bool error; + int nElems; + int maxElems; + char **const elems; +}; + +static int +virInterfaceObjListFindByMACStringCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjForEachData *data = opaque; + + if (data->error) + return 0; + + if (data->nElems == data->maxElems) + return 0; + + virObjectLock(obj); + + if (STRCASEEQ(obj->def->mac, data->matchStr)) { + if (VIR_STRDUP(data->elems[data->nElems], data->matchStr) < 0) { + data->error = true; + goto cleanup; + } + data->nElems++; + } + + cleanup: + virObjectUnlock(obj); + return 0; +} + + int virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces, const char *mac, char **const matches, int maxmatches) { - size_t i; - int matchct = 0; + struct _virInterfaceObjForEachData data = { .matchStr = mac, + .error = false, + .nElems = 0, + .maxElems = maxmatches, + .elems = matches }; - for (i = 0; i < interfaces->count; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListFindByMACStringCb, + &data); + virObjectRWUnlock(interfaces); - virObjectLock(obj); - def = obj->def; - if (STRCASEEQ(def->mac, mac)) { - if (matchct < maxmatches) { - if (VIR_STRDUP(matches[matchct], def->name) < 0) { - virObjectUnlock(obj); - goto error; - } - matchct++; - } - } - virObjectUnlock(obj); - } - return matchct; + if (data.error) + goto error; + + return data.nElems; error: - while (--matchct >= 0) - VIR_FREE(matches[matchct]); + while (--data.nElems >= 0) + VIR_FREE(data.elems[data.nElems]); return -1; } +static virInterfaceObjPtr +virInterfaceObjListFindByNameLocked(virInterfaceObjListPtr interfaces, + const char *name) +{ + return virObjectRef(virHashLookup(interfaces->objsName, name)); +} + + virInterfaceObjPtr virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces, const char *name) { - size_t i; - - for (i = 0; i < interfaces->count; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; - + virInterfaceObjPtr obj; + virObjectRWLockRead(interfaces); + obj = virInterfaceObjListFindByNameLocked(interfaces, name); + virObjectRWUnlock(interfaces); + if (obj) virObjectLock(obj); - def = obj->def; - if (STREQ(def->name, name)) - return virObjectRef(obj); - virObjectUnlock(obj); - } - return NULL; + return obj; } void -virInterfaceObjListFree(virInterfaceObjListPtr interfaces) +virInterfaceObjListDispose(void *obj) +{ + virInterfaceObjListPtr interfaces = obj; + + virHashFree(interfaces->objsName); +} + + +struct _virInterfaceObjListCloneData { + bool error; + virInterfaceObjListPtr dest; +}; + +static int +virInterfaceObjListCloneCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) { - size_t i; + virInterfaceObjPtr srcObj = payload; + struct _virInterfaceObjListCloneData *data = opaque; + char *xml = NULL; + virInterfaceDefPtr backup = NULL; + virInterfaceObjPtr obj; + + if (data->error) + return 0; + + virObjectLock(srcObj); + + if (!(xml = virInterfaceDefFormat(srcObj->def))) + goto error; + + if (!(backup = virInterfaceDefParseString(xml))) + goto error; + VIR_FREE(xml); - for (i = 0; i < interfaces->count; i++) - virObjectUnref(interfaces->objs[i]); - VIR_FREE(interfaces->objs); - VIR_FREE(interfaces); + if (!(obj = virInterfaceObjListAssignDef(data->dest, backup))) + goto error; + virInterfaceObjEndAPI(&obj); + + virObjectUnlock(srcObj); + return 0; + + error: + data->error = true; + VIR_FREE(xml); + virInterfaceDefFree(backup); + virObjectUnlock(srcObj); + return 0; } virInterfaceObjListPtr virInterfaceObjListClone(virInterfaceObjListPtr interfaces) { - size_t i; - unsigned int cnt; - virInterfaceObjListPtr dest; + struct _virInterfaceObjListCloneData data = { .error = false, + .dest = NULL }; if (!interfaces) return NULL; - if (!(dest = virInterfaceObjListNew())) + if (!(data.dest = virInterfaceObjListNew())) return NULL; - cnt = interfaces->count; - for (i = 0; i < cnt; i++) { - virInterfaceObjPtr srcobj = interfaces->objs[i]; - virInterfaceDefPtr backup; - virInterfaceObjPtr obj; - char *xml = virInterfaceDefFormat(srcobj->def); + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListCloneCb, &data); + virObjectRWUnlock(interfaces); - if (!xml) - goto error; + if (data.error) + goto error; - if (!(backup = virInterfaceDefParseString(xml))) { - VIR_FREE(xml); - goto error; - } - - VIR_FREE(xml); - if (!(obj = virInterfaceObjListAssignDef(dest, backup))) - goto error; - virInterfaceObjEndAPI(&obj); - } - - return dest; + return data.dest; error: - virInterfaceObjListFree(dest); + virObjectUnref(data.dest); return NULL; } @@ -253,9 +335,11 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces, { virInterfaceObjPtr obj; - if ((obj = virInterfaceObjListFindByName(interfaces, def->name))) { + virObjectRWLockWrite(interfaces); + if ((obj = virInterfaceObjListFindByNameLocked(interfaces, def->name))) { virInterfaceDefFree(obj->def); obj->def = def; + virObjectRWUnlock(interfaces); return obj; } @@ -263,13 +347,19 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces, if (!(obj = virInterfaceObjNew())) return NULL; - if (VIR_APPEND_ELEMENT_COPY(interfaces->objs, - interfaces->count, obj) < 0) { - virInterfaceObjEndAPI(&obj); - return NULL; - } + if (virHashAddEntry(interfaces->objsName, def->name, obj) < 0) + goto error; + virObjectRef(obj); + obj->def = def; - return virObjectRef(obj); + virObjectRWUnlock(interfaces); + + return obj; + + error: + virInterfaceObjEndAPI(&obj); + virObjectRWUnlock(interfaces); + return NULL; } @@ -277,20 +367,48 @@ void virInterfaceObjListRemove(virInterfaceObjListPtr interfaces, virInterfaceObjPtr obj) { - size_t i; - + virObjectRef(obj); + virObjectUnlock(obj); + virObjectRWLockWrite(interfaces); + virObjectLock(obj); + virHashRemoveEntry(interfaces->objsName, obj->def->name); virObjectUnlock(obj); - for (i = 0; i < interfaces->count; i++) { - virObjectLock(interfaces->objs[i]); - if (interfaces->objs[i] == obj) { - virObjectUnlock(interfaces->objs[i]); - virObjectUnref(interfaces->objs[i]); - - VIR_DELETE_ELEMENT(interfaces->objs, i, interfaces->count); - break; + virObjectUnref(obj); + virObjectRWUnlock(interfaces); +} + + +static int +virInterfaceObjListForEachCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjForEachData *data = opaque; + + if (data->error) + return 0; + + if (data->maxElems >= 0 && data->nElems == data->maxElems) + return 0; + + virObjectLock(obj); + + if (data->wantActive != virInterfaceObjIsActive(obj)) + goto cleanup; + + if (data->elems) { + if (VIR_STRDUP(data->elems[data->nElems], obj->def->name) < 0) { + data->error = true; + goto cleanup; } - virObjectUnlock(interfaces->objs[i]); } + + data->nElems++; + + cleanup: + virObjectUnlock(obj); + return 0; } @@ -298,18 +416,17 @@ int virInterfaceObjListNumOfInterfaces(virInterfaceObjListPtr interfaces, bool wantActive) { - size_t i; - int ninterfaces = 0; + struct _virInterfaceObjForEachData data = { .wantActive = wantActive, + .error = false, + .nElems = 0, + .maxElems = -1, + .elems = NULL }; - for (i = 0; (i < interfaces->count); i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virObjectLock(obj); - if (wantActive == virInterfaceObjIsActive(obj)) - ninterfaces++; - virObjectUnlock(obj); - } + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListForEachCb, &data); + virObjectRWUnlock(interfaces); - return ninterfaces; + return data.nElems; } @@ -319,30 +436,24 @@ virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces, char **const names, int maxnames) { - int nnames = 0; - size_t i; + struct _virInterfaceObjForEachData data = { .wantActive = wantActive, + .error = false, + .nElems = 0, + .maxElems = maxnames, + .elems = names }; - for (i = 0; i < interfaces->count && nnames < maxnames; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListForEachCb, &data); + virObjectRWUnlock(interfaces); - virObjectLock(obj); - def = obj->def; - if (wantActive == virInterfaceObjIsActive(obj)) { - if (VIR_STRDUP(names[nnames], def->name) < 0) { - virObjectUnlock(obj); - goto failure; - } - nnames++; - } - virObjectUnlock(obj); - } + if (data.error) + goto error; - return nnames; + return data.nElems; - failure: - while (--nnames >= 0) - VIR_FREE(names[nnames]); + error: + while (--data.nElems >= 0) + VIR_FREE(data.elems[data.nElems]); return -1; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9243c55910..ec2edd27e8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -932,7 +932,6 @@ virInterfaceObjListAssignDef; virInterfaceObjListClone; virInterfaceObjListFindByMACString; virInterfaceObjListFindByName; -virInterfaceObjListFree; virInterfaceObjListGetNames; virInterfaceObjListNew; virInterfaceObjListNumOfInterfaces; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1c48347994..14bba7494c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -154,7 +154,7 @@ testDriverFree(testDriverPtr driver) virObjectUnref(driver->domains); virNodeDeviceObjListFree(driver->devs); virObjectUnref(driver->networks); - virInterfaceObjListFree(driver->ifaces); + virObjectUnref(driver->ifaces); virStoragePoolObjListFree(&driver->pools); virObjectUnref(driver->eventState); virMutexUnlock(&driver->lock); @@ -3880,7 +3880,7 @@ testInterfaceChangeCommit(virConnectPtr conn, goto cleanup; } - virInterfaceObjListFree(privconn->backupIfaces); + virObjectUnref(privconn->backupIfaces); privconn->transaction_running = false; ret = 0; @@ -3910,7 +3910,7 @@ testInterfaceChangeRollback(virConnectPtr conn, goto cleanup; } - virInterfaceObjListFree(privconn->ifaces); + virObjectUnref(privconn->ifaces); privconn->ifaces = privconn->backupIfaces; privconn->backupIfaces = NULL; -- 2.13.6

1 1

[libvirt] [PATCH 0/2] Tie up some loose ends w/ network common object
by John Ferlan 13 Oct '17

13 Oct '17

Patches speak for themselves. Use RWObjectLockable and a common callback helper to peruse the lists for NumOfNetworks, GetNames, and Export. John Ferlan (2): network: Convert virNetworkObjList to use RWObjectLockable network: Introduce virNetworkObjListForEachCb src/conf/virnetworkobj.c | 199 ++++++++++++++++++++--------------------------- 1 file changed, 85 insertions(+), 114 deletions(-) -- 2.13.6

3 6

[libvirt] [PATCH] virt-host-validate: require fuse for LXC if compiled in
by Guido Günther 13 Oct '17

13 Oct '17

Domains fail to start without fuse like error: internal error: guest failed to start: fuse: device not found, try 'modprobe fuse' first Failure in libvirt_lxc startup: no error so check for it too. References: https://ci.debian.net/data/autopkgtest/unstable/amd64/libv/libvirt/20171012… --- tools/virt-host-validate-lxc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c index 2b906cc88a..64d9279c30 100644 --- a/tools/virt-host-validate-lxc.c +++ b/tools/virt-host-validate-lxc.c @@ -93,5 +93,12 @@ int virHostValidateLXC(void) "BLK_CGROUP") < 0) ret = -1; +#if WITH_FUSE + if (virHostValidateDeviceExists("LXC", "/sys/fs/fuse/connections", + VIR_HOST_VALIDATE_FAIL, + _("Load the 'fuse' module to enable /proc/ overrides")) < 0) + ret = -1; +#endif + return ret; } -- 2.14.2

3 3

[libvirt] [PATCH v3] qemu: add the print of page size in cmd domjobinfo
by Chao Fan 13 Oct '17

13 Oct '17

The command "info migrate" of qemu outputs the dirty-pages-rate during migration, but page size is different in different architectures. So page size should be output to calculate dirty pages in bytes. Page size is already implemented with commit 030ce1f8612215fcbe9d353dfeaeb2937f8e3f94 in qemu. Now Implement the counter-part in libvirt. Signed-off-by: Chao Fan <fanc.fnst(a)cn.fujitsu.com> Signed-off-by: Li Zhijian <lizhijian(a)cn.fujitsu.com> --- v2 -> v3: Follow the suggestion of John Ferlan: 1. Improve a judgment logic when failing to get page size. v1 -> v2: Follow the suggestion of John Ferlan: 1. Drop the fix for unrelated coding style problem. 2. Fix typo. 3. Improve a judgment logic when failing to get page size. --- include/libvirt/libvirt-domain.h | 7 +++++++ src/qemu/qemu_domain.c | 6 ++++++ src/qemu/qemu_migration_cookie.c | 7 +++++++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 2 ++ tools/virsh-domain.c | 8 ++++++++ 6 files changed, 31 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 030a62c43..1f4ddcf66 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3336,6 +3336,13 @@ typedef enum { # define VIR_DOMAIN_JOB_MEMORY_DIRTY_RATE "memory_dirty_rate" /** + * VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE: + * + * virDomainGetJobStats field: page size of the memory in this domain + */ +# define VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE "page_size" + +/** * VIR_DOMAIN_JOB_MEMORY_ITERATION: * * virDomainGetJobStats field: current iteration over domain's memory diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e395c4ddf..e95e427e5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -570,6 +570,12 @@ qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo, stats->ram_iteration) < 0) goto error; + if (stats->ram_page_size > 0 && + virTypedParamsAddULLong(&par, &npar, &maxpar, + VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, + stats->ram_page_size) < 0) + goto error; + if (virTypedParamsAddULLong(&par, &npar, &maxpar, VIR_DOMAIN_JOB_DISK_TOTAL, stats->disk_total + diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index eef40a6cd..bc6a8dc55 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -654,6 +654,10 @@ qemuMigrationCookieStatisticsXMLFormat(virBufferPtr buf, stats->ram_iteration); virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", + VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, + stats->ram_page_size); + + virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", VIR_DOMAIN_JOB_DISK_TOTAL, stats->disk_total); virBufferAsprintf(buf, "<%1$s>%2$llu</%1$s>\n", @@ -1014,6 +1018,9 @@ qemuMigrationCookieStatisticsXMLParse(xmlXPathContextPtr ctxt) virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_ITERATION "[1])", ctxt, &stats->ram_iteration); + virXPathULongLong("string(./" VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE "[1])", + ctxt, &stats->ram_page_size); + virXPathULongLong("string(./" VIR_DOMAIN_JOB_DISK_TOTAL "[1])", ctxt, &stats->disk_total); virXPathULongLong("string(./" VIR_DOMAIN_JOB_DISK_PROCESSED "[1])", diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6414d2483..1e3322433 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -677,6 +677,7 @@ struct _qemuMonitorMigrationStats { unsigned long long ram_normal; unsigned long long ram_normal_bytes; unsigned long long ram_dirty_rate; + unsigned long long ram_page_size; unsigned long long ram_iteration; unsigned long long disk_transferred; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c63d250d3..70c895a35 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2892,6 +2892,8 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, &stats->ram_normal_bytes)); ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-pages-rate", &stats->ram_dirty_rate)); + ignore_value(virJSONValueObjectGetNumberUlong(ram, "page-size", + &stats->ram_page_size)); ignore_value(virJSONValueObjectGetNumberUlong(ram, "dirty-sync-count", &stats->ram_iteration)); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a3f3b7c7b..a50713d6e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6021,6 +6021,14 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd) } if ((rc = virTypedParamsGetULLong(params, nparams, + VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE, + &value)) < 0) { + goto save_error; + } else if (rc) { + vshPrint(ctl, "%-17s %-12llu bytes\n", _("Page size:"), value); + } + + if ((rc = virTypedParamsGetULLong(params, nparams, VIR_DOMAIN_JOB_MEMORY_ITERATION, &value)) < 0) { goto save_error; -- 2.13.5

2 3

[libvirt] [PATCH v4 0/5] numa: describe sibling nodes distances
by Wim Ten Have 12 Oct '17

12 Oct '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch extends guest domain administration adding support to advertise node sibling distances when configuring HVM numa guests. NUMA (non-uniform memory access), a method of configuring a cluster of nodes within a single multiprocessing system such that it shares processor local memory amongst others improving performance and the ability of the system to be expanded. A NUMA system could be illustrated as shown below. Within this 4-node system, every socket is equipped with its own distinct memory. The whole typically resembles a SMP (symmetric multiprocessing) system being a "tightly-coupled," "share everything" system in which multiple processors are working under a single operating system and can access each others' memory over multiple "Bus Interconnect" paths. +-----+-----+-----+ +-----+-----+-----+ | M | CPU | CPU | | CPU | CPU | M | | E | | | | | | E | | M +- Socket0 -+ +- Socket3 -+ M | | O | | | | | | O | | R | CPU | CPU <---------> CPU | CPU | R | | Y | | | | | | Y | +-----+--^--+-----+ +-----+--^--+-----+ | | | Bus Interconnect | | | +-----+--v--+-----+ +-----+--v--+-----+ | M | | | | | | M | | E | CPU | CPU <---------> CPU | CPU | E | | M | | | | | | M | | O +- Socket1 -+ +- Socket2 -+ O | | R | | | | | | R | | Y | CPU | CPU | | CPU | CPU | Y | +-----+-----+-----+ +-----+-----+-----+ In contrast there is the limitation of a flat SMP system (not illustrated) under which the bus (data and address path) can easily become a performance bottleneck under high activity as sockets are added. NUMA adds an intermediate level of memory shared amongst a few cores per socket as illustrated above, so that data accesses do not have to travel over a single bus. Unfortunately the way NUMA does this adds its own limitations. This, as visualized in the illustration above, happens when data is stored in memory associated with Socket2 and is accessed by a CPU (core) in Socket0. The processors use the "Bus Interconnect" to create gateways between the sockets (nodes) enabling inter-socket access to memory. These "Bus Interconnect" hops add data access delays when a CPU (core) accesses memory associated with a remote socket (node). For terminology we refer to sockets as "nodes" where access to each others' distinct resources such as memory make them "siblings" with a designated "distance" between them. A specific design is described under the ACPI (Advanced Configuration and Power Interface Specification) within the chapter explaining the system's SLIT (System Locality Distance Information Table). These patches extend core libvirt's XML description of a virtual machine's hardware to include NUMA distance information for sibling nodes, which is then passed to Xen guests via libxl. Recently qemu landed support for constructing the SLIT since commit 0f203430dd ("numa: Allow setting NUMA distance for different NUMA nodes"), hence these core libvirt extensions can also help other drivers in supporting this feature. The XML changes made allow to describe the <cell> node/sockets <distances> amongst <sibling> node identifiers and propagate these towards the numa domain functionality finally adding support to libxl. [below is an example illustrating a 4 node/socket <cell> setup] <cpu> <numa> <cell id='0' cpus='0,4-7' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='10'/> <sibling id='1' value='21'/> <sibling id='2' value='31'/> <sibling id='3' value='41'/> </distances> </cell> <cell id='1' cpus='1,8-10,12-15' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='21'/> <sibling id='1' value='10'/> <sibling id='2' value='21'/> <sibling id='3' value='31'/> </distances> </cell> <cell id='2' cpus='2,11' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='31'/> <sibling id='1' value='21'/> <sibling id='2' value='10'/> <sibling id='3' value='21'/> </distances> </cell> <cell id='3' cpus='3' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='41'/> <sibling id='1' value='31'/> <sibling id='2' value='21'/> <sibling id='3' value='10'/> </distances> </cell> </numa> </cpu> By default on libxl, if no <distances> are given to describe the distance data between different <cell>s, this patch will default to a scheme using 10 for local and 20 for any remote node/socket, which is the assumption of guest OS when no SLIT is specified. While SLIT is optional, libxl requires that distances are set nonetheless. On Linux systems the SLIT detail can be listed with help of the 'numactl -H' command. The above HVM guest would show the following output. [root@f25 ~]# numactl -H available: 4 nodes (0-3) node 0 cpus: 0 4 5 6 7 node 0 size: 1988 MB node 0 free: 1743 MB node 1 cpus: 1 8 9 10 12 13 14 15 node 1 size: 1946 MB node 1 free: 1885 MB node 2 cpus: 2 11 node 2 size: 2011 MB node 2 free: 1912 MB node 3 cpus: 3 node 3 size: 2010 MB node 3 free: 1980 MB node distances: node 0 1 2 3 0: 10 21 31 41 1: 21 10 21 31 2: 31 21 10 21 3: 41 31 21 10 Wim ten Have (5): numa: rename function virDomainNumaDefCPUFormat numa: describe siblings distances within cells xenconfig: add domxml conversions for xen-xl libxl: vnuma support xlconfigtest: add tests for numa cell sibling distances docs/formatdomain.html.in | 63 +++- docs/schemas/basictypes.rng | 7 + docs/schemas/cputypes.rng | 18 ++ src/conf/cpu_conf.c | 2 +- src/conf/numa_conf.c | 342 ++++++++++++++++++++- src/conf/numa_conf.h | 22 +- src/libvirt_private.syms | 5 + src/libxl/libxl_conf.c | 120 ++++++++ src/libxl/libxl_driver.c | 3 +- src/xenconfig/xen_xl.c | 333 ++++++++++++++++++++ .../test-fullvirt-vnuma-autocomplete.cfg | 26 ++ .../test-fullvirt-vnuma-autocomplete.xml | 85 +++++ .../test-fullvirt-vnuma-nodistances.cfg | 26 ++ .../test-fullvirt-vnuma-nodistances.xml | 53 ++++ .../test-fullvirt-vnuma-partialdist.cfg | 26 ++ .../test-fullvirt-vnuma-partialdist.xml | 60 ++++ tests/xlconfigdata/test-fullvirt-vnuma.cfg | 26 ++ tests/xlconfigdata/test-fullvirt-vnuma.xml | 81 +++++ tests/xlconfigtest.c | 6 + 19 files changed, 1295 insertions(+), 9 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.xml -- 2.9.5

3 9

[libvirt] [PATCH] cpu_ppc64: Error out when model tag missing in virsh cpu-compare xml
by Nitesh Konkar 12 Oct '17

12 Oct '17

libvirtd throws unhandled signal 11 on ppc while running virsh cpu-compare with missing model tag in the xml. This patch errors out in such situation. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/cpu/cpu_ppc64.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index b58e80a..c11ac9f 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -247,6 +247,12 @@ ppc64ModelFromCPU(const virCPUDef *cpu, { struct ppc64_model *model; + if (!cpu->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return NULL; + } + if (!(model = ppc64ModelFind(map, cpu->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown CPU model %s"), cpu->model); -- 2.9.5

3 3

[libvirt] [PATCH 0/3] Tie up some loose ends w/ nodedev common object
by John Ferlan 12 Oct '17

12 Oct '17

Patches speak for themselves... Convert to RWObjectLockable and then merge the various ForEach callback functions into one API and structure. John Ferlan (3): nodedev: Convert virNodeDeviceObjList to use RWObjectLockable nodedev: Convert virNodeDeviceObjHasCap to bool nodedev: Introduce virNodeDeviceObjListForEachCb src/conf/virnodedeviceobj.c | 237 ++++++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 139 deletions(-) -- 2.13.6

2 6

[libvirt] [PATCH 0/2] Tie up a couple of secretobjs loose ends
by John Ferlan 12 Oct '17

12 Oct '17

Patches should speak for themselves. John Ferlan (2): secrets: Convert to use ObjectRWLockable secrets: Introduce virSecretObjListForEachCb src/conf/virsecretobj.c | 203 +++++++++++++++++------------------------------- 1 file changed, 72 insertions(+), 131 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] util: Resolve resource leak
by John Ferlan 12 Oct '17

12 Oct '17

Need to free @groups in the parent on success similar to other APIs (virFile*) which use virGetGroupList and virFork. Reported by Coverity. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/vircommand.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 41a61da49f..6cd76a560e 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -606,6 +606,7 @@ virExec(virCommandPtr cmd) cmd->pid = pid; + VIR_FREE(groups); VIR_FREE(binarystr); return 0; -- 2.13.6

2 1

[libvirt] [question]Why libvirt bind all devices with same vendor id and device id to vfio-pci driver, and only unbind devices used by VMs to original driver?
by Wuzongyong (Euler Dept) 11 Oct '17

11 Oct '17

Hi, As the title says, I thought that it's a bit unreasonable and inconsistent to unbind devices assigned to VMs to original driver and leave other devices binding to vfio-pci driver. Why not to bind devices we need to vfio-pci driver instead of bind all devices with same type to vfio-pci driver? Or, we may can rebind devices unused with same type to original driver. Thanks, Zongyong Wu

3 2

[libvirt] [PATCH 0/2] PIIX3 implicit controller address handling fixes
by Ján Tomko 11 Oct '17

11 Oct '17

Ján Tomko (2): qemu: reserve PCI addresses for implicit i440fx devices qemu: clarify error message for index 0 PIIX3 USB controller src/qemu/qemu_domain_address.c | 17 +++++++++++---- .../qemuxml2argv-440fx-ide-address-conflict.xml | 25 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-440fx-ide-address-conflict.xml -- 2.13.0

3 7

[libvirt] [PATCH] maint: update to latest gnulib
by Daniel P. Berrange 11 Oct '17

11 Oct '17

This pulls in the fix for getopt tests on Fedora >= 28 / glibc > 2.26.0 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 8d116e3f65..5e9abf8716 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8d116e3f657cb120f79efbbb675fa3cc9d21f53e +Subproject commit 5e9abf87163ad4aeaefef0b02961f8674b0a4879 -- 2.13.5

2 1

[libvirt] [PATCH go-xml] Add support for memory device element
by zhenwei.pi 11 Oct '17

11 Oct '17

Support model, access and target. Add Marshal/Unmarshal mothed for memory device. Add test code for device list in full domain. Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 29 +++++++++++++++++++++++++++++ domain_test.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/domain.go b/domain.go index 8c2cc1b..bacab11 100644 --- a/domain.go +++ b/domain.go @@ -436,6 +436,22 @@ type DomainHostdev struct { Address *DomainAddress `xml:"address"` } +type DomainMemorydevTargetNode struct { + Value uint `xml:",chardata"` +} + +type DomainMemorydevTarget struct { + Size *DomainMemory `xml:"size"` + Node *DomainMemorydevTargetNode `xml:"node"` +} + +type DomainMemorydev struct { + XMLName xml.Name `xml:"memory"` + Model string `xml:"model,attr"` + Access string `xml:"access,attr"` + Target *DomainMemorydevTarget `xml:"target"` +} + type DomainDeviceList struct { Emulator string `xml:"emulator,omitempty"` Controllers []DomainController `xml:"controller"` @@ -452,6 +468,7 @@ type DomainDeviceList struct { Sounds []DomainSound `xml:"sound"` RNGs []DomainRNG `xml:"rng"` Hostdevs []DomainHostdev `xml:"hostdev"` + Memorydevs []DomainMemorydev `xml:"memory"` } type DomainMemory struct { @@ -915,6 +932,18 @@ func (d *DomainHostdev) Marshal() (string, error) { return string(doc), nil } +func (d *DomainMemorydev) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), d) +} + +func (d *DomainMemorydev) Marshal() (string, error) { + doc, err := xml.MarshalIndent(d, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} + type HexUint uint func (h *HexUint) UnmarshalXMLAttr(attr xml.Attr) error { diff --git a/domain_test.go b/domain_test.go index 4fe6bfe..dbebe42 100644 --- a/domain_test.go +++ b/domain_test.go @@ -372,6 +372,21 @@ var domainTestData = []struct { }, }, }, + Memorydevs: []DomainMemorydev{ + DomainMemorydev{ + Model: "dimm", + Access: "private", + Target: &DomainMemorydevTarget{ + Size: &DomainMemory{ + Value: 1, + Unit: "GiB", + }, + Node: &DomainMemorydevTargetNode{ + Value: 0, + }, + }, + }, + }, }, }, Expected: []string{ @@ -414,6 +429,12 @@ var domainTestData = []struct { ` <source mode="connect" service="1234" host="1.2.3.4"></source>`, ` </backend>`, ` </rng>`, + ` <memory model="dimm" access="private">`, + ` <target>`, + ` <size unit="GiB">1</size>`, + ` <node>0</node>`, + ` </target>`, + ` </memory>`, ` </devices>`, `</domain>`, }, @@ -1630,6 +1651,30 @@ var domainTestData = []struct { `</hostdev>`, }, }, + { + Object: &DomainMemorydev{ + Model: "dimm", + Access: "private", + Target: &DomainMemorydevTarget{ + Size: &DomainMemory{ + Value: 1, + Unit: "GiB", + }, + Node: &DomainMemorydevTargetNode{ + Value: 0, + }, + }, + }, + + Expected: []string{ + `<memory model="dimm" access="private">`, + ` <target>`, + ` <size unit="GiB">1</size>`, + ` <node>0</node>`, + ` </target>`, + `</memory>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.7.4

2 1

[libvirt] [PATCH v2] qemu: Don't crash when parsing command line lacking -M
by Andrea Bolognani 11 Oct '17

11 Oct '17

Parse the -M (or -machine) command line option before starting processing in earnest and have a fallback ready in case it's not present, so that while parsing other options we can rely on def->os.machine being initialized. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1379218 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Changes from [v1]: * rework command line parsing instead of adding checks to qemuDomainMachineIs*() functions [v1] https://www.redhat.com/archives/libvir-list/2017-October/msg00406.html src/qemu/qemu_parse_command.c | 174 ++++++++++++--------- .../qemuargv2xml-nomachine-aarch64.args | 11 ++ .../qemuargv2xml-nomachine-aarch64.xml | 39 +++++ .../qemuargv2xml-nomachine-ppc64.args | 11 ++ .../qemuargv2xml-nomachine-ppc64.xml | 49 ++++++ .../qemuargv2xml-nomachine-x86_64.args | 11 ++ .../qemuargv2xml-nomachine-x86_64.xml | 48 ++++++ tests/qemuargv2xmltest.c | 4 + 8 files changed, 270 insertions(+), 77 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 7c409b03a..aaa4d3703 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1884,6 +1884,98 @@ qemuParseCommandLine(virCapsPtr caps, } } + /* Detect machine type before processing any other arguments, + * because they might depend on it */ + for (i = 1; progargv[i]; i++) { + const char *arg = progargv[i]; + + /* Make sure we have a single - for all options to + simplify next logic */ + if (STRPREFIX(arg, "--")) + arg++; + + if (STREQ(arg, "-M") || + STREQ(arg, "-machine")) { + char *param; + size_t j = 0; + + /* -machine [type=]name[,prop[=value][,...]] + * Set os.machine only if first parameter lacks '=' or + * contains explicit type='...' */ + WANT_VALUE(); + if (!(list = virStringSplit(val, ",", 0))) + goto error; + param = list[0]; + + if (STRPREFIX(param, "type=")) + param += strlen("type="); + if (!strchr(param, '=')) { + if (VIR_STRDUP(def->os.machine, param) < 0) + goto error; + j++; + } + + /* handle all remaining "-machine" parameters */ + while ((param = list[j++])) { + if (STRPREFIX(param, "dump-guest-core=")) { + param += strlen("dump-guest-core="); + def->mem.dump_core = virTristateSwitchTypeFromString(param); + if (def->mem.dump_core <= 0) + def->mem.dump_core = VIR_TRISTATE_SWITCH_ABSENT; + } else if (STRPREFIX(param, "mem-merge=off")) { + def->mem.nosharepages = true; + } else if (STRPREFIX(param, "accel=kvm")) { + def->virtType = VIR_DOMAIN_VIRT_KVM; + def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; + } else if (STRPREFIX(param, "aes-key-wrap=")) { + if (STREQ(arg, "-M")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("aes-key-wrap is not supported with " + "this QEMU binary")); + goto error; + } + param += strlen("aes-key-wrap="); + if (!def->keywrap && VIR_ALLOC(def->keywrap) < 0) + goto error; + def->keywrap->aes = virTristateSwitchTypeFromString(param); + if (def->keywrap->aes < 0) + def->keywrap->aes = VIR_TRISTATE_SWITCH_ABSENT; + } else if (STRPREFIX(param, "dea-key-wrap=")) { + if (STREQ(arg, "-M")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("dea-key-wrap is not supported with " + "this QEMU binary")); + goto error; + } + param += strlen("dea-key-wrap="); + if (!def->keywrap && VIR_ALLOC(def->keywrap) < 0) + goto error; + def->keywrap->dea = virTristateSwitchTypeFromString(param); + if (def->keywrap->dea < 0) + def->keywrap->dea = VIR_TRISTATE_SWITCH_ABSENT; + } + } + virStringListFree(list); + list = NULL; + } + } + + /* If no machine type has been found among the arguments, then figure + * out a reasonable value by using capabilities */ + if (!def->os.machine) { + virCapsDomainDataPtr capsdata; + + if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type, + def->os.arch, def->virtType, NULL, NULL))) + goto error; + + if (VIR_STRDUP(def->os.machine, capsdata->machinetype) < 0) { + VIR_FREE(capsdata); + goto error; + } + VIR_FREE(capsdata); + } + /* Now the real processing loop */ for (i = 1; progargv[i]; i++) { const char *arg = progargv[i]; @@ -2137,69 +2229,6 @@ qemuParseCommandLine(virCapsPtr caps, } if (STREQ(def->name, "")) VIR_FREE(def->name); - } else if (STREQ(arg, "-M") || - STREQ(arg, "-machine")) { - char *param; - size_t j = 0; - - /* -machine [type=]name[,prop[=value][,...]] - * Set os.machine only if first parameter lacks '=' or - * contains explicit type='...' */ - WANT_VALUE(); - if (!(list = virStringSplit(val, ",", 0))) - goto error; - param = list[0]; - - if (STRPREFIX(param, "type=")) - param += strlen("type="); - if (!strchr(param, '=')) { - if (VIR_STRDUP(def->os.machine, param) < 0) - goto error; - j++; - } - - /* handle all remaining "-machine" parameters */ - while ((param = list[j++])) { - if (STRPREFIX(param, "dump-guest-core=")) { - param += strlen("dump-guest-core="); - def->mem.dump_core = virTristateSwitchTypeFromString(param); - if (def->mem.dump_core <= 0) - def->mem.dump_core = VIR_TRISTATE_SWITCH_ABSENT; - } else if (STRPREFIX(param, "mem-merge=off")) { - def->mem.nosharepages = true; - } else if (STRPREFIX(param, "accel=kvm")) { - def->virtType = VIR_DOMAIN_VIRT_KVM; - def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; - } else if (STRPREFIX(param, "aes-key-wrap=")) { - if (STREQ(arg, "-M")) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("aes-key-wrap is not supported with " - "this QEMU binary")); - goto error; - } - param += strlen("aes-key-wrap="); - if (!def->keywrap && VIR_ALLOC(def->keywrap) < 0) - goto error; - def->keywrap->aes = virTristateSwitchTypeFromString(param); - if (def->keywrap->aes < 0) - def->keywrap->aes = VIR_TRISTATE_SWITCH_ABSENT; - } else if (STRPREFIX(param, "dea-key-wrap=")) { - if (STREQ(arg, "-M")) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("dea-key-wrap is not supported with " - "this QEMU binary")); - goto error; - } - param += strlen("dea-key-wrap="); - if (!def->keywrap && VIR_ALLOC(def->keywrap) < 0) - goto error; - def->keywrap->dea = virTristateSwitchTypeFromString(param); - if (def->keywrap->dea < 0) - def->keywrap->dea = VIR_TRISTATE_SWITCH_ABSENT; - } - } - virStringListFree(list); - list = NULL; } else if (STREQ(arg, "-serial")) { WANT_VALUE(); if (STRNEQ(val, "none")) { @@ -2489,6 +2518,11 @@ qemuParseCommandLine(virCapsPtr caps, argRecognized = false; } + } else if (STREQ(arg, "-M") || + STREQ(arg, "-machine")) { + // This option has already been processed before entering this + // loop, so we just need to skip its argument and move along + WANT_VALUE(); } else { argRecognized = false; } @@ -2571,20 +2605,6 @@ qemuParseCommandLine(virCapsPtr caps, } } - if (!def->os.machine) { - virCapsDomainDataPtr capsdata; - - if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type, - def->os.arch, def->virtType, NULL, NULL))) - goto error; - - if (VIR_STRDUP(def->os.machine, capsdata->machinetype) < 0) { - VIR_FREE(capsdata); - goto error; - } - VIR_FREE(capsdata); - } - if (!nographics && (def->ngraphics == 0 || have_sdl)) { virDomainGraphicsDefPtr sdl; const char *display = qemuFindEnv(progenv, "DISPLAY"); diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args new file mode 100644 index 000000000..b17c0d0c2 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args @@ -0,0 +1,11 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name QEMUGuest1 \ +-m 512 \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml new file mode 100644 index 000000000..eb8f9db80 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml @@ -0,0 +1,39 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <features> + <gic version='2'/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args new file mode 100644 index 000000000..ac618775e --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args @@ -0,0 +1,11 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ +-m 512 \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml new file mode 100644 index 000000000..fa41070cb --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml @@ -0,0 +1,49 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='scsi'/> + <readonly/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> + </controller> + <controller type='scsi' index='0'> + <address type='spapr-vio' reg='0x2000'/> + </controller> + <input type='keyboard' bus='usb'/> + <input type='mouse' bus='usb'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + <panic model='pseries'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args new file mode 100644 index 000000000..22bc4fb1c --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args @@ -0,0 +1,11 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-m 512 \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml new file mode 100644 index 000000000..71a36f083 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml @@ -0,0 +1,48 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.11'>hvm</type> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <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> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 1adbcfef6..5d261afa6 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -288,6 +288,10 @@ mymain(void) DO_TEST("machine-deakeywrap-off-argv"); DO_TEST("machine-keywrap-none-argv"); + DO_TEST("nomachine-x86_64"); + DO_TEST("nomachine-aarch64"); + DO_TEST("nomachine-ppc64"); + qemuTestDriverFree(&driver); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 2.13.6

3 3

[libvirt] [PATCH] qemu: Avoid crashes in qemuDomainMachineIs*()
by Andrea Bolognani 10 Oct '17

10 Oct '17

Make sure pointers are non-NULL before dereferencing them, and add test suite coverage for the crashers doing so fixes. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1379218 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain.c | 35 ++++++++-------- .../qemuargv2xml-nomachine-aarch64.args | 11 +++++ .../qemuargv2xml-nomachine-aarch64.xml | 39 ++++++++++++++++++ .../qemuargv2xml-nomachine-ppc64.args | 11 +++++ .../qemuargv2xml-nomachine-ppc64.xml | 47 +++++++++++++++++++++ .../qemuargv2xml-nomachine-x86_64.args | 11 +++++ .../qemuargv2xml-nomachine-x86_64.xml | 48 ++++++++++++++++++++++ tests/qemuargv2xmltest.c | 4 ++ 8 files changed, 188 insertions(+), 18 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b202d02f9..30ea3e592 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6601,8 +6601,9 @@ qemuDomainIsQ35(const virDomainDef *def) bool qemuDomainMachineIsQ35(const char *machine) { - return (STRPREFIX(machine, "pc-q35") || - STREQ(machine, "q35")); + return (machine && + (STREQ(machine, "q35") || + STRPREFIX(machine, "pc-q35"))); } @@ -6616,11 +6617,12 @@ qemuDomainIsI440FX(const virDomainDef *def) bool qemuDomainMachineIsI440FX(const char *machine) { - return (STREQ(machine, "pc") || - STRPREFIX(machine, "pc-0.") || - STRPREFIX(machine, "pc-1.") || - STRPREFIX(machine, "pc-i440") || - STRPREFIX(machine, "rhel")); + return (machine && + (STREQ(machine, "pc") || + STRPREFIX(machine, "pc-0.") || + STRPREFIX(machine, "pc-1.") || + STRPREFIX(machine, "pc-i440") || + STRPREFIX(machine, "rhel"))); } @@ -6689,7 +6691,8 @@ qemuDomainIsS390CCW(const virDomainDef *def) bool qemuDomainMachineIsS390CCW(const char *machine) { - return STRPREFIX(machine, "s390-ccw"); + return (machine && + STRPREFIX(machine, "s390-ccw")); } @@ -6708,11 +6711,9 @@ qemuDomainMachineIsVirt(const char *machine, arch != VIR_ARCH_AARCH64) return false; - if (STRNEQ(machine, "virt") && - !STRPREFIX(machine, "virt-")) - return false; - - return true; + return (machine && + (STREQ(machine, "virt") || + STRPREFIX(machine, "virt-"))); } @@ -6730,11 +6731,9 @@ qemuDomainMachineIsPSeries(const char *machine, if (!ARCH_IS_PPC64(arch)) return false; - if (STRNEQ(machine, "pseries") && - !STRPREFIX(machine, "pseries-")) - return false; - - return true; + return (machine && + (STREQ(machine, "pseries") || + STRPREFIX(machine, "pseries-"))); } diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args new file mode 100644 index 000000000..b17c0d0c2 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args @@ -0,0 +1,11 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name QEMUGuest1 \ +-m 512 \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml new file mode 100644 index 000000000..eb8f9db80 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml @@ -0,0 +1,39 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <features> + <gic version='2'/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args new file mode 100644 index 000000000..ac618775e --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args @@ -0,0 +1,11 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 \ +-name QEMUGuest1 \ +-m 512 \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml new file mode 100644 index 000000000..1e987f645 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> + </controller> + <controller type='ide' index='0'/> + <input type='keyboard' bus='usb'/> + <input type='mouse' bus='usb'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + <panic model='pseries'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args new file mode 100644 index 000000000..22bc4fb1c --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args @@ -0,0 +1,11 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-m 512 \ +-hda /dev/HostVG/QEMUGuest1 \ +-cdrom /root/boot.iso diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml new file mode 100644 index 000000000..71a36f083 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml @@ -0,0 +1,48 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc-0.11'>hvm</type> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <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> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='sdl'/> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 1adbcfef6..5d261afa6 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -288,6 +288,10 @@ mymain(void) DO_TEST("machine-deakeywrap-off-argv"); DO_TEST("machine-keywrap-none-argv"); + DO_TEST("nomachine-x86_64"); + DO_TEST("nomachine-aarch64"); + DO_TEST("nomachine-ppc64"); + qemuTestDriverFree(&driver); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 2.13.6

2 4