- Devel - libvirt List Archives

[libvirt] [PATCH for 1.2.7 0/8] Expose Expose IOMMU and VFIO host capabilities
by Michal Privoznik 03 Jul '14

03 Jul '14

After my RFC round, here are the actual patches. Michal Privoznik (8): Introduce domain_capabilities Introduce virConnectGetDomainCapabilities virsh: expose virConnectGetDomainCapabilities tests: Move qemu caps XML parsing into shared unit qemu_capabilities: Introduce virQEMUCapsCacheLookupByArch qemu_capabilities: Introduce virQEMUCapsIsMachineSupported qemu_capabilities: Introduce virQEMUCapsGetDefaultMachine qemu: Implement virConnectGetDomainCapabilities docs/formatdomaincaps.html.in | 200 ++++++++++++++++ docs/schemas/Makefile.am | 1 + docs/schemas/domaincaps.rng | 90 ++++++++ docs/sitemap.html.in | 4 + include/libvirt/libvirt.h.in | 7 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_capabilities.c | 254 +++++++++++++++++++++ src/conf/domain_capabilities.h | 103 +++++++++ src/driver.h | 9 + src/libvirt.c | 52 +++++ src/libvirt_private.syms | 8 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 146 ++++++++++++ src/qemu/qemu_capabilities.h | 11 + src/qemu/qemu_driver.c | 101 ++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 19 +- src/remote_protocol-structs | 11 + tests/Makefile.am | 13 ++ tests/domaincapsschemadata/domaincaps-basic.xml | 10 + tests/domaincapsschemadata/domaincaps-full.xml | 56 +++++ .../domaincaps-qemu_1.6.50-1.xml | 44 ++++ tests/domaincapsschematest | 11 + tests/domaincapstest.c | 194 ++++++++++++++++ tests/qemucapabilitiestest.c | 57 +---- tests/testutilsqemu.c | 49 ++++ tests/testutilsqemu.h | 3 + tools/virsh-host.c | 84 +++++++ tools/virsh.pod | 16 ++ 32 files changed, 1509 insertions(+), 55 deletions(-) create mode 100644 docs/formatdomaincaps.html.in create mode 100644 docs/schemas/domaincaps.rng create mode 100644 src/conf/domain_capabilities.c create mode 100644 src/conf/domain_capabilities.h create mode 100644 tests/domaincapsschemadata/domaincaps-basic.xml create mode 100644 tests/domaincapsschemadata/domaincaps-full.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_1.6.50-1.xml create mode 100755 tests/domaincapsschematest create mode 100644 tests/domaincapstest.c -- 1.8.5.5

3 26

[libvirt] [PATCH 00/12] OOM reporting cleanups
by Ján Tomko 03 Jul '14

03 Jul '14

Patches 1-3 don't touch any code 4-5 no functional change 6 introduces a new function 7-8 have no functional change unless virBuffer API is misused (that case resulted in an OOM error before, now it's an internal error) 9-10 add OOM error reporting to a few functions 11-12 remove double OOM error reporting Ján Tomko (12): Fix indentation in bridge driver More indentation fixes usb: Remove redundant comment Remove useless condition in networkRadvdConfContents Use virStringReplace instead of openvz_replace Introduce virBufferCheckError Report errors in virCapabilitiesFormatXML Use virBufferCheckError everywhere we report OOM error Set errno on OOM in lxcProcReadMeminfo Add OOM error reporting to a few fucntions Remove double OOM error reporting from JSON monitor Remove double OOM error reporting HACKING | 7 +- docs/hacking.html.in | 7 +- po/POTFILES.in | 1 + src/bhyve/bhyve_driver.c | 12 +-- src/conf/capabilities.c | 2 +- src/conf/cpu_conf.c | 6 +- src/conf/domain_conf.c | 17 +--- src/conf/interface_conf.c | 8 +- src/conf/network_conf.c | 12 +-- src/conf/node_device_conf.c | 9 +- src/conf/nwfilter_conf.c | 16 +--- src/conf/secret_conf.c | 6 +- src/conf/snapshot_conf.c | 5 +- src/conf/storage_conf.c | 18 ++-- src/cpu/cpu_map.c | 14 ++- src/cpu/cpu_x86.c | 5 +- src/esx/esx_driver.c | 20 +--- src/esx/esx_util.c | 12 +-- src/esx/esx_vi.c | 20 +--- src/esx/esx_vi_methods.c | 4 +- src/hyperv/hyperv_wmi.c | 4 +- src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 12 +-- src/locking/lock_driver_sanlock.c | 5 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 8 +- src/lxc/lxc_driver.c | 47 +++------- src/lxc/lxc_fuse.c | 4 +- src/network/bridge_driver.c | 105 ++++++++++----------- src/node_device/node_device_udev.c | 8 +- src/nwfilter/nwfilter_ebiptables_driver.c | 10 +- src/nwfilter/nwfilter_gentech_driver.c | 63 ++++++------- src/openvz/openvz_conf.c | 40 +------- src/parallels/parallels_driver.c | 3 +- src/phyp/phyp_driver.c | 16 +--- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 150 ++++++++---------------------- src/qemu/qemu_driver.c | 47 +++------- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_migration.c | 5 +- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor_json.c | 21 ++--- src/qemu/qemu_monitor_text.c | 9 +- src/rpc/virnetsocket.c | 4 +- src/rpc/virnetsshsession.c | 8 +- src/storage/storage_backend.c | 6 +- src/storage/storage_backend_rbd.c | 12 +-- src/test/test_driver.c | 3 +- src/uml/uml_conf.c | 4 +- src/uml/uml_driver.c | 3 +- src/util/virbuffer.c | 31 ++++++ src/util/virbuffer.h | 17 ++++ src/util/vircommand.c | 5 +- src/util/virconf.c | 10 +- src/util/virnetdevopenvswitch.c | 4 +- src/util/virstoragefile.c | 4 +- src/util/virstring.c | 8 +- src/util/virsysinfo.c | 4 +- src/util/virsystemd.c | 8 +- src/util/viruri.c | 7 +- src/util/virusb.c | 1 - src/vmx/vmx.c | 4 +- src/xen/xen_driver.c | 12 +-- src/xen/xen_hypervisor.c | 8 +- src/xen/xend_internal.c | 9 +- src/xenapi/xenapi_driver.c | 8 +- src/xenapi/xenapi_utils.c | 5 +- src/xenxs/xen_sxpr.c | 12 +-- src/xenxs/xen_xm.c | 17 +--- tests/domainsnapshotxml2xmltest.c | 4 +- tests/vircaps2xmltest.c | 4 +- 71 files changed, 328 insertions(+), 666 deletions(-) -- 1.8.5.5

2 15

Re: [libvirt] Fwd: [PATCH] qemu: Add cmd_per_lun, max_sectors to virtio-scsi
by Nicholas A. Bellinger 03 Jul '14

03 Jul '14

