- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Introduce safewrite_str
by Ján Tomko 23 Feb '16

23 Feb '16

3 7

[libvirt] [PATCH 0/3] Couple of coverity fixes
by Michal Privoznik 23 Feb '16

23 Feb '16

All of these were spotted by coverity tool. Michal Privoznik (3): vbox: Avoid signed and unsigned comparison xen: Check return value of virStringReplace qemuBuildCommandLine: Change the condition for -nographics src/qemu/qemu_command.c | 2 +- src/vbox/vbox_common.c | 8 +++----- src/xenconfig/xen_xl.c | 7 ++++++- 3 files changed, 10 insertions(+), 7 deletions(-) -- 2.4.10

2 6

[libvirt] [PATCH] docs: Try harder to uninstall
by Michal Privoznik 23 Feb '16

23 Feb '16

Imagine you have partially installed libvirt, or maybe you're just running 'make uninstall' from a different version than 'make install' has been ran. One way or another, we are doing plain 'rm' instead of 'rm -f' and thus not trying hard enough when uninstalling. In the rest of our code we stick with -f switch. Do that for docs too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 02eca64..1b4353b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -366,8 +366,8 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/libvirtLogo.png $(DESTDIR)$(pkgdatadir) uninstall-local: - for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done - for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done + for h in $(apihtml); do rm -f $(DESTDIR)$(HTML_DIR)/$$h; done + for p in $(apipng); do rm -f $(DESTDIR)$(HTML_DIR)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ + rm -f $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ done -- 2.4.10

2 1

[libvirt] libvirt-guests.sh not correctly working - patch included
by Draget 23 Feb '16

23 Feb '16

Greetings, this mail is sent via CC to ubunutu-devel, because I am not 100% sure if the found formating issue might originate from some ubuntu issue. libvirst-guests.sh on Ubuntu Xenial would not work correctly for me. Only one of the guests would be correctly suspended while the others were killed violently. Package: libvirt-bin Version: 1.3.1-1ubuntu2 /usr/lib/libvirt/libvirt-guests.sh The script writes a list of the VMs it will manage into /usr/lib/libvirt/libvirt-guests but I noticed it was in the format: <url> <vm uuid> <vm uuid> <vm uuid> and only the first VM was handled. After reading through the script and doing some try & error patches, I figured that the correct format should be: <url> <vm uuid> <vm uuid> <vm uuid> i.e. with no new lines. The attached patch makes sure the returned list of VMs does not contain new lines. This fixed the issue. Additionally I would suggest adding an information message on line line 444. Changing: [ -f "$LISTFILE" ] && return 0 to: [ -f "$LISTFILE" ] && echo "No VMs started by libvirt-guests.sh, not doing anything." && return 0 Regards, Michael Gajda

1 0

[libvirt] [PATCH] tests: Fix typo oaque -> opaque
by Andrea Bolognani 23 Feb '16

23 Feb '16

No functional changes. --- Pushed under the trivial rule. tests/virhostdevtest.c | 16 ++++++++-------- tests/virpcitest.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 1b30681..cadb66a 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -157,7 +157,7 @@ virHostdevHostSupportsPassthroughKVM(void) # endif static int -testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevPreparePCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -216,7 +216,7 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevReAttachPCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -250,7 +250,7 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevPreparePCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -296,7 +296,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevReAttachPCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -328,7 +328,7 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevDetachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevDetachPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -347,7 +347,7 @@ testVirHostdevDetachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) return ret; } static int -testVirHostdevResetPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevResetPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -365,7 +365,7 @@ testVirHostdevResetPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevReAttachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevReAttachPCINodeDevice(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; size_t i; @@ -386,7 +386,7 @@ testVirHostdevReAttachPCINodeDevice(const void *oaque ATTRIBUTE_UNUSED) } static int -testVirHostdevUpdateActivePCIHostdevs(const void *oaque ATTRIBUTE_UNUSED) +testVirHostdevUpdateActivePCIHostdevs(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; int count, count1; diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 6dceef2..dd02b0c 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -91,7 +91,7 @@ testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) } static int -testVirPCIDeviceDetach(const void *oaque ATTRIBUTE_UNUSED) +testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; virPCIDevicePtr dev[] = {NULL, NULL, NULL}; -- 2.5.0

1 0

[libvirt] [PATCH 0/3] implement vram64 attribute for QXL video device
by Pavel Hrdina 23 Feb '16

23 Feb '16

