- Devel - libvirt List Archives

Re: [libvirt] [PATCH v2 3/3] KVM: VMX: enable guest access to LMCE related MSRs
by Eduardo Habkost 20 Jun '16

20 Jun '16

On Thu, Jun 16, 2016 at 12:04:50PM +0200, Paolo Bonzini wrote: > On 16/06/2016 08:05, Haozhong Zhang wrote: > > From: Ashok Raj <ashok.raj(a)intel.com> > > > > On Intel platforms, this patch adds LMCE to KVM MCE supported > > capabilities and handles guest access to LMCE related MSRs. > > > > Signed-off-by: Ashok Raj <ashok.raj(a)intel.com> > > [Haozhong: macro KVM_MCE_CAP_SUPPORTED => variable kvm_mce_cap_supported > > Only enable LMCE on Intel platform > > Check MSR_IA32_FEATURE_CONTROL when handling guest > > access to MSR_IA32_MCG_EXT_CTL] > > Signed-off-by: Haozhong Zhang <haozhong.zhang(a)intel.com> [...] > > @@ -6433,6 +6455,8 @@ static __init int hardware_setup(void) > > > > kvm_set_posted_intr_wakeup_handler(wakeup_handler); > > > > + kvm_mce_cap_supported |= MCG_LMCE_P; > > Ah, so virtual LMCE is available on all processors! This is > interesting, but it also makes it more complicated to handle in QEMU; a > new QEMU generally doesn't require a new kernel. > > Eduardo, any ideas? (CCing libvirt list) As we shouldn't make machine-type changes introduce new host requirements, it looks like we need to either add a new set of CPU models (unreasonable), or expect management software to explicitly enable LMCE after ensuring the host supports it. Or we could wait for a reasonable time after the feature is available in the kernel, and declare that QEMU as a whole requires a newer kernel. But how much time would be reasonable for that? Long term, I believe we should think of a better solution. I don't think it is reasonable to require new libvirt code to be written for every single low-level feature that requires a newer kernel or newer host hardware. Maybe new introspection interfaces that would allow us to drop the "no new requirements on machine-type changes" rule? -- Eduardo

3 4

[libvirt] [PATCH] qemu_hotplug: Use a helper variable consistently
by Tomasz Flendrich 20 Jun '16

20 Jun '16

--- src/qemu/qemu_hotplug.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9aca853..f695903 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1305,7 +1305,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, char *charAlias = NULL; char *devstr = NULL; - if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) + if (qemuAssignDeviceRedirdevAlias(def, redirdev, -1) < 0) goto cleanup; if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) @@ -1314,7 +1314,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup; - if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) + if (VIR_REALLOC_N(def->redirdevs, def->nredirdevs+1) < 0) goto cleanup; qemuDomainObjEnterMonitor(driver, vm); @@ -1335,7 +1335,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto audit; - vm->def->redirdevs[vm->def->nredirdevs++] = redirdev; + def->redirdevs[def->nredirdevs++] = redirdev; ret = 0; audit: virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); @@ -1514,7 +1514,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (rc == 1) need_release = true; - if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) + if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0) goto cleanup; if (virAsprintf(&charAlias, "char%s", chr->info.alias) < 0) @@ -1533,13 +1533,13 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto audit; - qemuDomainChrInsertPreAlloced(vm->def, chr); + qemuDomainChrInsertPreAlloced(vmdef, chr); ret = 0; audit: virDomainAuditChardev(vm, NULL, chr, "attach", ret == 0); cleanup: if (ret < 0 && virDomainObjIsActive(vm)) - qemuDomainChrInsertPreAllocCleanup(vm->def, chr); + qemuDomainChrInsertPreAllocCleanup(vmdef, chr); if (ret < 0 && need_release) qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); VIR_FREE(charAlias); @@ -4066,7 +4066,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, sa_assert(tmpChr->info.alias); - if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) + if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0) return ret; qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info); -- 2.7.4 (Apple Git-66)

2 1

[libvirt] Question: forbid dnsmasq to install IPv6 default route
by Maxim Perevedentsev 18 Jun '16