Hi Mike & Co, > ---------- Forwarded message ---------- > From: Mike Perez <thingee(a)gmail.com> > Date: Fri, Jun 27, 2014 at 7:39 PM > Subject: Re: [libvirt] [PATCH] qemu: Add cmd_per_lun, max_sectors to > virtio-scsi > To: Ján Tomko <jtomko(a)redhat.com> > Cc: Eric Blake <eblake(a)redhat.com>, libvir-list(a)redhat.com, > berrange(a)redhat.com, "Nab(a)daterainc.com" <Nab(a)daterainc.com> > > > On Thu, Jun 5, 2014 at 6:57 AM, Ján Tomko <jtomko(a)redhat.com> wrote: > > On 05/23/2014 12:06 AM, Eric Blake wrote: > >> On 05/22/2014 12:22 PM, Mike Perez wrote: > >>> This introduces two new attributes "cmd_per_lun" and "max_sectors" same > >>> with the names QEMU uses for virtio-scsi. An example of the XML: > >>> > >>> <controller type='scsi' index='0' model='virtio-scsi' cmd_per_lun='50' > >>> max_sectors='512'/> > >> > >> I'm not a fan of underscore (why type the shift key, when a dash will > >> do). The libvirt xml name does not have to exactly match the qemu > >> option name, so maybe there's some room for bikeshedding what names we > >> should actually present to the user. > >> > > > > > IMO using underscores here would be consistent with other disk-related options > > like read_iops_sec; dashes are mostly used for network-related options. > > > > We could also use camelCase [1], or just roll a dice. > > Well underscores are originally what I had in my first patch [1]. Eric > what do you think? > Can we please keep the libvirt names consistent for virtio-scsi parameters with what is already defined in qemu..? (Paolo CC'ed) >From qemu/include/hw/virtio/virtio-scsi.h: #define DEFINE_VIRTIO_SCSI_PROPERTIES(_state, _conf_field) \ DEFINE_PROP_UINT32("num_queues", _state, _conf_field.num_queues, 1), \ DEFINE_PROP_UINT32("max_sectors", _state, _conf_field.max_sectors, 0xFFFF),\ DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128) AFAICT, having different names between qemu + libvirt parameters can only add confusion. --nab

4 6

[libvirt] [PATCH v2] nwfilter: enum cleanups in "src/nwfilter/*"
by Julio Faracco 03 Jul '14

03 Jul '14

As we are doing with the enum structures, a cleanup in "src/nwfilter/" directory was done now. All the enums that were defined in the header files were converted to typedefs in this directory. This patch includes all the adjustments to remove conflicts when you do this kind of change. "Enum-to-typedef"'s conversions were made in "src/nwfilter/nwfilter_{gentech_driver, learnipaddr, tech_driver}.h". Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/nwfilter/nwfilter_gentech_driver.c | 12 ++++++------ src/nwfilter/nwfilter_gentech_driver.h | 4 ++-- src/nwfilter/nwfilter_learnipaddr.c | 8 ++++---- src/nwfilter/nwfilter_learnipaddr.h | 8 ++++---- src/nwfilter/nwfilter_tech_driver.h | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 5bed106..e267cf1 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -332,7 +332,7 @@ static int virNWFilterDefToInst(virNWFilterDriverStatePtr driver, virNWFilterDefPtr def, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + virInstCase useNewFilter, bool *foundNewFilter, virNWFilterInstPtr inst); @@ -374,7 +374,7 @@ static int virNWFilterIncludeDefToRuleInst(virNWFilterDriverStatePtr driver, virNWFilterIncludeDefPtr inc, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + virInstCase useNewFilter, bool *foundNewFilter, virNWFilterInstPtr inst) { @@ -464,7 +464,7 @@ static int virNWFilterDefToInst(virNWFilterDriverStatePtr driver, virNWFilterDefPtr def, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, + virInstCase useNewFilter, bool *foundNewFilter, virNWFilterInstPtr inst) { @@ -630,7 +630,7 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, int ifindex, const char *linkdev, virNWFilterHashTablePtr vars, - enum instCase useNewFilter, bool *foundNewFilter, + virInstCase useNewFilter, bool *foundNewFilter, bool teardownOld, const virMacAddr *macaddr, virNWFilterDriverStatePtr driver, @@ -782,7 +782,7 @@ __virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, const virMacAddr *macaddr, const char *filtername, virNWFilterHashTablePtr filterparams, - enum instCase useNewFilter, + virInstCase useNewFilter, bool forceWithPendingReq, bool *foundNewFilter) { @@ -896,7 +896,7 @@ _virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, const unsigned char *vmuuid, const virDomainNetDef *net, bool teardownOld, - enum instCase useNewFilter, + virInstCase useNewFilter, bool *foundNewFilter) { const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 8349ab4..4d14603 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -32,10 +32,10 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); -enum instCase { +typedef enum { INSTANTIATE_ALWAYS, INSTANTIATE_FOLLOW_NEWFILTER, -}; +} virInstCase; int virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 4cea9cf..ff73515 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -326,7 +326,7 @@ virNWFilterDeregisterLearnReq(int ifindex) static void procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len, uint32_t *vmaddr, uint32_t *bcastaddr, - enum howDetect *howDetected) + virHowDetect *howDetected) { struct dhcp_option *dhcpopt = &dhcp->options[0]; @@ -395,7 +395,7 @@ learnIPAddressThread(void *arg) char *filter = NULL; uint16_t etherType; bool showError = true; - enum howDetect howDetected = 0; + virHowDetect howDetected = 0; virNWFilterTechDriverPtr techdriver = req->techdriver; if (virNWFilterLockIface(req->ifname) < 0) @@ -683,7 +683,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *filtername, virNWFilterHashTablePtr filterparams, virNWFilterDriverStatePtr driver, - enum howDetect howDetect) + virHowDetect howDetect) { int rc; virNWFilterIPAddrLearnReqPtr req = NULL; @@ -771,7 +771,7 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUSED, const char *filtername ATTRIBUTE_UNUSED, virNWFilterHashTablePtr filterparams ATTRIBUTE_UNUSED, virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED, - enum howDetect howDetect ATTRIBUTE_UNUSED) + virHowDetect howdetect ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IP parameter must be given since libvirt " diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h index 1cc881a..19f8881 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -30,10 +30,10 @@ # include "nwfilter_tech_driver.h" # include <net/if.h> -enum howDetect { +typedef enum { DETECT_DHCP = 1, DETECT_STATIC = 2, -}; +} virHowDetect; typedef struct _virNWFilterIPAddrLearnReq virNWFilterIPAddrLearnReq; typedef virNWFilterIPAddrLearnReq *virNWFilterIPAddrLearnReqPtr; @@ -46,7 +46,7 @@ struct _virNWFilterIPAddrLearnReq { char *filtername; virNWFilterHashTablePtr filterparams; virNWFilterDriverStatePtr driver; - enum howDetect howDetect; + virHowDetect howDetect; int status; pthread_t thread; @@ -61,7 +61,7 @@ int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver, const char *filtername, virNWFilterHashTablePtr filterparams, virNWFilterDriverStatePtr driver, - enum howDetect howDetect); + virHowDetect howDetect); virNWFilterIPAddrLearnReqPtr virNWFilterLookupLearnReq(int ifindex); int virNWFilterTerminateLearnReq(const char *ifname); diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h index 7b6f56f..05d2561 100644 --- a/src/nwfilter/nwfilter_tech_driver.h +++ b/src/nwfilter/nwfilter_tech_driver.h @@ -70,13 +70,13 @@ typedef int (*virNWFilterRemoveBasicRules)(const char *ifname); typedef int (*virNWFilterDropAllRules)(const char *ifname); -enum techDrvFlags { +typedef enum { TECHDRV_FLAG_INITIALIZED = (1 << 0), -}; +} techDrvFlags; struct _virNWFilterTechDriver { const char *name; - enum techDrvFlags flags; + techDrvFlags flags; virNWFilterTechDrvInit init; virNWFilterTechDrvShutdown shutdown; -- 1.7.10.4

1 1

[libvirt] [PATCH] Delete changelog from RPM specfile
by Daniel P. Berrange 02 Jul '14

02 Jul '14

The RPM changelog is intended to provide information about changes to the packaging, but as used we're filling in psuedo release notes. As a result the Fedora RPM changelog for libvirt shares nothing in common with the upstream RPM changelog. The mingw RPM changelog meanwhile is empty which is more common for upstreams. Having the psuedo release notes in the upstream spec makes life marginally more tedious when rebasing Fedora, since it shows up as a massive diff when comparing. Since the upstream changelog doesn't really serve the intended purpose just remove it. We already ship the full ChangeLog and NEWS files in the RPM itself which provide more useful info. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 689 -------------------------------------------------------- 1 file changed, 689 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8b9a1f8..635e81c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2236,692 +2236,3 @@ exit 0 %doc examples/systemtap %changelog -* Wed Jul 2 2014 Daniel Veillard <veillard(a)redhat.com> - 1.2.6-1 -- libxl: add migration support and fixes -- various improvements and fixes for NUMA -- many improvements and bug fixes - -* Mon Jun 2 2014 Daniel Veillard <veillard(a)redhat.com> - 1.2.5-1 -- LSN-2014-0003: Don't expand entities when parsing XML (security) -- Introduce virDomain{Get,Set}Time APIs -- Introduce virDomainFSFreeze() and virDomainFSThaw() public API -- various improvements and bug fixes - -* Sun May 4 2014 Daniel Veillard <veillard(a)redhat.com> - 1.2.4-1 -- various improvements and bug fixes -- lot of internal code refactoring - -* Tue Apr 1 2014 Daniel Veillard <veillard(a)redhat.com> - 1.2.3-1 -- add new virDomainCoreDumpWithFormat API -- conf: Introduce virDomainDeviceGetInfo API -- more features and fixes on bhyve driver -- lot of cleanups and improvement on the Xen driver -- a lot of various improvements and bug fixes - -* Sun Mar 2 2014 Daniel Veillard <veillard(a)redhat.com> - 1.2.2-1 -- add LXC from native conversion tool -- vbox: add support for v4.2.20+ and v4.3.4+ -- Introduce Libvirt Wireshark dissector -- Fix CVE-2013-6456: Avoid unsafe use of /proc/$PID/root in LXC -- a lot of various improvements and bug fixes - -* Thu Jan 16 2014 Daniel Veillard <veillard(a)redhat.com> - 1.2.1-1 -- Fix s CVE-2014-0028 event: filter global events by domain:getattr ACL -- Fix CVE-2014-1447 Don't crash if a connection closes early -- Fix CVE-2013-6458-1 qemu: Do not access stale data in virDomainBlockStats -- Fix CVE-2013-6457 libxl: avoid crashing if calling `virsh numatune' on inactive domain -- Fix CVE-2013-6436: fix crash in lxcDomainGetMemoryParameters -- many doc and bug fixes and improvements - -* Mon Dec 2 2013 Daniel Veillard <veillard(a)redhat.com> - 1.2.0-1 -- Separation of python binding as libvirt-python srpm -- Add support for gluster pool -- vbox: add support for 4.3 APIs -- a number of doc, bug fixes and various improvements - -* Mon Nov 4 2013 Daniel Veillard <veillard(a)redhat.com> - 1.1.4-1 -- Add support for AArch64 architecture -- Various improvements on test code and test driver -- 4 security bug fixes -- a lot of bug fixes and various improvements - -* Tue Oct 1 2013 Daniel Veillard <veillard(a)redhat.com> - 1.1.3-1 -- VMware: Initial VMware Fusion support and various improvements -- libvirt: add new public API virConnectGetCPUModelNames -- various libxl driver improvements -- LXC many container driver improvement -- ARM cpu improvements -- 3 security bug fixes -- a lot of bug and leak fixes and various improvements - -* Mon Sep 2 2013 Daniel Veillard <veillard(a)redhat.com> - 1.1.2-1 -- various improvements to libxl driver -- systemd integration improvements -- Add flag to BaselineCPU API to return detailed CPU features -- Introduce a virt-login-shell binary -- conf: add startupPolicy attribute for harddisk -- various bug fixes and improvements including localizations - -* Tue Jul 30 2013 Daniel Veillard <veillard(a)redhat.com> - 1.1.1-1 -- Adding device removal or deletion events -- Introduce new domain create APIs to pass pre-opened FDs to LXC -- Add interface versions for Xen 4.3 -- Add new public API virDomainSetMemoryStatsPeriod -- Various LXC improvements -- various bug fixes and improvements including localizations - -* Mon Jul 1 2013 Daniel Veillard <veillard(a)redhat.com> - 1.1.0-1 -- CVE-2013-2218: Fix crash listing network interfaces with filters -- Fine grained ACL support for the API -- Extensible migration APIs -- various improvements in the Xen driver -- agent based vCPU hotplug support -- various bug fixes and improvements including localizations - -* Mon Jun 3 2013 Daniel Veillard <veillard(a)redhat.com> - 1.0.6-1 -- Move VirtualBox driver into libvirtd -- Support for static routes on a virtual bridge -- Various improvement for hostdev SCSI support -- Switch to VIR_STRDUP and VIR_STRNDUP -- Various cleanups and improvement in Xen and LXC drivers -- various bug fixes and improvements including localizations - -* Thu May 2 2013 Daniel Veillard <veillard(a)redhat.com> - 1.0.5-1 -- add support for NVRAM device -- Add XML config for resource partitions -- Add support for TPM -- NPIV storage migration support -- various bug fixes and improvements including localizations - -* Mon Apr 1 2013 Daniel Veillard <veillard(a)redhat.com> - 1.0.4-1 -- qemu: support passthrough for iscsi disks -- various S390 improvements -- various LXC bugs fixes and improvements -- Add API for thread cancellation -- various bug fixes and improvements - -* Tue Mar 5 2013 Daniel Veillard <veillard(a)redhat.com> - 1.0.3-1 -- Introduce virDomainMigrate*CompressionCache APIs -- Introduce virDomainGetJobStats API -- Add basic support for VDI images -- Introduce API virNodeDeviceLookupSCSIHostByWWN -- Various locking improvements -- a lot of bug fixes and overall improvements - -* Wed Jan 30 2013 Daniel Veillard <veillard(a)redhat.com> - 1.0.2-1 -- LXC improvements -- S390 architecture improvement -- Power architecture improvement -- large Coverity report cleanups and associated bug fixes -- virTypedParams* APIs to helps with those data structures -- a lot of bug fixes and overall improvements - -* Fri Nov 2 2012 Daniel Veillard <veillard(a)redhat.com> - 1.0.0-1 -- virNodeGetCPUMap: Define public API -- Add systemd journal support -- Add a qemu capabilities cache manager -- USB migration support -- various improvement and fixes when using QMP QEmu interface -- Support for Xen 4.2 -- Lot of localization enhancements -- a lot of bug fixes, improvements and portability work - -* Mon Sep 24 2012 Daniel Veillard <veillard(a)redhat.com> - 0.10.2-1 -- network: define new API virNetworkUpdate -- add support for QEmu sandbox support -- blockjob: add virDomainBlockCommit -- New APIs to get/set Node memory parameters -- new API virConnectListAllSecrets -- new API virConnectListAllNWFilters -- new API virConnectListAllNodeDevices -- parallels: add support of containers to the driver -- new API virConnectListAllInterfaces -- new API virConnectListAllNetworks -- new API virStoragePoolListAllVolumes -- Add PMSUSPENDED life cycle event -- new API virStorageListAllStoragePools -- Add per-guest S3/S4 state configuration -- qemu: Support for Block Device IO Limits -- a lot of bug fixes, improvements and portability work - -* Fri Aug 31 2012 Daniel Veillard <veillard(a)redhat.com> - 0.10.1-1 -- bugfixes and a brown paper bag - -* Wed Aug 29 2012 Daniel Veillard <veillard(a)redhat.com> - 0.10.0-1 -- agent: add qemuAgentArbitraryCommand() for general qemu agent command -- Introduce virDomainPinEmulator and virDomainGetEmulatorPinInfo functions -- network: use firewalld instead of iptables, when available -- network: make network driver vlan-aware -- esx: Implement network driver -- driver for parallels hypervisor -- Various LXC improvements -- Add virDomainGetHostname -- a lot of bug fixes, improvements and portability work - -* Mon Jul 2 2012 Daniel Veillard <veillard(a)redhat.com> - 0.9.13-1 -- S390: support for s390(x) -- snapshot: implement new APIs for esx and vbox -- snapshot: new query APIs and many improvements -- virsh: Allow users to reedit rejected XML -- nwfilter: add DHCP snooping -- Enable driver modules in libvirt RPM -- Default to enable driver modules for libvirtd -- storage backend: Add RBD (RADOS Block Device) support -- sVirt support for LXC domains inprovement -- a lot of bug fixes, improvements and portability work - -* Mon May 14 2012 Daniel Veillard <veillard(a)redhat.com> - 0.9.12-1 -- qemu: allow snapshotting of sheepdog and rbd disks -- blockjob: add new APIs -- a lot of bug fixes, improvements and portability work - -* Tue Apr 3 2012 Daniel Veillard <veillard(a)redhat.com> - 0.9.11-1 -- Add support for the suspend event -- Add support for event tray moved of removable disks -- qemu: Support numad -- cpustats: API, improvements and qemu support -- qemu: support type='hostdev' network devices at domain start -- Introduce virDomainPMWakeup API -- network: support Open vSwitch -- a number of snapshot improvements -- many improvements and bug fixes - -* Mon Feb 13 2012 Daniel Veillard <veillard(a)redhat.com> - 0.9.10-1 -- Add support for sVirt in the LXC driver -- block rebase: add new API virDomainBlockRebase -- API: Add api to set and get domain metadata -- virDomainGetDiskErrors public API -- conf: add rawio attribute to disk element of domain XML -- Add new public API virDomainGetCPUStats() -- Introduce virDomainPMSuspendForDuration API -- resize: add virStorageVolResize() API -- Add a virt-host-validate command to sanity check HV config -- Add new virDomainShutdownFlags API -- QEMU guest agent support -- many improvements and bug fixes - -* Sat Jan 7 2012 Daniel Veillard <veillard(a)redhat.com> - 0.9.9-1 -- Add API virDomain{S,G}etInterfaceParameters -- Add API virDomain{G, S}etNumaParameters -- Add support for ppc64 qemu -- Support Xen domctl v8 -- many improvements and bug fixes - -* Thu Dec 8 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.8-1 -- Add support for QEMU 1.0 -- Add preliminary PPC cpu driver -- Add new API virDomain{Set, Get}BlockIoTune -- block_resize: Define the new API -- Add a public API to invoke suspend/resume on the host -- various improvements for LXC containers -- Define keepalive protocol and add virConnectIsAlive API -- Add support for STP and VLAN filtering -- many improvements and bug fixes - -* Tue Nov 8 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.7-1 -- esx: support vSphere 5.x -- vbox: support for VirtualBox 4.1 -- Introduce the virDomainOpenGraphics API -- Add AHCI support to qemu driver -- snapshot: many improvements and 2 new APIs -- api: Add public api for 'reset' -- many improvements and bug fixes - -* Thu Sep 22 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.6-1 -- Fix the qemu reboot bug and a few others bug fixes - -* Tue Sep 20 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.5-1 -- many snapshot improvements (Eric Blake) -- latency: Define new public API and structure (Osier Yang) -- USB2 and various USB improvements (Marc-Andr�� Lureau) -- storage: Add fs pool formatting (Osier Yang) -- Add public API for getting migration speed (Jim Fehlig) -- Add basic driver for Microsoft Hyper-V (Matthias Bolte) -- many improvements and bug fixes - -* Wed Aug 3 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.4-1 -- network bandwidth QoS control -- Add new API virDomainBlockPull* -- save: new API to manipulate save file images -- CPU bandwidth limits support -- allow to send NMI and key event to guests -- new API virDomainUndefineFlags -- Implement code to attach to external QEMU instances -- bios: Add support for SGA -- various missing python binding -- many improvements and bug fixes - -* Mon Jul 4 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.3-1 -- new API virDomainGetVcpupinInfo -- Add TXT record support for virtual DNS service -- Support reboots with the QEMU driver -- New API virDomainGetControlInfo API -- New API virNodeGetMemoryStats -- New API virNodeGetCPUTime -- New API for send-key -- New API virDomainPinVcpuFlags -- support multifunction PCI device -- lxc: various improvements -- many improvements and bug fixes - -* Mon Jun 6 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.2-1 -- Framework for lock manager plugins -- API for network config change transactions -- flags for setting memory parameters -- virDomainGetState public API -- qemu: allow blkstat/blkinfo calls during migration -- Introduce migration v3 API -- Defining the Screenshot public API -- public API for NMI injection -- Various improvements and bug fixes - -* Thu May 5 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.1-1 -- support various persistent domain updates -- improvements on memory APIs -- Add virDomainEventRebootNew -- various improvements to libxl driver -- Spice: support audio, images and stream compression -- Various improvements and bug fixes - -* Mon Apr 4 2011 Daniel Veillard <veillard(a)redhat.com> - 0.9.0-1 -- Support cputune cpu usage tuning -- Add public APIs for storage volume upload/download -- Add public API for setting migration speed on the fly -- Add libxenlight driver -- qemu: support migration to fd -- libvirt: add virDomain{Get,Set}BlkioParameters -- setmem: introduce a new libvirt API (virDomainSetMemoryFlags) -- Expose event loop implementation as a public API -- Dump the debug buffer to libvirtd.log on fatal signal -- Audit support -- Various improvements and bug fixes - -* Thu Feb 17 2011 Daniel Veillard <veillard(a)redhat.com> - 0.8.8-1 -- expose new API for sysinfo extraction -- cgroup blkio weight support -- smartcard device support -- qemu: Support per-device boot ordering -- Various improvements and bug fixes - -* Tue Jan 4 2011 Daniel Veillard <veillard(a)redhat.com> - 0.8.7-1 -- Preliminary support for VirtualBox 4.0 -- IPv6 support -- Add VMware Workstation and Player driver driver -- Add network disk support -- Various improvements and bug fixes - -* Tue Nov 30 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.6-1 -- Add support for iSCSI target auto-discovery -- QED: Basic support for QED images -- remote console support -- support for SPICE graphics -- sysinfo and VMBIOS support -- virsh qemu-monitor-command -- various improvements and bug fixes - -* Fri Oct 29 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.5-1 -- Enable JSON and netdev features in QEMU >= 0.13 -- framework for auditing integration -- framework DTrace/SystemTap integration -- Setting the number of vcpu at boot -- Enable support for nested SVM -- Virtio plan9fs filesystem QEMU -- Memory parameter controls -- various improvements and bug fixes - -* Fri Sep 10 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.4-1 -- big improvements to UML driver -- various improvements and bug fixes - -* Wed Aug 4 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.3-1 -- esx: Support vSphere 4.1 -- Qemu arbitrary monitor commands -- Qemu Monitor API entry point -- various improvements and bug fixes - -* Mon Jul 5 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.2-1 -- phyp: adding support for IVM -- libvirt: introduce domainCreateWithFlags API -- add 802.1Qbh and 802.1Qbg switches handling -- Support for VirtualBox version 3.2 -- Init script for handling guests on shutdown/boot -- qemu: live migration with non-shared storage for kvm - -* Fri Apr 30 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.1-1 -- Starts dnsmasq from libvirtd with --dhcp-hostsfile -- Add virDomainGetBlockInfo API to query disk sizing -- a lot of bug fixes and cleanups - -* Mon Apr 12 2010 Daniel Veillard <veillard(a)redhat.com> - 0.8.0-1 -- Snapshotting support (QEmu/VBox/ESX) -- Network filtering API -- XenAPI driver -- new APIs for domain events -- Libvirt managed save API -- timer subselection for domain clock -- synchronous hooks -- API to update guest CPU to host CPU -- virDomainUpdateDeviceFlags new API -- migrate max downtime API -- volume wiping API -- and many bug fixes - -* Fri Mar 5 2010 Daniel Veillard <veillard(a)redhat.com> - 0.7.7-1 -- macvtap support -- async job handling -- virtio channel -- computing baseline CPU -- virDomain{Attach,Detach}DeviceFlags -- assorted bug fixes and lots of cleanups - -* Wed Feb 3 2010 Daniel Veillard <veillard(a)redhat.com> - 0.7.6-1 - -* Wed Dec 23 2009 Daniel Veillard <veillard(a)redhat.com> - 0.7.5-1 -- Add new API virDomainMemoryStats -- Public API and domain extension for CPU flags -- vbox: Add support for version 3.1 -- Support QEMU's virtual FAT block device driver -- a lot of fixes - -* Fri Nov 20 2009 Daniel Veillard <veillard(a)redhat.com> - 0.7.3-1 -- udev node device backend -- API to check object properties -- better QEmu monitor processing -- MAC address based port filtering for qemu -- support IPv6 and multiple addresses per interfaces -- a lot of fixes - -* Tue Sep 15 2009 Daniel Veillard <veillard(a)redhat.com> - 0.7.1-1 -- ESX, VBox driver updates -- mutipath support -- support for encrypted (qcow) volume -- compressed save image format for Qemu/KVM -- QEmu host PCI device hotplug support -- configuration of huge pages in guests -- a lot of fixes - -* Wed Aug 5 2009 Daniel Veillard <veillard(a)redhat.com> - 0.7.0-1 -- ESX, VBox3, Power Hypervisor drivers -- new net filesystem glusterfs -- Storage cloning for LVM and Disk backends -- interface implementation based on netcf -- Support cgroups in QEMU driver -- QEmu hotplug NIC support -- a lot of fixes - -* Fri Jul 3 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.5-1 -- release of 0.6.5 - -* Fri May 29 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.4-1 -- release of 0.6.4 -- various new APIs - -* Fri Apr 24 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.3-1 -- release of 0.6.3 -- VirtualBox driver - -* Fri Apr 3 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.2-1 -- release of 0.6.2 - -* Wed Mar 4 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.1-1 -- release of 0.6.1 - -* Sat Jan 31 2009 Daniel Veillard <veillard(a)redhat.com> - 0.6.0-1 -- release of 0.6.0 - -* Tue Nov 25 2008 Daniel Veillard <veillard(a)redhat.com> - 0.5.0-1 -- release of 0.5.0 - -* Tue Sep 23 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.6-1 -- release of 0.4.6 - -* Mon Sep 8 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.5-1 -- release of 0.4.5 - -* Wed Jun 25 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.4-1 -- release of 0.4.4 -- mostly a few bug fixes from 0.4.3 - -* Thu Jun 12 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.3-1 -- release of 0.4.3 -- lots of bug fixes and small improvements - -* Tue Apr 8 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.2-1 -- release of 0.4.2 -- lots of bug fixes and small improvements - -* Mon Mar 3 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.1-1 -- Release of 0.4.1 -- Storage APIs -- xenner support -- lots of assorted improvements, bugfixes and cleanups -- documentation and localization improvements - -* Tue Dec 18 2007 Daniel Veillard <veillard(a)redhat.com> - 0.4.0-1 -- Release of 0.4.0 -- SASL based authentication -- PolicyKit authentication -- improved NUMA and statistics support -- lots of assorted improvements, bugfixes and cleanups -- documentation and localization improvements - -* Sun Sep 30 2007 Daniel Veillard <veillard(a)redhat.com> - 0.3.3-1 -- Release of 0.3.3 -- Avahi support -- NUMA support -- lots of assorted improvements, bugfixes and cleanups -- documentation and localization improvements - -* Tue Aug 21 2007 Daniel Veillard <veillard(a)redhat.com> - 0.3.2-1 -- Release of 0.3.2 -- API for domains migration -- APIs for collecting statistics on disks and interfaces -- lots of assorted bugfixes and cleanups -- documentation and localization improvements - -* Tue Jul 24 2007 Daniel Veillard <veillard(a)redhat.com> - 0.3.1-1 -- Release of 0.3.1 -- localtime clock support -- PS/2 and USB input devices -- lots of assorted bugfixes and cleanups -- documentation and localization improvements - -* Mon Jul 9 2007 Daniel Veillard <veillard(a)redhat.com> - 0.3.0-1 -- Release of 0.3.0 -- Secure remote access support -- unification of daemons -- lots of assorted bugfixes and cleanups -- documentation and localization improvements - -* Fri Jun 8 2007 Daniel Veillard <veillard(a)redhat.com> - 0.2.3-1 -- Release of 0.2.3 -- lot of assorted bugfixes and cleanups -- support for Xen-3.1 -- new scheduler API - -* Tue Apr 17 2007 Daniel Veillard <veillard(a)redhat.com> - 0.2.2-1 -- Release of 0.2.2 -- lot of assorted bugfixes and cleanups -- preparing for Xen-3.0.5 - -* Thu Mar 22 2007 Jeremy Katz <katzj(a)redhat.com> - 0.2.1-2.fc7 -- don't require xen; we don't need the daemon and can control non-xen now -- fix scriptlet error (need to own more directories) -- update description text - -* Fri Mar 16 2007 Daniel Veillard <veillard(a)redhat.com> - 0.2.1-1 -- Release of 0.2.1 -- lot of bug and portability fixes -- Add support for network autostart and init scripts -- New API to detect the virtualization capabilities of a host -- Documentation updates - -* Fri Feb 23 2007 Daniel P. Berrange <berrange(a)redhat.com> - 0.2.0-4.fc7 -- Fix loading of guest & network configs - -* Fri Feb 16 2007 Daniel P. Berrange <berrange(a)redhat.com> - 0.2.0-3.fc7 -- Disable kqemu support since its not in Fedora qemu binary -- Fix for -vnc arg syntax change in 0.9.0 QEMU - -* Thu Feb 15 2007 Daniel P. Berrange <berrange(a)redhat.com> - 0.2.0-2.fc7 -- Fixed path to qemu daemon for autostart -- Fixed generation of <features> block in XML -- Pre-create config directory at startup - -* Wed Feb 14 2007 Daniel Veillard <veillard(a)redhat.com> 0.2.0-1.fc7 -- support for KVM and QEmu -- support for network configuration -- assorted fixes - -* Mon Jan 22 2007 Daniel Veillard <veillard(a)redhat.com> 0.1.11-1.fc7 -- finish inactive Xen domains support -- memory leak fix -- RelaxNG schemas for XML configs - -* Wed Dec 20 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.10-1.fc7 -- support for inactive Xen domains -- improved support for Xen display and vnc -- a few bug fixes -- localization updates - -* Thu Dec 7 2006 Jeremy Katz <katzj(a)redhat.com> - 0.1.9-2 -- rebuild against python 2.5 - -* Wed Nov 29 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.9-1 -- better error reporting -- python bindings fixes and extensions -- add support for shareable drives -- add support for non-bridge style networking -- hot plug device support -- added support for inactive domains -- API to dump core of domains -- various bug fixes, cleanups and improvements -- updated the localization - -* Tue Nov 7 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-3 -- it's pkgconfig not pgkconfig ! - -* Mon Nov 6 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-2 -- fixing spec file, added %%dist, -devel requires pkgconfig and xen-devel -- Resolves: rhbz#202320 - -* Mon Oct 16 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.8-1 -- fix missing page size detection code for ia64 -- fix mlock size when getting domain info list from hypervisor -- vcpu number initialization -- don't label crashed domains as shut off -- fix virsh man page -- blktapdd support for alternate drivers like blktap -- memory leak fixes (xend interface and XML parsing) -- compile fix -- mlock/munlock size fixes - -* Fri Sep 22 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.7-1 -- Fix bug when running against xen-3.0.3 hypercalls -- Fix memory bug when getting vcpus info from xend - -* Fri Sep 22 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.6-1 -- Support for localization -- Support for new Xen-3.0.3 cdrom and disk configuration -- Support for setting VNC port -- Fix bug when running against xen-3.0.2 hypercalls -- Fix reconnection problem when talking directly to http xend - -* Tue Sep 5 2006 Jeremy Katz <katzj(a)redhat.com> - 0.1.5-3 -- patch from danpb to support new-format cd devices for HVM guests - -* Tue Sep 5 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.5-2 -- reactivating ia64 support - -* Tue Sep 5 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.5-1 -- new release -- bug fixes -- support for new hypervisor calls -- early code for config files and defined domains - -* Mon Sep 4 2006 Daniel Berrange <berrange(a)redhat.com> - 0.1.4-5 -- add patch to address dom0_ops API breakage in Xen 3.0.3 tree - -* Mon Aug 28 2006 Jeremy Katz <katzj(a)redhat.com> - 0.1.4-4 -- add patch to support paravirt framebuffer in Xen - -* Mon Aug 21 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.4-3 -- another patch to fix network handling in non-HVM guests - -* Thu Aug 17 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.4-2 -- patch to fix virParseUUID() - -* Wed Aug 16 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.4-1 -- vCPUs and affinity support -- more complete XML, console and boot options -- specific features support -- enforced read-only connections -- various improvements, bug fixes - -* Wed Aug 2 2006 Jeremy Katz <katzj(a)redhat.com> - 0.1.3-6 -- add patch from pvetere to allow getting uuid from libvirt - -* Wed Aug 2 2006 Jeremy Katz <katzj(a)redhat.com> - 0.1.3-5 -- build on ia64 now - -* Thu Jul 27 2006 Jeremy Katz <katzj(a)redhat.com> - 0.1.3-4 -- don't BR xen, we just need xen-devel - -* Thu Jul 27 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.3-3 -- need rebuild since libxenstore is now versionned - -* Mon Jul 24 2006 Mark McLoughlin <markmc(a)redhat.com> - 0.1.3-2 -- Add BuildRequires: xen-devel - -* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0.1.3-1.1 -- rebuild - -* Tue Jul 11 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.3-1 -- support for HVM Xen guests -- various bugfixes - -* Mon Jul 3 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.2-1 -- added a proxy mechanism for read only access using httpu -- fixed header includes paths - -* Wed Jun 21 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.1-1 -- extend and cleanup the driver infrastructure and code -- python examples -- extend uuid support -- bug fixes, buffer handling cleanups -- support for new Xen hypervisor API -- test driver for unit testing -- virsh --conect argument - -* Mon Apr 10 2006 Daniel Veillard <veillard(a)redhat.com> 0.1.0-1 -- various fixes -- new APIs: for Node information and Reboot -- virsh improvements and extensions -- documentation updates and man page -- enhancement and fixes of the XML description format - -* Tue Feb 28 2006 Daniel Veillard <veillard(a)redhat.com> 0.0.6-1 -- added error handling APIs -- small bug fixes -- improve python bindings -- augment documentation and regression tests - -* Thu Feb 23 2006 Daniel Veillard <veillard(a)redhat.com> 0.0.5-1 -- new domain creation API -- new UUID based APIs -- more tests, documentation, devhelp -- bug fixes - -* Fri Feb 10 2006 Daniel Veillard <veillard(a)redhat.com> 0.0.4-1 -- fixes some problems in 0.0.3 due to the change of names - -* Wed Feb 8 2006 Daniel Veillard <veillard(a)redhat.com> 0.0.3-1 -- changed library name to libvirt from libvir, complete and test the python - bindings - -* Sun Jan 29 2006 Daniel Veillard <veillard(a)redhat.com> 0.0.2-1 -- upstream release of 0.0.2, use xend, save and restore added, python bindings - fixed - -* Wed Nov 2 2005 Daniel Veillard <veillard(a)redhat.com> 0.0.1-1 -- created -- 1.9.3

2 1

[libvirt] [PATCH] qemu_domain: fix startup policy for disks
by Pavel Hrdina 02 Jul '14

02 Jul '14

https://bugzilla.redhat.com/show_bug.cgi?id=1086121 We now support startupPolicy='optional' for disks, but this should work only for cold boot, not for restore or migrate. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9e38d02..a8cce76 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2230,11 +2230,16 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, { char uuid[VIR_UUID_STRING_BUFLEN]; int startupPolicy = vm->def->disks[diskIndex]->startupPolicy; + int device = vm->def->disks[diskIndex]->device; virUUIDFormat(vm->def->uuid, uuid); switch ((virDomainStartupPolicy) startupPolicy) { case VIR_DOMAIN_STARTUP_POLICY_OPTIONAL: + if (!cold_boot && + device != VIR_DOMAIN_DISK_DEVICE_FLOPPY && + device != VIR_DOMAIN_DISK_DEVICE_CDROM) + goto error; break; case VIR_DOMAIN_STARTUP_POLICY_MANDATORY: -- 1.8.5.5

2 2

[libvirt] [PATCHv4 0/4] vbox: Rewrite vbox driver.
by Taowei 02 Jul '14

02 Jul '14

Use vboxUniformedAPI to rewrite vbox driver. vboxInitialize and vboxDomainSave are rewrited in this way. Taowei (4): add definitions for vboxUniformedAPI implement vboxUniformedAPI in vbox_tmpl.c use vboxUniformedAPI to generate common code install vboxUniformedAPI po/POTFILES.in | 1 + src/Makefile.am | 4 +- src/vbox/vbox_common.c | 150 +++++++++++++++ src/vbox/vbox_common.h | 151 +++++++++++++++ src/vbox/vbox_driver.c | 35 +++- src/vbox/vbox_tmpl.c | 419 ++++++++++++++++++++++++----------------- src/vbox/vbox_uniformed_api.h | 168 +++++++++++++++++ 7 files changed, 749 insertions(+), 179 deletions(-) create mode 100644 src/vbox/vbox_common.c create mode 100644 src/vbox/vbox_common.h create mode 100644 src/vbox/vbox_uniformed_api.h -- 1.7.9.5

3 12

Re: [libvirt] [Qemu-devel] [PATCH for 2.1] vfio: use correct runstate
by Eric Blake 02 Jul '14

02 Jul '14

[adding libvirt] On 06/27/2014 11:51 AM, Paolo Bonzini wrote: > ----- Messaggio originale ----- >> Da: "Alex Williamson" <alex.williamson(a)redhat.com> >> A: "Paolo Bonzini" <pbonzini(a)redhat.com> >> Cc: qemu-devel(a)nongnu.org, qemu-trivial(a)nongnu.org >> Inviato: Venerdì, 27 giugno 2014 18:34:59 >> Oggetto: Re: [PATCH for 2.1] vfio: use correct runstate >> >> On Fri, 2014-06-27 at 16:32 +0200, Paolo Bonzini wrote: >>> io-error is for block device errors; it should always be preceded >>> by a BLOCK_IO_ERROR event. >> >> Where does this requirement come from? I only see a loose association >> of IO_ERROR to disk in libvirt and none in QEMU. > > See the RunState enum in qapi-schema.json: > > ## > # @RunState > # > # An enumeration of VM run states. > # > # ... > # > # @internal-error: An internal error that prevents further guest execution > # has occurred > # > # @io-error: the last IOP has failed and the device is configured to pause > # on I/O errors > # > # @paused: guest has been paused via the 'stop' command > > The point of io-error is that management can look at block devices, see if > any have an error reported, and then resume execution (see documentation of > rerror=stop and werror=stop/enospc). This is counter to the intentions you > have in vfio. > >>> I think vfio wants to use >>> RUN_STATE_INTERNAL_ERROR instead. >> >> But that seems to put us into an "unknown" paused state in libvirt. > > I think paused is incorrect, because (unlike RUN_STATE_IO_ERROR), you cannot > resume from RUN_STATE_INTERNAL_ERROR except with a reset. QEMU enforces that, > and this matches the error you are reporting: > > error_report("%s(%04x:%02x:%02x.%x) Unrecoverable error detected. " > "Please collect any data possible and then kill the guest", > __func__, vdev->host.domain, vdev->host.bus, > vdev->host.slot, vdev->host.function); > > libvirt has a crashed state, I think that's what libvirt should call the > internal-error runstate. IIRC on Xen you get to crashed when the processor > raises an error on vmentry, for example. > > Libvirt only knows about crashed/unknown, but one could add crashed/internal-error > too. Yes, we probably need to teach libvirt about this state. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] LXC: update comments of lxcDomainCreateXMLWithFiles() and lxcDomainCreateXML()
by Wang Rui 02 Jul '14

02 Jul '14

From: Yue wenyuan <yuewenyuan(a)huawei.com> The comments for lxcDomainCreateXMLWithFiles are out of date. So update them. And add comments for lxcDomainCreateXML Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> Signed-off-by: Yue wenyuan <yuewenyuan(a)huawei.com> --- src/lxc/lxc_driver.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 06f3e18..11bfb80 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1122,14 +1122,16 @@ static int lxcDomainCreateWithFlags(virDomainPtr dom, } /** - * lxcDomainCreateXML: + * lxcDomainCreateXMLWithFiles: * @conn: pointer to connection + * @nfiles: number of file descriptors passed + * @files: list of file descriptors passed * @xml: XML definition of domain * @flags: Must be 0 for now * * Creates a domain based on xml and starts it * - * Returns 0 on success or -1 in case of error + * Returns a new domain object or NULL in case of failure. */ static virDomainPtr lxcDomainCreateXMLWithFiles(virConnectPtr conn, @@ -1209,7 +1211,16 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, return dom; } - +/** + * lxcDomainCreateXML: + * @conn: pointer to connection + * @xml: XML definition of domain + * @flags: Must be 0 for now + * + * Creates a domain based on xml and starts it + * + * Returns a new domain object or NULL in case of failure. + */ static virDomainPtr lxcDomainCreateXML(virConnectPtr conn, const char *xml, -- 1.7.12.4

2 2

[libvirt] [PATCH] virsh: Allow attach-disk to specify disk target bus
by Yanbing Du 02 Jul '14

02 Jul '14

From: Yanbing Du <ydu(a)ydu-0.nay.redhat.com> By default, the bus type is inferred from the style of the device name('target' in this command), e.g. a device named 'sda' will typically be exported using a SCSI bus. Actually, not only SCSI bus, but USB/SATA bus also use this kind of device name. So add '--bus' option for attach-disk command to allow user specify the target bus. Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 14 ++++++++++++-- tools/virsh.pod | 9 +++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f55dae4..4488250 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -277,6 +277,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .flags = VSH_OFLAG_REQ, .help = N_("target of disk device") }, + {.name = "bus", + .type = VSH_OT_STRING, + .help = N_("target bus of disk device") + }, {.name = "driver", .type = VSH_OT_STRING, .help = N_("driver of disk device") @@ -502,7 +506,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) const char *source = NULL, *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, *mode = NULL, *cache = NULL, *serial = NULL, *straddr = NULL, - *wwn = NULL; + *wwn = NULL, *targetbus = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -536,6 +540,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || + vshCommandOptStringReq(ctl, cmd, "bus", &targetbus) < 0 || vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) goto cleanup; @@ -590,7 +595,12 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (source) virBufferAsprintf(&buf, "<source %s='%s'/>\n", isFile ? "file" : "dev", source); - virBufferAsprintf(&buf, "<target dev='%s'/>\n", target); + virBufferAsprintf(&buf, "<target dev='%s'", target); + if (targetbus) { + virBufferAsprintf(&buf, " bus='%s'", targetbus); + } + virBufferAddLit(&buf, "/>\n"); + if (mode) virBufferAsprintf(&buf, "<%s/>\n", mode); diff --git a/tools/virsh.pod b/tools/virsh.pod index b248c9a..3550825 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2091,7 +2091,7 @@ expected. =item B<attach-disk> I<domain> I<source> I<target> [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] -[I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] +[I<--bus>] [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--sourcetype sourcetype>] [I<--serial serial>] [I<--wwn wwn>] [I<--rawio>] [I<--address address>] [I<--multifunction>] [I<--print-xml>] @@ -2099,7 +2099,12 @@ expected. Attach a new disk device to the domain. I<source> is path for the files and devices. I<target> controls the bus or device under which the disk is exposed to the guest OS. It indicates the -"logical" device name. I<driver> can be I<file>, I<tap> or I<phy> for the Xen +"logical" device name; the optional I<bus> attribute specifies the type of +disk device to emulate; possible values are driver specific, with typical +values being I<ide>, I<scsi>, I<virtio>, I<xen>, I<usb>, I<sata>, or I<sd>, +if omitted, the bus type is inferred from the style of the device name (e.g. +a device named 'sda' will typically be exported using a SCSI bus). +I<driver> can be I<file>, I<tap> or I<phy> for the Xen hypervisor depending on the kind of access; or I<qemu> for the QEMU emulator. Further details to the driver can be passed using I<subdriver>. For Xen I<subdriver> can be I<aio>, while for QEMU subdriver should match the format -- 1.9.3

2 1

[libvirt] [PATCH] libxl: don't break the build on Xen>=4.5 because of libxl_vcpu_setaffinity()
by Dario Faggioli 02 Jul '14

02 Jul '14

libxl interface for vcpu pinning is changing in Xen 4.5. Basically, libxl_set_vcpuaffinity() now wants one more parameter. That is representative of 'VCPU soft affinity', which libvirt does not use. To mark such change, the macro LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY is defined. Use it as a gate and, if present, re-#define the calls from the old to the new interface, to avoid breaking the build. Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Campbell <Ian.Campbell(a)citrix.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> --- src/libxl/libxl_conf.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 6aa36d2..da66b4e 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -55,6 +55,17 @@ # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" # define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +/* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new + * parameter has been added, representative of 'VCPU soft affinity'. If one + * does not care about it (and that's libvirt case), passing NULL is the + * right thing to do. To mark that change, LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY + * is defined. */ +# ifdef LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY +# define libxl_set_vcpuaffinity(ctx, domid, vcpuid, map) \ + libxl_set_vcpuaffinity((ctx), (domid), (vcpuid), (map), NULL) +# define libxl_set_vcpuaffinity_all(ctx, domid, max_vcpus, map) \ + libxl_set_vcpuaffinity_all((ctx), (domid), (max_vcpus), (map), NULL) +# endif typedef struct _libxlDriverPrivate libxlDriverPrivate; typedef libxlDriverPrivate *libxlDriverPrivatePtr;

4 8

[libvirt] [PATCH] Fix segfault when starting a domain with no cpu definition
by Ján Tomko 02 Jul '14

02 Jul '14

My commit fba6bc4 iterated over the features in cpu definition without checking if there is one. --- Pushed as trivial. src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bbfb09a..99d4c4a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1513,7 +1513,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, return false; } - for (i = 0; i < def->cpu->nfeatures; i++) { + for (i = 0; def->cpu && i < def->cpu->nfeatures; i++) { virCPUFeatureDefPtr feature = &def->cpu->features[i]; if (feature->policy != VIR_CPU_FEATURE_REQUIRE) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a39cc0a..570960e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3636,7 +3636,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) } } - for (i = 0; i < def->cpu->nfeatures; i++) { + for (i = 0; def->cpu && i < def->cpu->nfeatures; i++) { virCPUFeatureDefPtr feature = &def->cpu->features[i]; if (feature->policy != VIR_CPU_FEATURE_REQUIRE) -- 1.8.5.5

1 0

[libvirt] Release of libvirt-1.2.6
by Daniel Veillard 02 Jul '14

02 Jul '14

As planned I have tagged the release in git and pushed the tarball as well as signed rpms to the usual place: ftp://libvirt.org/libvirt/ I also tagged 1.2.6 for the libvirt tree and pushed the associated release to its own tree: ftp://libvirt.org/libvirt/python/ Looks like a well balanced release, some new user visible features, a number of bugs fixes, lot of improvement accross the whole code, and a bit less than 300 patches in. Features: - libxl: add migration support and fixes (Jim Fehlig) - various improvements and fixes for NUMA (Michal Privoznik) Documentation: - security: manager: Document behavior of disk label manipulation funcs (Peter Krempa) - fix some typos in formatdomain.html (Jincheng Miao) - virsh: man: Correctly spell QEMU (Peter Krempa) - virsh: man: Fix examples and docs for virsh version (Peter Krempa) - Added example script on how to convert LXC container config (Cédric Bosdonnat) - blockjob: document recent job addition (Eric Blake) - virsh: Add details about specified migration host (Chen Fan) - blockcommit: document semantics of committing active layer (Eric Blake) - fix a typo in hacking.html.in (Wangrui (K)) - formatcaps: Rework and add stubs to document (Michal Privoznik) Portability: - build: link libvirt_conf with libxml (Martin Kletzander) - vbox: fix linker error (Jim Fehlig) - libxl: don't break the build on Xen>=4.5 because of libxl_vcpu_setaffinity() (Dario Faggioli) - Add PKG_CONFIG_PATH to run.in script. (Daniel P. Berrange) - Change 'interface' to 'iface' in virNetworkDHCPLease (Daniel P. Berrange) - Fix shadowed variable with older gcc (Ján Tomko) - Add pkg-config files to allow deps to build against source tree (Daniel P. Berrange) - Add pkg-config files for libvirt-qemu & libvirt-lxc (Daniel P. Berrange) - blockjob: avoid compiler uncertainty in info sizing (Eric Blake) - build: prefer -fstack-protector-strong to -all (Ján Tomko) - build: remove ssp-buffer-size (Ján Tomko) - build: remove duplicit warning suppression (Ján Tomko) - virnetdev: Use ifname in virNetDevGetLinkInfo (Michal Privoznik) - Fix virbitmaptest on 32-bit (Ján Tomko) - translations: Don't leave default template fields in .po files (Martin Kletzander) - tests: Build virstoragetest only when storage driver is compiled too (Peter Krempa) - Fix build on freebsd (Pavel Hrdina) Bug Fixes: - qemu: copy: Accept 'format' parameter when copying to a non-existing img (Peter Krempa) - storage: gluster: Fix header reader function (Peter Krempa) - conf: storage: Add volume feature formatter for gluster pools (Peter Krempa) - vboxsnapshotxmltest: Don't write to a file in abs_srcdir (Michal Privoznik) - securityselinuxlabeltest: Don't create dummy file in the srcdir (Michal Privoznik) - Report one error less when getting net dev speed (Ján Tomko) - Only detect PCI Express devices as root in udev nodedev driver (Ján Tomko) - libxl: add PV console if not explicitly specified (Jim Fehlig) - qemu: snapshot: Save persistent domain config when taking external snapshot (Peter Krempa) - bhyve: fix build by fixing typo in variable name (Roman Bogorodskiy) - docs: publish correct enum values (Eric Blake) - qemu: fix guestfwd chardev option back how it was (Martin Kletzander) - Fix typo s/SASL_CONF_DIR/SASL_CONF_PATH/ in QEMU VNC code (Daniel P. Berrange) - qemu: blockcopy: Don't remove existing disk mirror info (Peter Krempa) - bridge: leases: Fix potential crash caused by use after free (Peter Krempa) - Free DHCP leases file in networkGetDHCPLeasesHelper (Ján Tomko) - Rework remoteSerializeDHCPLease (Ján Tomko) - Free file header in virStorageFileGetMetadataRecurse (Ján Tomko) - graphics: remember graphics not auto allocated ports (Giuseppe Scrivano) - LXC: trivially support flag VIR_DRV_FEATURE_TYPED_PARAM_STRING (Chen Hanxiao) - cmdFreepages: initialize @tmp (Michal Privoznik) - Fix closedir usage in virNumaGetPages (Roman Bogorodskiy) - Don't include @LIBS@ in libvirt.pc.in file (Daniel P. Berrange) - virnuma: Actually build huge page code (Michal Privoznik) - Do not call closedir with NULL argument (Ján Tomko) - Fix invalid write in virNumaGetDistances (Ján Tomko) - Properly check the return value of CCWAddressAsString (Ján Tomko) - virsh: fix broken code in freepages (Eric Blake) - Fix xmconfigtest (Jim Fehlig) - vbox_snapshot_conf: fix wrong use of 'xmlSaveFormatFileEnc' (Pavel Hrdina) - tests: fix vbox snapshot xmls (Pavel Hrdina) - vbox: fix a segfault when taking a snapshot (Yohan BELLEGUIC) - vbox: snapshot: Avoid memleaks in functions dealing with disk arrays (Peter Krempa) - vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren (Peter Krempa) - uuid: Fix coverity warning of unchecked return value (Peter Krempa) - network: bridge: Avoid freeing uninitialized pointer on cleanup path (Peter Krempa) - net: leaseshelper: Refactor copying of old entries to avoid double free (Peter Krempa) - net: leaseshelper: Ignore corrupted lease file and rewrite it (Peter Krempa) - net: leaseshelper: Don't crash if DNSMASQ doesn't provide lease expiry (Peter Krempa) - blockjob: don't remove older-style mirror XML (Eric Blake) - blockcommit: require base below top (Eric Blake) - leaseshelper: fix another crash (Pavel Hrdina) - bhyve: do not cleanup unallocated networks on fail (Roman Bogorodskiy) - bhyve: fix crash in bhyveBuildNetArgStr (Roman Bogorodskiy) - storage: report VIR_ERR_NO_STORAGE_VOL when the file doesn't exist (Giuseppe Scrivano) - blockcommit: fix regression with explicit top argument (Eric Blake) - virsh: forbid negative vcpu argument to vcpupin (Jincheng Miao) - Fix crash when saving a domain with type none dac label (Ján Tomko) - vbox_snapshot_conf: Resolve Coverity warnings (John Ferlan) - vbox_temp: Resolve Coverity warnings (John Ferlan) - libxl: Resolve Coverity warnings (John Ferlan) - leaseshelper: fix crash (Pavel Hrdina) - qemu: Properly label FDs when restoring domain with static label (Shivaprasad G Bhat) - nodeinfo: avoid uninitialized variable on error (Eric Blake) - storage: fix memory leak with encrypted images (Eric Blake) - vbox: fix compilation error (Roman Bogorodskiy) - SELinux: don't fail silently when no label is present (Ján Tomko) - parallels: Avoid possible leak of "cpu" from parallelsBuildCapabilities (Peter Krempa) - Fix storage format probing (Ján Tomko) - network: bridge: Avoid memory leak from networkBuildDhcpDaemonCommandLine (Peter Krempa) - qemu: monitor: Fix type of holdtime argument in qemuMonitorJSONSendKey (Peter Krempa) - libxl: Avoid possible use of uninitialized mem in libxlDomainStart (Daniel P. Berrange) - qemu: Remove character device backend only after frontend is gone (Jiri Denemark) - qemu: Remove disk backend only after frontend is gone (Jiri Denemark) - qemu: Remove interface backend only after frontend is gone (Jiri Denemark) - Don't use AI_ADDRCONFIG when binding to wildcard addresses (Ján Tomko) - qemu: Unref cfg when detaching hostdev interface (Jiri Denemark) - virsh: Check whether found volume is member of the specified storage pool (Peter Krempa) Improvements: - Introduce virFileReadAllQuiet (Ján Tomko) - Track privileged state in udev nodedev driver (Ján Tomko) - build: fix 'make syntax-check' after commit c6cf5df3 (Jim Fehlig) - LXC: throw an error if we failed to get Idmap elements (Chen Hanxiao) - cpu: Add new Broadwell CPU model (Jiri Denemark) - net: merge virNetworkGetDHCPLeases and virNetworkGetDHCPLeasesForMAC (Peter Krempa) - Add test for type none model dac seclabel (Ján Tomko) - test: add user_xattr check for securityselinuxlabeltest (Jincheng Miao) - libxl: detect support for save and restore (Jim Fehlig) - security: nop: Avoid very long lines (Peter Krempa) - security: Fix header formatting of a few functions (Peter Krempa) - security: manager: Unify function header format (Peter Krempa) - security: manager: Avoid forward decl of virSecurityManagerDispose (Peter Krempa) - security: Rename virSecurityManagerRestoreImageLabel to *Disk* (Peter Krempa) - util: s/virStorageSourceClearBackingStore/virStorageSourceBackingStoreClear (Peter Krempa) - Fix a typo in a localized string (Daniel Veillard) - virConnectCompareCPU: Introduce FAIL_INCOMPATIBLE flag (Jiri Denemark) - cpuCompare*: Add support for reporting failure on incompatible CPUs (Jiri Denemark) - cpu: Cleanup coding style in generic CPU driver (Jiri Denemark) - virsh: Remove bogus stat on log file (Jiri Denemark) - enhance hostdev mode 'capabilities' process (Jincheng Miao) - storage: Don't store parent directory of an image explicitly (Peter Krempa) - storage: Don't canonicalize paths unnecessarily (Peter Krempa) - tests: virstoragetest: Remove unneeded relative test plumbing (Peter Krempa) - tests: virstoragetest: Don't test relative start of backing chains (Peter Krempa) - util: storage: Remove now redundant backingRelative from virStorageSource (Peter Krempa) - tests: virstoragetest: Remove now unused pathAbs (Peter Krempa) - storage: Store relative path only for relatively backed storage (Peter Krempa) - tests: virstoragetest: Remove "expBackingStore" field (Peter Krempa) - util: storage: Add helper to resolve relative path difference (Peter Krempa) - LXC: check whether we get MemSwap[Total|Usage] (Chen Hanxiao) - qemu: enum cleanups in "src/qemu/*" (Julio Faracco) - libxl: fix version annotation of migration functions (Jim Fehlig) - virtportallocator: new function "virPortAllocatorSetUsed" (Giuseppe Scrivano) - net-dhcp-leases: Add virsh support (Nehal J Wani) - net-dhcp-leases: Private implementation inside network (Nehal J Wani) - net-dhcp-leases: Implement the remote protocol (Nehal J Wani) - net-dhcp-leases: Implement the public APIs (Nehal J Wani) - virNumaGetPages: Don't fail on huge page-less systems (Michal Privoznik) - virNumaGetPageInfo: Take huge pages into account (Michal Privoznik) - storage: gluster: Avoid name shadow on older compilers (Peter Krempa) - storage: gluster: Add backend to return unique storage file path (Peter Krempa) - util: storagefile: Introduce universal function to canonicalize paths (Peter Krempa) - util: string: Add helper to free non-NULL terminated string arrays (Peter Krempa) - libxl: prefer qdisk for <driver name='file'> (Jim Fehlig) - qemu: parse -device virtio-balloon (Laine Stump) - Report correct error in virNetDevTapCreate (Ján Tomko) - util: numa: Stub out hugepage code on non-Linux platforms (Peter Krempa) - util: numa: Catch readdir errors in virNumaGetPages (Peter Krempa) - tests: Fix syntax-check after cdd11151791bc9e61538988438980f41c0185681 (Peter Krempa) - test: Disable storage test when FS backend isn't compiled in (Peter Krempa) - Split out CCW address allocation (Ján Tomko) - libxl: Use cooperative resume for migration (Jason Andryuk) - cpu_arm: Support all ARM processors we know about (Michal Privoznik) - virNodeParseSocket: Take ARM into account (Michal Privoznik) - nodeinfotest: Print error if cpuinfo file can't be opened (Michal Privoznik) - virNodeParseNode: Propagate host architecture (Michal Privoznik) - nodeinfo: Introduce @arch to linuxNodeInfoCPUPopulate (Michal Privoznik) - interface: clean up virInterfaceDefDevFormat (Laine Stump) - interface: clean up virInterfaceDefParseXML (Laine Stump) - interface: move parsing of bridge attributes into appropriate function (Laine Stump) - interface: report link state for bonds and vlans too (Laine Stump) - security: Rename virSecurityManagerSetImageLabel to *Disk* (Peter Krempa) - security: Sanitize type of @migrated in virSecurityManagerRestoreAllLabel (Peter Krempa) - util: Don't require full disk definition when getting imagelabels (Peter Krempa) - util: storagefile: Introduce helper to free storage source perms (Peter Krempa) - util: seclabel: Add deep copy function for device labels (Peter Krempa) - storage: encryption: Add deep copy function for storage encryption (Peter Krempa) - libxl: limit support for specifying an interface script (Jim Fehlig) - libxl: support interface type=network (Jim Fehlig) - interface: allow reordering of elements in xml (Laine Stump) - nodeinfo: Implement nodeGetFreePages (Michal Privoznik) - virsh: Expose virNodeGetFreePages (Michal Privoznik) - Introduce virNodeGetFreePages (Michal Privoznik) - virCaps: expose pages info (Michal Privoznik) - virnuma: Introduce pages helpers (Michal Privoznik) - nodeinfo: Rename nodeGetFreeMemory to nodeGetMemory (Michal Privoznik) - virnuma: Introduce virNumaNodeIsAvailable (Michal Privoznik) - virsh: expose new active commit controls (Eric Blake) - blockjob: use stable disk string in job event (Eric Blake) - xen: handle root= in xen-xm configuration files. (Ian Campbell) - virt-aa-helper: allow access to /dev/vhost-net if needed (Serge Hallyn) - util: json: Add helpers for manipulating json arrays (Peter Krempa) - util: json: Unify function header formatting (Peter Krempa) - Increase the size of REMOTE_MIGRATE_COOKIE_MAX to REMOTE_STRING_MAX (Shivaprasad G Bhat) - nodedev: Introduce <pci-express/> to PCI devices (Michal Privoznik) - virpci: Introduce virPCIDeviceIsPCIExpress and friends (Michal Privoznik) - storage: better tests of lookup (Eric Blake) - storage: renumber lookup tests (Eric Blake) - storage: add alias for less typing (Eric Blake) - qemu: snapshot: Don't mark all block disks for metadata reuse (Peter Krempa) - bhyve: silent destroy command errors on cleanup (Roman Bogorodskiy) - bhyve: implement PCI address allocation (Roman Bogorodskiy) - virNetDevGetLinkInfo: Don't report link speed if NIC's not up (Michal Privoznik) - tests: virstoragetest: Fix output when hitting errors (Peter Krempa) - blockcommit: update error messages related to block jobs (Eric Blake) - virsh: improve blockcopy UI (Eric Blake) - virNodeDevCapPCIDevParseXML: Initialize numa_node variable (Michal Privoznik) - virsh: Reject negative numbers in vshCommandOptULongLong (Peter Krempa) - virsh: Reject negative numbers in vshCommandOptUL (Peter Krempa) - virsh: Reject negative numbers in vshCommandOptUInt (Peter Krempa) - security: Don't skip labelling for network disks (Peter Krempa) - storage: volume: Rework lookup of volume objects (Peter Krempa) - storage: Clean up unlocking of storage pool objects (Peter Krempa) - storage: pool: Fix handling of errors on pool lookup failure (Peter Krempa) - virsh: include bhyve in virsh -V output (Roman Bogorodskiy) - maint: exempt graphic binaries from syntax check (Eric Blake) - vmware: make version parsing more robust (Jean-Baptiste Rouault) - node_device: Expose link state & speed (Michal Privoznik) - interface_backend_udev: Implement link speed & state (Michal Privoznik) - virnetdev: Introduce virNetDevGetLinkInfo (Michal Privoznik) - virInterface: Expose link state & speed (Michal Privoznik) - vbox_tmpl.c: Add function for undefining snapshot (Yohan BELLEGUIC) - vbox_tmpl.c: Patch for redefining snapshots (Yohan BELLEGUIC) - Add vbox_snapshot_conf struct (Yohan BELLEGUIC) - vbox_tmpl.c: Better XML description for snapshots (Manuel VIVES) - qemu: ignore -nodefconfig and -nodefaults when parsing commandline (Laine Stump) - test: display qemuParseCommandline warnings when VIR_TEST_DEBUG > 0 (Laine Stump) - m4: bhyve: Fix check for the required bhyve programs (Peter Krempa) - vmx: Relax virtualHW.version check (Matthias Bolte) - conf: alter disk mirror xml output (Eric Blake) - conf: store mirroring information in virStorageSource (Eric Blake) - conf: store disk source as pointer, for easier manipulation (Eric Blake) - conf: consolidate disk def allocation (Eric Blake) - conf: store snapshot source as pointer, for easier manipulation (Eric Blake) - nodedev: Export NUMA node locality for PCI devices (Michal Privoznik) - Implement pretty flag for vcpuinfo and nodecpumap (Ján Tomko) - Introduce virBitmapDataToString (Ján Tomko) - Always report an error if virBitmapFormat fails (Ján Tomko) - Format NULL bitmap as an empty string (Ján Tomko) - virsh: Separate API calls and result printing in cmdVcpuinfo (Ján Tomko) - virsh: Invert logic in cmdVcpuinfo (Ján Tomko) - Parallels: Include CPU info in the capabilities XML (Alexander Burluka) - Parallels: add connectBaselineCPU() (Alexander Burluka) - Parallels: add domainGetVcpus() (Alexander Burluka) - maint: prohibit empty first lines (Martin Kletzander) - Remove unnecessary empty first lines (Martin Kletzander) - Simplify conditions in virStorageBackendProbeTarget (Ján Tomko) - Don't reuse 'ret' variable in virStorageBackendProbeTarget (Ján Tomko) - vircaps2xmltest: Introduce basic testing (Michal Privoznik) - libxl: introduce libxlDomainDefCheckABIStability (Jim Fehlig) - maint: detect VPATH builds when checking for gnulib update (Eric Blake) - maint: optimize locale.h syntax check (Eric Blake) - virnuma: Check for numa_bitmask_isbitset presence (Michal Privoznik) - cfg.mk: Introduce rule for setlocale() (Michal Privoznik) - virnuma: Implement virNumaGetDistances stub for non-NUMA (Michal Privoznik) - virCaps: Expose distance between host NUMA nodes (Michal Privoznik) - virnuma: Introduce virNumaGetDistances (Michal Privoznik) - tests: monitor: json: Fix error message when returning json in json (Peter Krempa) - libxl: Move virDomainXMLOptionNew into libxlCreateXMLConf (Daniel P. Berrange) - libxl: Don't pass libxlDriverPrivatePtr into libxlBuildDomainConfig (Daniel P. Berrange) - libxl: Don't pass virDomainObjPtr to libxlBuildDomainConfig (Daniel P. Berrange) - qemu: Return in from qemuDomainRemove*Device (Jiri Denemark) - tests: storagetest: Unify and reformat storage chain format string (Peter Krempa) - qemu: json: Add format strings for optional command arguments (Peter Krempa) - util: string: Return element count from virStringSplit (Peter Krempa) - storage: Traverse backing chains of network disks (Peter Krempa) - storage: Change to new backing store parser (Peter Krempa) - storage: Add infrastructure to parse remote network backing names (Peter Krempa) - storage: Switch metadata crawler to use storage driver file access check (Peter Krempa) - storage: Switch metadata crawler to use storage driver to read headers (Peter Krempa) - storage: Switch metadata crawler to use storage driver to get unique path (Peter Krempa) - storage: backend: Add possibility to suppress errors from backend lookup (Peter Krempa) - test: storage: Initialize storage source to correct type (Peter Krempa) - storage: Determine the local storage type right away (Peter Krempa) - storage: Move virStorageFileGetMetadata to the storage driver (Peter Krempa) - storage: Add API to check accessibility of storage volumes (Peter Krempa) - storage: backend: Add unique id retrieval API (Peter Krempa) - xenapi_utils: Adapt to enum cleanups (Michal Privoznik) - virnuma.c: Fix some comments (Michal Privoznik) - conf: more enum cleanups in "src/conf/domain_conf.h" (Julio Faracco) - conf: enum cleanups in "src/conf/domain_conf.h" (Julio Faracco) - cpu: use typedefs for enums in "src/cpu/cpu_map.h" (Julio Faracco) - virsh-nodedev: Avoid spurious errors (Michal Privoznik) - qemu: Process DEVICE_DELETED event in a separate thread (Jiri Denemark) - qemu: Finish device removal in the original thread (Jiri Denemark) - Add helper program to create custom leases (Nehal J Wani) Cleanups: - Remove redundant docs from libvirt.h (Jiri Denemark) - conf: whitespace tweak (Chen Fan) So thanks everybody for your contributions to this release and the python one, be it with reports, patches, documentation etc ... Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCHv3] Add invariant TSC cpu flag
by Ján Tomko 02 Jul '14

02 Jul '14

Add suport for invariant TSC flag (CPUID 0x80000007, bit 8 of EDX). If this flag is enabled, the TSC ticks at a constant rate across all ACPI P-, C- and T-states. This can be enabled by adding: <feature name='invtsc'/> to the <cpu> element. Migration and saving the domain does not work with this flag. QEMU support for this is not merged yet: https://lists.gnu.org/archive/html/qemu-devel/2014-04/msg05024.html The feature name "invtsc" differs from the name "" used by the linux kernel: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x… --- v1: https://www.redhat.com/archives/libvir-list/2014-May/msg00183.html v2: https://www.redhat.com/archives/libvir-list/2014-May/msg00297.html add it as a cpu flag instead of a timer v3: check if the feature wasn't filtered out on domain startup src/cpu/cpu_map.xml | 5 +++++ src/qemu/qemu_migration.c | 14 ++++++++++++++ src/qemu/qemu_process.c | 15 +++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 7d34d40..ffaeb92 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -327,6 +327,11 @@ <cpuid function='0x00000007' ebx='0x00100000'/> </feature> +  + <feature name='invtsc'> + <cpuid function='0x80000007' edx='0x00000100'/> + </feature> +  <model name='486'> <feature name='fpu'/> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f0df1a6..7504a38 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1513,6 +1513,20 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, return false; } + for (i = 0; i < def->cpu->nfeatures; i++) { + virCPUFeatureDefPtr feature = &def->cpu->features[i]; + + if (feature->policy != VIR_CPU_FEATURE_REQUIRE) + continue; + + if (STREQ(feature->name, "invtsc")) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain has CPU feature: %s"), + feature->name); + return false; + } + } + return true; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a83780f..0824afe 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3568,6 +3568,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; int rc; bool ret = false; + size_t i; switch (arch) { case VIR_ARCH_I686: @@ -3590,6 +3591,20 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, virDomainObjPtr vm) goto cleanup; } } + + for (i = 0; i < def->cpu->nfeatures; i++) { + virCPUFeatureDefPtr feature = &def->cpu->features[i]; + + if (feature->policy != VIR_CPU_FEATURE_REQUIRE) + continue; + + if (STREQ(feature->name, "invtsc") && + !cpuHasFeature(guestcpu, feature->name)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("host doesn't support invariant TSC")); + goto cleanup; + } + } break; default: -- 1.8.3.2

3 5

[libvirt] [PATCH] qemu: Add cmd_per_lun, max_sectors to virtio-scsi
by Mike Perez 02 Jul '14

02 Jul '14

This introduces two new attributes "cmd_per_lun" and "max_sectors" same with the names QEMU uses for virtio-scsi. An example of the XML: <controller type='scsi' index='0' model='virtio-scsi' cmd_per_lun='50' max_sectors='512'/> The corresponding QEMU command line: -device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,max_sectors=512, bus=pci.0,addr=0x3 Signed-off-by: Mike Perez <thingee(a)gmail.com> --- docs/formatdomain.html.in | 29 +++++++++++++++++++--- docs/schemas/domaincommon.rng | 10 ++++++++ src/conf/domain_conf.c | 27 ++++++++++++++++++-- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 27 ++++++++++++++++---- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 9 +++++++ .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml | 29 ++++++++++++++++++++++ .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 9 +++++++ .../qemuxml2argv-disk-virtio-scsi-max_sectors.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++++ tests/qemuxml2xmltest.c | 2 ++ 11 files changed, 168 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 691a451..8ffb247 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2559,11 +2559,32 @@ An optional sub-element <code>driver</code> can specify the driver - specific options. Currently it only supports attribute <code>queues</code> - (1.0.5, QEMU and KVM only), which specifies the - number of queues for the controller. For best performance, it's recommended - to specify a value matching the number of vCPUs. + specific options: + <dl> + <dt><code>queues</code></dt> + <dd> + The optional <code>queues</code> attribute specifies the number of + queues for the controller. For best performance, it's recommended to + specify a value matching the number of vCPUs. + Since 1.0.5 (QEMU and KVM only) + </dd> + <dt><code>cmd_per_lun</code></dt> + <dd> + The optional <code>cmd_per_lun</code> attribute specifies the maximum + number of commands that can be queued on devices controlled by the + host. + Since 1.2.5 (QEMU and KVM only) + </dd> + <dt><code>max_sectors</code></dt> + <dd> + The optional <code>max_sectors</code> attribute specifies the maximum + amount of data in bytes that will be transferred to or from the device + in a single command. The transfer length is measured in sectors, where + a sector is 512 bytes. + Since 1.2.5 (QEMU and KVM only) + </dd> + </dl> USB companion controllers have an optional sub-element <code><master></code> to specify the exact diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4249ed5..4bf4699 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1735,6 +1735,16 @@ <ref name="unsignedInt"/> </attribute> </optional> + <optional> + <attribute name="cmd_per_lun"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="max_sectors"> + <ref name="unsignedInt"/> + </attribute> + </optional> </element> </optional> </interleave> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 40c385e..4388cb8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6041,6 +6041,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *idx = NULL; char *model = NULL; char *queues = NULL; + char *cmd_per_lun = NULL; + char *max_sectors = NULL; xmlNodePtr saved = ctxt->node; int rc; @@ -6084,6 +6086,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "driver")) queues = virXMLPropString(cur, "queues"); + cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); + max_sectors = virXMLPropString(cur, "max_sectors"); } cur = cur->next; } @@ -6094,6 +6098,17 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } + if (cmd_per_lun && virStrToLong_ui(cmd_per_lun, NULL, 10, &def->cmd_per_lun) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'cmd_per_lun' value '%s'"), cmd_per_lun); + goto error; + } + + if (max_sectors && virStrToLong_ui(max_sectors, NULL, 10, &def->max_sectors) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'max_sectors' value %s'"), max_sectors); + } + if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; @@ -6201,6 +6216,8 @@ virDomainControllerDefParseXML(xmlNodePtr node, VIR_FREE(idx); VIR_FREE(model); VIR_FREE(queues); + VIR_FREE(cmd_per_lun); + VIR_FREE(max_sectors); return def; @@ -15279,13 +15296,19 @@ virDomainControllerDefFormat(virBufferPtr buf, break; } - if (def->queues || virDomainDeviceInfoIsSet(&def->info, flags) || - pcihole64) { + if (def->queues || def->cmd_per_lun || def->max_sectors || + virDomainDeviceInfoIsSet(&def->info, flags) || pcihole64) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (def->queues) virBufferAsprintf(buf, "<driver queues='%u'/>\n", def->queues); + if (def->cmd_per_lun) + virBufferAsprintf(buf, "<driver cmd_per_lun='%u'/>\n", def->cmd_per_lun); + + if (def->max_sectors) + virBufferAsprintf(buf, "<driver max_sectors='%u'/>\n", def->max_sectors); + if (virDomainDeviceInfoIsSet(&def->info, flags) && virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bde303c..66484a1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -720,6 +720,8 @@ struct _virDomainControllerDef { unsigned int idx; int model; /* -1 == undef */ unsigned int queues; + unsigned int cmd_per_lun; + unsigned int max_sectors; union { virDomainVirtioSerialOpts vioserial; virDomainPCIControllerOpts pciopts; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 193959f..5274d17 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4236,12 +4236,23 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBuffer buf = VIR_BUFFER_INITIALIZER; int model; - if (def->queues && - !(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + if (!(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("'queues' is only supported by virtio-scsi controller")); - return NULL; + if (def->queues) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'queues' is only supported by virtio-scsi controller")); + return NULL; + } + if (def->cmd_per_lun) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'cmd_per_lun' is only supported by virtio-scsi controller")); + return NULL; + } + if (def->max_sectors) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'max_sectors' is only supported by virtio-scsi controller")); + return NULL; + } } switch (def->type) { @@ -4369,6 +4380,12 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, if (def->queues) virBufferAsprintf(&buf, ",num_queues=%u", def->queues); + if (def->cmd_per_lun) + virBufferAsprintf(&buf, ",cmd_per_lun=%u", def->cmd_per_lun); + + if (def->max_sectors) + virBufferAsprintf(&buf, ",max_sectors=%u", def->max_sectors); + if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info, qemuCaps) < 0) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args new file mode 100644 index 0000000..2c75790 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml new file mode 100644 index 0000000..615a7f5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'> + <driver cmd_per_lun='50'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args new file mode 100644 index 0000000..895f379 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml new file mode 100644 index 0000000..cd7d4a7 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'> + <driver max_sectors='512'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1ea7bf8..8ebb202 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -807,6 +807,12 @@ mymain(void) DO_TEST("disk-virtio-scsi-num_queues", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-virtio-scsi-cmd_per_lun", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-virtio-scsi-max_sectors", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index da528da..73c4ff1 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -223,6 +223,8 @@ mymain(void) DO_TEST("disk-scsi-vscsi"); DO_TEST("disk-scsi-virtio-scsi"); DO_TEST("disk-virtio-scsi-num_queues"); + DO_TEST("disk-virtio-scsi-cmd_per_lun"); + DO_TEST("disk-virtio-scsi-max_sectors"); DO_TEST("disk-scsi-megasas"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); DO_TEST_FULL("disk-mirror", true, WHEN_INACTIVE); -- 1.9.1

3 5

[libvirt] [PATCH] util: unify extra asterisk in viralloc.h
by Martin Kletzander 02 Jul '14

02 Jul '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial. src/util/viralloc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 55372e5..7125e67 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -1,7 +1,7 @@ /* * viralloc.h: safer memory allocation * - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * Copyright (C) 2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -279,7 +279,7 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); # define VIR_SHRINK_N(ptr, count, remove) \ virShrinkN(&(ptr), sizeof(*(ptr)), &(count), remove) -/* +/** * VIR_TYPEMATCH: * * The following macro seems a bit cryptic, so it needs a thorough @@ -481,7 +481,7 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); # define VIR_DELETE_ELEMENT_INPLACE(ptr, at, count) \ virDeleteElementsN(&(ptr), sizeof(*(ptr)), at, &(count), 1, true) -/* +/** * VIR_ALLOC_VAR_OVERSIZED: * @M: size of base structure * @N: number of array elements in trailing array -- 2.0.0

1 0

[libvirt] [PATCH for 1.2.6] qemu: copy: Accept 'format' parameter when copying to a non-existing img
by Peter Krempa 01 Jul '14

01 Jul '14

We have the following matrix of possible arguments handled by the logic statement touched by this patch: | flags & _REUSE_EXT | !(flags & _REUSE_EXT) -------+--------------------+---------------------- format| (1) | (2) -------+--------------------+---------------------- !format| (3) | (4) -------+--------------------+---------------------- In cases 1 and 2 the user provided a format, in cases 3 and 4 not. The user requests to use a pre-existing image in 1 and 3 and libvirt shall create a new image in 2 and 4. The difference between cases 3 and 4 is that for 3 the format is probed from the user-provided image, whereas in 4 we just use the existing disk format. The current code would treat cases 1,3 and 4 correctly but in case 2 the format provided by the user would be ignored. The particular piece of code was broken in commit 35c7701c64508f975dfeb8 but since it was introduced a few commits before that it was never released as working. --- src/qemu/qemu_driver.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 775f6ab..d45a161 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15356,29 +15356,34 @@ qemuDomainBlockCopy(virDomainObjPtr vm, /* XXX Allow non-file mirror destinations */ mirror->type = VIR_STORAGE_TYPE_FILE; + if (format) { + if ((mirror->format = virStorageFileFormatTypeFromString(format)) <= 0) { + virReportError(VIR_ERR_INVALID_ARG, _("unrecognized format '%s'"), + format); + goto endjob; + } + } else { + if (!(flags & VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT)) { + mirror->format = disk->src->format; + } else { + /* If the user passed the REUSE_EXT flag, then either they + * also passed the RAW flag (and format is non-NULL), or it is + * safe for us to probe the format from the file that we will + * be using. */ + mirror->format = virStorageFileProbeFormat(dest, cfg->user, + cfg->group); + } + } + + /* pre-create the image file */ if (!(flags & VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT)) { int fd = qemuOpenFile(driver, vm, dest, O_WRONLY | O_TRUNC | O_CREAT, &need_unlink, NULL); if (fd < 0) goto endjob; VIR_FORCE_CLOSE(fd); - if (!format) - mirror->format = disk->src->format; - } else if (format) { - mirror->format = virStorageFileFormatTypeFromString(format); - if (mirror->format <= 0) { - virReportError(VIR_ERR_INVALID_ARG, _("unrecognized format '%s'"), - format); - goto endjob; - } - } else { - /* If the user passed the REUSE_EXT flag, then either they - * also passed the RAW flag (and format is non-NULL), or it is - * safe for us to probe the format from the file that we will - * be using. */ - mirror->format = virStorageFileProbeFormat(dest, cfg->user, - cfg->group); } + if (!format && mirror->format > 0) format = virStorageFileFormatTypeToString(mirror->format); if (VIR_STRDUP(mirror->path, dest) < 0) -- 1.9.3

2 2

[libvirt] [PATCH 0/2] Gluster: tweak two small issues
by Peter Krempa 01 Jul '14

01 Jul '14

Peter Krempa (2): conf: storage: Add volume feature formatter for gluster pools storage: gluster: Fix header reader function src/conf/storage_conf.c | 2 ++ src/storage/storage_backend_gluster.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- 1.9.3

2 4

[libvirt] odd message from latest libvirt.git
by Eric Blake 01 Jul '14

01 Jul '14

# ./run daemon/libvirtd 2014-07-01 04:27:19.913+0000: 1160: info : libvirt version: 1.2.6 2014-07-01 04:27:19.913+0000: 1160: error : virFileReadAll:1297 : Failed to read file '/sys/class/net/wlp3s0/speed': Invalid argument This is probably a kernel bug in Fedora 20; but we shouldn't be polluting the logs just because of the kernel being unable to read a file that it claims exists: # ls -l /sys/class/net/wlp3s0/speed -r--r--r--. 1 root root 4096 Jun 28 07:41 /sys/class/net/wlp3s0/speed # cat /sys/class/net/wlp3s0/speed cat: /sys/class/net/wlp3s0/speed: Invalid argument -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 5

[libvirt] [PATCH v1.2.[1-5]-maint] qemu: blockcopy: Don't remove existing disk mirror info
by Eric Blake 01 Jul '14

01 Jul '14

From: Peter Krempa <pkrempa(a)redhat.com> When creating a new disk mirror the new struct is stored in a separate variable until everything went well. The removed hunk would actually remove existing mirror information for example when the api would be run if a mirror still exists. (cherry picked from commit 02b364e186d487f54ed410c01af042f23e812d42) This fixes a regression introduced in commit ff5f30b. Signed-off-by: Eric Blake <eblake(a)redhat.com> Conflicts: src/qemu/qemu_driver.c - no refactoring of commit 7b7bf001 --- As Peter's patch resolves a regression, I'd like to backport it to the maint branches; however, that means redoing the patch. src/qemu/qemu_driver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 59185c6..591864f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15203,6 +15203,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm, struct stat st; bool need_unlink = false; char *mirror = NULL; + int mirrorFormat; virQEMUDriverConfigPtr cfg = NULL; /* Preliminaries: find the disk we are editing, sanity checks */ @@ -15290,10 +15291,10 @@ qemuDomainBlockCopy(virDomainObjPtr vm, goto endjob; VIR_FORCE_CLOSE(fd); if (!format) - disk->mirrorFormat = disk->src.format; + mirrorFormat = disk->src.format; } else if (format) { - disk->mirrorFormat = virStorageFileFormatTypeFromString(format); - if (disk->mirrorFormat <= 0) { + mirrorFormat = virStorageFileFormatTypeFromString(format); + if (mirrorFormat <= 0) { virReportError(VIR_ERR_INVALID_ARG, _("unrecognized format '%s'"), format); goto endjob; @@ -15303,11 +15304,11 @@ qemuDomainBlockCopy(virDomainObjPtr vm, * also passed the RAW flag (and format is non-NULL), or it is * safe for us to probe the format from the file that we will * be using. */ - disk->mirrorFormat = virStorageFileProbeFormat(dest, cfg->user, - cfg->group); + mirrorFormat = virStorageFileProbeFormat(dest, cfg->user, + cfg->group); } - if (!format && disk->mirrorFormat > 0) - format = virStorageFileFormatTypeToString(disk->mirrorFormat); + if (!format && mirrorFormat > 0) + format = virStorageFileFormatTypeToString(mirrorFormat); if (VIR_STRDUP(mirror, dest) < 0) goto endjob; @@ -15333,13 +15334,12 @@ qemuDomainBlockCopy(virDomainObjPtr vm, /* Update vm in place to match changes. */ need_unlink = false; disk->mirror = mirror; + disk->mirrorFormat = mirrorFormat; mirror = NULL; endjob: if (need_unlink && unlink(dest)) VIR_WARN("unable to unlink just-created %s", dest); - if (ret < 0 && disk) - disk->mirrorFormat = VIR_STORAGE_FILE_NONE; VIR_FREE(mirror); if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; -- 1.9.3

2 3

[libvirt] [PATCH v2 for 1.2.6] build: link libvirt_conf with libxml
by Martin Kletzander 01 Jul '14

01 Jul '14

Since there is code using functions from the libxml library, libvirt_conf should have that in LIBADD so it can be linked against even without libvirt_util (which usually deals with the error itself, since libvirt_util has libxml in LIBADD). The same applies to storage_backend.c. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is a v2 of: https://www.redhat.com/archives/libvir-list/2014-June/msg01322.html If this gets ACKed for th 1.2.6 release, please push this as well since I won't be available before DV makes the release, thank you. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 35720be..047d4c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -991,6 +991,7 @@ libvirt_la_BUILT_LIBADD += libvirt_conf.la libvirt_conf_la_SOURCES = $(CONF_SOURCES) libvirt_conf_la_CFLAGS = $(AM_CFLAGS) libvirt_conf_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_conf_la_LIBADD = $(LIBXML_LIBS) noinst_LTLIBRARIES += libvirt_cpu.la libvirt_la_BUILT_LIBADD += libvirt_cpu.la @@ -1452,7 +1453,7 @@ libvirt_driver_storage_impl_la_CFLAGS = \ $(AM_CFLAGS) libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_storage_impl_la_LIBADD = -libvirt_driver_storage_impl_la_LIBADD += $(SECDRIVER_LIBS) +libvirt_driver_storage_impl_la_LIBADD += $(SECDRIVER_LIBS) $(LIBXML_LIBS) if WITH_BLKID libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS) libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS) -- 2.0.0

2 1

[libvirt] [PATCH 0/4] Report less errors
by Ján Tomko 01 Jul '14

01 Jul '14

Some are distracting and not really helpful. Ján Tomko (4): Track privileged state in udev nodedev driver Only detect PCI Express devices as root in udev nodedev driver Introduce virFileReadAllQuiet Report one error less when getting net dev speed src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 10 ++++++++-- src/util/virfile.c | 15 +++++++++++++++ src/util/virfile.h | 2 ++ src/util/virnetdev.c | 7 ++++--- 5 files changed, 30 insertions(+), 5 deletions(-) -- 1.8.5.5

2 9

[libvirt] [PATCH for 1.2.6] vboxsnapshotxmltest: Don't write to a file in abs_srcdir
by Michal Privoznik 01 Jul '14

01 Jul '14

In the test, the snapshot XML is written into a file that's located under: abs_srcdir/vboxsnapshotxmldata/testResult.vbox However, the abs_srcdir doesn't have to be necessarily writable. It should have been abs_builddir instead. Moreover, the label in the func creating the file is called 'fail' while it fulfils the duty of 'cleanup' label. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/vboxsnapshotxmltest.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 7795688..85ef96a 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -59,42 +59,47 @@ testCompareXMLtoXMLFiles(const char *xml) char *pathResult = NULL; int ret = -1; virVBoxSnapshotConfMachinePtr machine = NULL; - if (virAsprintf(&pathResult, "%s/vboxsnapshotxmldata/testResult.vbox", - abs_srcdir) < 0) + + if (VIR_STRDUP(pathResult, + abs_builddir "/vboxsnapshotxmldata/testResult.vbox") < 0) return -1; + if (virFileMakePath(abs_builddir "/vboxsnapshotxmldata") < 0) + goto cleanup; + if (virtTestLoadFile(xml, &xmlData) < 0) - goto fail; + goto cleanup; if (!(machine = virVBoxSnapshotConfLoadVboxFile(xml, (char*)""))) - goto fail; + goto cleanup; if (virVBoxSnapshotConfSaveVboxFile(machine, pathResult) < 0) - goto fail; + goto cleanup; if (virtTestLoadFile(pathResult, &actual) < 0) - goto fail; + goto cleanup; if (unlink(pathResult) < 0) - goto fail; + goto cleanup; if (!(actual = testFilterXML(actual))) - goto fail; + goto cleanup; if (!(xmlData = testFilterXML(xmlData))) - goto fail; + goto cleanup; if (STRNEQ(actual, xmlData)) { virtTestDifference(stderr, xmlData, actual); - goto fail; + goto cleanup; } ret = 0; - fail: + cleanup: VIR_FREE(xmlData); VIR_FREE(actual); virVBoxSnapshotConfMachineFree(machine); VIR_FREE(pathResult); + rmdir(abs_builddir "/vboxsnapshotxmldata"); return ret; } -- 1.8.5.5

2 1

[libvirt] run domain in paused state
by Vasiliy Tolstov 01 Jul '14

01 Jul '14

Hi all. I need to construct domain, run it in paused state , attach some devices and unpause it. How can i do that in libvirt api (i'm use ruby). As i see virsh have start --paused option, but how can i specify state in domain xml? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

1 1

[libvirt] [PATCH for 1.2.6] securityselinuxlabeltest: Don't create dummy file in the srcdir
by Michal Privoznik 01 Jul '14

01 Jul '14

At the very beginning of the test we check if the underlying filesystem supports extended attributes as they are used to store fake SELinux labels. In order to check that, a dummy file is created and semi-random attribute is set. However, the file is created under: abs_srcdir "/securityselinuxlabeldata/testxattr" which has two problems: abs_srcdir is not required to be writable, so it should have been abs_builddir. The second one is - there's no "securityselinuxlabeldata" folder under abs_builddir. The problem was introduced in caf164f1. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/securityselinuxlabeltest.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 3699d89..455eb74 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -65,10 +65,11 @@ testUserXattrEnabled(void) const char *con_value = "system_u:object_r:svirt_image_t:s0:c41,c264"; char *path = NULL; if (virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", - abs_srcdir) < 0) + abs_builddir) < 0) goto cleanup; - if (virFileTouch(path, 0600) < 0) + if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0 || + virFileTouch(path, 0600) < 0) goto cleanup; len = setxattr(path, "user.libvirt.selinux", con_value, @@ -83,6 +84,7 @@ testUserXattrEnabled(void) cleanup: unlink(path); + rmdir(abs_builddir "/securityselinuxlabeldata"); VIR_FREE(path); return ret; } -- 1.8.5.5

2 1

[libvirt] Facing problems in running QEMU guest agents in Windows 2008 guest machine.
by Puneet Bakshi 01 Jul '14

01 Jul '14

Hi, I have a CenOS host machine running KVM and a Windows 2008 guest machine. I am able to run "qemu-monitor-command" but not "qemu-agent-command". [root@sdsr720-14 Windows_ISO]# virsh qemu-monitor-command --hmp vm_win_05 'info network' Devices not on any VLAN: hostnet0: fd=23 peer=net0 net0: model=virtio-net-pci,macaddr=52:54:00:7f:4a:5b peer=hostnet0 [root@sdsr720-14 Windows_ISO]# virsh qemu-agent-command vm_win_05 '{"execute":"guest-ping"}' [root@sdsr720-14 Windows_ISO]# [QEMU guest installation] To install QEMU guest agent, I followed steps mentioned at following URL http://wiki.qemu.org/Features/QAPI/GuestAgent#Example_usage [Problem-1] "qemu-ga.exe -s install" runs silently, "net start qemu-ga" gave error. Following is the snippet from Windows shell. PS C:\puneet> .\qemu-ga.exe -s install PS C:\puneet> net start qemu-ga The service name is invalid. More help is available by typing NET HELPMSG 2185. PS C:\puneet>[root@sdsr720-14 Windows_ISO]# [Problem-2] When I double click the "qemu-ga.exe", it gives the following error. "The application was unable to start correctly (0xc000007b). Click Ok to close the application." I tried some other possible ways also but could not get them working. Regards, ~Puneet

2 2

[libvirt] [PATCH] virsh: enable list inactive domain when using 'list --[no-]autostart
by Chen Hanxiao 01 Jul '14

01 Jul '14

This patch could let us know which domains are marked as [no]autostart without starting them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-domain-monitor.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8bd58ad..779b67b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1869,8 +1869,10 @@ cmdList(vshControl *ctl, const vshCmd *cmd) FILTER("with-managed-save", VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE); FILTER("without-managed-save", VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE); - FILTER("autostart", VIR_CONNECT_LIST_DOMAINS_AUTOSTART); - FILTER("no-autostart", VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART); + FILTER("autostart", VIR_CONNECT_LIST_DOMAINS_AUTOSTART | + VIR_CONNECT_LIST_DOMAINS_INACTIVE); + FILTER("no-autostart", VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART | + VIR_CONNECT_LIST_DOMAINS_INACTIVE); FILTER("with-snapshot", VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT); FILTER("without-snapshot", VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT); -- 1.9.0

2 1

[libvirt] [PATCH] qemu: raise an error when trying to use readonly ide disks
by Giuseppe Scrivano 01 Jul '14

01 Jul '14

The IDE bus doesn't support readonly disks, so inform the user with an error message instead of let qemu fail with a more obscure "Device 'ide-hd' could not be initialized" error message. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1112939 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/qemu/qemu_command.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63f322a..4829176 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3385,8 +3385,15 @@ qemuBuildDriveStr(virConnectPtr conn, disk->bus != VIR_DOMAIN_DISK_BUS_IDE) virBufferAddLit(&opt, ",boot=on"); if (disk->readonly && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_READONLY)) + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_READONLY)) { + if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE && + disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("readonly ide disks are not supported")); + goto error; + } virBufferAddLit(&opt, ",readonly=on"); + } if (disk->transient) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("transient disks not supported yet")); -- 1.9.3

3 6

[libvirt] [PATCHv4 00/29] (for 1.2.7) qemu: Refactor handling of disk image metadata
by Peter Krempa 01 Jul '14

01 Jul '14

This is meant for the 1.2.7 release as we are currently in freeze for 1.2.6. This version incorporates feedback from Eric's review and adds a ton of new stuff. Peter Krempa (29): storage: Implement virStorageFileCreate for local and gluster files qemu: Don't propagate whole disk definition into qemuDomainGetImageIds qemu: Add helper to initialize storage file backend with correct uid/gid storage: file: Tolerate NULL src when uninitializing the backend conf: Don't output seclabels for backingStore elements storage: Move readonly and shared flags to disk source from disk def util: storagefile: Add deep copy for struct virStorageSource util: storage: Add helper to determine whether storage is local util: storage: Add function to transfer config parts to new chain element util: storage: Copy parent's disk metadata to backing chain elements util: cgroup: Add helper to convert device mode to string qemu: cgroup: Add functions to set cgroup image stuff on individual imgs qemu: cgroup: Setup only the top level disk image for read-write access locking: Add APIs to lock individual image files security: Introduce APIs to label single images security: selinux: Implement per-image seclabel restore security: selinux: Implement per-image seclabel set security: DAC: Implement per-image seclabel restore security: DAC: Implement per-image seclabel set security: AppArmor: Implement per-image seclabel restore security: AppArmor: Implement per-image seclabel set util: storage: Make virStorageFileChainLookup more network storage aware util: storage: Return complete parent info from virStorageFileChainLookup qemu: blockcopy: Use the mirror disk source to label the files qemu: block: Properly track disk source while pivotting to new image qemu: snapshot: Improve approach to deal with snapshot metadata qemu: Refactor qemuDomainPrepareDiskChainElement qemu: snapshot: Refactor image labelling of new snapshot files qemu: snapshot: Use storage driver to pre-create snapshot file src/conf/domain_conf.c | 77 +++++--- src/conf/domain_conf.h | 2 - src/libvirt_private.syms | 8 + src/libxl/libxl_conf.c | 2 +- src/locking/domain_lock.c | 65 ++++--- src/locking/domain_lock.h | 8 + src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_cgroup.c | 109 ++++++----- src/qemu/qemu_cgroup.h | 3 + src/qemu/qemu_command.c | 14 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_domain.c | 29 ++- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 349 +++++++++++----------------------- src/qemu/qemu_migration.c | 16 +- src/security/security_apparmor.c | 55 ++++-- src/security/security_dac.c | 111 +++++------ src/security/security_driver.h | 10 + src/security/security_manager.c | 56 ++++++ src/security/security_manager.h | 7 + src/security/security_nop.c | 19 ++ src/security/security_selinux.c | 150 +++++++++------ src/security/security_stack.c | 38 ++++ src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend_fs.c | 17 ++ src/storage/storage_backend_gluster.c | 28 +++ src/storage/storage_driver.c | 2 +- src/util/vircgroup.c | 62 ++++-- src/util/vircgroup.h | 2 + src/util/virstoragefile.c | 300 ++++++++++++++++++++++++++--- src/util/virstoragefile.h | 15 +- src/vbox/vbox_tmpl.c | 30 +-- src/xenxs/xen_sxpr.c | 10 +- src/xenxs/xen_xm.c | 10 +- tests/virstoragetest.c | 86 ++++----- 37 files changed, 1097 insertions(+), 609 deletions(-) -- 1.9.3

1 30

[libvirt] Build failed in Jenkins: libvirt-syntax-check #2434
by Jenkins CI 01 Jul '14

01 Jul '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/2434/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2747 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson2596201862121310184.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.53 GFDL_version TAB_in_indentation 0.51 TAB_in_indentation Wundef_boolean 0.22 Wundef_boolean avoid_attribute_unused_in_header 0.31 avoid_attribute_unused_in_header avoid_ctype_macros 0.69 avoid_ctype_macros avoid_if_before_free 6.16 avoid_if_before_free avoid_strcase 0.79 avoid_strcase avoid_write 0.33 avoid_write bindtextdomain 0.27 bindtextdomain cast_of_argument_to_free 0.61 cast_of_argument_to_free cast_of_x_alloc_return_value 0.55 cast_of_x_alloc_return_value changelog 0.21 changelog const_long_option 0.53 const_long_option copyright_check 0.69 copyright_check copyright_format 1.77 copyright_format copyright_usage 1.46 copyright_usage correct_id_types 0.68 correct_id_types curly_braces_style 0.85 curly_braces_style error_message_period 0.44 error_message_period error_message_warn_fatal 0.45 error_message_warn_fatal flags_debug 1.12 flags_debug flags_usage 1.09 flags_usage forbid_const_pointer_typedef 1.15 forbid_const_pointer_typedef forbid_manual_xml_indent 0.53 forbid_manual_xml_indent libvirt_unmarked_diagnostics 1.72 libvirt_unmarked_diagnostics m4_quote_check 0.24 m4_quote_check makefile_TAB_only_indentation 0.26 makefile_TAB_only_indentation makefile_at_at_check 0.20 makefile_at_at_check makefile_conditionals 0.26 makefile_conditionals po_check 14.88 po_check preprocessor_indentation 0.65 preprocessor_indentation prohibit_HAVE_MBRTOWC 0.74 prohibit_HAVE_MBRTOWC prohibit_PATH_MAX 0.60 prohibit_PATH_MAX prohibit_VIR_ERR_NO_MEMORY 0.57 prohibit_VIR_ERR_NO_MEMORY prohibit_access_xok 0.59 prohibit_access_xok prohibit_always-defined_macros 1.99 prohibit_always-defined_macros prohibit_always_true_header_tests 0.83 prohibit_always_true_header_tests prohibit_argmatch_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.44 prohibit_argmatch_without_use prohibit_asprintf 1.39 prohibit_asprintf prohibit_assert_without_use grep: write error grep: write error /bin/sed: couldn't write 51 items to stdout: Broken pipe sed: couldn't write 65 items to stdout: Broken pipe 0.48 prohibit_assert_without_use prohibit_atoi 0.76 prohibit_atoi prohibit_backup_files 0.16 prohibit_backup_files prohibit_c_ctype_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.45 prohibit_c_ctype_without_use prohibit_canonicalize_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.49 prohibit_canonicalize_without_use prohibit_cloexec_without_use grep: write error grep: write error /bin/sed: couldn't write 38 items to stdout: Broken pipe sed: couldn't write 54 items to stdout: Broken pipe 0.85 prohibit_cloexec_without_use prohibit_close 1.58 prohibit_close prohibit_close_stream_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.43 prohibit_close_stream_without_use prohibit_config_h_in_headers 0.32 prohibit_config_h_in_headers prohibit_cross_inclusion 8.51 prohibit_cross_inclusion prohibit_ctype_h 0.67 prohibit_ctype_h prohibit_cvs_keyword 0.66 prohibit_cvs_keyword prohibit_defined_have_decl_tests 0.79 prohibit_defined_have_decl_tests prohibit_diagnostic_without_format 1.72 prohibit_diagnostic_without_format prohibit_dirent_without_use grep: write error grep: write error /bin/sed: couldn't write 57 items to stdout: Broken pipe sed: couldn't write 52 items to stdout: Broken pipe 0.50 prohibit_dirent_without_use prohibit_doubled_word 6.65 prohibit_doubled_word prohibit_duplicate_header 13.42 prohibit_duplicate_header prohibit_empty_first_line 1.95 prohibit_empty_first_line prohibit_empty_lines_at_EOF 0.95 prohibit_empty_lines_at_EOF prohibit_error_without_use grep: write error grep: write error /bin/sed: couldn't write 69 items to stdout: Broken pipe sed: couldn't write 64 items to stdout: Broken pipe 0.95 prohibit_error_without_use prohibit_exit_in_tests 0.85 prohibit_exit_in_tests prohibit_fork_wrappers 1.20 prohibit_fork_wrappers prohibit_getenv 0.70 prohibit_getenv prohibit_gethostby 0.64 prohibit_gethostby prohibit_gethostname 0.67 prohibit_gethostname prohibit_getopt_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.46 prohibit_getopt_without_use prohibit_gettext_markup 0.70 prohibit_gettext_markup prohibit_gettext_noop 0.68 prohibit_gettext_noop prohibit_hash_pjw_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.41 prohibit_hash_pjw_without_use prohibit_have_config_h 0.64 prohibit_have_config_h prohibit_ignore_value_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.45 prohibit_ignore_value_without_use prohibit_include_public_headers_brackets 0.49 prohibit_include_public_headers_brackets prohibit_include_public_headers_quote 0.46 prohibit_include_public_headers_quote prohibit_int_ijk 0.93 prohibit_int_ijk prohibit_internal_functions 0.82 prohibit_internal_functions prohibit_intprops_without_use grep: write error grep: write error /bin/sed: couldn't write 25 items to stdout: Broken pipe sed: couldn't write 57 items to stdout: Broken pipe 0.47 prohibit_intprops_without_use prohibit_inttostr_without_use grep: write error grep: write error /bin/sed: couldn't write 51 items to stdout: Broken pipe sed: couldn't write 65 items to stdout: Broken pipe 0.41 prohibit_inttostr_without_use prohibit_libgen 0.95 prohibit_libgen prohibit_long_lines src/Makefile.am:1146:libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) maint.mk: Wrap long lines in Makefiles make: *** [sc_prohibit_long_lines] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCH] libxl: add PV console if not explicitly specified
by Jim Fehlig 01 Jul '14

01 Jul '14

Xen PV domains always have a PV console, so add one to the domain config via post-parse callback if not explicitly specified in the XML. The legacy Xen driver behaves similarly, causing a regression when switching to the new Xen toolstack. I.e. virsh console pv-domain will no longer work after upgrading a xm/xend stack to xl/libxl. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index da3f241..0c86601 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -503,9 +503,38 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, return 0; } +static int +libxlDomainDefPostParse(virDomainDefPtr def, + virCapsPtr caps ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + if (STREQ(def->os.type, "hvm")) + return 0; + + if (def->nconsoles == 0) { + virDomainChrDefPtr chrdef; + + if (!(chrdef = virDomainChrDefNew())) + return -1; + + chrdef->source.type = VIR_DOMAIN_CHR_TYPE_PTY; + chrdef->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; + chrdef->target.port = 0; + chrdef->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; + + if (VIR_ALLOC_N(def->consoles, 1) < 0) + return -1; + + def->nconsoles = 1; + def->consoles[0] = chrdef; + } + return 0; +} + virDomainDefParserConfig libxlDomainDefParserConfig = { .macPrefix = { 0x00, 0x16, 0x3e }, .devicesPostParseCallback = libxlDomainDeviceDefPostParse, + .domainPostParseCallback = libxlDomainDefPostParse, }; -- 1.8.4.5

2 2

[libvirt] [PATCH] build: fix 'make syntax-check' after commit c6cf5df3
by Jim Fehlig 01 Jul '14

01 Jul '14

The commit caused prohibit_long_lines to fail in src/Makefile.am. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the build-breaker rule. src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 10c35d7..35720be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1143,7 +1143,9 @@ libvirt_driver_vbox_impl_la_CFLAGS = \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) +libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) \ + $(MSCOM_LIBS) \ + $(LIBXML_LIBS) libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES) endif WITH_VBOX -- 1.8.4.5

1 0

[libvirt] [PATCH] vbox: fix linker error
by Jim Fehlig 01 Jul '14

01 Jul '14

Noticed the following error when building the vbox driver in the openSUSE build service CCLD vboxsnapshotxmltest /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/bin/ld: ../src/.libs/libvirt_driver_vbox_impl.a (libvirt_driver_vbox_impl_la-vbox_snapshot_conf.o): undefined reference to symbol 'xmlXPathRegisterNs@@LIBXML2_2.4.30' /usr/lib64/libxml2.so: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Fixed by adding LIBXML_LIBS to libvirt_driver_vbox_impl_la_LIBADD Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Oddly, I don't see this when doing local builds, but haven't really found out what is different between my build environments. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2b9ac61..10c35d7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1143,7 +1143,7 @@ libvirt_driver_vbox_impl_la_CFLAGS = \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) +libvirt_driver_vbox_impl_la_LIBADD = $(DLOPEN_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES) endif WITH_VBOX -- 1.8.4.5

2 3

[libvirt] [libvirt-glib] [PATCH v3 0/3] Add API to fetch snapshots
by Timm Bäder 30 Jun '14

30 Jun '14

This patchset replaces the old one and includes gvir_domain_fetch_snapshtos_async as well as a version of gvir_domain_fetch_snapshots that works with it. Timm Bäder (3): libvirt-gobject-domain: Add _fetch_snapshots libvirt-gobject-domain: Add _get_snapshots GVirDomain: Add async version of _fetch_snapshots libvirt-gobject/libvirt-gobject-domain.c | 164 +++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 51 ++++++++++ libvirt-gobject/libvirt-gobject.sym | 5 + 3 files changed, 220 insertions(+) -- 2.0.1

1 2

Re: [libvirt] [Xen-devel] [xen-unstable bisection] complete build-i386-libvirt
by Dario Faggioli 30 Jun '14

30 Jun '14

On lun, 2014-06-30 at 08:11 +0100, Ian Campbell wrote: > On Sun, 2014-06-29 at 18:35 +0100, xen.org wrote: > > branch xen-unstable > > xen branch xen-unstable > > job build-i386-libvirt > > test libvirt-build > > > > Tree: gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… > > Tree: libvirt git://xenbits.xen.org/libvirt.git > > Tree: qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git > > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git > > Tree: xen git://xenbits.xen.org/xen.git > > > > *** Found and reproduced problem changeset *** > > > > Bug is in tree: xen git://xenbits.xen.org/xen.git > > Bug introduced: 871b43a309d80ac99458c13c2c3da8d15c482d30 > > Bug not present: 6cc89d3101d8874e01a69a89a65736a2adfbd199 > > > > > > commit 871b43a309d80ac99458c13c2c3da8d15c482d30 > > Author: Dario Faggioli <dario.faggioli(a)citrix.com> > > Date: Fri Jun 20 18:19:12 2014 +0200 > > > > libxl: get and set soft affinity > > Dario, > > libvirt doesn't use the LIBXL_API_VERSION mechanism but instead uses the > LIBXL_HAVE stuff to retain compatibility. > > Will you be able to send a patch against libvirt today to make it use > the new interface (conditional on LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY)? > So, brief recap for the ones not knowing the details of this, libxl interface for vcpu pinning is changing (basically, libxl_set_vcpuaffinity() wants one more param). Libxl provides some ifdefs for these situations, and in this case, the gate to be used is, as Ian is saying: #ifdef LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY One possible approach is to enclose all the calls into such #ifdef-#endif but, although there are only two of them right now, I don't like it (what if we need more calls in the future?). I could come up with the alternatives attached to this message. In patch1, I use the new interface in the code and #define it to the old one if !LIBXL_HAV_VCPUINFO_SOFT_AFFINITY. In patch2 I do the opposite (keep old interface in the code and redefine to new, with additional param equal to NULL). I like patch1 better, but I think it can cause "unused variable" like warnings if, at some point in future, we will actually use the new soft affinity parameter, when compiling on a version of libxl that does not define HAVE_VCPUINFO_SOFT_AFFINITY, can't it? If yes, is it an issue? If yes, a big enough one to make us prefer patch2? Just let me know your thoughts, and I'll submit the one you prefer appropriately. Regards, Dario PS. patches not tested, I'm updating my xen+libvirt testbox. Will be able to test soon (for sure within today) -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

2 2

[libvirt] [PATCH v7 RFC 0/2] libxl USB prototype and design discussion
by George Dunlap 30 Jun '14

30 Jun '14

Hey all! So here I finally have a rebased the HVM USB hotplug series from last year. I went through and addressed all of IanC's technical comments that I could; so it should be in much better shape than it was. However, one of the unfinished threads of the conversation at that time was about the interface. In particular since Simon Bo is now working on the PVUSB side of things, I thought it would be good to review the situation so we can get an interface we're happy with. In order to really answer the questions, I went through and looked at the underlying capabilities of QEMU and PVUSB, at the existing libxl and xend interfaces for those two, and also at the libvirt interface. I summarize what I've found here; but if you want a TLDR version, just skip to the bottom, where it says "Draft Design Proposal". But before asking any questions or making any criticisms, please go back and read the appropriate summary section. References are at the very bottom of the e-mail. This can be found at the following address: git://xenbits.xen.org/people/gdunlap/xen.git out/hvm-usb-hotplug-v7-RFC == Capabilities of QEMU == Qemu has the additional ability to not only pass through host devices, but other kinds of devices -- tablets, mice, keyboards, drives, hubs, and so on. As far as I know, PVUSB can only do host device pass-through at the moment. (Although you could certainly imagine that changing; if qemu was taught how to become a PVUSB back-end, for example.) qemu has two ways of specifying usb devices. The "legacy" method can be specified on the qemu command-line or via the qemu monitor. It is limited to USB 1.1. The new "qdevice" method can be used either on the command-line or via qmp. qemu-traditional only supports the legacy method. qemu-xen still supports the legacy method via command-line, but we should try to start using the qdevice method if we can. qemu-xen has the ability to create virtual USB 2.0 or 3.0 controllers. These can be named, and it is possible to specify (to a certain level) which controller to plug a device into. These can be created either via the command-line, or hot-plugged via qmp. qemu also seems to be willing to shift things around behind the scenes to be able to handle your request; shifting around the USB topology, for instance. It will also do "helpful" things; for instance, if you specify that you want to plug a device into a USB 2.0 controller, and the device is only 1.1 capable, it will ignore what you asked and plug it into the 1.1 controller. == Capabilities of PVUSB == PVUSB also requires you to first create a virtual controller, before attaching host devices to it. There is some flexibility in how to create these, and you can create more than one and specify which virtual bus to attach the host device. You seem to be able to specify the USB version number when you specify the controller as well. You can also specify the number of ports for a device; I'm not sure what the maximum number of ports per controller is, or why you would ever really want to have less than the maximum number of ports. It looks like in the xm interface, when you create a virtual controller it is assigned an index, starting at 0; and this is the index that is used when specifying where to plug in a device. (Simon, can you please correct this if I'm wrong, and add anything important that I missed?) == libxl/xl interface == At the moment, libxl/xl only support USB at domain creation time. For HVM guests, we have two incompatible sets of options. usb=1 and usbdevice=[] use the "old-style" qemu interface on the qemu command-line. The "old-style" interface can only be used to specify USB 1.1 devices. We also have "usbversion=[foo]", which uses the "new-style" device specification commands. These new specification commands *can* be specified either on the qemu command-line or via qmp; but at the moment libxl specifies them on the command-line. The patch series attached specifes using the new-style interface via qmp. (This seems to work properly with the various controllers no matter how they were created.) In theory, we should be able to attach these devices during domain creation, after qemu has been started but before the guest is running. Obviously, we would ideally like for the user not to have to worry about a lot of this complexity, and just say, "Can you pass this device through to the guest? Thanks." Another thing to consider in the design space is config file and start-up behavior. == Libvirt's interface == I've had a brief look at libvirt's USB interface, and learned a bit about libvirt's general approach to things at the Xen Hackathon last week. One of the goals of libvirt is to be able to specify the virtual hardware in enough detail to keep it from changing when you upgrade the hypervisor, so that certain proprietary operating systems which are sensitive to this kind of thing continue to work. Instead of specifying a controller name, you specify a controller index (which is different than qemu). But instead of specifying a USB version number, you specify a model for the USB controller (which happens to be the exact name that qemu uses): "piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", "pci-ohci" or "nec-xhci". When specifying a USB device, libvirt has the concept of an "address" where you will plug it into. Here is what the page says about it: "USB addresses have the following additional attributes: bus (a hex value between 0 and 0xfff, inclusive), and port (a dotted notation of up to four octets, such as 1.2 or 2.1.3.1)." It's not exactly clear to me what those numbers mean. But after chatting with Daniel Berrange at the Hackathon, it looks like the "bus" in the address corresponds to the "index" in the controller specification. It also appears that this "index" is internal to libvirt and is not exposed to the guest: so it should in theory be possible to have index 0 be a Xen PVUSB controller, 1 be an emulated qemu controller, 3 be an emulated PVUSB controller, and so on. == Open questions == Those are things I think I know; there are a couple of pertinent factual questions which I'm not sure of: * Is it possible to specify PVUSB controllers and attach USB devices to them before the guest is up and running (i.e., before the frontend is connected)? It looks like xend had a syntax for specifying virtual controllers and attaching virtual devices, so it seems like it should be possible. * Is it possible to connect a USB 1.1 device to a PVUSB controller which has been specified 2.0, or would there have to be a separate virtual controller for each? * Is it possible for the toolstack to tell if dom0 (or whatever the specified backend domain) has PVUSB support before starting the guest? * Is it possible for the toolstack to tell if domU has a working and connected PVUSB front-end? * Do we want to be able to create virtual hubs for qemu-backed controllers at some point in the future? Is there any groundwork we want to lay for that? == Design questions == Then based on that, we have several design questions. * How much of the "controller" thing should be exposed via libxl? Via xl? * This series only allows you to specify the "protocol", either PV or DEVICE_MODEL. Would it be better, for instance, to get rid of that, and instead allow the user to specify the creation of USB controllers, allow them to have a type of "HCI (or emulated)" or "PV", and allow the user to specify which controller to attach a specific device to? * How much "smarts" should we have in the libxl / xl about creating emulated/virtual controllers and of what kinds? * How much / what kind of "smarts" should be in libxl / xl about choosing a controller to plug a device into? * What about config file syntax? Should we try to reuse / extend the current config syntax, or create a new one? Should the new one allow the specification of controllers? Should it perhaps *require* the specification of controllers? == Draft design proposal == I've given it some thought, and based on the below is a suggested design for people to have a go at. Basic idea: Specify named controllers. It's controllers that are PV or emulated, and may have a backend domain. When adding devices, specify which controller to attach it to. Allow most things to have intelligent defaults. * libxl functions usb_controller_add usb_controller_remove/destroy usb_controller_list device struct: name # If empty, default to hciN/pvN, where N starts at 0 type = {PV, EMULATED, AUTO} backend_{domname,domid} # PV only usbversion = {1, 2, 3} numports # default 16 If type==AUTO, then it will be PV for a PV domain, EMULATED for an HVM domain. usb_add usb_remove/destroy usb_list device struct: controller_name # If empty, choose one of the controllers. type hostdev hostbus,hostaddr Note: I've removed backend from the device struct, as that will be based on the controller. * Storing information about virtual USB controllers / devices qemu does not at the moment have a way to query for plugged-in devices. I'm not sure if PVUSB does. Store information about both USB controllers and USB devices created with libxl in xenstore, somewhat similar to the system in the attached patches. * Domain creation I think what we add to the domain creation libxl calls will be obvious from how we design the config file interface. For reference, here are some example config snippets from the current xl / xm config files: -- snip -- # HVM USB usb=1 usbdevice=['tablet','host:4.3'] # HVM USB, not compatible with the above usbversion=3 # xend's PVUSB config file; this creates one virtual controller, then # plugs hostdev 1.8 into port 1 vusb=['usbver=2, numports=4, port_1=1-8'] -- snip -- Given that, here is a potential config file format: -- snip -- # Create two controllers, one pv, one emulated usbcontroller=['type=pv,name=pv0,usbversion=2,numports=4', 'type=emul,name=hci0,usbversion=2'] # Create a controller with the defaults; PV for PV guests, emul for HVM guests usbcontroller=[''] # Same as above, but defaulting to version 2 usbversion=2 # I think we should be able to automatically detect which format to # use; so I think we should re-use usbdevice. I could be convinced otherwise. usbdevice=['type=tablet','type=hostdev,hostaddr=4.3,bus=pv0'] -- snip -- Other ideas: * To make the interface closer to libvirt's, instead of specifying PV / EMULATED and usbversion, just specify a model. Then create "pvusb-v1", "pvusb-v2", &c for PVUSB hubs with the various versions, and detect automatically whether to use the PV or the qemu path. (NB that at the libvirt level, to fit with their syntax, we'd probably end up creating a "xenpvusbN" model in libvirt that would translate down to whatever the appropriate thing is in libxl.) * Rather than having to specify a controller, automatically hot-plug controllers as-needed. * Include an optional port number into which we will plug the USB device. Thoughts? -George == References == Last time this was posted: http://thread.gmane.org/gmane.comp.emulators.xen.devel/156796 PVUSB references: http://doc.opensuse.org/products/draft/SLES/SLES-xen_sd_draft/cha.xen.confi… Libvirt references: http://wiki.libvirt.org/page/QEMUSwitchToLibvirt#-usbdevice https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux… http://libvirt.org/formatdomain.html http://libvirt.org/formatdomain.html#elementsControllers CC: Ian Jackson <ian.jackson(a)citrix.com> CC: Roger Pau Monne <roger.pau(a)citrix.com> CC: sstanisi(a)cbnco.com CC: Fabio Fantoni <fabio.fantoni(a)m2r.biz> CC: Ian Campbell <ian.campbell(a)citrix.com> CC: Anthony Perard <anthony.perard(a)citrix.com> CC: Simon (Bo) Cao <caobosimon(a)gmail.com> CC: LibVirt Development List <libvir-list(a)redhat.com> CC: Jim Fehlig <jfehlig(a)suse.com> CC: Daniel P. Berrange <berrange(a)redhat.com>

5 6

[libvirt] [python PATCH] maint: document development against uninstalled libvirt
by Eric Blake 30 Jun '14

30 Jun '14

Thanks to Dan's recent work in libvirt.git, it is much easier to develop against uninstalled libvirt. Mention how. * README: More details. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- README | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README b/README index ad50828..df1de59 100644 --- a/README +++ b/README @@ -21,6 +21,21 @@ or to install as non-root python setup.py build python setup.py install --user +If python-nose is installed, you can test the package with + + python setup.py test + +A makefile shim is provided so that you can do + + make && make check + +rather than directly invoking setup.py. + +As of libvirt 1.2.6, it is possible to develop against an uninstalled +libvirt.git checkout, by setting some environment variables: + + export PKG_CONFIG_PATH=/path/to/libvirt/git/src/ + export LD_LIBRARY_PATH=/path/to/libvirt/git/src/.libs/ Patches for this code should be sent to the main libvirt development mailing list -- 1.9.3

4 8

[libvirt] [PATCH] LXC: throw an error if we failed to get Idmap elements
by Chen Hanxiao 30 Jun '14

30 Jun '14

Throwing an error is much friendly than just "error: An error occurred, but the cause is unknown" Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b7aa4f5..fa64dc1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10983,6 +10983,8 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, if (virXPathUInt("string(./@start)", ctxt, &idmap[i].start) < 0 || virXPathUInt("string(./@target)", ctxt, &idmap[i].target) < 0 || virXPathUInt("string(./@count)", ctxt, &idmap[i].count) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid idmap start/target/count settings")); VIR_FREE(idmap); goto cleanup; } -- 1.9.0

2 1

[libvirt] [sVirt] Question about virSecuritySELinuxSetSecurityAllLabel()
by H Changyao 30 Jun '14

30 Jun '14

Hi, I am studying sVirt,i have some questions about virSecuritySELinuxSetSecurityAllLabel() function (below AllLabel() instead)in src/security/security_selinux.c. >From some materials, i have understood how sVirt works. AllLabel() is responsible to label "object",in most materials, "object" represents image files, howerver, in AllLabel(),i find there are some other "object"(Hostdev,TPMFile,Chardev,Smartcard,os.kernel, os.initrd,os.dtb) to be labeled. I have question about the scope of "object",besides labeling image files,is those other object necessary to be labeled to guarantee sVirt to achieve strong isolation.

1 0

[libvirt] [for 1.2.6 PATCH] qemu: snapshot: Save persistent domain config when taking external snapshot
by Peter Krempa 30 Jun '14

30 Jun '14

Commit 55bbb011b965c7962933604c70f61cef45e8ec04 introduced a regression where we forgot to save the persistent domain configuration after a external snapshot. This would make libvirt forget the snapshots and effectively revert to the previous state in the following scenario: 1) Start VM 2) Take snapshot 3) Destroy VM 4) Restart libvirtd Also fix spurious blank line added by patch mentioned above. --- src/qemu/qemu_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d34da6f..775f6ab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13126,8 +13126,10 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, int indx = virDomainDiskIndexByName(vm->newDef, vm->def->disks[i]->dst, false); - if (indx >= 0) + if (indx >= 0) { persistDisk = vm->newDef->disks[indx]; + persist = true; + } } ret = qemuDomainSnapshotCreateSingleDiskActive(driver, vm, @@ -13173,7 +13175,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, persistDisk = vm->newDef->disks[indx]; persist = true; } - } qemuDomainSnapshotUndoSingleDiskActive(driver, vm, -- 1.9.3

2 2

[libvirt] Track an error
by David kiarie 30 Jun '14

30 Jun '14

Hi there, Just a silly question, do we have a simpler way of checking where exactly a test is failing.The tests are failing after hacking stuff around. I have this error ../build-aux/test-driver: line 95: 20128 Segmentation fault "$@" > $log_file 2>&1 Yes am having a segfault! I don't know how to track it, well, I could review the whole file but is there some other method I am missing.Could you help me interpret the error, what does 20128 stand for?

2 2

[libvirt] [PATCH 0/2] memdev device: add share argument for type=file
by Michele Paolino 30 Jun '14

30 Jun '14

This patch enables the possibility to run a qemu virtual machine with the share option for the memory-backend-file. The xml description looks like: <memdev type='file' share='on'> <name>ram0</name> <source mem-path='/hugetlbfs'/> <capacity unit='MiB'>1024</capacity> </memdev> This work is based on the previous work of Chen Fan[1]. We are aware of the existing conflict with the previous numa patches[2]. We are sharing this because it is a dependency for some use cases of the qemu vhost-user support(e.g. snabbswitch). [1] http://www.redhat.com/archives/libvir-list/2014-June/msg01195.html [2] http://www.redhat.com/archives/libvir-list/2014-June/msg00201.html Michele Paolino (2): Add share argument to memdev devices(type=file) Documentation and test for the share argument in memdev device docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 16 ++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 3 +++ tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa4.xml | 2 +- 7 files changed, 32 insertions(+), 2 deletions(-) -- 1.9.3

3 4

[libvirt] Entering freeze for libvirt-1.2.6
by Daniel Veillard 30 Jun '14

30 Jun '14

As stated yesterday, we just entered freeze for libvirt-1.2.6, I have pushed a first release candidate tarball and signed rpms at the usual place: ftp://libvirt.org/libvirt/ I gave it a try and with my limited testing it looks okay, but please have a look and test. The goal is to make the release on Tues 1st if all goes well. Also of note I will likely move the libvirt.org server Monday morning (chinese time i.e. sunday for most), it should be quick, just that if you hit the old IP untim DNS propagates you may have the old server (I will block ssh access after the move on the old to avoid split pushes) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 5

[libvirt] [PATCH] net: merge virNetworkGetDHCPLeases and virNetworkGetDHCPLeasesForMAC
by Peter Krempa 30 Jun '14

30 Jun '14

Instead of maintaining two very similar APIs, add the "@mac" parameter to virNetworkGetDHCPLeases and kill virNetworkGetDHCPLeasesForMAC. Both of those functions would return data the same way, so making @mac an optional filter simplifies a lot of stuff. --- daemon/remote.c | 69 +----------------------------------------- include/libvirt/libvirt.h.in | 6 +--- src/driver.h | 8 +---- src/libvirt.c | 70 ++++++------------------------------------- src/libvirt_public.syms | 1 - src/network/bridge_driver.c | 69 +++++++++++------------------------------- src/remote/remote_driver.c | 71 ++------------------------------------------ src/remote/remote_protocol.x | 20 ++----------- src/remote_protocol-structs | 15 +--------- tools/virsh-network.c | 5 +--- 10 files changed, 35 insertions(+), 299 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9ffc1cb..ea16789 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -6292,6 +6292,7 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; if ((nleases = virNetworkGetDHCPLeases(net, + args->mac ? *args->mac : NULL, args->need_results ? &leases : NULL, args->flags)) < 0) goto cleanup; @@ -6336,74 +6337,6 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server ATTRIBUTE_UNUSED, } -static int -remoteDispatchNetworkGetDHCPLeasesForMAC(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - remote_network_get_dhcp_leases_for_mac_args *args, - remote_network_get_dhcp_leases_for_mac_ret *ret) -{ - int rv = -1; - size_t i; - struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); - virNetworkDHCPLeasePtr *leases = NULL; - virNetworkPtr net = NULL; - int nleases = 0; - - if (!priv->conn) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); - goto cleanup; - } - - if (!(net = get_nonnull_network(priv->conn, args->net))) - goto cleanup; - - if ((nleases = virNetworkGetDHCPLeasesForMAC(net, args->mac, - args->need_results ? &leases : NULL, - args->flags)) < 0) - goto cleanup; - - if (nleases > REMOTE_NETWORK_DHCP_LEASES_MAX) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Number of leases is %d, which exceeds max limit: %d"), - nleases, REMOTE_NETWORK_DHCP_LEASES_MAX); - return -1; - } - - if (leases && nleases) { - if (VIR_ALLOC_N(ret->leases.leases_val, nleases) < 0) - goto cleanup; - - ret->leases.leases_len = nleases; - - for (i = 0; i < nleases; i++) { - if (remoteSerializeDHCPLease(ret->leases.leases_val + i, leases[i]) < 0) - goto cleanup; - } - - } else { - ret->leases.leases_len = 0; - ret->leases.leases_val = NULL; - } - - ret->ret = nleases; - - rv = 0; - - cleanup: - if (rv < 0) - virNetMessageSaveError(rerr); - if (leases) { - for (i = 0; i < nleases; i++) - virNetworkDHCPLeaseFree(leases[i]); - VIR_FREE(leases); - } - virNetworkFree(net); - return rv; -} - - /*----- Helpers. -----*/ /* get_nonnull_domain and get_nonnull_network turn an on-wire diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 594521e..032d6e6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -5169,14 +5169,10 @@ struct _virNetworkDHCPLease { void virNetworkDHCPLeaseFree(virNetworkDHCPLeasePtr lease); int virNetworkGetDHCPLeases(virNetworkPtr network, + const char *mac, virNetworkDHCPLeasePtr **leases, unsigned int flags); -int virNetworkGetDHCPLeasesForMAC(virNetworkPtr network, - const char *mac, - virNetworkDHCPLeasePtr **leases, - unsigned int flags); - /** * virConnectNetworkEventGenericCallback: * @conn: the connection pointer diff --git a/src/driver.h b/src/driver.h index 6e72e92..5018068 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1184,15 +1184,10 @@ typedef int typedef int (*virDrvNetworkGetDHCPLeases)(virNetworkPtr network, + const char *mac, virNetworkDHCPLeasePtr **leases, unsigned int flags); -typedef int -(*virDrvNetworkGetDHCPLeasesForMAC)(virNetworkPtr network, - const char *mac, - virNetworkDHCPLeasePtr **leases, - unsigned int flags); - typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1546,7 +1541,6 @@ struct _virNetworkDriver { virDrvNetworkIsActive networkIsActive; virDrvNetworkIsPersistent networkIsPersistent; virDrvNetworkGetDHCPLeases networkGetDHCPLeases; - virDrvNetworkGetDHCPLeasesForMAC networkGetDHCPLeasesForMAC; }; diff --git a/src/libvirt.c b/src/libvirt.c index 566f984..49c9d16 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21014,6 +21014,7 @@ virNodeGetFreePages(virConnectPtr conn, /** * virNetworkGetDHCPLeases: * @network: Pointer to network object + * @mac: Optional ASCII formatted MAC address of an interface * @leases: Pointer to a variable to store the array containing details on * obtained leases, or NULL if the list is not required (just returns * number of leases). @@ -21040,6 +21041,11 @@ virNodeGetFreePages(virConnectPtr conn, * Note: @mac, @iaid, @ipaddr, @clientid are in ASCII form, not raw bytes. * Note: @expirytime can 0, in case the lease is for infinite time. * + * The API fetches leases info of guests in the specified network. If the + * optional parameter @mac is specified, the returned list will contain only + * lease info about a specific guest interface with @mac. There can be + * multiple leases for a single @mac because this API supports DHCPv6 too. + * * Returns the number of leases found or -1 and sets @leases to NULL in * case of error. On success, the array stored into @leases is guaranteed to * have an extra allocated element set to NULL but not included in the return @@ -21057,7 +21063,7 @@ virNodeGetFreePages(virConnectPtr conn, * int nleases; * unsigned int flags = 0; * - * nleases = virNetworkGetDHCPLeases(network, &leases, flags); + * nleases = virNetworkGetDHCPLeases(network, NULL, &leases, flags); * if (nleases < 0) * error(); * @@ -21079,6 +21085,7 @@ virNodeGetFreePages(virConnectPtr conn, */ int virNetworkGetDHCPLeases(virNetworkPtr network, + const char *mac, virNetworkDHCPLeasePtr **leases, unsigned int flags) { @@ -21097,7 +21104,7 @@ virNetworkGetDHCPLeases(virNetworkPtr network, if (conn->networkDriver && conn->networkDriver->networkGetDHCPLeases) { int ret; - ret = conn->networkDriver->networkGetDHCPLeases(network, leases, flags); + ret = conn->networkDriver->networkGetDHCPLeases(network, mac, leases, flags); if (ret < 0) goto error; return ret; @@ -21110,65 +21117,6 @@ virNetworkGetDHCPLeases(virNetworkPtr network, return -1; } -/** - * virNetworkGetDHCPLeasesForMAC: - * @network: Pointer to network object - * @mac: ASCII formatted MAC address of an interface - * @leases: Pointer to a variable to store the array containing details on - * obtained leases, or NULL if the list is not required (just returns - * number of leases). - * @flags: extra flags, not used yet, so callers should always pass 0 - * - * The API fetches leases info of the interface which matches with the - * given @mac. There can be multiple leases for a single @mac because this - * API supports DHCPv6 too. - * - * Returns the number of leases found or -1 and sets @leases to NULL in case of - * error. On success, the array stored into @leases is guaranteed to have an - * extra allocated element set to NULL but not included in the return count, - * to make iteration easier. The caller is responsible for calling - * virNetworkDHCPLeaseFree() on each array element, then calling free() on @leases. - * - * See virNetworkGetDHCPLeases() for more details on list contents. - */ -int -virNetworkGetDHCPLeasesForMAC(virNetworkPtr network, - const char *mac, - virNetworkDHCPLeasePtr **leases, - unsigned int flags) -{ - virConnectPtr conn; - - VIR_DEBUG("network=%p, mac=%s, leases=%p, flags=%x", - network, mac, leases, flags); - - virResetLastError(); - - if (leases) - *leases = NULL; - - virCheckNonNullArgGoto(mac, error); - - virCheckNetworkReturn(network, -1); - - conn = network->conn; - - if (conn->networkDriver && - conn->networkDriver->networkGetDHCPLeasesForMAC) { - int ret; - ret = conn->networkDriver->networkGetDHCPLeasesForMAC(network, mac, - leases, flags); - if (ret < 0) - goto error; - return ret; - } - - virReportUnsupportedError(); - - error: - virDispatchError(network->conn); - return -1; -} /** * virNetworkDHCPLeaseFree: diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index f64462e..65a5b43 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -663,7 +663,6 @@ LIBVIRT_1.2.6 { virNodeGetFreePages; virNetworkDHCPLeaseFree; virNetworkGetDHCPLeases; - virNetworkGetDHCPLeasesForMAC; } LIBVIRT_1.2.5; # .... define new API here using predicted next version number .... diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1c20b66..0ece432 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3369,9 +3369,10 @@ static int networkSetAutostart(virNetworkPtr net, } static int -networkGetDHCPLeasesHelper(virNetworkObjPtr obj, - const char *mac, - virNetworkDHCPLeasePtr **leases) +networkGetDHCPLeases(virNetworkPtr network, + const char *mac, + virNetworkDHCPLeasePtr **leases, + unsigned int flags) { size_t i, j; size_t nleases = 0; @@ -3391,6 +3392,15 @@ networkGetDHCPLeasesHelper(virNetworkObjPtr obj, virNetworkIpDefPtr ipdef_tmp = NULL; virNetworkDHCPLeasePtr lease = NULL; virNetworkDHCPLeasePtr *leases_ret = NULL; + virNetworkObjPtr obj; + + virCheckFlags(0, -1); + + if (!(obj = networkObjFromNetwork(network))) + return -1; + + if (virNetworkGetDHCPLeasesEnsureACL(network->conn, obj->def) < 0) + goto cleanup; /* Retrieve custom leases file location */ custom_lease_file = networkDnsmasqLeaseFileNameCustom(obj->def->bridge); @@ -3530,6 +3540,10 @@ networkGetDHCPLeasesHelper(virNetworkObjPtr obj, VIR_FREE(lease_entries); VIR_FREE(custom_lease_file); virJSONValueFree(leases_array); + + if (obj) + virNetworkObjUnlock(obj); + return rv; error: @@ -3541,54 +3555,6 @@ networkGetDHCPLeasesHelper(virNetworkObjPtr obj, goto cleanup; } -static int -networkGetDHCPLeases(virNetworkPtr network, - virNetworkDHCPLeasePtr **leases, - unsigned int flags) -{ - int rv = -1; - virNetworkObjPtr obj; - - virCheckFlags(0, -1); - - if (!(obj = networkObjFromNetwork(network))) - return rv; - - if (virNetworkGetDHCPLeasesEnsureACL(network->conn, obj->def) < 0) - goto cleanup; - - rv = networkGetDHCPLeasesHelper(obj, NULL, leases); - - cleanup: - if (obj) - virNetworkObjUnlock(obj); - return rv; -} - -static int -networkGetDHCPLeasesForMAC(virNetworkPtr network, - const char *mac, - virNetworkDHCPLeasePtr **leases, - unsigned int flags) -{ - int rv = -1; - virNetworkObjPtr obj; - - virCheckFlags(0, -1); - - if (!(obj = networkObjFromNetwork(network))) - return rv; - - if (virNetworkGetDHCPLeasesForMACEnsureACL(network->conn, obj->def) < 0) - goto cleanup; - - rv = networkGetDHCPLeasesHelper(obj, mac, leases); - - cleanup: - if (obj) - virNetworkObjUnlock(obj); - return rv; -} static virNetworkDriver networkDriver = { "Network", @@ -3616,7 +3582,6 @@ static virNetworkDriver networkDriver = { .networkIsActive = networkIsActive, /* 0.7.3 */ .networkIsPersistent = networkIsPersistent, /* 0.7.3 */ .networkGetDHCPLeases = networkGetDHCPLeases, /* 1.2.6 */ - .networkGetDHCPLeasesForMAC = networkGetDHCPLeasesForMAC, /* 1.2.6 */ }; static virStateDriver networkStateDriver = { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 76ce4a9..04039ac 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7601,6 +7601,7 @@ remoteSerializeDHCPLease(virNetworkDHCPLeasePtr lease_dst, remote_network_dhcp_l static int remoteNetworkGetDHCPLeases(virNetworkPtr net, + const char *mac, virNetworkDHCPLeasePtr **leases, unsigned int flags) { @@ -7614,6 +7615,7 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, remoteDriverLock(priv); make_nonnull_network(&args.net, net); + args.mac = mac == NULL ? NULL : (char **) &mac; args.flags = flags; args.need_results = !!leases; @@ -7665,74 +7667,6 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, } -static int -remoteNetworkGetDHCPLeasesForMAC(virNetworkPtr net, - const char *mac, - virNetworkDHCPLeasePtr **leases, - unsigned int flags) -{ - int rv = -1; - size_t i; - struct private_data *priv = net->conn->networkPrivateData; - remote_network_get_dhcp_leases_for_mac_args args; - remote_network_get_dhcp_leases_for_mac_ret ret; - - virNetworkDHCPLeasePtr *leases_ret = NULL; - remoteDriverLock(priv); - - make_nonnull_network(&args.net, net); - args.mac = (char *) mac; - args.flags = flags; - args.need_results = !!leases; - - memset(&ret, 0, sizeof(ret)); - - if (call(net->conn, priv, 0, REMOTE_PROC_NETWORK_GET_DHCP_LEASES_FOR_MAC, - (xdrproc_t)xdr_remote_network_get_dhcp_leases_for_mac_args, (char *)&args, - (xdrproc_t)xdr_remote_network_get_dhcp_leases_for_mac_ret, (char *)&ret) == -1) - goto done; - - if (ret.leases.leases_len > REMOTE_NETWORK_DHCP_LEASES_MAX) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Number of leases is %d, which exceeds max limit: %d"), - ret.leases.leases_len, REMOTE_NETWORK_DHCP_LEASES_MAX); - goto cleanup; - } - - if (leases) { - if (ret.leases.leases_len && - VIR_ALLOC_N(leases_ret, ret.leases.leases_len + 1) < 0) - goto cleanup; - - for (i = 0; i < ret.leases.leases_len; i++) { - if (VIR_ALLOC(leases_ret[i]) < 0) - goto cleanup; - - if (remoteSerializeDHCPLease(leases_ret[i], &ret.leases.leases_val[i]) < 0) - goto cleanup; - } - - *leases = leases_ret; - leases_ret = NULL; - } - - rv = ret.ret; - - cleanup: - if (leases_ret) { - for (i = 0; i < ret.leases.leases_len; i++) - virNetworkDHCPLeaseFree(leases_ret[i]); - VIR_FREE(leases_ret); - } - xdr_free((xdrproc_t)xdr_remote_network_get_dhcp_leases_for_mac_ret, - (char *) &ret); - - done: - remoteDriverUnlock(priv); - return rv; -} - - /* get_nonnull_domain and get_nonnull_network turn an on-wire * (name, uuid) pair into virDomainPtr or virNetworkPtr object. * These can return NULL if underlying memory allocations fail, @@ -8098,7 +8032,6 @@ static virNetworkDriver network_driver = { .networkIsActive = remoteNetworkIsActive, /* 0.7.3 */ .networkIsPersistent = remoteNetworkIsPersistent, /* 0.7.3 */ .networkGetDHCPLeases = remoteNetworkGetDHCPLeases, /* 1.2.6 */ - .networkGetDHCPLeasesForMAC = remoteNetworkGetDHCPLeasesForMAC, /* 1.2.6 */ }; static virInterfaceDriver interface_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 4b75bdb..bff2c47 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3035,6 +3035,7 @@ struct remote_network_dhcp_lease { struct remote_network_get_dhcp_leases_args { remote_nonnull_network net; + remote_string mac; int need_results; unsigned int flags; }; @@ -3044,18 +3045,6 @@ struct remote_network_get_dhcp_leases_ret { unsigned int ret; }; -struct remote_network_get_dhcp_leases_for_mac_args { - remote_nonnull_network net; - remote_nonnull_string mac; - int need_results; - unsigned int flags; -}; - -struct remote_network_get_dhcp_leases_for_mac_ret { - remote_network_dhcp_lease leases<REMOTE_NETWORK_DHCP_LEASES_MAX>; - unsigned int ret; -}; - /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -5413,11 +5402,6 @@ enum remote_procedure { * @generate: none * @acl: network:read */ - REMOTE_PROC_NETWORK_GET_DHCP_LEASES = 341, + REMOTE_PROC_NETWORK_GET_DHCP_LEASES = 341 - /** - * @generate: none - * @acl: network:read - */ - REMOTE_PROC_NETWORK_GET_DHCP_LEASES_FOR_MAC = 342 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 222f125..a14e1fd 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2498,6 +2498,7 @@ struct remote_network_dhcp_lease { }; struct remote_network_get_dhcp_leases_args { remote_nonnull_network net; + remote_string mac; int need_results; u_int flags; }; @@ -2508,19 +2509,6 @@ struct remote_network_get_dhcp_leases_ret { } leases; u_int ret; }; -struct remote_network_get_dhcp_leases_for_mac_args { - remote_nonnull_network net; - remote_nonnull_string mac; - int need_results; - u_int flags; -}; -struct remote_network_get_dhcp_leases_for_mac_ret { - struct { - u_int leases_len; - remote_network_dhcp_lease * leases_val; - } leases; - u_int ret; -}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -2863,5 +2851,4 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2 = 339, REMOTE_PROC_NODE_GET_FREE_PAGES = 340, REMOTE_PROC_NETWORK_GET_DHCP_LEASES = 341, - REMOTE_PROC_NETWORK_GET_DHCP_LEASES_FOR_MAC = 342, }; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 2d5b9be..e7499fa 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1348,10 +1348,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) if (!(network = vshCommandOptNetwork(ctl, cmd, &name))) return false; - nleases = mac ? virNetworkGetDHCPLeasesForMAC(network, mac, &leases, flags) - : virNetworkGetDHCPLeases(network, &leases, flags); - - if (nleases < 0) { + if ((nleases = virNetworkGetDHCPLeases(network, mac, &leases, flags) < 0)) { vshError(ctl, _("Failed to get leases info for %s"), name); goto cleanup; } -- 1.9.3

3 3

[libvirt] [libvirt-glib] [PATCHv2 1/2] libvirt-gobject-domain: Add _fetch_snapshots
by Timm Bäder 27 Jun '14

27 Jun '14

This function can be used to fetch the snapshots of a domain (according to the given GVirDomainSnapshotListFlags) and save them in a domain-internal GHashTable. A function to access them from outside will be added in a later patch. --- libvirt-gobject/libvirt-gobject-domain.c | 61 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 36 +++++++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 2 ++ 3 files changed, 99 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index c6e30e5..a527d4e 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -38,6 +38,7 @@ struct _GVirDomainPrivate { virDomainPtr handle; gchar uuid[VIR_UUID_STRING_BUFLEN]; + GHashTable *snapshots; }; G_DEFINE_TYPE(GVirDomain, gvir_domain, G_TYPE_OBJECT); @@ -121,6 +122,10 @@ static void gvir_domain_finalize(GObject *object) g_debug("Finalize GVirDomain=%p", domain); + if (priv->snapshots) { + g_hash_table_unref (priv->snapshots); + } + virDomainFree(priv->handle); G_OBJECT_CLASS(gvir_domain_parent_class)->finalize(object); @@ -1514,3 +1519,59 @@ gvir_domain_create_snapshot(GVirDomain *dom, g_free(custom_xml); return dom_snapshot; } + + + +/** + * gvir_domain_fetch_snapshots: + * @dom: The domain + * @list_flags: bitwise-OR of #GVirDomainSnapshotListFlags + * @error: (allow-none): Place-holder for error or NULL + * + * Returns: TRUE on success, FALSE otherwise. + */ +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint list_flags, + GError **error) +{ + GVirDomainPrivate *priv; + virDomainSnapshotPtr *snapshots = NULL; + GVirDomainSnapshot *snap; + int n_snaps = 0; + int i; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail((error == NULL) || (*error == NULL), FALSE); + + priv = dom->priv; + + if (priv->snapshots != NULL) { + g_hash_table_unref (priv->snapshots); + } + + priv->snapshots = g_hash_table_new_full(g_str_hash, + g_str_equal, + NULL, + g_object_unref); + + + n_snaps = virDomainListAllSnapshots(priv->handle, &snapshots, list_flags); + + if (n_snaps < 0) { + gvir_set_error(error, GVIR_DOMAIN_ERROR, 0, + "Unable to fetch snapshots of %s", + gvir_domain_get_name (dom)); + return FALSE; + } + + for (i = 0; i < n_snaps; i ++) { + snap = GVIR_DOMAIN_SNAPSHOT(g_object_new(GVIR_TYPE_DOMAIN_SNAPSHOT, + "handle", snapshots[i], + NULL)); + g_hash_table_insert(priv->snapshots, + (gpointer)gvir_domain_snapshot_get_name(snap), + snap); + } + free(snapshots); + return TRUE; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 38d3458..fb33e2b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -183,6 +183,39 @@ typedef enum { GVIR_DOMAIN_REBOOT_GUEST_AGENT = VIR_DOMAIN_REBOOT_GUEST_AGENT, } GVirDomainRebootFlags; +/** + * GVirDomainSnapshotListFlags: + * @GVIR_DOMAIN_SNAPSHOT_LIST_ALL: List all snapshots + * @GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS: List all descendants, not just + * children, when listing a snapshot. + * For historical reasons, groups do not use contiguous bits. + * @GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS: Filter by snapshots with no parents, when listing a domain + * @GVIR_DOMAIN_SNAPSHOT_LIST_METADATA: Filter by snapshots which have metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES: Filter by snapshots with no children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES: Filter by snapshots that have children + * @GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA: Filter by snapshots with no metadata + * @GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE: Filter by snapshots taken while guest was shut off + * @GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE: Filter by snapshots taken while guest was active, and with memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY: Filter by snapshots taken while guest was active, but without memory state + * @GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL: Filter by snapshots stored internal to disk images + * @GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL: Filter by snapshots that use files external to disk images + */ +typedef enum { + GVIR_DOMAIN_SNAPSHOT_LIST_ALL = 0, + GVIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS = VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS, + GVIR_DOMAIN_SNAPSHOT_LIST_ROOTS = VIR_DOMAIN_SNAPSHOT_LIST_ROOTS, + GVIR_DOMAIN_SNAPSHOT_LIST_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES = VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES, + GVIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA = VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA, + GVIR_DOMAIN_SNAPSHOT_LIST_INACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_ACTIVE = VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE, + GVIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY = VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY, + GVIR_DOMAIN_SNAPSHOT_LIST_INTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL, + GVIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL = VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL +} GVirDomainSnapshotListFlags; + + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -330,6 +363,9 @@ gvir_domain_create_snapshot(GVirDomain *dom, guint flags, GError **err); +gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, + guint flags, + GError **error); G_END_DECLS #endif /* __LIBVIRT_GOBJECT_DOMAIN_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index b781cc6..781310f 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -236,7 +236,9 @@ LIBVIRT_GOBJECT_0.1.5 { LIBVIRT_GOBJECT_0.1.9 { global: + gvir_domain_fetch_snapshots; gvir_domain_snapshot_delete; + gvir_domain_snapshot_list_flags_get_type; } LIBVIRT_GOBJECT_0.1.5; # .... define new API here using predicted next version number .... -- 2.0.0

2 3

[libvirt] [PATCH] bhyve: fix build by fixing typo in variable name
by Roman Bogorodskiy 27 Jun '14

27 Jun '14

Commit 80d0918b introduced a typo in variable name: s/failIncomaptible/failIncompatible/ Pushed under the build breaker rule. --- src/bhyve/bhyve_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index d784ed1..eb5fc95 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1326,14 +1326,14 @@ bhyveConnectCompareCPU(virConnectPtr conn, if (virConnectCompareCPUEnsureACL(conn) < 0) goto cleanup; - failIncomaptible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); + failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); if (!(caps = bhyveDriverGetCapabilities(driver))) goto cleanup; if (!caps->host.cpu || !caps->host.cpu->model) { - if (failIncomaptible) { + if (failIncompatible) { virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", _("cannot get host CPU capabilities")); } else { @@ -1341,7 +1341,7 @@ bhyveConnectCompareCPU(virConnectPtr conn, ret = VIR_CPU_COMPARE_INCOMPATIBLE; } } else { - ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncomaptible); + ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncompatible); } cleanup: -- 1.9.0

1 0

[libvirt] [PATCH] cpu: Add new Broadwell CPU model
by Jiri Denemark 27 Jun '14

27 Jun '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: The corresponding patch [1] for QEMU is not usptream yet but nobody seems to be complaining about that model. And chances are the patch gets in before QEMU enters hard freeze for 2.1. So please review this patch but I won't push it until the model gets pushed to QEMU. [1] https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg04025.html src/cpu/cpu_map.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 7d34d40..d704e59 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -511,6 +511,14 @@ <feature name='rtm'/> </model> + <model name='Broadwell'> + <model name='Haswell'/> + <feature name='3dnowprefetch'/> + <feature name='rdseed'/> + <feature name='adx'/> + <feature name='smap'/> + </model> +  <model name='athlon'> <model name='pentiumpro'/> -- 2.0.0

2 2

[libvirt] [PATCH RFC 0/4] Expose Expose IOMMU and VFIO host capabilities
by Michal Privoznik 27 Jun '14

27 Jun '14

*** NOT FOR UPSTREAM MERGE *** This is pure RFC, that's why it contains just code without any documentation, RNG schemas, tests, ..., with sparse commit messages. I just want to make sure I'm on the right track this time. BTW: The ACL issue on the command is still not resolved and honestly, I've no solution. Long story short, with this API I'm introducing users with RO connection can execute arbitrary files on the host. Isn't that just nice? So, what you should see after these patches are applied? Something like this: virsh # domcapabilities /usr/bin/qemu-system-x86_64 kvm <emulatorCapabilities> <path>/usr/bin/qemu-system-x86_64</path> <domain>kvm</domain> <machine>pc-i440fx-2.1</machine> <arch>x86_64</arch> <vcpu>255</vcpu> <devices> <disk supported='yes'> <enum name='diskDevice'> <value>disk</value> <value>cdrom</value> <value>floppy</value> <value>lun</value> </enum> <enum name='bus'> <value>ide</value> <value>fdc</value> <value>scsi</value> <value>virtio</value> <value>xen</value> <value>usb</value> <value>sd</value> </enum> </disk> <hostdev supported='yes'> <enum name='mode'/> <enum name='startupPolicy'> <value>default</value> <value>mandatory</value> <value>requisite</value> <value>optional</value> </enum> <enum name='subsysType'> <value>usb</value> <value>pci</value> <value>scsi</value> </enum> <enum name='capsType'/> <enum name='pciBackend'> <value>default</value> <value>kvm</value> <value>vfio</value> </enum> </hostdev> </devices> </emulatorCapabilities> Michal Privoznik (4): Introduce domain_capabilities Introduce virConnectGetDomainCapabilities virsh: expose virConnectGetDomainCapabilities qemu: Implement virConnectGetDomainCapabilities include/libvirt/libvirt.h.in | 7 ++ src/Makefile.am | 1 + src/conf/domain_capabilities.c | 217 +++++++++++++++++++++++++++++++++++++++++ src/conf/domain_capabilities.h | 89 +++++++++++++++++ src/driver.h | 9 ++ src/libvirt.c | 52 ++++++++++ src/libvirt_private.syms | 6 ++ src/libvirt_public.syms | 1 + src/qemu/qemu_capabilities.c | 82 ++++++++++++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_driver.c | 102 +++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 20 +++- src/remote_protocol-structs | 11 +++ tools/virsh-host.c | 84 ++++++++++++++++ 15 files changed, 685 insertions(+), 1 deletion(-) create mode 100644 src/conf/domain_capabilities.c create mode 100644 src/conf/domain_capabilities.h -- 1.8.5.5

3 11

[libvirt] [python PATCHv2] Implement new virNetworkGetDHCPLeases API
by Peter Krempa 27 Jun '14

27 Jun '14

From: Nehal J Wani <nehaljw.kkd1(a)gmail.com> This API returns a list of DHCP leases for all network interfaces connected to the given virtual network or limited output just for one interface if mac is specified. Example Output: [{'iface': 'virbr3', 'ipaddr': '192.168.150.181', 'hostname': 'ubuntu14', 'expirytime': 1403737495L, 'prefix': 24, 'clientid': None, 'mac': '52:54:00:e8:73:eb', 'iaid': None, 'type': 0}, {'iface': 'virbr3', 'ipaddr': '2001:db8:ca2:2:1::bd', 'hostname': 'fedora20-test', 'expirytime': 1403738587L, 'prefix': 64, 'clientid': '00:04:b1:d8:86:42:e1:6a:aa:cf:d5:86:94:23:6f:94:04:cd', 'mac': '52:54:00:5b:40:98', 'iaid': '5980312', 'type': 1}] Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- examples/README | 1 + examples/dhcpleases.py | 53 +++++++++++++++++++++++++++++ generator.py | 4 +++ libvirt-override-api.xml | 7 ++++ libvirt-override.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 6 ++++ 6 files changed, 159 insertions(+) create mode 100755 examples/dhcpleases.py diff --git a/examples/README b/examples/README index f4db76c..5b5d405 100644 --- a/examples/README +++ b/examples/README @@ -10,6 +10,7 @@ domsave.py - save all running domU's into a directory domrestore.py - restore domU's from their saved files in a directory esxlist.py - list active domains of an VMware ESX host and print some info. also demonstrates how to use the libvirt.openAuth() method +dhcpleases.py - list dhcp leases for a given virtual network The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py new file mode 100755 index 0000000..c172dc2 --- /dev/null +++ b/examples/dhcpleases.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# netdhcpleases - print leases info for given virtual network + +import libvirt +import sys +import time + +def usage(): + print "Usage: %s [URI] NETWORK" % sys.argv[0] + print " Print leases info for a given virtual network" + +uri = None +network = None +args = len(sys.argv) + +if args == 2: + network = sys.argv[1] +elif args == 3: + uri = sys.argv[1] + network = sys.argv[2] +else: + usage() + sys.exit(2) + +conn = libvirt.open(uri) +if conn == None: + print "Unable to open connection to libvirt" + sys.exit(1) + +try: + net = conn.networkLookupByName(network) +except libvirt.libvirtError: + print "Network %s not found" % network + sys.exit(0) + +leases = net.DHCPLeases(); +if (leases == None): + print "Failed to get leases for %s" % net.name() + sys.exit(0) + +def toIPAddrType(addrType): + if addrType == libvirt.VIR_IP_ADDR_TYPE_IPV4: + return "ipv4" + elif addrType == libvirt.VIR_IP_ADDR_TYPE_IPV6: + return "ipv6" + +print " {0:20} {1:18} {2:9} {3:25} {4:15} {5}".format("Expiry Time", "MAC address", "Protocol", "IP address", "Hostname", "Client ID or DUID") +print "-"*115 + +for lease in leases: + print " {0:20}".format(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(lease['expirytime']))), + print "{0:18} {1:9}".format(lease['mac'], toIPAddrType(lease['type'])), + print "{0:<25} {1:15} {2}".format("{}/{}".format(lease['ipaddr'], lease['prefix']), lease['hostname'], lease['clientid']) diff --git a/generator.py b/generator.py index 03027c6..a12c52b 100755 --- a/generator.py +++ b/generator.py @@ -463,6 +463,7 @@ skip_impl = ( 'virDomainMigrateToURI3', 'virConnectGetCPUModelNames', 'virNodeGetFreePages', + 'virNetworkGetDHCPLeases', ) lxc_skip_impl = ( @@ -568,6 +569,8 @@ skip_function = ( "virTypedParamsGetString", "virTypedParamsGetUInt", "virTypedParamsGetULLong", + + 'virNetworkDHCPLeaseFree', # only useful in C, python code uses list ) lxc_skip_function = ( @@ -1115,6 +1118,7 @@ def nameFixup(name, classe, type, file): elif name[0:13] == "virNetworkGet": func = name[13:] func = func[0:1].lower() + func[1:] + func = func.replace("dHCP", "DHCP") elif name[0:10] == "virNetwork": func = name[10:] func = func[0:1].lower() + func[1:] diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index bbf0ab1..09bbbf8 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -633,5 +633,12 @@ <arg name='flags' type='int' info='unused, pass 0'/> <return type='char *' info='the list available memory in the cells'/> </function> + <function name="virNetworkGetDHCPLeases" file='python'> + <info>Returns a list of dhcp leases for interfaces connected to the given virtual network</info> + <arg name='network' type='virNetworkPtr' info='a network object'/> + <arg name='mac' type='const char *' info='optional mac address'/> + <arg name='flags' type='unsigned int' info='unused, pass 0'/> + <return type='char *' info="list of leases"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 40aefcc..ed5e9e4 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7866,6 +7866,93 @@ libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(counts); return py_retval; } + + +static PyObject * +libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = NULL; + PyObject *py_lease = NULL; + virNetworkPtr network; + PyObject *pyobj_network; + unsigned int flags; + virNetworkDHCPLeasePtr *leases = NULL; + int leases_count; + char *mac = NULL; + size_t i; + + if (!PyArg_ParseTuple(args, (char *) "Ozi:virNetworkDHCPLeasePtr", + &pyobj_network, &mac, &flags)) + return NULL; + + network = (virNetworkPtr) PyvirNetwork_Get(pyobj_network); + + LIBVIRT_BEGIN_ALLOW_THREADS; + leases_count = virNetworkGetDHCPLeases(network, mac, &leases, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (leases_count < 0) { + py_retval = VIR_PY_NONE; + goto cleanup; + } + + if (!(py_retval = PyList_New(leases_count))) + goto no_memory; + + for (i = 0; i < leases_count; i++) { + virNetworkDHCPLeasePtr lease = leases[i]; + + if ((py_lease = PyDict_New()) == NULL) + goto no_memory; + +#define VIR_SET_LEASE_ITEM(NAME, VALUE_OBJ_FUNC) \ + do { \ + PyObject *tmp_val; \ + \ + if (!(tmp_val = VALUE_OBJ_FUNC)) \ + goto no_memory; \ + \ + if (PyDict_SetItemString(py_lease, NAME, tmp_val) < 0) { \ + Py_DECREF(tmp_val); \ + goto no_memory; \ + } \ + } while (0) + + VIR_SET_LEASE_ITEM("iface", libvirt_charPtrWrap(lease->iface)); + VIR_SET_LEASE_ITEM("expirytime", libvirt_longlongWrap(lease->expirytime)); + VIR_SET_LEASE_ITEM("type", libvirt_intWrap(lease->type)); + VIR_SET_LEASE_ITEM("mac", libvirt_charPtrWrap(lease->mac)); + VIR_SET_LEASE_ITEM("ipaddr", libvirt_charPtrWrap(lease->ipaddr)); + VIR_SET_LEASE_ITEM("prefix", libvirt_uintWrap(lease->prefix)); + VIR_SET_LEASE_ITEM("hostname", libvirt_charPtrWrap(lease->hostname)); + VIR_SET_LEASE_ITEM("clientid", libvirt_charPtrWrap(lease->clientid)); + VIR_SET_LEASE_ITEM("iaid", libvirt_charPtrWrap(lease->iaid)); + +#undef VIR_SET_LEASE_ITEM + + if (PyList_SetItem(py_retval, i, py_lease) < 0) + goto no_memory; + + py_lease = NULL; + } + + cleanup: + Py_XDECREF(py_lease); + if (leases) { + for (i = 0; i < leases_count; i++) + virNetworkDHCPLeaseFree(leases[i]); + } + VIR_FREE(leases); + + return py_retval; + + no_memory: + Py_XDECREF(py_retval); + py_retval = PyErr_NoMemory(); + goto cleanup; +} + #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ /************************************************************************ @@ -8051,6 +8138,7 @@ static PyMethodDef libvirtMethods[] = { #endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ #if LIBVIR_CHECK_VERSION(1, 2, 6) {(char *) "virNodeGetFreePages", libvirt_virNodeGetFreePages, METH_VARARGS, NULL}, + {(char *) "virNetworkGetDHCPLeases", libvirt_virNetworkGetDHCPLeases, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ {NULL, NULL, 0, NULL} }; diff --git a/sanitytest.py b/sanitytest.py index 6067a3f..4f4a648 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -78,6 +78,9 @@ for cname in wantfunctions: if name[0:14] == "virTypedParams": continue + if name[0:23] == "virNetworkDHCPLeaseFree": + continue + # These aren't functions, they're callback signatures if name in ["virConnectAuthCallbackPtr", "virConnectCloseFunc", "virStreamSinkFunc", "virStreamSourceFunc", "virStreamEventCallback", @@ -210,6 +213,9 @@ for name in sorted(basicklassmap): if func[0:8] == "fSFreeze" or func[0:6] == "fSThaw": func = "fs" + func[2:] + if klass == "virNetwork": + func = func.replace("dHCP", "DHCP") + # ...except when they don't. More stupid naming # decisions we can't fix if func == "iD": -- 1.9.3

2 2

[libvirt] Change of server
by Daniel Veillard 27 Jun '14

27 Jun '14

I went ahead and switched earlier today, the new IP for libvirt.org is 91.121.203.120 , seems to me that all services are functionning as before, I also migrated the various cron. The DNS TTL should expire within 2 hours and everybody should see the new box then. it has twice the memory and twice the CPU power (still not a speed daemon by any measure but should be a bit better). Main point is that the hardware is newer and hence less likely to fail, but don't repeat it Murphy could hear about it ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0