Pavel Hrdina (3): qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64 docs/formatdomain: rewrite video documentation qemu: introduce vram64 attribute for QXL video device docs/formatdomain.html.in | 18 +++++++----- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 34 ++++++++++++++++++---- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 13 +++++++++ src/qemu/qemu_monitor_json.c | 8 +++++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 ++ tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 ++ .../qemuxml2argv-video-qxl-device-vram64.args | 25 ++++++++++++++++ .../qemuxml2argv-video-qxl-device-vram64.xml | 29 ++++++++++++++++++ .../qemuxml2argv-video-qxl-sec-device-vram64.args | 27 +++++++++++++++++ .../qemuxml2argv-video-qxl-sec-device-vram64.xml | 32 ++++++++++++++++++++ 22 files changed, 204 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vram64.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vram64.xml -- 2.7.1

2 7

Re: [libvirt] [PATCH] Fix bug of attaching redirdev device
by Osier Yang 23 Feb '16

23 Feb '16

ping? > >> On 18 Feb 2016, at 16:02, Osier Yang <osier(a)yunify.com> wrote: > >>> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1298070 > >>> > >>> The corresponding chardev must be attached first, otherwise the > >>> the qemu command line won't be complete (missing the host part), > >>> --- > >>> src/qemu/qemu_hotplug.c | 27 ++++++++++++++++++++++----- > >>> 1 file changed, 22 insertions(+), 5 deletions(-) > >>> > >>> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c > >>> index ee305e7..5095e31 100644 > >>> --- a/src/qemu/qemu_hotplug.c > >>> +++ b/src/qemu/qemu_hotplug.c > >>> @@ -1381,6 +1381,7 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, > >>> int ret; > >>> qemuDomainObjPrivatePtr priv = vm->privateData; > >>> virDomainDefPtr def = vm->def; > >>> + char *charAlias = NULL; > >>> char *devstr = NULL; > >>> > >>> if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { > >>> @@ -1391,21 +1392,33 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, > >>> > >>> if (qemuAssignDeviceRedirdevAlias(vm->def, redirdev, -1) < 0) > >>> goto error; > >>> - if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) > >>> - goto error; > >>> > >>> - if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) > >>> + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) > >>> goto error; > >>> > >>> qemuDomainObjEnterMonitor(driver, vm); > >>> + if (qemuMonitorAttachCharDev(priv->mon, > >>> + charAlias, > >>> + &(redirdev->source.chr)) < 0) { > >>> + ignore_value(qemuDomainObjExitMonitor(driver, vm)); > >>> + goto error; > >>> + } > >>> + VIR_FREE(charAlias); > >>> + > >>> + if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) > >>> + goto rollback; > >>> + > >>> + if (VIR_REALLOC_N(vm->def->redirdevs, vm->def->nredirdevs+1) < 0) > >>> + goto rollback; > >>> + > >>> ret = qemuMonitorAddDevice(priv->mon, devstr); > >>> > >>> if (qemuDomainObjExitMonitor(driver, vm) < 0) > >>> - goto error; > >>> + goto rollback; > >>> > >>> virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0); > >>> if (ret < 0) > >>> - goto error; > >>> + goto rollback; > >>> > >>> vm->def->redirdevs[vm->def->nredirdevs++] = redirdev; > >>> > >>> @@ -1414,9 +1427,13 @@ int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, > >>> return 0; > >>> > >>> error: > >>> + VIR_FREE(charAlias); > >>> VIR_FREE(devstr); > >>> return -1; > >>> > >>> + rollback: > >>> + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); > >>> + goto error; > >>> } > >>> > >>> static int > >>> -- > >>> 2.1.4 > >>> > >>> -- > >>> libvir-list mailing list > >>> libvir-list(a)redhat.com > >>> https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] Fw: [RFC PATCH 0/2] nodeinfo: PPC64: Fix topology and siblings info on capabilities and nodeinfo
by David Gibson 23 Feb '16

23 Feb '16