18 Jun '16

Hello guys! I got into problem with installing IPv6 default gateway on centos7 guest while running dhcpv6. === Scheme === Guest has two network interfaces. *eth0* is connected to Host-Only network over virbr0. This network has dhcpv6 set up. [root@s143 ~]# virsh net-dumpxml Host-Only <network connections='1'> <name>Host-Only</name> <uuid>11aa4e6a-9014-4dae-86b9-b13159896efe</uuid> <bridge name='virbr0' stp='off' delay='0'/> <mac address='52:54:00:1e:17:49'/> <ip family='ipv4' address='10.37.130.2' prefix='24'> <dhcp> <range start='10.37.130.1' end='10.37.130.254'/> </dhcp> </ip> <ip family='ipv6' address='fdb2:2c26:f4e4::1' prefix='64'> <dhcp> <range start='fdb2:2c26:f4e4::' end='fdb2:2c26:f4e4::ffff'/> </dhcp> </ip> </network> *eth1* is connected to Bridged network over br0 bridge on host enp4s0 interface. [root@s143 ~]# virsh net-dumpxml Bridged <network connections='1'> <name>Bridged</name> <uuid>1ffa16f9-6a52-4710-9b58-52b8463cdece</uuid> <forward mode='bridge'/> <bridge name='br0'/> </network> [root@s143 ~]# virsh iface-dumpxml br0 <interface type='bridge' name='br0'> <protocol family='ipv4'> <ip address='10.94.1.161' prefix='16'/> </protocol> <protocol family='ipv6'> <ip address='2001:aaad::a5e:a28E' prefix='64'/> <ip address='fe80::be5f:f4ff:fe44:2cbb' prefix='64'/> </protocol> <bridge> <interface type='ethernet' name='vme42460d71'> <link state='unknown'/> <mac address='fe:1c:42:46:0d:71'/> </interface> <interface type='ethernet' name='enp4s0'> <link speed='1000' state='up'/> <mac address='bc:5f:f4:44:2c:bb'/> </interface> </bridge> </interface> === Problem === Now I want to set ipv6 address 2001:aaad::a5e:a28F to guest eth1 (bridged to host) and install a default route ip -6 route add default via 2001:aaad::a5e:a290 dev eth1 // metric 1024 So I want all the IPv6 traffic w/o route to go into eth1, then through host bridge to gateway (same for host and guest). The problem is that I see following in my guest: // the metric changes somehow, but this does not matter. default via fe80::5054:ff:fe1e:1749 dev eth0 proto static metric 100 pref medium default via 2001:aaad::a5e:a290 dev eth1 metric 1024 pref medium And the first (via link-local) route is preferred on routing. [root@s143 ~]# ip -6 address show dev virbr0 6: virbr0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 inet6 fdb2:2c26:f4e4::1/64 scope global valid_lft forever preferred_lft forever inet6 fe80::5054:ff:fe1e:1749/64 scope link valid_lft forever preferred_lft forever The problem is: guest:/ # radvdump # # radvd configuration generated by radvdump 2.11 # based on Router Advertisement from fe80::5054:ff:fe1e:1749 # received by interface eth0 # interface eth0 { AdvSendAdvert on; # Note: {Min,Max}RtrAdvInterval cannot be obtained with radvdump AdvManagedFlag on; AdvOtherConfigFlag on; AdvReachableTime 0; AdvRetransTimer 0; AdvCurHopLimit 64; AdvDefaultLifetime 1800; <---------------- AdvHomeAgentFlag off; AdvDefaultPreference medium; AdvLinkMTU 1500; AdvSourceLLAddress on; prefix fdb2:2c26:f4e4::/64 { AdvValidLifetime 3600; AdvPreferredLifetime 3600; AdvOnLink on; AdvAutonomous off; AdvRouterAddr off; }; # End of prefix definition RDNSS fe80::5054:ff:fe1e:1749 { AdvRDNSSLifetime 3600; }; # End of RDNSS definition }; # End of interface definition So, dnsmasq includes its link-local address into RA and announces itself as default gateway valid for 30min. Guest sees this RA and installs a route in accordance. As a result, the default gateway requested by user is overridden and thus not used. We cannot just disable RA since we still need IPv6 address on guest eth0 (dhcp6 part of functionality). === Possible solutions === I see two possible solutions. 1) Tinker with routes. As I said, the metric of installed RA routes may change and it's difficult to override them for sure (maybe with metric 0 or 1?) Moreover, this may confuse user and requires specific knowledge (IPv6, RA, etc.). 2) Forbid guest to learn default route from RA sysctl -w net.ipv6.conf.eth0.accept_ra_defrtr=0 - This should be made for all virbr-based networks. - This may confuse user as well. 3) Forbid dnsmasq to announce virbr0 link-local address as default gateway. This can be made with adding 'ra-param=*,0,0' to /var/lib/libvirt/dnsmasq/Host-Only.conf // interface=* (any), interval=0 (default), router_lifetime=0 (I am NOT you gateway, Luke). // tested on dnsmasq-2.75-3.fc22 but should work from 2.67 now the RA looks as following: linux-bnqo:/ # radvdump # # radvd configuration generated by radvdump 2.11 # based on Router Advertisement from fe80::5054:ff:fe1e:1749 # received by interface eth0 # interface eth0 { AdvSendAdvert on; # Note: {Min,Max}RtrAdvInterval cannot be obtained with radvdump AdvManagedFlag on; AdvOtherConfigFlag on; AdvReachableTime 0; AdvRetransTimer 0; AdvCurHopLimit 64; AdvDefaultLifetime 0; AdvHomeAgentFlag off; AdvDefaultPreference medium; AdvLinkMTU 1500; AdvSourceLLAddress on; prefix fdb2:2c26:f4e4::/64 { AdvValidLifetime 3600; AdvPreferredLifetime 3600; AdvOnLink on; AdvAutonomous off; AdvRouterAddr off; }; # End of prefix definition RDNSS fe80::5054:ff:fe1e:1749 { AdvRDNSSLifetime 3600; }; # End of RDNSS definition }; # End of interface definition === Conclusion ==== Please correct me if my setup itself is wrong and causes problems. Maybe there are another solutions possible, w/o modifying libvirt/guest? Would you accept patches related to 3rd solution? Looking forward to your replies. Thanks in advance! -- Your sincerely, Maxim Perevedentsev