Sorry, accidentally sent to just Andrea the first time around, resending... Begin forwarded message: Date: Mon, 22 Feb 2016 16:53:15 +1100 From: David Gibson <dgibson(a)redhat.com> To: Andrea Bolognani <abologna(a)redhat.com> Subject: Re: [libvirt] [RFC PATCH 0/2] nodeinfo: PPC64: Fix topology and siblings info on capabilities and nodeinfo On Fri, 19 Feb 2016 17:40:31 +0100 Andrea Bolognani <abologna(a)redhat.com> wrote: > On Tue, 2016-02-16 at 13:04 +1100, David Gibson wrote: > > > So the information don't seem to add up: we claim that the > > > host has 160 online CPUs, but the NUMA topology only contains > > > information about 5 of them per each node, so 20 in total. > > > > > > That's of course because Linux only provides us with topology > > > information for online CPUs, but KVM on ppc64 wants secondary > > > threads to be offline in the host. The secondary threads are > > > still used to schedule guest threads, so reporting 160 online > > > CPUs is correct for the purpose of planning the number of > > > guests based on the capacity of the host; the problem is that > > > the detailed NUMA topology doesn't match with that. > > > > Yeah, that's rather unfortunate. We do want to list all the threads in > > the capabilities, I think, since they're capable of running vcpus. > > There's a problem with that, though, that I didn't think about > when writing the original message. See below. > > > > The new information is more complete than it was before, and > > > this series certainly would help users make better guest > > > allocation choices. On the other hand, it doesn't really solve > > > the problem of nodeinfo and capabilities disagreeing with each > > > other, and pushes the NUMA topology reported by libvirt a > > > little farther from the one reported by the kernel. > > > > Uh.. I don't really see how nodeinfo and capabilities disagree here. > > Because nodeinfo tell us that the host has 160 online CPUs, while > capabilities tell us that only 40 CPUs are actually online. Hmm, ok. I guess the question is what does "online" mean in the context of a libvirt client. It used to be that "online in host" and "able to run vcpus" were the same thing, but now they're not. > Just to clarify, since the naming is not very explicit: nodeinfo > reports *online* CPUs only, and each <cpu> element in capabilities > is supposed to represent an *online* CPU. Offline CPUs are not > listed or counted anywhere. Ok. > > Now how the topology differs from the kernel. > > Because the kernel reports physical information, so online CPUs > that are in the same physical core (as evidenced by the core_id > value) are counted as siblings regardless of the subcore > configuration. Yeah.. I'll have a chat to Ben and/or Paul and see if they think that's the right choice for the kernel. > > > It may also break some assumptions, eg. CPU 0 and 4 both have > > > the same value for 'core_id', so I'd expect them to be among > > > each other's 'siblings', but they no longer are. > > > > Ah, yes, that's wrong. With this setup the core_id should be set to > > the id of the subcore's first thread, rather than the physical core's > > first thread. > > This would be a pretty wild departure from what the kernel is > exposing to userspace. If that's more meaningful for libvirt's clients than the kernel information, I don't think that's necessarily a problem. > > > I have a different proposal: since we're already altering the > > > NUMA topology information reported by the kernel by counting > > > secondary threads as online, we might as well go all the way > > > and rebuild the entire NUMA topology as if they were. > > > > > > So the capabilities XML when subcores-per-core=1 would look > > > like: > > > > > > <cells num='4'> > > > <cell id='0'> > > > <memory unit='KiB'>67108864</memory> > > > <pages unit='KiB' size='64'>1048576</pages> > > > <pages unit='KiB' size='16384'>0</pages> > > > <distances> > > > <sibling id='0' value='10'/> > > > <sibling id='1' value='20'/> > > > <sibling id='16' value='40'/> > > > <sibling id='17' value='40'/> > > > </distances> > > > <cpus num='10'> > > > <cpu id='0' socket_id='0' core_id='32' subcore_id='0' siblings='0-7'/> > > > > I don't think adding a subcore_id is a good idea. Because it's only > > ever likely to mean something on ppc64, tools are qlikely to just > > ignore it and use the core_id. > > Fair enough, and something we definitely need to take into account. > > > Most of the time that will be wrong: > > behaviorally subcores act like cores in almost all regards. > > > > That could be worked around by instead having core_id give the subcore > > address and adding a new "supercore_id" or "core_group_id" or something. > > Well, those would be just as likely to be ignored by tools as > subcore_id and capacity, wouldn't they? :) Yes, but it means when they ignore those and look at "core_id" they'll get the subcore id, not the physical core id, which is probably what they actually wanted. Those few (if any) tools that really, truly, need the physical core information get to look at supercore or whatever. > > But frankly, I don't think there's actually much point exposing the > > physical topology in addition to the logical (subcore) topology. Yes, > > subcores will have different performance characteristics to real cores > > which will be relevant in some situations. But if you're manually > > setting the host's subcore mode then you're already into the realm of > > manually tweaking parameters based on knowledge of your system and > > workload. Basically I don't see anything upper layers would do with > > the subcore vs. core information that isn't likely to be overriden by > > manual tweaks in any case where you're setting the subcore mode at all. > > > > Bear in mind that now that we have dynamic split core merged, I'm not > > sure there are *any* realistic use cases for using manual subcore > > splitting. > > As far as I know, and of course correct me if I'm wrong, dynamic split > cores are a way to avoid heavy performance drops when the host is Not so much heavy performance drops per se. What it's really about is mitigating the case where the system is overcommited in terms of number of virtual cores, but not in terms of number of virtual threads. Without dynamic split core the system will make more use of the host's threading capabilities, with it, it will do a much better job. > overcommitted, but it has some overhead of its own because of the need > to split the core when entering KVM and restoring the previous > configuration when exiting it. Hmm.. I guess there would be a little extra latency on entering and exiting the guest. I don't know if it's at all significant compared to the already substantial cost of entering/leaving the guest. > Splitting cores manually, on the other hand, is less flexible but > gives the admin complete control over resource allocations and has > no overhead, which makes it critical for fine performance tuning. Well.. except manual splitting can only be done system wide an only do, whereas dynamic split-core can do it per-core which might allow it to better match the workload. > So unless my understanding is off, I believe we need to expose the > topology in a way that enables both use cases. Well, that would be ideal, certainly. > > So, as noted, I actually prefer Shivaprasad's original approach of > > treating subcores as cores. The implementation of that does need some > > adjustment as noted above, basically treating subcores as cores even > > more universally than the current patches do. > > > > Basically I see manually setting the subcores-per-core as telling the > > system you want it treated as having more cores. So libvirt shouldn't > > decide it knows better and report physical cores instead. > > It's not really a case of libvirt thinking it knows better, it's more > a case of the kernel always reporting information about the physical > topology and x86 not having AFAIK any configuration where physical > and logical topology disagree, whereas that's the case on ppc64 as > soon as you split a core. Hmm. I'm not entirely sure what point you're making there. > > Tangentially related is the question of how to deal with threads which > > are offline in the host but can be used for vcpus, which appears with > > or without subcores. > > This is exactly the issue I was thinking about at the beginning of > the message: if I see a <cpu> element that means the CPU is online, > and I expect to be able to pin a vCPU to it, but that would no > longer be the case if we started adding <cpu> elements for CPUs > that are offline in the host - any attempt to pin vCPUs to such > CPUs would fail. Ah, good point. That sounds like a case for the "capacity" property then. > > I have no very strong opinion between the options of (1) adding <cpu> > > entries for the offline threads (whose siblings should be set based on > > the subcore) or (2) adding a capacity tag to the online threads > > indicating that you can put more vcpus on them that the host online > > thread count indicates. > > > > (1) is more likely to do the right thing with existing tools, but (2) > > is more accurately expressive. > > I kinda think it would be the other way around, as I expect existing > tools to make some of the assumptions described above. > > So after discussing for a while with Shivaprasad on IRC, reading > your reply and thinking about it some more, I'm starting to think > that we should report the same information as the kernel whenever > possible, and enhance it with hints such as capacity for tools > and admins, but carefully avoid being too clever for our own good. Well, I'm tempted to say that ship has sailed for libvirt.. :p. But I don't disagree. > We can paper over most of the differences between x86 and ppc64, > but not all of them, I believe. Documentation is key here, and > there's definitely room for improvement both when it comes to > reasonable assumptions and ppc64 specific quirks - this is > something I'm planning to address. > > So my proposal is to drop patch 1/2 entirely and rework patch 2/2 > to just add the capacity attribute (maybe with a more descriptive > name?), without touching the list of siblings or any other > information retrieved from the kernel. > > Cheers. > > -- > Andrea Bolognani > Software Engineer - Virtualization Team -- David Gibson <dgibson(a)redhat.com> Senior Software Engineer, Virtualization, Red Hat -- David Gibson <dgibson(a)redhat.com> Senior Software Engineer, Virtualization, Red Hat

1 0

Re: [libvirt] kvm: "warning: host doesn't support requested feature: CPUID.01H:ECX.x2apic [bit 21]"
by Eduardo Habkost 22 Feb '16

22 Feb '16

(CCing libvir-list) On Sat, Feb 20, 2016 at 04:00:30AM -0500, Paolo Bonzini wrote: > ----- Original Message ----- > > From: "Jan Kiszka" <jan.kiszka(a)web.de> > > To: "Eduardo Habkost" <ehabkost(a)redhat.com>, "Paolo Bonzini" <pbonzini(a)redhat.com> > > Cc: "qemu-devel" <qemu-devel(a)nongnu.org>, "kvm" <kvm(a)vger.kernel.org> > > Sent: Saturday, February 20, 2016 9:09:32 AM > > Subject: kvm: "warning: host doesn't support requested feature: CPUID.01H:ECX.x2apic [bit 21]" > > > > Hi all, > > > > I suppose 5120901a37 introduced this: qemu with kernel_irqchip=off now > > generates these warnings, one per VCPU, during QEMU startup. Is the plan > > to live with them until we finally have x2APIC emulation in userspace > > (ie. also MSR vmexiting to there), or should we otherwise avoid it? > > I think it's a bug, x2apic should be auto-suppressed with kernel_irqchip=off. My first reaction is to dislike the idea of adding yet another variable that affects the results of CPU models. But considering that we are moving towards a design where libvirt must not assume or query any low-level detail from CPU models at all, maybe this won't be harmful. -- Eduardo