2 1

[libvirt] [PATCH v5] virsh: Introduce virsh-pool command
by Jovanka Gulicoska 18 Jun '16

18 Jun '16

--- tools/virsh-pool.c | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++ 2 files changed, 202 insertions(+) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index f9299e2..18e218c 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -32,6 +32,7 @@ #include "virfile.h" #include "conf/storage_conf.h" #include "virstring.h" +#include "virtime.h" #define VIRSH_COMMON_OPT_POOL_FULL \ VIRSH_COMMON_OPT_POOL(N_("pool name or uuid")) \ @@ -1889,6 +1890,183 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd) return ret; } +/* + * "pool-event" command + */ +VIR_ENUM_DECL(virshPoolEvent) +VIR_ENUM_IMPL(virshPoolEvent, + VIR_STORAGE_POOL_EVENT_LAST, + N_("Defined"), + N_("Undefined"), + N_("Started"), + N_("Stopped"), + N_("Refreshed")) + +static const char * +virshPoolEventToString(int event) +{ + const char *str = virshPoolEventTypeToString(event); + return str ? _(str) : _("unknown"); +} + +struct virshPoolEventData { + vshControl *ctl; + bool loop; + bool timestamp; + int count; +}; +typedef struct virshPoolEventData virshPoolEventData; + +VIR_ENUM_DECL(virshPoolEventId) +VIR_ENUM_IMPL(virshPoolEventId, + VIR_STORAGE_POOL_EVENT_ID_LAST, + "lifecycle") + +static void +vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolPtr pool, + int event, + int detail ATTRIBUTE_UNUSED, + void *opaque) +{ + virshPoolEventData *data = opaque; + + if (!data->loop && data->count) + return; + + if (data->timestamp) { + char timestamp[VIR_TIME_STRING_BUFLEN]; + + if (virTimeStringNowRaw(timestamp) < 0) + timestamp[0] = '\0'; + + vshPrint(data->ctl, _("%s: event 'lifecycle' for storage pool %s: %s\n"), + timestamp, + virStoragePoolGetName(pool), + virshPoolEventToString(event)); + } else { + vshPrint(data->ctl, _("event 'lifecycle' for storage pool %s: %s\n"), + virStoragePoolGetName(pool), + virshPoolEventToString(event)); + } + + data->count++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static const vshCmdInfo info_pool_event[] = { + {.name = "help", + .data = N_("Storage Pool Events") + }, + {.name = "desc", + .data = N_("List event types, or wait for storage pool events to occur") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_pool_event[] = { + {.name = "pool", + .type = VSH_OT_STRING, + .help = N_("filter by storage pool name or uuid") + }, + {.name = "event", + .type = VSH_OT_STRING, + .help = N_("which event type to wait for") + }, + {.name = "loop", + .type = VSH_OT_BOOL, + .help = N_("loop until timeout or interrupt, rather than one-shot") + }, + {.name = "timeout", + .type = VSH_OT_INT, + .help = N_("timeout seconds") + }, + {.name = "list", + .type = VSH_OT_BOOL, + .help = N_("list valid event types") + }, + {.name = "timestamp", + .type = VSH_OT_BOOL, + .help = N_("show timestamp for each printed event") + }, + {.name = NULL} +}; + +static bool +cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) +{ + virStoragePoolPtr pool = NULL; + bool ret = false; + int eventId = -1; + int timeout = 0; + virshPoolEventData data; + const char *eventName = NULL; + int event; + virshControlPtr priv = ctl->privData; + + if (vshCommandOptBool(cmd, "list")) { + size_t i; + + for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) + vshPrint(ctl, "%s\n", virshPoolEventIdTypeToString(i)); + return true; + } + + if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + return false; + if (!eventName) { + vshError(ctl, "%s", _("either --list or event type is required")); + return false; + } + if ((event = virshPoolEventIdTypeFromString(eventName)) < 0) { + vshError(ctl, _("unknown event type %s"), eventName); + return false; + } + + data.ctl = ctl; + data.loop = vshCommandOptBool(cmd, "loop"); + data.timestamp = vshCommandOptBool(cmd, "timestamp"); + data.count = 0; + if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) + return false; + + if (vshCommandOptBool(cmd, "pool")) + pool = virshCommandOptPool(ctl, cmd, "pool", NULL); + if (vshEventStart(ctl, timeout) < 0) + goto cleanup; + + if ((eventId = virConnectStoragePoolEventRegisterAny(priv->conn, pool, event, + VIR_STORAGE_POOL_EVENT_CALLBACK(vshEventLifecyclePrint), + &data, NULL)) < 0) + goto cleanup; + switch (vshEventWait(ctl)) { + case VSH_EVENT_INTERRUPT: + vshPrint(ctl, "%s", _("event loop interrupted\n")); + break; + case VSH_EVENT_TIMEOUT: + vshPrint(ctl, "%s", _("event loop timed out\n")); + break; + case VSH_EVENT_DONE: + break; + default: + goto cleanup; + } + vshPrint(ctl, _("events received: %d\n"), data.count); + if (data.count) + ret = true; + + cleanup: + vshEventCleanup(ctl); + if (eventId >= 0 && + virConnectStoragePoolEventDeregisterAny(priv->conn, eventId) < 0) + ret = false; + if (pool) + virStoragePoolFree(pool); + return ret; +} + + const vshCmdDef storagePoolCmds[] = { {.name = "find-storage-pool-sources-as", .handler = cmdPoolDiscoverSourcesAs, @@ -2004,5 +2182,11 @@ const vshCmdDef storagePoolCmds[] = { .info = info_pool_uuid, .flags = 0 }, + {.name = "pool-event", + .handler = cmdPoolEvent, + .opts = opts_pool_event, + .info = info_pool_event, + .flags = 0 + }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 1e56660..e530160 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3457,6 +3457,24 @@ Undefine the configuration for an inactive I<pool>. Returns the UUID of the named I<pool>. +=item B<pool-event> {[I<pool>] I<event> [I<--loop>] [I<--timeout> +I<seconds>] [I<--timestamp>] | I<--list>} + +Wait for a class of storage pool events to occur, and print appropriate +details of events as they happen. The events can optionally be filtered +by I<pool>. Using I<--list> as the only argument will provide a list +of possible I<event> values known by this client, although the connection +might not allow registering for all these events. + +By default, this command is one-shot, and returns success once an event +occurs; you can send SIGINT (usually via C<Ctrl-C>) to quit immediately. +If I<--timeout> is specified, the command gives up waiting for events +after I<seconds> have elapsed. With I<--loop>, the command prints all +events until a timeout or interrupt key. + +When I<--timestamp> is used, a human-readable timestamp will be printed +before the event. + =back =head1 VOLUME COMMANDS -- 2.5.5