1 0

[libvirt] [PATCH] qemu: add support for LSI SAS1068 (aka MPT Fusion) SCSI controller
by Paolo Bonzini 22 Feb '16

22 Feb '16

This does nothing more than adding the new device and capability. The device is present since QEMU 2.6.0. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 ++++++- .../qemuxml2argv-disk-scsi-mptsas1068.args | 27 +++++++++++++ .../qemuxml2argv-disk-scsi-mptsas1068.xml | 36 ++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ .../qemuxml2xmlout-disk-scsi-mptsas1068.xml | 44 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 4 ++ 8 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3099e34..2b953ea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -314,6 +314,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "vserport-change-event", /* 210 */ "virtio-balloon-pci.deflate-on-oom", + "mptsas1068", ); @@ -1567,6 +1568,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-tablet-pci", QEMU_CAPS_VIRTIO_TABLET }, { "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST }, { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST }, + { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e5353de..b73c529 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -343,6 +343,7 @@ typedef enum { QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ + QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d7f19f3..4d4d65e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -872,11 +872,19 @@ qemuSetSCSIControllerModel(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: /*TODO: need checking work here if necessary */ break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MPTSAS1068)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the LSI SAS1068 (MPT Fusion) controller")); + return -1; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_MEGASAS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU doesn't support " - "the LSI SAS1078 controller")); + "the LSI SAS1078 (MegaRAID) controller")); return -1; } break; @@ -4753,6 +4761,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: virBufferAddLit(&buf, "spapr-vscsi"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068: + virBufferAddLit(&buf, "mptsas1068"); + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: virBufferAddLit(&buf, "megasas"); break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args new file mode 100644 index 0000000..bdfc1af --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args @@ -0,0 +1,27 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-device mptsas1068,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-4-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,drive=drive-scsi0-0-4-0,\ +id=scsi0-0-4-0,wwn=0x5000c50015ea71ac \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml new file mode 100644 index 0000000..b817b69 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.xml @@ -0,0 +1,36 @@ +<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'>1</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='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + <wwn>5000c50015ea71ac</wwn> + </disk> + <controller type='ide' index='0'/> + <controller type='scsi' index='0' model='lsisas1068'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c7693b..b5d92c4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -865,6 +865,10 @@ mymain(void) DO_TEST("disk-scsi-megasas", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST("disk-scsi-mptsas1068", + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-sata-device", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml new file mode 100644 index 0000000..a88b63a --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-mptsas1068.xml @@ -0,0 +1,44 @@ +<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'>1</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='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + <wwn>5000c50015ea71ac</wwn> + <address type='drive' controller='0' bus='0' target='4' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='lsisas1068'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d9550cc..d7d10f6 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -415,6 +415,10 @@ mymain(void) DO_TEST_FULL("disk-scsi-megasas", WHEN_ACTIVE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); + DO_TEST_FULL("disk-scsi-mptsas1068", WHEN_ACTIVE, + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_MPTSAS1068, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old"); DO_TEST_FULL("disk-mirror", WHEN_ACTIVE, NONE); DO_TEST_FULL("disk-mirror", WHEN_INACTIVE, NONE); -- 2.5.0

3 4