2 2

[libvirt] ANNOUNCE: virt-manager 1.4.0 released
by Cole Robinson 18 Jun '16

18 Jun '16

I'm happy to announce the release of virt-manager 1.4.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - virt-manager: spice GL console support (Marc-André Lureau, Cole Robinson) - Note, this isn't enabled by default, and there isn't any GUI bits to enable this, but if it _is_ enabled the virt-manager SPICE viewer will do the right thing. More details: http://blog.wikichoon.com/2016/05/spice-openglvirgl-acceleration-on.html - Bump gtk and pygobject deps to 3.14 - virt-manager: add checkbox to forget keyring password (Pavel Hrdina) - cli: add --graphics gl= (Marc-André Lureau) - cli: add --video accel3d= (Marc-André Lureau) - cli: add --graphics listen=none (Marc-André Lureau) - cli: add --transient flag (Richard W.M. Jones) - cli: --features gic= support, and set a default for it (Pavel Hrdina) - cli: Expose --video heads, ram, vram, vgamem - cli: add --graphics listen=socket - cli: add device address.type/address.bus/... - cli: add --disk seclabelX.model (and .label, .relabel) - cli: add -cpu cellX.id (and .cpus, and .memory) - cli: add --network rom_bar= and rom_file= - cli: add --disk backing_format= - Many bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH v2] libxl: add USB to hostdev domcapabilities
by Joao Martins 17 Jun '16

17 Jun '16

From: Jim Fehlig <jfehlig(a)suse.com> Commit 2a58ed0b added support for creating guests with USB hostdevs. Commit fc21d10 later added support for hotplut of USB hostdevs. Advertise support for USB hostdevs in the domcapabilities. In addition add the appropriate caps for USB support on domaincapstest when libvirt is built on a Xen with LIBXL_HAVE_PVUSB. Otherwise domaincapstest would fail i.e. testing the wrong domain capabilities. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v2: - Change domaincapstest to target (non-)PVUSB caps. --- src/libxl/libxl_capabilities.c | 5 ++ tests/domaincapsschemadata/libxl-xenfv-usb.xml | 69 ++++++++++++++++++++++++++ tests/domaincapsschemadata/libxl-xenpv-usb.xml | 59 ++++++++++++++++++++++ tests/domaincapstest.c | 12 ++++- 4 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 tests/domaincapsschemadata/libxl-xenfv-usb.xml create mode 100644 tests/domaincapsschemadata/libxl-xenpv-usb.xml diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 45f0988..0145116 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -492,6 +492,11 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdevPtr dev) VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI); +#ifdef LIBXL_HAVE_PVUSB + VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); +#endif + /* No virDomainHostdevCapsType for libxl */ virDomainCapsEnumClear(&dev->capsType); diff --git a/tests/domaincapsschemadata/libxl-xenfv-usb.xml b/tests/domaincapsschemadata/libxl-xenfv-usb.xml new file mode 100644 index 0000000..c071d12 --- /dev/null +++ b/tests/domaincapsschemadata/libxl-xenfv-usb.xml @@ -0,0 +1,69 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>xen</domain> + <machine>xenfv</machine> + <arch>x86_64</arch> + <vcpu max='128'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/lib/xen/boot/hvmloader</value> + <value>/usr/lib/xen/boot/ovmf.bin</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + </enum> + </loader> + </os> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>scsi</value> + <value>xen</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>xen</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <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> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>xen</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapsschemadata/libxl-xenpv-usb.xml b/tests/domaincapsschemadata/libxl-xenpv-usb.xml new file mode 100644 index 0000000..4dd07bd --- /dev/null +++ b/tests/domaincapsschemadata/libxl-xenpv-usb.xml @@ -0,0 +1,59 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>xen</domain> + <machine>xenpv</machine> + <arch>x86_64</arch> + <vcpu max='512'/> + <os supported='yes'> + <loader supported='no'/> + </os> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>scsi</value> + <value>xen</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>xen</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <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> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>xen</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 9fb2c97..ae31146 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -367,9 +367,17 @@ mymain(void) #if WITH_LIBXL - DO_TEST_LIBXL("libxl-xenpv", "/usr/bin/qemu-system-x86_64", +# ifdef LIBXL_HAVE_PVUSB +# define LIBXL_XENPV_CAPS "libxl-xenpv-usb" +# define LIBXL_XENFV_CAPS "libxl-xenfv-usb" +# else +# define LIBXL_XENPV_CAPS "libxl-xenpv" +# define LIBXL_XENFV_CAPS "libxl-xenfv" +# endif + + DO_TEST_LIBXL(LIBXL_XENPV_CAPS, "/usr/bin/qemu-system-x86_64", "xenpv", "x86_64", VIR_DOMAIN_VIRT_XEN); - DO_TEST_LIBXL("libxl-xenfv", "/usr/bin/qemu-system-x86_64", + DO_TEST_LIBXL(LIBXL_XENFV_CAPS, "/usr/bin/qemu-system-x86_64", "xenfv", "x86_64", VIR_DOMAIN_VIRT_XEN); #endif /* WITH_LIBXL */ -- 2.1.4

2 1

[libvirt] [PATCH] Remove stray space in cmdHelp
by Ján Tomko 17 Jun '16

17 Jun '16

--- tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/tools/vsh.c b/tools/vsh.c index 605c574..8649305 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2858,7 +2858,7 @@ const vshCmdInfo info_help[] = { bool cmdHelp(vshControl *ctl, const vshCmd *cmd) - { +{ const char *name = NULL; if (vshCommandOptStringQuiet(ctl, cmd, "command", &name) <= 0) { -- 2.7.3

1 0

[libvirt] [PATCH] libxl: add USB to hostdev domcapabilities
by Jim Fehlig 17 Jun '16

17 Jun '16

Commit 2a58ed0b added support for creating guests with USB hostdevs. Commit fc21d10 later added support for hotplut of USB hostdevs. Advertise support for USB hostdevs in the domcapabilities. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_capabilities.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 45f0988..0145116 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -492,6 +492,11 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdevPtr dev) VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI); +#ifdef LIBXL_HAVE_PVUSB + VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); +#endif + /* No virDomainHostdevCapsType for libxl */ virDomainCapsEnumClear(&dev->capsType); -- 2.1.4

2 5

[libvirt] [PATCH] storage: dir: adapts .wipeVol for ploop volumes
by Olga Krishtal 17 Jun '16

17 Jun '16

The modification of .volWipe callback wipes ploop volume using one of given wiping algorithm: dod, nnsa, etc. However, in case of ploop volume we need to reinitialize root.hds and DiskDescriptor.xml. Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> --- src/storage/storage_backend.c | 58 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index d47a76a..367a887 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -2295,6 +2295,45 @@ virStorageBackendWipeLocal(virStorageVolDefPtr vol, return ret; } +static int +virStorageBackendVolWipePloop(virStorageVolDefPtr vol) +{ + virCommandPtr cmd = NULL; + char *target_path = NULL; + char *disk_desc = NULL; + int ret = -1; + + if (virAsprintf(&target_path, "%s/root.hds", vol->target.path) < 0) + goto cleanup; + + if (virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path) < 0) + goto cleanup; + + if (virFileRemove(disk_desc, 0, 0) < 0) { + virReportError(errno, _("Failed to delete DiskDescriptor.xml of volume '%s'"), + vol->target.path); + goto cleanup; + } + if (virFileRemove(target_path, 0, 0) < 0) { + virReportError(errno, _("failed to delete root.hds of volume '%s'"), + vol->target.path); + goto cleanup; + } + + cmd = virCommandNewArgList("ploop", "init", "-s", NULL); + + virCommandAddArgFormat(cmd, "%lluM", VIR_DIV_UP(vol->target.capacity, + (1024 * 1024))); + virCommandAddArgList(cmd, "-t", "ext4", NULL); + virCommandAddArgFormat(cmd, "%s/root.hds", vol->target.path); + ret = virCommandRun(cmd, NULL); + + cleanup: + VIR_FREE(disk_desc); + VIR_FREE(target_path); + virCommandFree(cmd); + return ret; +} int virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -2307,6 +2346,8 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, const char *alg_char = NULL; struct stat st; virCommandPtr cmd = NULL; + char *path = NULL; + char *target_path = vol->target.path; virCheckFlags(0, -1); @@ -2314,12 +2355,12 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.path, algorithm); if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("wiping for ploop volumes is not supported")); - goto cleanup; + if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) + goto cleanup; + target_path = path; } - fd = open(vol->target.path, O_RDWR); + fd = open(target_path, O_RDWR); if (fd == -1) { virReportSystemError(errno, _("Failed to open storage volume with path '%s'"), @@ -2376,13 +2417,12 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, if (algorithm != VIR_STORAGE_VOL_WIPE_ALG_ZERO) { cmd = virCommandNew(SCRUB); virCommandAddArgList(cmd, "-f", "-p", alg_char, - vol->target.path, NULL); + target_path, NULL); if (virCommandRun(cmd, NULL) < 0) goto cleanup; ret = 0; - goto cleanup; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { ret = virStorageBackendVolZeroSparseFileLocal(vol, st.st_size, fd); @@ -2392,10 +2432,16 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.allocation, st.st_blksize); } + if (ret < 0) + goto cleanup; } + if (vol->target.format == VIR_STORAGE_FILE_PLOOP) + ret = virStorageBackendVolWipePloop(vol); + cleanup: virCommandFree(cmd); + VIR_FREE(path); VIR_FORCE_CLOSE(fd); return ret; } -- 1.8.3.1

3 3

[libvirt] [PATCH 0/5] Allow disjunct ranges in VIR_TEST_RANGE
by Ján Tomko 17 Jun '16

17 Jun '16

Now you can do: VIR_TEST_RANGE=7-14,^10,1024 ./virschematest Ján Tomko (5): Do not return number of set bits in virBitmapParse Introduce virBitmapParseSeparator Remove separator argument from virBitmapParse Introduce virBitmapParseUnlimited Allow disjunct ranges in VIR_TEST_RANGE src/conf/domain_conf.c | 15 +++-- src/conf/network_conf.c | 2 +- src/conf/numa_conf.c | 7 +-- src/libvirt_private.syms | 2 + src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_native.c | 4 +- src/nodeinfo.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 2 +- src/util/virbitmap.c | 149 ++++++++++++++++++++++++++++++++++++++++++--- src/util/virbitmap.h | 12 +++- src/util/virhostcpu.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xend_internal.c | 5 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 3 +- tests/qemuxml2argvtest.c | 2 +- tests/testutils.c | 30 ++------- tests/virbitmaptest.c | 31 ++++++---- tests/vircapstest.c | 2 +- tools/virsh-domain.c | 2 +- 22 files changed, 205 insertions(+), 77 deletions(-) -- 2.7.3

2 10