- Devel - libvirt List Archives

[libvirt] Pushed trivial patch
by Chris Lalancette 28 Jul '10

28 Jul '10

Hello, I've pushed the attached patch under the trivial rules. Thanks, -- Chris Lalancette

1 0

[libvirt] [PATCH] Introduce a -libvirt-caps flag as a stop-gap
by Anthony Liguori 28 Jul '10

28 Jul '10

Today libvirt parses -help output to attempt to enumerate capabilities. This is very broken and has led to multiple failures. Since libvirt is an important management interface to QEMU, we need to do a better job giving them the ability to detect what a QEMU executable supports. Right now, we keep fixing up help output to appease it's parsing code but this is undesirable. The Right Solution is to introduce a robust capabilities advertisement that enumerates every feature we have. As with most Right Solutions, we don't have mergable code today and it's unclear that we'll get there by the next release. This patch introduces an incremental solution of just spitting out the handful of capabilities libvirt is probing for today. This interface will need to remain forever but can stop being updated once we have a Right Solution. Signed-off-by: Anthony Liguori <aliguori(a)us.ibm.com> diff --git a/qemu-options.hx b/qemu-options.hx index 40cee70..a618914 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2235,7 +2235,26 @@ Normally QEMU loads a configuration file from @var{sysconfdir}/qemu.conf and option will prevent QEMU from loading these configuration files at startup. ETEXI +DEF("libvirt-caps", 0, QEMU_OPTION_libvirt_caps, + "-libvirt-caps output libvirt-specific capabilities\n", + QEMU_ARCH_ALL) +STEXI +@item -libvirt-caps +@findex -libvirt-caps +Output a common separate list of capabilities that this version of QEMU +supports and exit. This interface specifically exists for libvirt's use as an +intermediate solution until we support a full capabilities system. One this +capabilities system exist, this option's output should never change. + +The format out this command is: + +version: VERSION +package: PACKAGE +caps: CAP1[,CAP2...] +ETEXI + HXCOMM This is the last statement. Insert new options before this line! STEXI @end table ETEXI + diff --git a/vl.c b/vl.c index ba6ee11..8fe354d 100644 --- a/vl.c +++ b/vl.c @@ -2616,6 +2616,14 @@ int main(int argc, char **argv, char **envp) fclose(fp); break; } + case QEMU_OPTION_libvirt_caps: + printf("version: " QEMU_VERSION "\n" + "package: " QEMU_PKGVERSION "\n" + "caps: name,enable-kvm,no-reboot,uuid,xen-domid,drive" + ",cache-v2,format,vga,serial,mem-path,chardev,balloon" + ",device,rtc,netdev,sdl,topology\n"); + exit(0); + break; default: os_parse_cmd_args(popt->index, optarg); } -- 1.7.0.4

7 10

[libvirt] [PATCH 0/3] libvirt-guests: fix init script to Fedora standards
by Eric Blake 28 Jul '10

28 Jul '10

https://bugzilla.redhat.com/show_bug.cgi?id=617300 documents several shortcoming in our libvirt-guests init script, in relation to Fedora init script standards. For easier review, I've split it into three simpler patches. Eric Blake (3): libvirt-guests: detect invalid arguments libvirt-guests: enhance status libvirt-guests: add reload, condrestart daemon/libvirt-guests.init.in | 46 +++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 8 deletions(-) -- 1.7.2

3 6

[libvirt] [PATCH] qemu: Allow setting boot menu on/off
by Cole Robinson 27 Jul '10

27 Jul '10

Add a new element to the <os> block: <bootmenu enable="yes|no"/> Which maps to -boot,menu=on|off on the QEMU command line. I decided to use an explicit 'enable' attribute rather than just make the bootmenu element boolean. This allows us to treat lack of a bootmenu element as 'use hypervisor default'. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html.in | 8 +++++ docs/schemas/domain.rng | 10 ++++++ src/conf/domain_conf.c | 18 ++++++++++++ src/conf/domain_conf.h | 8 ++++- src/qemu/qemu_conf.c | 27 ++++++++++++++++- src/qemu/qemu_conf.h | 1 + tests/qemuhelptest.c | 9 ++++-- .../qemuxml2argv-boot-menu-disable.args | 1 + .../qemuxml2argv-boot-menu-disable.xml | 27 ++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 30 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + 13 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3e80312..c79b606 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -79,6 +79,8 @@ <type>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> + <boot dev='cdrom'/> + <bootmenu enable='yes'/> </os> ...</pre> @@ -104,6 +106,12 @@ times to setup a priority list of boot devices to try in turn. Since 0.1.3 </dd> + <dt><code>bootmenu</code></dt> + <dd> Whether or not to enable an interactive boot menu prompt on guest + startup. The <code>enable</code> attribute can be either "yes" or "no". + If not specified, the hypervisor default is used. + Since 0.8.3 + </dd> </dl> <h4><a name="elementsOSBootloader">Host bootloader</a></h4> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 2d22ce4..f36bb1f 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -122,6 +122,16 @@ <ref name="osbootdev"/> </oneOrMore> </choice> + <optional> + <element name="bootmenu"> + <attribute name="enable"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5b59c01..dc775e8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4300,6 +4300,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } if (STREQ(def->os.type, "hvm")) { + char *bootstr; + /* analysis of the boot devices */ if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -4329,6 +4331,15 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK; } VIR_FREE(nodes); + + bootstr = virXPathString("string(./os/bootmenu[1]/@enable)", ctxt); + if (bootstr) { + if (STREQ(bootstr, "yes")) + def->os.bootmenu = VIR_DOMAIN_BOOT_MENU_ENABLED; + else + def->os.bootmenu = VIR_DOMAIN_BOOT_MENU_DISABLED; + VIR_FREE(bootstr); + } } def->emulator = virXPathString("string(./devices/emulator[1])", ctxt); @@ -6275,6 +6286,13 @@ char *virDomainDefFormat(virDomainDefPtr def, } virBufferVSprintf(&buf, " <boot dev='%s'/>\n", boottype); } + + if (def->os.bootmenu != VIR_DOMAIN_BOOT_MENU_DEFAULT) { + const char *enabled = (def->os.bootmenu == + VIR_DOMAIN_BOOT_MENU_ENABLED ? "yes" + : "no"); + virBufferVSprintf(&buf, " <bootmenu enable='%s'/>\n", enabled); + } } virBufferAddLit(&buf, " </os>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9ef687b..afd172f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -615,7 +615,6 @@ struct _virDomainDeviceDef { # define VIR_DOMAIN_MAX_BOOT_DEVS 4 -/* 3 possible boot devices */ enum virDomainBootOrder { VIR_DOMAIN_BOOT_FLOPPY, VIR_DOMAIN_BOOT_CDROM, @@ -625,6 +624,12 @@ enum virDomainBootOrder { VIR_DOMAIN_BOOT_LAST, }; +enum virDomainBootMenu { + VIR_DOMAIN_BOOT_MENU_DEFAULT = 0, + VIR_DOMAIN_BOOT_MENU_ENABLED, + VIR_DOMAIN_BOOT_MENU_DISABLED, +}; + enum virDomainFeature { VIR_DOMAIN_FEATURE_ACPI, VIR_DOMAIN_FEATURE_APIC, @@ -651,6 +656,7 @@ struct _virDomainOSDef { char *machine; int nBootDevs; int bootDevs[VIR_DOMAIN_BOOT_LAST]; + int bootmenu; char *init; char *kernel; char *initrd; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 05ad67d..1db504d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1205,6 +1205,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NO_KVM_PIT; if (strstr(help, "-tdf")) flags |= QEMUD_CMD_FLAG_TDF; + if (strstr(help, ",menu=on")) + flags |= QEMUD_CMD_FLAG_BOOT_MENU; /* Keep disabled till we're actually ready to turn on netdev mode * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ @@ -4078,9 +4080,25 @@ int qemudBuildCommandLine(virConnectPtr conn, } } if (def->os.nBootDevs) { + virBuffer boot_buf = VIR_BUFFER_INITIALIZER; + boot[def->os.nBootDevs] = '\0'; - ADD_ARG_LIT("-boot"); - ADD_ARG_LIT(boot); + virBufferVSprintf(&boot_buf, "-boot %s", boot); + + if (qemuCmdFlags & QEMUD_CMD_FLAG_BOOT_MENU && + def->os.bootmenu != VIR_DOMAIN_BOOT_MENU_DEFAULT) { + if (def->os.bootmenu == VIR_DOMAIN_BOOT_MENU_ENABLED) + virBufferAddLit(&boot_buf, ",menu=on"); + else if (def->os.bootmenu == VIR_DOMAIN_BOOT_MENU_DISABLED) + virBufferAddLit(&boot_buf, ",menu=off"); + } + + if (virBufferError(&boot_buf)) { + virReportOOMError(); + goto error; + } + + ADD_ARG_LIT(virBufferContentAndReset(&boot_buf)); } if (def->os.kernel) { @@ -6207,8 +6225,13 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, def->os.bootDevs[b++] = VIR_DOMAIN_BOOT_CDROM; else if (val[n] == 'n') def->os.bootDevs[b++] = VIR_DOMAIN_BOOT_NET; + else if (val[n] == ',') + break; } def->os.nBootDevs = b; + + if (strstr(val, "menu=on")) + def->os.bootmenu = 1; } else if (STREQ(arg, "-name")) { WANT_VALUE(); if (!(def->name = strdup(val))) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 8c17e26..1aa9d2e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -91,6 +91,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_TDF = (1LL << 35), /* -tdf flag (user-mode pit catchup) */ QEMUD_CMD_FLAG_PCI_CONFIGFD = (1LL << 36), /* pci-assign.configfd */ QEMUD_CMD_FLAG_NODEFCONFIG = (1LL << 37), /* -nodefconfig */ + QEMUD_CMD_FLAG_BOOT_MENU = (1LL << 38), /* -boot menu=on support */ }; /* Main driver state */ diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 517a8fe..56a49fd 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -220,7 +220,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_RTC_TD_HACK | QEMUD_CMD_FLAG_NO_HPET | QEMUD_CMD_FLAG_NO_KVM_PIT | - QEMUD_CMD_FLAG_TDF, + QEMUD_CMD_FLAG_TDF | + QEMUD_CMD_FLAG_BOOT_MENU, 10092, 1, 0); DO_TEST("qemu-0.12.1", QEMUD_CMD_FLAG_VNC_COLON | @@ -244,7 +245,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_SMP_TOPOLOGY | QEMUD_CMD_FLAG_RTC | - QEMUD_CMD_FLAG_NO_HPET, + QEMUD_CMD_FLAG_NO_HPET | + QEMUD_CMD_FLAG_BOOT_MENU, 12001, 0, 0); DO_TEST("qemu-kvm-0.12.3", QEMUD_CMD_FLAG_VNC_COLON | @@ -274,7 +276,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_VNET_HOST | QEMUD_CMD_FLAG_NO_HPET | QEMUD_CMD_FLAG_NO_KVM_PIT | - QEMUD_CMD_FLAG_TDF, + QEMUD_CMD_FLAG_TDF | + QEMUD_CMD_FLAG_BOOT_MENU, 12003, 1, 0); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args new file mode 100644 index 0000000..1c773fd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot d,menu=off -cdrom /dev/cdrom -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml new file mode 100644 index 0000000..ceb109c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + <bootmenu enable='no'/> + </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='cdrom'> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args new file mode 100644 index 0000000..85b74d1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot dcna,menu=on -cdrom /dev/cdrom -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml new file mode 100644 index 0000000..48f27aa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <boot dev='network'/> + <boot dev='fd'/> + <bootmenu enable='yes'/> + </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='cdrom'> + <source dev='/dev/cdrom'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3d6c583..0ca9804 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -223,6 +223,8 @@ mymain(int argc, char **argv) DO_TEST("boot-cdrom", 0); DO_TEST("boot-network", 0); DO_TEST("boot-floppy", 0); + DO_TEST("boot-multi", QEMUD_CMD_FLAG_BOOT_MENU); + DO_TEST("boot-menu-disable", QEMUD_CMD_FLAG_BOOT_MENU); DO_TEST("bootloader", QEMUD_CMD_FLAG_DOMID); DO_TEST("clock-utc", 0); DO_TEST("clock-localtime", 0); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 69829b1..00b3a1b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -89,6 +89,8 @@ mymain(int argc, char **argv) DO_TEST("boot-cdrom"); DO_TEST("boot-network"); DO_TEST("boot-floppy"); + DO_TEST("boot-multi"); + DO_TEST("boot-menu-disable"); DO_TEST("bootloader"); DO_TEST("clock-utc"); DO_TEST("clock-localtime"); -- 1.7.1.1

3 4

[libvirt] [PATCH] docs: Link wiki FAQ to main page
by Cole Robinson 27 Jul '10

27 Jul '10

Since DV recommended keeping the build instructions distributed with the source, move them from the old FAQ to the downloads page. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/FAQ.html.in | 144 ------------------------------------------------ docs/Makefile.am | 3 +- docs/downloads.html.in | 29 ++++++++++ docs/search.php | 2 +- docs/sitemap.html.in | 2 +- 5 files changed, 32 insertions(+), 148 deletions(-) delete mode 100644 docs/FAQ.html.in diff --git a/docs/FAQ.html.in b/docs/FAQ.html.in deleted file mode 100644 index 50f798d..0000000 --- a/docs/FAQ.html.in +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0"?> -<html> - <body> - <h1 >FAQ</h1> - Table of Contents: - <ul> - <li> - <a href="FAQ.html#License">License(s)</a> - </li> - <li> - <a href="FAQ.html#Installati">Installation</a> - </li> - <li> - <a href="FAQ.html#Compilatio">Compilation</a> - </li> - <li> - <a href="FAQ.html#Developer">Developer corner</a> - </li> - </ul> - <h3><a name="License" id="License">License</a>(s)</h3> - <ol> - <li> - Licensing Terms for libvirt - libvirt is released under the <a href="http://www.opensource.org/licenses/lgpl-license.html">GNU Lesser - General Public License</a>, see the file COPYING.LIB in the distribution - for the precise wording. The only library that libvirt depends upon is - the Xen store access library which is also licenced under the LGPL. - </li> - <li> - Can I embed libvirt in a proprietary application ? - Yes. The LGPL allows you to embed libvirt into a proprietary - application. It would be graceful to send-back bug fixes and improvements - as patches for possible incorporation in the main development tree. It - will decrease your maintenance costs anyway if you do so. - </li> - </ol> - <h3> - <a name="Installati" id="Installati">Installation</a> - </h3> - <ol> - <li>Where can I get libvirt ? - The original distribution comes from <a href="ftp://libvirt.org/libvirt/">ftp://libvirt.org/libvirt/</a>. - </li> - <li> - I can't install the libvirt/libvirt-devel RPM packages due to - failed dependencies - The most generic solution is to re-fetch the latest src.rpm , and - rebuild it locally with - <code>rpm --rebuild libvirt-xxx.src.rpm</code>. - If everything goes well it will generate two binary rpm packages (one - providing the shared libs and virsh, and the other one, the -devel - package, providing includes, static libraries and scripts needed to build - applications with libvirt that you can install locally. - One can also rebuild the RPMs from a tarball: - - <code>rpmbuild -ta libdir-xxx.tar.gz</code> - - Or from a configured tree with: - - <code>make rpm</code> - - </li> - <li> - Failure to use the API for non-root users - Large parts of the API may only be accessible with root privileges, - however the read only access to the xenstore data doesnot have to be - forbidden to user, at least for monitoring purposes. If "virsh dominfo" - fails to run as an user, change the mode of the xenstore read-only socket - with: - - <code>chmod 666 /var/run/xenstored/socket_ro</code> - - and also make sure that the Xen Daemon is running correctly with local - HTTP server enabled, this is defined in - <code>/etc/xen/xend-config.sxp</code> which need the following line to be - enabled: - - <code>(xend-http-server yes)</code> - - If needed restart the xend daemon after making the change with the - following command run as root: - - <code>service xend restart</code> - - </li> - </ol> - <h3> - <a name="Compilatio" id="Compilatio">Compilation</a> - </h3> - <ol> - <li> - What is the process to compile libvirt ? - As most UNIX libraries libvirt follows the "standard": - - <code>gunzip -c libvirt-xxx.tar.gz | tar xvf -</code> - - - <code>cd libvirt-xxxx</code> - - - <code>./configure --help</code> - - to see the options, then the compilation/installation proper - - <code>./configure [possible options]</code> - - - <code>make</code> - - - <code>make install</code> - - At that point you may have to rerun ldconfig or a similar utility to - update your list of installed shared libs. - </li> - <li> - What other libraries are needed to compile/install libvirt ? - Libvirt requires libxenstore, which is usually provided by the xen - packages as well as the public headers to compile against libxenstore. - </li> - <li> - I use the GIT version and there is no configure script - The configure script (and other Makefiles) are generated. Use the - autogen.sh script to regenerate the configure script and Makefiles, - like: - - <code>./autogen.sh --prefix=/usr --disable-shared</code> - - </li> - </ol> - <h3><a name="Developer" id="Developer">Developer</a> corner</h3> - <ol> - <li> - Troubles compiling or linking programs using libvirt - To simplify the process of reusing the library, libvirt comes with - pkgconfig support, which can be used directly from autoconf support or - via the pkg-config command line tool, like: - - <code>pkg-config libvirt --libs</code> - - </li> - </ol> - </body> -</html> diff --git a/docs/Makefile.am b/docs/Makefile.am index a6a6d07..114ea1f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -159,8 +159,7 @@ rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -$(INSTALL) -m 0644 $(srcdir)/FAQ.html \ - $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) + -$(INSTALL) -m 0644 $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html for h in $(apihtml); do \ $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done diff --git a/docs/downloads.html.in b/docs/downloads.html.in index a0cb6fc..04fd16c 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -43,6 +43,35 @@ <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a> </pre> + + <h1>Installation</h1> + <h2> + <a name="Compilatio" id="Compilatio">Compilation</a> + </h2> + As most UNIX libraries libvirt follows the "standard": + + <code>gunzip -c libvirt-xxx.tar.gz | tar xvf -</code> + + + <code>cd libvirt-xxxx</code> + + + <code>./configure --help</code> + + to see the options, then the compilation/installation proper + + <code>./configure [possible options]</code> + + + <code>make</code> + + + <code>make install</code> + + At that point you may have to rerun ldconfig or a similar utility to + update your list of installed shared libs. + + <h2>Building from a source code checkout</h2> The libvirt build process uses GNU autotools, so after obtaining a checkout it is necessary to generate the configure script and Makefile.in diff --git a/docs/search.php b/docs/search.php index a6c1def..bbd652a 100644 --- a/docs/search.php +++ b/docs/search.php @@ -258,7 +258,7 @@ </li><li> <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a> </li><li> - <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a> + <a title="Frequently asked questions" class="inactive" href="http://wiki.libvirt.org/page/FAQ">FAQ</a> </li><li> <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a> </li><li> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 404ce5a..e9ab591 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -265,7 +265,7 @@ User contributed content </li> <li> - <a href="FAQ.html">FAQ</a> + <a href="http://wiki.libvirt.org/page/FAQ">FAQ</a> Frequently asked questions </li> <li> -- 1.7.1.1

2 2

[libvirt] [PATCH] qemu: Error on unsupported graphics config
by Cole Robinson 27 Jul '10

27 Jul '10

Throw an explicit error if multiple graphics devices are specified, or an unsupported type is specified (rdp). Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_conf.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0dbab48..05ad67d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -4542,6 +4542,12 @@ int qemudBuildCommandLine(virConnectPtr conn, } } + if (def->ngraphics > 1) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("only 1 graphics device is supported")); + goto error; + } + if ((def->ngraphics == 1) && def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virBuffer opt = VIR_BUFFER_INITIALIZER; @@ -4641,6 +4647,12 @@ int qemudBuildCommandLine(virConnectPtr conn, * default, since the default changes :-( */ if (qemuCmdFlags & QEMUD_CMD_FLAG_SDL) ADD_ARG_LIT("-sdl"); + + } else if ((def->ngraphics == 1)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("unsupported graphics type '%s'"), + virDomainGraphicsTypeToString(def->graphics[0]->type)); + goto error; } if (def->nvideos) { -- 1.7.1.1

2 2

[libvirt] [PATCH] libvirt-guests: Don't throw errors if libvirtd is not installed
by Jiri Denemark 27 Jul '10

27 Jul '10

When only client parts of libvirt are installed (i.e., no libvirtd daemon), libvirt-guests init script in its default configuration would throw seriously looking errors during host shutdown: Running guests on default URI: error: unable to connect to '/var/run/libvirt/libvirt-sock', libvirtd may need to be started: No such file or directory error: failed to connect to the hypervisor This patch changes the script to print rather harmless message in that situation: Running guests on default URI: libvirtd not installed; skipping this URI. --- daemon/libvirt-guests.init.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/daemon/libvirt-guests.init.in b/daemon/libvirt-guests.init.in index f99c070..d2ec96a 100644 --- a/daemon/libvirt-guests.init.in +++ b/daemon/libvirt-guests.init.in @@ -25,6 +25,7 @@ sysconfdir=@sysconfdir@ localstatedir=@localstatedir@ +libvirtd=@sbindir@/libvirtd # Source function library. . "$sysconfdir"/rc.d/init.d/functions @@ -232,6 +233,12 @@ stop() { : >"$LISTFILE" for uri in $URIS; do echo -n $"Running guests on $uri URI: " + + if [ "x$uri" = xdefault ] && [ ! -x "$libvirtd" ]; then + echo $"libvirtd not installed; skipping this URI." + continue + fi + list=$(list_guests $uri) if [ $? -eq 0 ]; then empty=true -- 1.7.2

2 2

[libvirt] Virt-install Error and kvm‏
by cris rock 27 Jul '10

27 Jul '10

Hi guys, I hope you can help me on this issue with kvm/libvirt: using this command to install a kvm virtual machine: virt-install --connect qemu:///system \ --name p3k0401 \ --ram 2048 \ --file //dev/VolGroup01/p3k0401logvol \ --accelerate \ -s 10 \ --nographics \ --hvm \ --location='http://10.1.4.80' I get: Starting install... Retrieving file vmlinuz... | 1.8 MB 00:00 Retrieving file initrd.img... | 7.1 MB 00:00 ERROR internal error Domain p3k0401 didn't show up Domain installation may not have been successful. If it was, you can restart your domain by running 'virsh start p3k0401'; otherwise, please restart your installation. ERROR internal error Domain p3k0401 didn't show up Traceback (most recent call last): File "/usr/sbin/virt-install", line 889, in ? main() File "/usr/sbin/virt-install", line 751, in main start_time, guest.start_install) File "/usr/sbin/virt-install", line 813, in do_install dom = install_func(conscb, progresscb, wait=(not wait)) File "/usr/lib/python2.4/site-packages/virtinst/Guest.py", line 541, in start_install return self._do_install(consolecb, meter, removeOld, wait) File "/usr/lib/python2.4/site-packages/virtinst/Guest.py", line 633, in _do_install self.domain = self.conn.createLinux(install_xml, 0) File "/usr/lib64/python2.4/site-packages/libvirt.py", line 974, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: internal error Domain p3k0401 didn't show up On the /var/log/libvirt/qemu/p3k0401.log: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ /usr/bin/qemu-system-x86_64 -S -M rhel5.4.0 -m 1024 -smp 1 -name p3k0401 -uuid 7658c102-0738-724c-40eb-e1c58b2c2369 -domid 3 -nographic -monitor pty -pidfile /var/run/libvirt/qemu//p3k0401.pid -no-reboot -boot c -kernel /var/lib/libvirt/boot/virtinst-vmlinuz.O_SOVo -initrd /var/lib/libvirt/boot/virtinst-initrd.img.0ba0Fp -append method=http://10.1.4.80 -drive file=//dev/VolGroup01/p3k0401logvol,if=ide,index=0,cache=none -net nic,macaddr=54:52:00:15:c4:50,vlan=0 -net tap,fd=16,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb Supported machines are: pc Standard PC (alias of pc-0.12) pc-0.12 Standard PC (default) pc-0.11 Standard PC, qemu 0.11 pc-0.10 Standard PC, qemu 0.10 isapc ISA-only PC xenpv Xen Para-virtualized PC And my packages installed: # rpm -qa | grep qemu qemu-0.12.4-1.el5.rf # rpm -qa | grep kvm etherboot-zroms-kvm-5.4.4-13.el5.centos kmod-kvm-83-164.el5_5.12 kvm-83-164.el5_5.12 # rpm -qa | grep libvirt libvirt-0.6.3-33.el5_5.1 libvirt-0.6.3-33.el5_5.1 libvirt-python-0.6.3-33.el5_5.1 # uname -a Linux gs1p304 2.6.18-164.el5 #1 SMP Thu Sep 3 03:28:30 EDT 2009 x86_64 x86_64 x86_64 GNU/Linux Please any pointer is appreciated... thanks! cris _________________________________________________________________ Hotmail: Free, trusted and rich email service. https://signup.live.com/signup.aspx?id=60969

1 0

[libvirt] Virt-install Error on Centos 5.4 64bit and kvm
by cris rock 27 Jul '10

27 Jul '10

_________________________________________________________________ Hotmail: Free, trusted and rich email service. https://signup.live.com/signup.aspx?id=60969

1 0

[libvirt] [PATCH 0/5] qemu: support virtio console
by Cole Robinson 27 Jul '10

27 Jul '10

The following series adds virtio console XML and qemu driver support. The first 3 patches are just cleanups/improvements. Patch 4 adds XML support for more than 1 console device (not strictly required for virtio console, but it's a valid use case). Patch 5 actually adds virtio console support. Thanks, Cole Cole Robinson (5): docs: domain: Document virtio <channel> domain conf: Rename character prop targetType -> deviceType domain conf: char: Add an explicit targetType field domain conf: Support multiple <console> devices qemu: virtio console support docs/formatdomain.html.in | 31 +++- docs/schemas/domain.rng | 14 ++- src/conf/domain_conf.c | 192 ++++++++++++-------- src/conf/domain_conf.h | 26 ++- src/esx/esx_vmx.c | 4 +- src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 8 +- src/qemu/qemu_conf.c | 48 +++++- src/qemu/qemu_driver.c | 3 +- src/uml/uml_conf.c | 4 +- src/uml/uml_driver.c | 6 +- src/vbox/vbox_tmpl.c | 4 +- src/xen/xend_internal.c | 16 ++- src/xen/xm_internal.c | 19 ++- .../qemuxml2argv-console-virtio.args | 1 + .../qemuxml2argv-console-virtio.xml | 30 +++ tests/qemuxml2argvtest.c | 2 + .../xml2sexprdata/xml2sexpr-pv-multi-console.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-multi-console.xml | 24 +++ tests/xml2sexprtest.c | 1 + 20 files changed, 324 insertions(+), 111 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-multi-console.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-multi-console.xml

2 16

[libvirt] [PATCH] Invert logic for checking for QEMU disk cache options
by Daniel P. Berrange 27 Jul '10

27 Jul '10

QEMU has had two different syntax for disk cache options Old: on|off New: writeback|writethrough|none QEMU recently added another 'unsafe' option which broke the libvirt check. We can avoid this & future breakage, if we do a negative check for the old syntax, instead of a positive check for the new syntax * src/qemu/qemu_conf.c: Invert cache option check --- src/qemu/qemu_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0dbab48..db60ca3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1170,7 +1170,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_DOMID; if (strstr(help, "-drive")) { flags |= QEMUD_CMD_FLAG_DRIVE; - if (strstr(help, "cache=writethrough|writeback|none")) + if (strstr(help, "cache=") && + !strstr(help, "cache=on|off")) flags |= QEMUD_CMD_FLAG_DRIVE_CACHE_V2; if (strstr(help, "format=")) flags |= QEMUD_CMD_FLAG_DRIVE_FORMAT; -- 1.7.1.1

2 1

[libvirt] [PATCH 0/5] Fix compile and test errors in AppArmor related code
by Matthias Bolte 27 Jul '10

27 Jul '10

The recently added option to control the disk format probing has broken AppArmor related code and tests. This series fixes this. Matthias

5 22

[libvirt] [PATCH] Force FLR on for buggy SR-IOV devices.
by Chris Lalancette 26 Jul '10

26 Jul '10

Some buggy PCI devices actually support FLR, but forget to advertise that fact in their PCI config space. However, Virtual Functions on SR-IOV devices are *required* to support FLR by the spec, so force has_flr on if this is a virtual function. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/util/pci.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index c45b179..41e91af 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -183,6 +183,16 @@ pciOpenConfig(pciDevice *dev) return 0; } +static void +pciCloseConfig(pciDevice *dev) +{ + if (!dev) + return; + + if (dev->fd >= 0) + close(dev->fd); +} + static int pciRead(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen) { @@ -380,11 +390,16 @@ pciFindExtendedCapabilityOffset(pciDevice *dev, unsigned capability) return 0; } -static unsigned +/* detects whether this device has FLR. Returns 0 if the device does + * not have FLR, 1 if it does, and -1 on error + */ +static int pciDetectFunctionLevelReset(pciDevice *dev) { uint32_t caps; uint8_t pos; + char *path; + int found; /* The PCIe Function Level Reset capability allows * individual device functions to be reset without @@ -413,6 +428,25 @@ pciDetectFunctionLevelReset(pciDevice *dev) } } + /* there are some buggy devices that do support FLR, but forget to + * advertise that fact in their capabilities. However, FLR is *required* + * to be present for virtual functions (VFs), so if we see that this + * device is a VF, we just assume FLR works + */ + + if (virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name) < 0) { + virReportOOMError(); + return -1; + } + + found = virFileExists(path); + VIR_FREE(path); + if (found) { + VIR_DEBUG("%s %s: buggy device didn't advertise FLR, but is a VF; forcing flr on", + dev->id, dev->name); + return 1; + } + VIR_DEBUG("%s %s: no FLR capability found", dev->id, dev->name); return 0; @@ -626,6 +660,8 @@ pciTryPowerManagementReset(pciDevice *dev) static int pciInitDevice(pciDevice *dev) { + int flr; + if (pciOpenConfig(dev) < 0) { virReportSystemError(errno, _("Failed to open config space file '%s'"), @@ -635,7 +671,12 @@ pciInitDevice(pciDevice *dev) dev->pcie_cap_pos = pciFindCapabilityOffset(dev, PCI_CAP_ID_EXP); dev->pci_pm_cap_pos = pciFindCapabilityOffset(dev, PCI_CAP_ID_PM); - dev->has_flr = pciDetectFunctionLevelReset(dev); + flr = pciDetectFunctionLevelReset(dev); + if (flr < 0) { + pciCloseConfig(dev); + return flr; + } + dev->has_flr = flr; dev->has_pm_reset = pciDetectPowerManagementReset(dev); dev->initted = 1; return 0; @@ -1098,8 +1139,7 @@ pciFreeDevice(pciDevice *dev) if (!dev) return; VIR_DEBUG("%s %s: freeing", dev->id, dev->name); - if (dev->fd >= 0) - close(dev->fd); + pciCloseConfig(dev); VIR_FREE(dev); } -- 1.7.1.1

2 2

[libvirt] [RFC PATCH 0/4] fix secondary bus reset with active devices logic
by Chris Wright 26 Jul '10

26 Jul '10

The current logic can allow libvirt to issue a secondary bus reset despite the host having devices on the same bus as a device that's being assigned to a guest. The following patches refactor the code a little and then update the secondary bus reset logic to properly deal with active devices. This has been lightly tested, testing is still incomplete, hence the RFC to get any style comments out of the way once testing verifies this is working as expected. The following scenarios have been successfully tested: - Do not issue a secondary bus reset: - start guest w/ domain conf including hostdev that shares bus w/ devices owned by host - use attach-device to dynamically add hostdev to guest, hostdev shares bus w/ devices owned by host - attempt to node-reset a device assigned to guest - Issue a secondary bus reset: - start guest w/ domain conf including all devices on bus[1] - use attach-device to dynamically add hostdev to guest, hostdev does not share bus with other devices Not yet tested: - Issue a secondary bus reset: - when shutting down domain - when detaching device from domain [1] guest did not succesfully start w/ these devices, unclear if this patch series is implicated. Chris Wright (4): qemuGetPciHostDeviceList take hostdev list directly Add helpers qemuPrepareHostdevPCIDevices and qemuDomainReAttachHostdevDevices qemudDomainAttachHostPciDevice refactor to use new helpers pciResetDevice: use inactive devices to determine safe reset src/qemu/qemu_driver.c | 87 ++++++++++++++++++++---------------------------- src/util/pci.c | 20 ++++++----- src/util/pci.h | 3 +- src/xen/xen_driver.c | 2 +- 4 files changed, 50 insertions(+), 62 deletions(-)

2 11

[libvirt] libvirt on x64
by Tavares, John 26 Jul '10

26 Jul '10

I just logged onto the first X64 based machine with libvirt (0.3.3-18.5) installed on it and I am only seeing the X64 based version of the shared library. Here is what I am seeing: $ rpm -qal libvirt | grep libvirt.so /usr/lib64/libvirt.so.0 /usr/lib64/libvirt.so.0.3.3 Is there any reason why the 32-bit version is not also installed?? My application is 32-bit based, so it will not work on this hardware because of this. Thanks. John

2 5

[libvirt] [PATCH] build: fix VPATH builds
by Eric Blake 26 Jul '10

26 Jul '10

After the recent libvirt-qemu library addition, VPATH builds fail with: CC libvirt_qemu_la-libvirt-qemu.lo In file included from ../../src/libvirt-qemu.c:29: ../../include/libvirt/libvirt-qemu.h:17:22: error: libvirt.h: No such file or directory ... CCLD libvirt-qmeu.la /usr/bin/ld: cannot open linker script file libvirt_qemu.syms: No such file or directory This fixes both issues (there are still some documentation VPATH issues, but those don't show up with 'make all'). * configure.ac (LIBVIRT_QEMU_SYMBOL_FILE): While libvirt.syms is generated and lives in $(builddir), libvirt_qemu.syms is static and lives in $(srcdir). * include/libvirt/libvirt-qemu.h (includes): Pull in libvirt.h via the public location, since this is a public header. --- Tested with both in-tree and VPATH builds. Should libvirt-qemu.h be using <libvirt/libvirt.h> instead of "libvirt/libvirt.h"? configure.ac | 2 +- include/libvirt/libvirt-qemu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 08b7eb6..98d2f6e 100644 --- a/configure.ac +++ b/configure.ac @@ -1833,7 +1833,7 @@ CYGWIN_EXTRA_PYTHON_LIBADD= MINGW_EXTRA_LDFLAGS= WIN32_EXTRA_CFLAGS= LIBVIRT_SYMBOL_FILE=libvirt.syms -LIBVIRT_QEMU_SYMBOL_FILE=libvirt_qemu.syms +LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms' case "$host" in *-*-cygwin*) CYGWIN_EXTRA_LDFLAGS="-no-undefined" diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index d21fd92..9c191c7 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -14,7 +14,7 @@ #ifndef __VIR_QEMU_H__ # define __VIR_QEMU_H__ -# include "libvirt.h" +# include "libvirt/libvirt.h" # ifdef __cplusplus extern "C" { -- 1.7.1.1

2 2

[libvirt] [PATCH] Force FLR on for buggy SR-IOV devices.
by Chris Lalancette 26 Jul '10

26 Jul '10

Some buggy PCI devices actually support FLR, but forget to advertise that fact in their PCI config space. However, Virtual Functions on SR-IOV devices are *required* to support FLR by the spec, so force has_flr on if this is a virtual function. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/util/pci.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index c45b179..4bfad2c 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -385,6 +385,7 @@ pciDetectFunctionLevelReset(pciDevice *dev) { uint32_t caps; uint8_t pos; + char *path; /* The PCIe Function Level Reset capability allows * individual device functions to be reset without @@ -413,6 +414,27 @@ pciDetectFunctionLevelReset(pciDevice *dev) } } + /* there are some buggy devices that do support FLR, but forget to + * advertise that fact in their capabilities. However, FLR is *required* + * to be present for virtual functions (VFs), so if we see that this + * device is a VF, we just assume FLR works + */ + + if (virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name) < 0) { + VIR_ERROR("Failed to allocate memory when checking FLR for device %s", + dev->id); + return 0; + } + + if (virFileExists(path)) { + VIR_FREE(path); + VIR_DEBUG("%s %s: buggy device didn't advertise FLR, but is a VF; forcing flr on", + dev->id, dev->name); + return 1; + } + + VIR_FREE(path); + VIR_DEBUG("%s %s: no FLR capability found", dev->id, dev->name); return 0; -- 1.7.1.1

4 4

[libvirt] Parameters for macros in docs?
by Justin Clift 26 Jul '10

26 Jul '10

Hi all, The (autogenerated) docs aren't showing the parameters needed for the libvirt macros. For example, this is VIR_USE_CPU in the source: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /** * VIR_USE_CPU: * @cpumap: pointer to a bit map of real CPUs (in 8-bit bytes) (IN/OUT) * @cpu: the physical CPU number * * This macro is to be used in conjunction with virDomainPinVcpu() API. * USE_CPU macro set the bit (CPU usable) of the related cpu in cpumap. */ #define VIR_USE_CPU(cpumap,cpu) (cpumap[(cpu)/8] |= (1<<((cpu)%8))) +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ In the API docs on the website, this is shown: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VIR_USE_CPU #define VIR_USE_CPU This macro is to be used in conjunction with virDomainPinVcpu() API. USE_CPU macro set the bit (CPU usable) of the related cpu in cpumap. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ To me, it makess sense to show the parameters needed for each macro. The information is passed along by the Python doc generation script, but is disregarded in the final XSLT transformation to produce the html docs. Wondering if that's on purpose, or are we ok to display the macro parameters too? Regards and best wishes, Justin Clift

2 1

[libvirt] IO controller groups?
by Jon Masters 26 Jul '10

26 Jul '10

Folks, Anyone got any information about support in libvirt for automatic handling of IO controller throttling/IO limits with recent kernels? I'd love it if libvirt just supported assigning IO bandwidth automatically. :) Jon.

1 0

[libvirt] [PATCH] esx: Support vSphere 4.1
by Matthias Bolte 24 Jul '10

24 Jul '10

Also accept version > 4.1, but output a warning. --- src/esx/esx_driver.c | 12 ++++++++---- src/esx/esx_vi.c | 27 ++++++++++++++++++++++++--- src/esx/esx_vi.h | 10 ++++++++-- src/esx/esx_vmx.c | 9 +++++++++ 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5922cb6..e33976c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -353,9 +353,11 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, if (expectedProductVersion == esxVI_ProductVersion_ESX) { if (priv->host->productVersion != esxVI_ProductVersion_ESX35 && - priv->host->productVersion != esxVI_ProductVersion_ESX40) { + priv->host->productVersion != esxVI_ProductVersion_ESX40 && + priv->host->productVersion != esxVI_ProductVersion_ESX41 && + priv->host->productVersion != esxVI_ProductVersion_ESX4x) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("%s is neither an ESX 3.5 host nor an ESX 4.0 host"), + _("%s is neither an ESX 3.5 host nor an ESX 4.x host"), hostname); goto cleanup; } @@ -462,10 +464,12 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, } if (priv->vCenter->productVersion != esxVI_ProductVersion_VPX25 && - priv->vCenter->productVersion != esxVI_ProductVersion_VPX40) { + priv->vCenter->productVersion != esxVI_ProductVersion_VPX40 && + priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 && + priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("%s is neither a vCenter 2.5 server nor a vCenter " - "4.0 server"), hostname); + "4.x server"), hostname); goto cleanup; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 8c43d67..69ba7a9 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -378,9 +378,16 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->apiVersion = esxVI_APIVersion_25; } else if (STRPREFIX(ctx->service->about->apiVersion, "4.0")) { ctx->apiVersion = esxVI_APIVersion_40; + } else if (STRPREFIX(ctx->service->about->apiVersion, "4.1")) { + ctx->apiVersion = esxVI_APIVersion_41; + } else if (STRPREFIX(ctx->service->about->apiVersion, "4.")) { + ctx->apiVersion = esxVI_APIVersion_4x; + + VIR_WARN("Found untested VI API major/minor version '%s'", + ctx->service->about->apiVersion); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API major/minor version '2.5' or '4.0' " + _("Expecting VI API major/minor version '2.5' or '4.x' " "but found '%s'"), ctx->service->about->apiVersion); goto cleanup; } @@ -400,10 +407,17 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->productVersion = esxVI_ProductVersion_ESX35; } else if (STRPREFIX(ctx->service->about->version, "4.0")) { ctx->productVersion = esxVI_ProductVersion_ESX40; + } else if (STRPREFIX(ctx->service->about->version, "4.1")) { + ctx->productVersion = esxVI_ProductVersion_ESX41; + } else if (STRPREFIX(ctx->service->about->version, "4.")) { + ctx->productVersion = esxVI_ProductVersion_ESX4x; + + VIR_WARN("Found untested ESX major/minor version '%s'", + ctx->service->about->version); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting ESX major/minor version '3.5' or " - "'4.0' but found '%s'"), + "'4.x' but found '%s'"), ctx->service->about->version); goto cleanup; } @@ -412,9 +426,16 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->productVersion = esxVI_ProductVersion_VPX25; } else if (STRPREFIX(ctx->service->about->version, "4.0")) { ctx->productVersion = esxVI_ProductVersion_VPX40; + } else if (STRPREFIX(ctx->service->about->version, "4.1")) { + ctx->productVersion = esxVI_ProductVersion_VPX41; + } else if (STRPREFIX(ctx->service->about->version, "4.")) { + ctx->productVersion = esxVI_ProductVersion_VPX4x; + + VIR_WARN("Found untested VPX major/minor version '%s'", + ctx->service->about->version); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting VPX major/minor version '2.5' or '4.0' " + _("Expecting VPX major/minor version '2.5' or '4.x' " "but found '%s'"), ctx->service->about->version); goto cleanup; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index f5e89e9..9eb5094 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -94,7 +94,9 @@ enum _esxVI_APIVersion { esxVI_APIVersion_Undefined = 0, esxVI_APIVersion_Unknown, esxVI_APIVersion_25, - esxVI_APIVersion_40 + esxVI_APIVersion_40, + esxVI_APIVersion_41, + esxVI_APIVersion_4x /* > 4.1 */ }; /* @@ -110,10 +112,14 @@ enum _esxVI_ProductVersion { esxVI_ProductVersion_ESX = (1 << 1) << 16, esxVI_ProductVersion_ESX35 = esxVI_ProductVersion_ESX | 1, esxVI_ProductVersion_ESX40 = esxVI_ProductVersion_ESX | 2, + esxVI_ProductVersion_ESX41 = esxVI_ProductVersion_ESX | 3, + esxVI_ProductVersion_ESX4x = esxVI_ProductVersion_ESX | 4, /* > 4.1 */ esxVI_ProductVersion_VPX = (1 << 2) << 16, esxVI_ProductVersion_VPX25 = esxVI_ProductVersion_VPX | 1, - esxVI_ProductVersion_VPX40 = esxVI_ProductVersion_VPX | 2 + esxVI_ProductVersion_VPX40 = esxVI_ProductVersion_VPX | 2, + esxVI_ProductVersion_VPX41 = esxVI_ProductVersion_VPX | 3, + esxVI_ProductVersion_VPX4x = esxVI_ProductVersion_VPX | 4 /* > 4.1 */ }; enum _esxVI_Occurrence { diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e075149..c63b159 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -1184,6 +1184,7 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, * 4 7 API * ESX 3.5 + 2.5 * ESX 4.0 + + 4.0 + * ESX 4.1 + + 4.1 * GSX 2.0 + + 2.5 */ switch (productVersion) { @@ -1201,7 +1202,9 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, case esxVI_ProductVersion_GSX20: case esxVI_ProductVersion_ESX40: + case esxVI_ProductVersion_ESX41: case esxVI_ProductVersion_VPX40: + case esxVI_ProductVersion_VPX41: if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'virtualHW.version' to be 4 or 7 " @@ -1212,6 +1215,10 @@ esxVMX_ParseConfig(esxVI_Context *ctx, virCapsPtr caps, const char *vmx, break; + case esxVI_ProductVersion_ESX4x: + case esxVI_ProductVersion_VPX4x: + break; + default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected product version")); @@ -2702,6 +2709,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, case esxVI_ProductVersion_GSX20: case esxVI_ProductVersion_ESX40: + case esxVI_ProductVersion_ESX41: + case esxVI_ProductVersion_ESX4x: virBufferAddLit(&buffer, "virtualHW.version = \"7\"\n"); break; -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Don't ignore the vcenter query parameter
by Matthias Bolte 24 Jul '10

24 Jul '10

Since 070f61002f47b602c15d1e4950a122ac9edefe1b the vcenter query parameter has been ignored, because the refactoring to use esxUtil_ParseQuery was incomplete. This effectively broke migration, because the vcenter query parameter is essential for a migration. --- src/esx/esx_driver.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index acf8908..33f421d 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -475,11 +475,18 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } /* Login to vCenter */ - if (vCenter != NULL) { + if (parsedQuery->vCenter != NULL) { VIR_FREE(url); VIR_FREE(password); VIR_FREE(username); + vCenter = strdup(parsedQuery->vCenter); + + if (vCenter == NULL) { + virReportOOMError(); + goto cleanup; + } + /* If a vCenter is specified resolve the hostname */ if (STRNEQ(vCenter, "*") && esxUtil_ResolveHostname(vCenter, vCenterIpAddress, -- 1.7.0.4

2 2

[libvirt] [PATCH v2] esx: Add autodetection for the SCSI controller model
by Matthias Bolte 24 Jul '10

24 Jul '10

This works for file-backed SCSI disk device with a datastore related source path. --- v2: - check that ESX reports the same controller model for all disks attached to the SCSI controller, otherwise let autodetection fail docs/drvesx.html.in | 9 ++ docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/esx/esx_vi_generator.input | 149 +++++++++++++++++++++++ src/esx/esx_vi_generator.py | 3 + src/esx/esx_vmx.c | 256 +++++++++++++++++++++++++++++++++++++--- src/esx/esx_vmx.h | 8 +- 8 files changed, 407 insertions(+), 21 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 88c70bc..e8cee77 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -292,6 +292,15 @@ ethernet0.checkMACAddress = "false" <h4>SCSI controller models</h4> <dl> + <dt><code>auto</code></dt> + <dd> + This isn't a actual controller model. If specified the ESX driver + tries to detect the SCSI controller model referenced in the + <code>.vmdk</code> file and use it. Autodetection fails when a + SCSI controller has multiple disks attached and the SCSI controller + models referenced in the <code>.vmdk</code> files are inconsistent. + Since 0.8.3 + </dd> <dt><code>buslogic</code></dt> <dd> BusLogic SCSI controller for older guests. diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 6240518..7be10df 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -673,6 +673,7 @@ <optional> <attribute name="model"> <choice> + <value>auto</value> <value>buslogic</value> <value>lsilogic</value> <value>lsisas1068</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6ebf982..bc579ca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -140,6 +140,7 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, "virtio-serial") VIR_ENUM_IMPL(virDomainControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, + "auto", "buslogic", "lsilogic", "lsisas1068", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4abe376..984f65b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -196,6 +196,7 @@ enum virDomainControllerType { enum virDomainControllerModel { + VIR_DOMAIN_CONTROLLER_MODEL_AUTO, VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068, diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index ff65178..b4b33f6 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -184,6 +184,40 @@ object Event end +object FileInfo + String path r + Long fileSize o + DateTime modification o +end + + +object FileQuery +end + + +object FileQueryFlags + Boolean fileType r + Boolean fileSize r + Boolean modification r +end + + +object FloppyImageFileInfo extends FileInfo +end + + +object FloppyImageFileQuery extends FileQuery +end + + +object FolderFileInfo extends FileInfo +end + + +object FolderFileQuery extends FileQuery +end + + object HostCpuIdInfo Int level r String vendor o @@ -194,6 +228,22 @@ object HostCpuIdInfo end +object HostDatastoreBrowserSearchResults + ManagedObjectReference datastore o + String folderPath o + FileInfo file ol +end + + +object HostDatastoreBrowserSearchSpec + FileQuery query ol + FileQueryFlags details o + Boolean searchCaseInsensitive o + String matchPattern ol + Boolean sortFoldersFirst o +end + + object HostFileSystemVolume String type r String name r @@ -225,6 +275,14 @@ object HostVmfsVolume extends HostFileSystemVolume end +object IsoImageFileInfo extends FileInfo +end + + +object IsoImageFileQuery extends FileQuery +end + + object LocalDatastoreInfo extends DatastoreInfo String path o end @@ -424,6 +482,14 @@ object TaskInfo end +object TemplateConfigFileInfo extends VmConfigFileInfo +end + + +object TemplateConfigFileQuery extends VmConfigFileQuery +end + + object TraversalSpec extends SelectionSpec String type r String path r @@ -502,6 +568,82 @@ object VirtualMachineSnapshotTree end +object VmConfigFileInfo extends FileInfo + Int configVersion o +end + + +object VmConfigFileQuery extends FileQuery + VmConfigFileQueryFilter filter o + VmConfigFileQueryFlags details o +end + + +object VmConfigFileQueryFilter + Int matchConfigVersion ol +end + + +object VmConfigFileQueryFlags + Boolean configVersion r +end + + +object VmDiskFileInfo extends FileInfo + String diskType o + Long capacityKb o + Int hardwareVersion o + String controllerType o + String diskExtents ol +end + + +object VmDiskFileQuery extends FileQuery + VmDiskFileQueryFilter filter o + VmDiskFileQueryFlags details o +end + + +object VmDiskFileQueryFilter + String diskType ol + Int matchHardwareVersion ol + String controllerType ol +end + + +object VmDiskFileQueryFlags + Boolean diskType r + Boolean capacityKb r + Boolean hardwareVersion r + Boolean controllerType o + Boolean diskExtents o +end + + +object VmLogFileInfo extends FileInfo +end + + +object VmLogFileQuery extends FileQuery +end + + +object VmNvramFileInfo extends FileInfo +end + + +object VmNvramFileQuery extends FileQuery +end + + +object VmSnapshotFileInfo extends FileInfo +end + + +object VmSnapshotFileQuery extends FileQuery +end + + object VmfsDatastoreInfo extends DatastoreInfo HostVmfsVolume vmfs o end @@ -658,6 +800,13 @@ method RevertToSnapshot_Task returns ManagedObjectReference r end +method SearchDatastore_Task returns ManagedObjectReference r + ManagedObjectReference _this r + String datastorePath r + HostDatastoreBrowserSearchSpec searchSpec o +end + + method SessionIsActive returns Boolean r ManagedObjectReference _this:SessionManager r String sessionID r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index ff3e3d1..82bc9b6 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -1123,7 +1123,10 @@ additional_enum_features = { "ManagedEntityStatus" : Enum.FEATURE__ANY_TYPE additional_object_features = { "DatastoreInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__DYNAMIC_CAST, "Event" : Object.FEATURE__LIST, + "FileInfo" : Object.FEATURE__DYNAMIC_CAST, + "FileQuery" : Object.FEATURE__DYNAMIC_CAST, "HostCpuIdInfo" : Object.FEATURE__ANY_TYPE | Object.FEATURE__LIST, + "HostDatastoreBrowserSearchResults" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, "ObjectContent" : Object.FEATURE__DEEP_COPY | Object.FEATURE__LIST, "PerfCounterInfo" : Object.FEATURE__LIST, diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index c69e116..9035233 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -29,6 +29,7 @@ #include "virterror_internal.h" #include "memory.h" #include "logging.h" +#include "esx_vi_methods.h" #include "esx_private.h" #include "esx_util.h" #include "esx_vmx.h" @@ -433,6 +434,7 @@ def->parallels[0]... * are actually SCSI controller models in the ESX case */ VIR_ENUM_DECL(esxVMX_SCSIControllerModel) VIR_ENUM_IMPL(esxVMX_SCSIControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, + "auto", /* just to match virDomainControllerModel, will never be used */ "buslogic", "lsilogic", "lsisas1068", @@ -716,34 +718,244 @@ esxVMX_HandleLegacySCSIDiskDriverName(virDomainDefPtr def, int -esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], - bool present[4]) +esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, + virDomainDiskDefPtr def, int *model) { - int i; + int result = -1; + char *datastoreName = NULL; + char *directoryName = NULL; + char *fileName = NULL; + char *datastorePath = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastore = NULL; + esxVI_ManagedObjectReference *hostDatastoreBrowser = NULL; + esxVI_HostDatastoreBrowserSearchSpec *searchSpec = NULL; + esxVI_VmDiskFileQuery *vmDiskFileQuery = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + esxVI_TaskInfo *taskInfo = NULL; + esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL; + esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL; + + if (def->device != VIR_DOMAIN_DISK_DEVICE_DISK || + def->bus != VIR_DOMAIN_DISK_BUS_SCSI || + def->type != VIR_DOMAIN_DISK_TYPE_FILE || + def->src == NULL || + ! STRPREFIX(def->src, "[")) { + /* + * This isn't a file-based SCSI disk device with a datastore related + * source path => do nothing. + */ + return 0; + } + + if (esxUtil_ParseDatastoreRelatedPath(def->src, &datastoreName, + &directoryName, &fileName) < 0) { + goto cleanup; + } + + if (directoryName == NULL) { + if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) { + virReportOOMError(); + goto cleanup; + } + } else { + if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, + directoryName) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + /* Lookup HostDatastoreBrowser */ + if (esxVI_String_AppendValueToList(&propertyNameList, "browser") < 0 || + esxVI_LookupDatastoreByName(ctx, datastoreName, propertyNameList, + &datastore, + esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetManagedObjectReference(datastore, "browser", + &hostDatastoreBrowser, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + /* Build HostDatastoreBrowserSearchSpec */ + if (esxVI_HostDatastoreBrowserSearchSpec_Alloc(&searchSpec) < 0 || + esxVI_FileQueryFlags_Alloc(&searchSpec->details) < 0) { + goto cleanup; + } + + searchSpec->details->fileType = esxVI_Boolean_True; + searchSpec->details->fileSize = esxVI_Boolean_False; + searchSpec->details->modification = esxVI_Boolean_False; + + if (esxVI_VmDiskFileQuery_Alloc(&vmDiskFileQuery) < 0 || + esxVI_VmDiskFileQueryFlags_Alloc(&vmDiskFileQuery->details) < 0 || + esxVI_FileQuery_AppendToList + (&searchSpec->query, + esxVI_FileQuery_DynamicCast(vmDiskFileQuery)) < 0) { + goto cleanup; + } + + vmDiskFileQuery->details->diskType = esxVI_Boolean_False; + vmDiskFileQuery->details->capacityKb = esxVI_Boolean_False; + vmDiskFileQuery->details->hardwareVersion = esxVI_Boolean_False; + vmDiskFileQuery->details->controllerType = esxVI_Boolean_True; + vmDiskFileQuery->details->diskExtents = esxVI_Boolean_False; + + if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { + goto cleanup; + } + + searchSpec->matchPattern->value = fileName; + + /* Search datastore for file */ + if (esxVI_SearchDatastore_Task(ctx, hostDatastoreBrowser, datastorePath, + searchSpec, &task) < 0 || + esxVI_WaitForTaskCompletion(ctx, task, NULL, esxVI_Boolean_False, + &taskInfoState) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not serach in datastore '%s'"), datastoreName); + goto cleanup; + } + + if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo) < 0 || + esxVI_HostDatastoreBrowserSearchResults_CastFromAnyType + (taskInfo->result, &searchResults) < 0) { + goto cleanup; + } + + /* Interpret search result */ + vmDiskFileInfo = esxVI_VmDiskFileInfo_DynamicCast(searchResults->file); + + if (vmDiskFileInfo == NULL || vmDiskFileInfo->controllerType == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not lookup controller model for '%s'"), def->src); + goto cleanup; + } + + if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualBusLogicController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualLsiLogicController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "VirtualLsiLogicSASController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068; + } else if (STRCASEEQ(vmDiskFileInfo->controllerType, + "ParaVirtualSCSIController")) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI; + } else { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Found unexpected controller model '%s' for disk '%s'"), + vmDiskFileInfo->controllerType, def->src); + goto cleanup; + } + + result = 0; + + cleanup: + /* Don't double free fileName */ + if (searchSpec != NULL && searchSpec->matchPattern != NULL) { + searchSpec->matchPattern->value = NULL; + } + + VIR_FREE(datastoreName); + VIR_FREE(directoryName); + VIR_FREE(fileName); + VIR_FREE(datastorePath); + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&datastore); + esxVI_ManagedObjectReference_Free(&hostDatastoreBrowser); + esxVI_HostDatastoreBrowserSearchSpec_Free(&searchSpec); + esxVI_ManagedObjectReference_Free(&task); + esxVI_TaskInfo_Free(&taskInfo); + esxVI_HostDatastoreBrowserSearchResults_Free(&searchResults); + + return result; +} + + + +int +esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, + int virtualDev[4], bool present[4]) +{ + int result = -1; + int i, k; virDomainDiskDefPtr disk; - virDomainControllerDefPtr controller = NULL; + virDomainControllerDefPtr controller; + bool controllerHasDisksAttached; + int count = 0; + int *autodetectedModels; - for (i = 0; i < def->ndisks; ++i) { - disk = def->disks[i]; + if (VIR_ALLOC_N(autodetectedModels, def->ndisks) < 0) { + virReportOOMError(); + return -1; + } + + for (i = 0; i < def->ncontrollers; ++i) { + controller = def->controllers[i]; - if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { + // skip non-SCSI controllers continue; } - controller = NULL; + controllerHasDisksAttached = false; - for (i = 0; i < def->ncontrollers; ++i) { - if (def->controllers[i]->idx == disk->info.addr.drive.controller) { - controller = def->controllers[i]; + for (k = 0; k < def->ndisks; ++k) { + disk = def->disks[k]; + + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && + disk->info.addr.drive.controller == controller->idx) { + controllerHasDisksAttached = true; break; } } - if (controller == NULL) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Missing SCSI controller for index %d"), - disk->info.addr.drive.controller); - return -1; + if (! controllerHasDisksAttached) { + // skip SCSI controllers without attached disks + continue; + } + + if (ctx != NULL && + controller->model == VIR_DOMAIN_CONTROLLER_MODEL_AUTO) { + count = 0; + + // try to autodetect the SCSI controller model by collecting + // SCSI controller model of all disks attached to this controller + for (k = 0; k < def->ndisks; ++k) { + disk = def->disks[k]; + + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && + disk->info.addr.drive.controller == controller->idx) { + if (esxVMX_AutodetectSCSIControllerModel + (ctx, disk, &autodetectedModels[count]) < 0) { + goto cleanup; + } + + ++count; + } + } + + // autodetection fails when the disks attached to one controller + // have inconsistent SCSI controller models + for (k = 0; k < count; ++k) { + if (autodetectedModels[k] != autodetectedModels[0]) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Disks on SCSI controller %d have inconsistent " + "controller models, cannot autodetect model"), + controller->idx); + goto cleanup; + } + } + + controller->model = autodetectedModels[0]; } if (controller->model != -1 && @@ -756,14 +968,19 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], "'controller' to be 'buslogic' or 'lsilogic' or " "'lsisas1068' or 'vmpvscsi' but found '%s'"), virDomainControllerModelTypeToString(controller->model)); - return -1; + goto cleanup; } present[controller->idx] = true; virtualDev[controller->idx] = controller->model; } - return 0; + result = 0; + + cleanup: + VIR_FREE(autodetectedModels); + + return result; } @@ -2620,7 +2837,8 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, } } - if (esxVMX_GatherSCSIControllers(def, scsi_virtualDev, scsi_present) < 0) { + if (esxVMX_GatherSCSIControllers(ctx, def, scsi_virtualDev, + scsi_present) < 0) { goto failure; } diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index a9015fb..3ccae7a 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -48,8 +48,12 @@ esxVMX_HandleLegacySCSIDiskDriverName(virDomainDefPtr def, virDomainDiskDefPtr disk); int -esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], - bool present[4]); +esxVMX_AutodetectSCSIControllerModel(esxVI_Context *ctx, + virDomainDiskDefPtr def, int *model); + +int +esxVMX_GatherSCSIControllers(esxVI_Context *ctx, virDomainDefPtr def, + int virtualDev[4], bool present[4]); char * esxVMX_AbsolutePathToDatastoreRelatedPath(esxVI_Context *ctx, -- 1.7.0.4

2 2

[libvirt] [PATCH v2] esx: Allow 'vmpvscsi' as SCSI controller model
by Matthias Bolte 24 Jul '10

24 Jul '10

--- v2: - rename 'pvscsi' to 'vmpvscsi' - add esxVMX_SCSIControllerModelType{to,from}String to handle the difference between VMX and XML name of the controller model docs/drvesx.html.in | 13 ++++++++++++- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/esx/esx_vmx.c | 25 ++++++++++++++++++------- tests/vmx2xmldata/vmx2xml-scsi-driver.vmx | 5 +++++ tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 6 ++++++ tests/xml2vmxdata/xml2vmx-scsi-driver.vmx | 5 +++++ tests/xml2vmxdata/xml2vmx-scsi-driver.xml | 5 +++++ 9 files changed, 55 insertions(+), 9 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index bc7e1a0..88c70bc 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -302,7 +302,13 @@ ethernet0.checkMACAddress = "false" </dd> <dt><code>lsisas1068</code></dt> <dd> - LSI Logic SAS 1068 controller. + LSI Logic SAS 1068 controller. Since 0.8.0 + </dd> + <dt><code>vmpvscsi</code></dt> + <dd> + Special VMware Paravirtual SCSI controller, requires VMware tools inside + the guest. See <a href="http://kb.vmware.com/kb/1010398">VMware KB1010398</a> + for details. Since 0.8.3 </dd> </dl> @@ -642,5 +648,10 @@ Enter administrator password for example-vcenter.com: VMware VMX config parameters </a> </li> + <li> + <a href="http://www.vmware.com/pdf/vsp_4_pvscsi_perf.pdf"> + VMware ESX 4.0 PVSCSI Storage Performance + </a> + </li> </ul> </body></html> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 1d56f5b..6240518 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -676,6 +676,7 @@ <value>buslogic</value> <value>lsilogic</value> <value>lsisas1068</value> + <value>vmpvscsi</value> </choice> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 378c06e..6ebf982 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -142,7 +142,8 @@ VIR_ENUM_IMPL(virDomainController, VIR_DOMAIN_CONTROLLER_TYPE_LAST, VIR_ENUM_IMPL(virDomainControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, "buslogic", "lsilogic", - "lsisas1068") + "lsisas1068", + "vmpvscsi") VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 01da17e..4abe376 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -199,6 +199,7 @@ enum virDomainControllerModel { VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC, VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068, + VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI, VIR_DOMAIN_CONTROLLER_MODEL_LAST }; diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e10e745..c69e116 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -428,6 +428,15 @@ def->parallels[0]... #define ESX_BUILD_VMX_NAME(_suffix) \ snprintf(_suffix##_name, sizeof(_suffix##_name), "%s."#_suffix, prefix); +/* directly map the virDomainControllerModel to esxVMX_SCSIControllerModel, + * this is good enough for now because all virDomainControllerModel values + * are actually SCSI controller models in the ESX case */ +VIR_ENUM_DECL(esxVMX_SCSIControllerModel) +VIR_ENUM_IMPL(esxVMX_SCSIControllerModel, VIR_DOMAIN_CONTROLLER_MODEL_LAST, + "buslogic", + "lsilogic", + "lsisas1068", + "pvscsi"); int @@ -740,11 +749,12 @@ esxVMX_GatherSCSIControllers(virDomainDefPtr def, int virtualDev[4], if (controller->model != -1 && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && - controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068) { + controller->model != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068 && + controller->model != VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML attribute 'model' of entry " "'controller' to be 'buslogic' or 'lsilogic' or " - "'lsisas1068' but found '%s'"), + "'lsisas1068' or 'vmpvscsi' but found '%s'"), virDomainControllerModelTypeToString(controller->model)); return -1; } @@ -1478,16 +1488,17 @@ esxVMX_ParseSCSIController(virConfPtr conf, int controller, bool *present, *tmp = c_tolower(*tmp); } - *virtualDev = virDomainControllerModelTypeFromString(virtualDev_string); + *virtualDev = esxVMX_SCSIControllerModelTypeFromString(virtualDev_string); if (*virtualDev == -1 || (*virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_BUSLOGIC && *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSILOGIC && - *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068)) { + *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_LSISAS1068 && + *virtualDev != VIR_DOMAIN_CONTROLLER_MODEL_VMPVSCSI)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry '%s' to be 'buslogic' or 'lsilogic' " - "or 'lsisas1068' but found '%s'"), virtualDev_name, - virtualDev_string); + "or 'lsisas1068' or 'pvscsi' but found '%s'"), + virtualDev_name, virtualDev_string); goto failure; } } @@ -2619,7 +2630,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virCapsPtr caps, virDomainDefPtr def, if (scsi_virtualDev[i] != -1) { virBufferVSprintf(&buffer, "scsi%d.virtualDev = \"%s\"\n", i, - virDomainControllerModelTypeToString + esxVMX_SCSIControllerModelTypeToString (scsi_virtualDev[i])); } } diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx index cb055f6..64d7c99 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.vmx @@ -6,6 +6,8 @@ scsi1.present = "true" scsi1.virtualDev = "lsilogic" scsi2.present = "true" scsi2.virtualDev = "lsisas1068" +scsi3.present = "true" +scsi3.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "harddisk1.vmdk" @@ -15,3 +17,6 @@ scsi1:0.fileName = "harddisk2.vmdk" scsi2:0.present = "true" scsi2:0.deviceType = "scsi-hardDisk" scsi2:0.fileName = "harddisk3.vmdk" +scsi3:0.present = "true" +scsi3:0.deviceType = "scsi-hardDisk" +scsi3:0.fileName = "harddisk4.vmdk" diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index d39415d..553783b 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -26,8 +26,14 @@ <target dev='sdae' bus='scsi'/> <address type='drive' controller='2' bus='0' unit='0'/> </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sdat' bus='scsi'/> + <address type='drive' controller='3' bus='0' unit='0'/> + </disk> <controller type='scsi' index='0' model='buslogic'/> <controller type='scsi' index='1' model='lsilogic'/> <controller type='scsi' index='2' model='lsisas1068'/> + <controller type='scsi' index='3' model='vmpvscsi'/> </devices> </domain> diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx index 7cceca0..a92d7fc 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx @@ -11,6 +11,8 @@ scsi1.present = "true" scsi1.virtualDev = "lsilogic" scsi2.present = "true" scsi2.virtualDev = "lsisas1068" +scsi3.present = "true" +scsi3.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "/vmfs/volumes/datastore/directory/harddisk1.vmdk" @@ -20,3 +22,6 @@ scsi1:0.fileName = "/vmfs/volumes/datastore/directory/harddisk2.vmdk" scsi2:0.present = "true" scsi2:0.deviceType = "scsi-hardDisk" scsi2:0.fileName = "/vmfs/volumes/datastore/directory/harddisk3.vmdk" +scsi3:0.present = "true" +scsi3:0.deviceType = "scsi-hardDisk" +scsi3:0.fileName = "/vmfs/volumes/datastore/directory/harddisk4.vmdk" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml index 797a26e..ac630ee 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml @@ -21,5 +21,10 @@ <source file='[datastore] directory/harddisk3.vmdk'/> <target dev='sdae' bus='scsi'/> </disk> + <disk type='file' device='disk'> + <driver name='vmpvscsi'/> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sdat' bus='scsi'/> + </disk> </devices> </domain> -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix SEGV on exit after domainEventDeregister()
by Philipp Hahn 23 Jul '10

23 Jul '10

When the last callback is removed using domainEventDeregister(), the events dispatcher is deregistered from the C-library, but domainEventsCallbacks is still an empty list. On shutdown __del__() deregisters the dispatacher again, which SEGVs # You need the event-loop implementation from the Python examples; # give the file a name which is importable by Python. ln examples/domain-events/events-python/event-test.py eloop.py python -c 'from eloop import * import sys def dump(*args): print " ".join(map(str, args)) virEventLoopPureStart() c = libvirt.open("xen:///") c.domainEventRegister(dump, None) c.domainEventDeregister(dump) sys.exit(0)' domainEventDeregister() needs to delete domainEventCallbacks so subsequent calls to __del__() and domainEventRegister() choose the right code paths. Setting it to None is not enough, since calling domainEventRegiser() again would trigger an TypeError. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- python/libvirt-override-virConnect.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

2 2

[libvirt] problems using virt-manager with qemu-kvm to boot a windows from floppy
by John Lumby 23 Jul '10

23 Jul '10

Background : I have an existing win2K system which consists of one boot-floppy image (boot device) and one hard-disk partition /dev/sdc1). Previously I got this running with virt-manager and qemu-0.11 with kqemu - after hitting one bug in virtinst concerning name of the floppy and applying fix from Cole http://hg.fedorahosted.org/hg/python-virtinst/rev/4d0ea2274ffd Yesterday: tried running same win2k but on a different system - the machine has the Intel VT-x - OS still Fedora 13, using qemu-kvm. I applied the above patch to this system's virt-inst, and tried basically same virt-install command other than to select virt-type of kvm instead of kqemu virt-install --connect qemu:///system --name=OCFwin2k --ram=392 --cpuset=0 --description="win2k on OCFed disk on usb, nat network" --import --network=network=default,model=pcnet --virt-type=kvm --accelerate --vnc --vncport=5905 --video=cirrus --disk=/home/lumby/Downloads/win2k_boot.floppage,device=floppy --disk=/dev/sdc,device=disk --os-type=windows --os-variant=win2k But this time I hit two new problems : . another (different) one relating to the floppy - qemu-kvm couldn't find it . wrong syntax for the usb tablet in qemu-kvm command meant no tablet. The qemu-kvm command that virt-manager came up with was this: /usr/bin/qemu-kvm -S -M fedora-13 -cpu n270,+x2apic -enable-kvm -m 392 -smp 1,sockets=1,cores=1,threads=1 -name OCFwin2k -uuid 8a63ef02-cea8-cc23-5a31-f98a1b0bdea1 -nodefaults -chardev socket,id=monitor,path=/var/lib/libvirt/qemu/OCFwin2k.monitor,server,nowait -mon chardev=monitor,mode=readline -rtc base=localtime -boot a -drive file=/home/lumby/Downloads/win2k_boot.floppage,if=none,id=drive-fdc0-0-0 -global isa-fdc.driveA=drive-fdc0-0-0 -drive file=/dev/sdc,if=none,id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -device pcnet,vlan=0,id=net0,mac=52:54:00:97:f6:b9,bus=pci.0,addr=0x4 -net tap,fd=45,vlan=0,name=hostnet0 -chardev pty,id=serial0 -device isa-serial,chardev=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:5 -k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 I've attached at the bottom the xml that virst-inst built for this machine. I then looked back at what qemu command the virt-manager on my other system had come up with, merged bits of that with the above, and came up with this one which worked ok. It's a whole lot simpler! /usr/bin/qemu-kvm -M fedora-13 -m 392 -smp 1 -name OCFwin2k -localtime -boot a -drive file=/home/lumby/Downloads/win2k_boot.floppage,if=floppy,unit=0 -drive file=/dev/sdc,if=ide,bus=0,unit=0 -net nic,macaddr=52:54:00:d7:84:4e,vlan=0,name=net0 -net tap,fd=17,vlan=0,name=hostnet0 -serial pty -parallel none -usb -usbdevice tablet -vga cirrus I think there must be a bug or two somewhere but whether in virt-manager or in virt-inst or both I don't know. If you want more information just ask. John Lumby content of the xml generated by the above virt-install : [Thu, 22 Jul 2010 19:39:02 virt-install 4709] DEBUG (cli:192) Launched with command line: /usr/sbin/virt-install --connect qemu:///system --name=OCFwin2k --ram=392 --cpuset=0 --description=win2k on OCFed disk on usb, nat network --import --network=network=default,model=pcnet --virt-type=kvm --accelerate --vnc --vncport=5905 --video=cirrus --disk=/home/lumby/Downloads/win2k_boot.floppage,device=floppy --disk=/dev/sdc,device=disk --os-type=windows --os-variant=win2k [Thu, 22 Jul 2010 19:39:02 virt-install 4709] DEBUG (cli:216) Requesting libvirt URI qemu:///system [Thu, 22 Jul 2010 19:39:02 virt-install 4709] DEBUG (cli:218) Received libvirt URI qemu:///system [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (virt-install:494) Requesting virt method 'default', hv type 'kvm'. [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (virt-install:816) Received virt method 'hvm' [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (virt-install:817) Hypervisor name is 'kvm' [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (virt-install:351) parse_disk: returning {'format': None, 'bus': None, 'readOnly': False, 'volInstall': None, 'path': '/home/lumby/Downloads/win2k_boot.floppage', 'device': 'floppy', 'volName': None, 'conn': <libvirt.virConnect instance at 0x93ec6ec>, 'size': None, 'driverCache': None, 'shareable': False, 'sparse': True} [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (virt-install:351) parse_disk: returning {'format': None, 'bus': None, 'readOnly': False, 'volInstall': None, 'path': '/dev/sdc', 'device': 'disk', 'volName': None, 'conn': <libvirt.virConnect instance at 0x93ec6ec>, 'size': None, 'driverCache': None, 'shareable': False, 'sparse': True} [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (Guest:1012) Generated install XML: None required [Thu, 22 Jul 2010 19:39:03 virt-install 4709] DEBUG (Guest:1030) Generated boot XML: <domain type='kvm'> <name>OCFwin2k</name> <currentMemory>401408</currentMemory> <memory>401408</memory> <uuid>8a63ef02-cea8-cc23-5a31-f98a1b0bdea1</uuid> <description>win2k on OCFed disk on usb, nat network</description> <os> <type arch='i686'>hvm</type> <boot dev='fd'/> </os> <features> <acpi/><apic/><pae/> </features> <cpu match='exact'> <model>n270</model> <feature policy='force' name='x2apic'/> </cpu> <clock offset="localtime"/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <vcpu cpuset='0'>1</vcpu> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='floppy'> <driver name='qemu'/> <source file='/home/lumby/Downloads/win2k_boot.floppage'/> <target dev='fda' bus='fdc'/> </disk> <disk type='block' device='disk'> <driver name='qemu'/> <source dev='/dev/sdc'/> <target dev='hda' bus='ide'/> </disk> <interface type='network'> <source network='default'/> <mac address='52:54:00:97:f6:b9'/> <model type='pcnet'/> </interface> <input type='tablet' bus='usb'/> <graphics type='vnc' port='5905' keymap='en-us'/> <console type='pty'/> <video> <model type='cirrus'/> </video> </devices> </domain> [Thu, 22 Jul 2010 19:39:04 virt-install 4709] DEBUG (Guest:1070) Launching console callback _________________________________________________________________ Look 'em in the eye: FREE Messenger video chat http://go.microsoft.com/?linkid=9734386

1 0

[libvirt] [PATCH] pciSharesBusWithActive fails to find multiple devices on bus
by Chris Wright 23 Jul '10

23 Jul '10

The first conditional is always true which means the iterator will never find another device on the same bus. if (dev->domain != check->domain || dev->bus != check->bus || ----> (check->slot == check->slot && check->function == check->function)) <----- The goal of that check is to verify that the device is either: in a different pci domain on a different bus is the same identical device This means libvirt may issue a secondary bus reset when there are devices on that bus that actively in use by the host or another guest. Not good. Fix the typo. Cc: Alex Williamson <alex.williamson(a)redhat.com> Cc: Don Dutile <ddutile(a)redhat.com> Cc: Chris Lalancette <clalance(a)redhat.com> Signed-off-by: Chris Wright <chrisw(a)redhat.com> --- src/util/pci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index b2e1673..6d0ca24 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -446,10 +446,11 @@ pciSharesBusWithActive(pciDevice *dev, pciDevice *check, void *data) { pciDeviceList *activeDevs = data; + /* Different domain, different bus, or simply identical device */ if (dev->domain != check->domain || dev->bus != check->bus || - (check->slot == check->slot && - check->function == check->function)) + (dev->slot == check->slot && + dev->function == check->function)) return 0; if (activeDevs && !pciDeviceListFind(activeDevs, check))

4 3

[libvirt] libvir: Domain error <domName>: invalid argument in virDomainGetXMLDesc
by Priya 23 Jul '10

23 Jul '10

All, I just downloaded and installed *libvirt-bin* and this is my first email to the group, so I apologize in advance if my questions are too naive! So, I am trying to access VMs running on* xen3.2 hypervisor* (host with kernel *2.6.24-24-xen*) using *virt-manager* installed on a machine running*Ubuntu 9.04 * (client machine). I got to the point where I can connect to my virtual machine and my domain-0 through the* virt-manager* client (meaning that I already have *libvirt*,* ssh-askpass* downloaded and the *libvirtd* and * xend* running on my host machine), and on the client machine I can view the window showing the statistics of CPU utilization of my domain-0 and user domain. The attachment shows a shapshot of the *virt-manager* on my client machine. Now when I try to access the GUI of either of domain-0 or the user domain (by selecting the specific domain and clicking open) I get the following error message in a pop-up on my client and in the libvirtd console on the host: "*libvir: Domain error xen_2: invalid argument in virDomainGetXMLDesc*" I tried to Google this error, but I don't find any clear answers. It *seems*to be a bug in the *libvirt* implementation that has been detected and resolved already. And I am confused as to why is it that such a recent version is still buggy? Should I have downloded another version instead? I desperately wish to resolve this problem and would appreciate any guidance. Many thanks! -- Priya Bhat

1 0

[libvirt] Compiling C++ program with libvirt
by adrian wyssen 23 Jul '10

23 Jul '10

Hi everyone I am trying to compile a C++ program which uses libvirt to connect to an ESXi host. I got the code running if I wrote it in C, directly in the hellolibvirt.c example. However, I am now trying to compile that code in a C++ file which is not inside the example directory. I tried to compile with the following command: g++ -g -D debug=1 -c -llibvirt ESXWrapper.cpp g++ -g -D debug=1 -o ESXWrapper ESXWrapper.o The first line passes and creates ESXWrapper.o file. But when I run the second line, it gives me the following error: --- g++ -g -D debug=1 -c -llibvirt ESXWrapper.cpp g++ -g -D debug=1 -o ESXWrapper ESXWrapper.o ESXWrapper.o: In function `VPopCWrapper': /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:124: undefined reference to `virConnectOpenAuth' /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:133: undefined reference to `virConnectGetURI' /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:144: undefined reference to `virConnectClose' /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:124: undefined reference to `virConnectOpenAuth' /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:133: undefined reference to `virConnectGetURI' /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:144: undefined reference to `virConnectClose' ESXWrapper.o: In function `showError': /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:186: undefined reference to `virConnCopyLastError' /home/wyssen/school/Dropbox/virtualPOPC-1/NEW/vpopcwrapper/ESXWrapper.cpp:202: undefined reference to `virResetError' collect2: ld returned 1 exit status make: *** [all] Error 1 --- My makefile is the follwing: --- #vars CC=g++ OUTPUTFILE=ESXWrapper O_FILES=ESXWrapper.o FLAGS=-g -D debug=1 .PHONY: all all: esxwrapper $(CC) $(FLAGS) -o $(OUTPUTFILE) $(O_FILES) esxwrapper: ESXWrapper.cpp VPopCWrapper.h $(CC) $(FLAGS) -c -llibvirt ESXWrapper.cpp .PHONY: run run: all ./bignum .PHONY: clean clean: rm -f $(O_FILES) .PHONY: clean_all clean_all: clean rm -f $(OUTPUTFILE) --- Can anybody give me a hint, how to link correctly to libvirt. And also tell me, if there are special functions to use with C++, other than the examples provided in the source code, which are written in C. Thank you Adrian

2 1

[libvirt] kvm savevm/loadvm
by Serge Hallyn 22 Jul '10

22 Jul '10

Hi, virsh has save/restore to do a one-time save+shutdown. But it does not expose kvm's savevm/restorevm, which let's me do incremental snapshots. Is there a specific reason why that is not exposed in libvirt, or is it just that noone has implemented it? thanks, -serge

4 7

[libvirt] [PATCH] lxc: Ensure to kill init process by sending SIGKILL if needed
by Ryota Ozaki 22 Jul '10

22 Jul '10

Init process may remain after sending SIGTERM for some reason. For example, if original init program is used, it is definitely not killed by SIGTERM. --- src/lxc/lxc_controller.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 44bcc82..d8b7bc7 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -663,7 +663,11 @@ cleanup: close(containerPty); if (container > 1) { + int status; kill(container, SIGTERM); + if (!(waitpid(container, &status, WNOHANG) == 0 && + WIFEXITED(status))) + kill(container, SIGKILL); waitpid(container, NULL, 0); } return rc; -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix incorrect use of private data in remote driver
by Daniel P. Berrange 22 Jul '10

22 Jul '10

For upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=576796 The remote driver is using the wrong privateData field in a couple of functions. THis is harmless for stateful drivers like QEMU/UML/LXC, but will crash with Xen * src/remote/remote_driver.c: Fix use of privateData field --- src/remote/remote_driver.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7052bf1..c9129b1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4067,7 +4067,7 @@ remoteNetworkIsActive(virNetworkPtr network) int rv = -1; remote_network_is_active_args args; remote_network_is_active_ret ret; - struct private_data *priv = network->conn->privateData; + struct private_data *priv = network->conn->networkPrivateData; remoteDriverLock(priv); @@ -4091,7 +4091,7 @@ remoteNetworkIsPersistent(virNetworkPtr network) int rv = -1; remote_network_is_persistent_args args; remote_network_is_persistent_ret ret; - struct private_data *priv = network->conn->privateData; + struct private_data *priv = network->conn->networkPrivateData; remoteDriverLock(priv); @@ -4622,7 +4622,7 @@ remoteInterfaceIsActive(virInterfacePtr iface) int rv = -1; remote_interface_is_active_args args; remote_interface_is_active_ret ret; - struct private_data *priv = iface->conn->privateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); @@ -5127,7 +5127,7 @@ remoteStoragePoolIsActive(virStoragePoolPtr pool) int rv = -1; remote_storage_pool_is_active_args args; remote_storage_pool_is_active_ret ret; - struct private_data *priv = pool->conn->privateData; + struct private_data *priv = pool->conn->storagePrivateData; remoteDriverLock(priv); @@ -5151,7 +5151,7 @@ remoteStoragePoolIsPersistent(virStoragePoolPtr pool) int rv = -1; remote_storage_pool_is_persistent_args args; remote_storage_pool_is_persistent_ret ret; - struct private_data *priv = pool->conn->privateData; + struct private_data *priv = pool->conn->storagePrivateData; remoteDriverLock(priv); -- 1.5.5.6 -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2

[libvirt] [PATCH (v2)] Fix PCI address assignment if no IDE controller is present
by Daniel P. Berrange 22 Jul '10

22 Jul '10

The previous patch was flawed because it forgot to take into account pre-reserved addresses The PCI slot 1 must be reserved at all times, since PIIX3 is always present, even if no IDE device is in use for guest disks * src/qemu/qemu_conf.c: Always reserve slot 1 for PIIX3 --- src/qemu/qemu_conf.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 23e418b..0f1526d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2271,19 +2271,23 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, * - VirtIO balloon * - Host device passthrough * - Watchdog + * + * Prior to this function being invoked, qemuCollectPCIAddress() will have + * added all existing PCI addresses from the 'def' to 'addrs'. Thus this + * function must only try to reserve addresses if info.type == NONE and + * skip over info.type == PCI */ int qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) { int i; + bool reservedIDE = false; /* Host bridge */ if (qemuDomainPCIAddressReserveSlot(addrs, 0) < 0) goto error; - /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) - * hardcoded slot=1, multifunction device - */ + /* Verify that first IDE controller (if any) is on the PIIX3, fn 1 */ for (i = 0; i < def->ncontrollers ; i++) { /* First IDE controller lives on the PIIX3 at slot=1, function=1 */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && @@ -2297,18 +2301,26 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) _("Primary IDE controller must have PCI address 0:0:1.1")); goto error; } + /* If TYPE==PCI, then then qemuCollectPCIAddress() function + * has already reserved the address, so we must skip */ + reservedIDE = true; } else { def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; def->controllers[i]->info.addr.pci.domain = 0; def->controllers[i]->info.addr.pci.bus = 0; def->controllers[i]->info.addr.pci.slot = 1; def->controllers[i]->info.addr.pci.function = 1; - if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; } } } + /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) + * hardcoded slot=1, multifunction device + */ + if (!reservedIDE && + qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) + goto error; + /* First VGA is hardcoded slot=2 */ if (def->nvideos > 0) { if (def->videos[0]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { -- 1.7.1.1

2 1

[libvirt] [PATCH] Properly report failure to create raw storage volume files
by Laine Stump 21 Jul '10

21 Jul '10

We were previously checking for a return < 0 from virFileOperation(), but that function returns a standard errno, which is 0 on success, or some small positive number on failure. The result was that we wouldn't report failures to create storage volume files; instead they would appear to be created, but then would vanish as soon as a pool-refresh was done (or cause some later error as soon as someone tried to access the volume). The other uses of virFileOperation() were already properly checking for != 0. --- src/storage/storage_backend.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index aba8937..9792eed 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -362,7 +362,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, createRawFileOpHook, &hdata, VIR_FILE_OP_FORCE_PERMS | (pool->def->type == VIR_STORAGE_POOL_NETFS - ? VIR_FILE_OP_AS_UID : 0))) < 0) { + ? VIR_FILE_OP_AS_UID : 0))) != 0) { virReportSystemError(createstat, _("cannot create path '%s'"), vol->target.path); -- 1.7.1.1

4 17

Re: [libvirt] A problem in live migration
by Alex Jia 21 Jul '10

21 Jul '10

I am not sure if libvirt has resolved hostname and ip mapping problem, it had better that two hosts have same domain name, such as "dhcp-1-2-3.nay.redhat.com" and "dhcp-4-5-6.nay.redhat.com". In addition, I haven't seen your any storage pool information on two hosts, you need to create a sharing storage such as nfs sharing folder, and your guest is in the storage, of course, you may also manually mount your nfs folder to target host instead of creating storage pool. Best Regards, Alex ----- Original Message ----- From: "姚远" <sihuyy(a)gmail.com> To: libvir-list(a)redhat.com Sent: Wednesday, July 21, 2010 3:39:15 PM GMT +08:00 Beijing / Chongqing / Hong Kong / Urumqi Subject: [libvirt] A problem in live migration In virsh, I use command "migrate --live 1 qemu+ssh:// 10.1.10.60/system " to do live migration,but it shows error "internal error hostname on destination resolved to localhost, but migration requires an FQDN". I don't know why, and who do live migration successfully can help me. Thank you! My source and destination system are all fedora-13-x86_64, and the version of libvirt is 0.8.2 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

3 2

[libvirt] [PATCH] Fix PCI address assignment if no IDE controller is present
by Daniel P. Berrange 21 Jul '10

21 Jul '10

The PCI slot 1 must be reserved at all times, since PIIX3 is always present, even if no IDE device is in use for guest disks * src/qemu/qemu_conf.c: Always reserve slot 1 for PIIX3 --- src/qemu/qemu_conf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 23e418b..6ce9c9e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2284,6 +2284,10 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) * hardcoded slot=1, multifunction device */ + if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) + goto error; + + /* Verify that first IDE controller (if any) is on the PIIX3, fn 1 */ for (i = 0; i < def->ncontrollers ; i++) { /* First IDE controller lives on the PIIX3 at slot=1, function=1 */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && @@ -2303,8 +2307,6 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) def->controllers[i]->info.addr.pci.bus = 0; def->controllers[i]->info.addr.pci.slot = 1; def->controllers[i]->info.addr.pci.function = 1; - if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; } } } -- 1.7.1.1

2 1

[libvirt] [PATCH] Document the memory balloon device
by Daniel P. Berrange 21 Jul '10

21 Jul '10

* formatdomain.html.in: Document <memballoon> element --- docs/formatdomain.html.in | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 4cca67f..3e80312 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1506,6 +1506,53 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <h4><a name="elementsMemBalloon">Memory balloon device</a></h4> + + + A virtual memory balloon device is added to all Xen and KVM/QEMU + guests. It will be seen as <code>memballoon</code> element. + It will be automatically added when appropriate, so there is no + need to explicitly add this element in the guest XML unless a + specific PCI slot needs to be assigned. + Since 0.8.3, Xen, QEMU and KVM only + + + + Example automatically added device with KVM + +<pre> + ... + <devices> + <memballoon model='virtio'/> + </devices> + ...</pre> + + + Example manually added device with static PCI slot 2 requested + +<pre> + ... + <devices> + <watchdog model='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </devices> +</domain></pre> + + <dl> + <dt><code>model</code></dt> + <dd> + + The required <code>model</code> attribute specifies what type + of balloon device is provided. Valid values are specific to + the virtualization platform + + <ul> + <li>'virtio' — default with QEMU/KVM</li> + <li>'xen' — default with Xen</li> + </ul> + </dd> + </dl> + <h2><a name="examples">Example configs</a></h2> -- 1.7.1.1

2 1

[libvirt] [PATCH] Implement support for virtio plan9fs filesystem passthrough in QEMU
by Daniel P. Berrange 21 Jul '10

21 Jul '10

Make use of the existing <filesystem> element to support plan9fs filesystem passthrough in the QEMU driver <filesystem type='mount'> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> </filesystem> NB, the target is not actually a directory, it is merely a arbitrary string tag that is exported to the guest as a hint for where to mount it. --- src/qemu/qemu_conf.c | 96 +++++++++++++++++++++++++ src/qemu/qemu_conf.h | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 28 +++++++ tests/qemuxml2argvtest.c | 2 + 5 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fs9p.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3e35c57..23e418b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1205,6 +1205,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NO_KVM_PIT; if (strstr(help, "-tdf")) flags |= QEMUD_CMD_FLAG_TDF; + if (strstr(help, "-fsdev")) + flags |= QEMUD_CMD_FLAG_FSDEV; /* Keep disabled till we're actually ready to turn on netdev mode * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ @@ -1987,6 +1989,10 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) return 0; + for (i = 0; i < def->nfss ; i++) { + if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0) + goto no_memory; + } for (i = 0; i < def->nsounds ; i++) { if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0) goto no_memory; @@ -2324,6 +2330,15 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } } + for (i = 0; i < def->nfss ; i++) { + if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; + + /* Only support VirtIO-9p-pci so far. If that changes, + * we might need to skip devices here */ + if (qemuDomainPCIAddressSetNextAddr(addrs, &def->fss[i]->info) < 0) + goto error; + } /* Network interfaces */ for (i = 0; i < def->nnets ; i++) { @@ -2713,6 +2728,64 @@ error: } +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags ATTRIBUTE_UNUSED) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "local,security_model=mapped"); + virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",path=%s", fs->src); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + +char * +qemuBuildFSDevStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "virtio-9p-pci"); + virBufferVSprintf(&opt, ",id=%s", fs->info.alias); + virBufferVSprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",mount_tag=%s", fs->dst); + qemuBuildDeviceAddressStr(&opt, &fs->info); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + char * qemuBuildControllerDevStr(virDomainControllerDefPtr def) { @@ -4274,6 +4347,29 @@ int qemudBuildCommandLine(virConnectPtr conn, } } + if (qemuCmdFlags & QEMUD_CMD_FLAG_FSDEV) { + for (i = 0 ; i < def->nfss ; i++) { + char *optstr; + virDomainFSDefPtr fs = def->fss[i]; + + ADD_ARG_LIT("-fsdev"); + if (!(optstr = qemuBuildFSStr(fs, qemuCmdFlags))) + goto error; + ADD_ARG(optstr); + + ADD_ARG_LIT("-device"); + if (!(optstr = qemuBuildFSDevStr(fs))) + goto error; + ADD_ARG(optstr); + } + } else { + if (def->nfss) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem passthrough not supported by this QEMU")); + goto error; + } + } + if (!def->nnets) { /* If we have -device, then we set -nodefault already */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index ca4559f..68f10eb 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -91,6 +91,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_TDF = (1LL << 35), /* -tdf flag (user-mode pit catchup) */ QEMUD_CMD_FLAG_PCI_CONFIGFD = (1LL << 36), /* pci-assign.configfd */ QEMUD_CMD_FLAG_NODEFCONFIG = (1LL << 37), /* -nodefconfig */ + QEMUD_CMD_FLAG_FSDEV = (1LL << 38), /* -fstype filesystem passthrough */ }; /* Main driver state */ @@ -175,6 +176,7 @@ typedef qemuDomainPCIAddressSet *qemuDomainPCIAddressSetPtr; # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_VIRTIO_SERIAL_PREFIX "virtio-serial" +# define QEMU_FSDEV_HOST_PREFIX "fsdev-" # define qemuReportError(code, ...) \ virReportErrorHelper(NULL, VIR_FROM_QEMU, code, __FILE__, \ @@ -235,9 +237,12 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuBuildDriveStr(virDomainDiskDefPtr disk, int bootable, unsigned long long qemuCmdFlags); +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk); +char * qemuBuildFSDevStr(virDomainFSDefPtr fs); /* Current, best practice */ char * qemuBuildControllerDevStr(virDomainControllerDefPtr def); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args new file mode 100644 index 0000000..42c26a2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fsdev local,id=fsdev-fs0,path=/export/to/guest -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x4 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml new file mode 100644 index 0000000..9072ead --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <filesystem type='mount'> + <source dir='/export/to/guest'/> + <target dir='/import/from/host'/> + </filesystem> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 24002b8..10d1342 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -357,6 +357,8 @@ mymain(int argc, char **argv) DO_TEST("sound", 0); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); + DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | + QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV); DO_TEST("hostdev-usb-address", 0); DO_TEST("hostdev-usb-address-device", QEMUD_CMD_FLAG_DEVICE | -- 1.7.1.1

2 1

[libvirt] [PATCH 0/4] Re-arrange PCI device ordering
by Daniel P. Berrange 21 Jul '10

21 Jul '10

In an attempt to provide better compatability with older QEMU where static PCI device ordering wasn't available, we re-arrange our device address assignment code. We now try to assign addresses in the same order as QEMU would. This should upset Windows less.

4 17

[libvirt] [PATCH] Set a stable & high MAC addr for guest TAP devices on host
by Daniel P. Berrange 21 Jul '10

21 Jul '10

A Linux software bridge will assume the MAC address of the enslaved interface with the numerically lowest MAC addr. When the bridge changes MAC address there is a period of network blackout, so a change should be avoided. The kernel gives TAP devices a completely random MAC address. Occassionally the random TAP device MAC is lower than that of the physical interface (eth0, eth1etc) that is enslaved, causing the bridge to change its MAC. This change sets an explicit MAC address for all TAP devices created using the configured MAC from the XML, but with the high byte set to 0xFE. This should ensure TAP device MACs are higher than any physical interface MAC. * src/qemu/qemu_conf.c, src/uml/uml_conf.c: Pass in a MAC addr for the TAP device with high byte set to 0xFE * src/util/bridge.c, src/util/bridge.h: Set a MAC when creating the TAP device to override random MAC --- src/qemu/qemu_conf.c | 11 +++++++++-- src/uml/uml_conf.c | 11 +++++++++-- src/util/bridge.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/bridge.h | 3 ++- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ad41457..d721fcc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1608,6 +1608,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, int tapfd = -1; int vnet_hdr = 0; int template_ifname = 0; + unsigned char tapmac[VIR_MAC_BUFLEN]; if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { int active, fail = 0; @@ -1675,8 +1676,14 @@ qemudNetworkIfaceConnect(virConnectPtr conn, net->model && STREQ(net->model, "virtio")) vnet_hdr = 1; - if ((err = brAddTap(driver->brctl, brname, - &net->ifname, vnet_hdr, &tapfd))) { + memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); + tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ + if ((err = brAddTap(driver->brctl, + brname, + &net->ifname, + tapmac, + vnet_hdr, + &tapfd))) { if (errno == ENOTSUP) { /* In this particular case, give a better diagnostic. */ qemuReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 785d627..ea40efb 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -113,6 +113,7 @@ umlConnectTapDevice(virDomainNetDefPtr net, int tapfd = -1; int template_ifname = 0; int err; + unsigned char tapmac[VIR_MAC_BUFLEN]; if ((err = brInit(&brctl))) { virReportSystemError(err, "%s", @@ -130,8 +131,14 @@ umlConnectTapDevice(virDomainNetDefPtr net, template_ifname = 1; } - if ((err = brAddTap(brctl, bridge, - &net->ifname, BR_TAP_PERSIST, &tapfd))) { + memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); + tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ + if ((err = brAddTap(brctl, + bridge, + &net->ifname, + tapmac, + 0, + &tapfd))) { if (errno == ENOTSUP) { /* In this particular case, give a better diagnostic. */ umlReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/bridge.c b/src/util/bridge.c index b236f80..7d0caae 100644 --- a/src/util/bridge.c +++ b/src/util/bridge.c @@ -285,6 +285,38 @@ brDeleteInterface(brControl *ctl ATTRIBUTE_UNUSED, # endif /** + * ifSetInterfaceMac: + * @ctl: bridge control pointer + * @ifname: interface name to set MTU for + * @macaddr: MAC address (VIR_MAC_BUFLEN in size) + * + * This function sets the @macaddr for a given interface @ifname. This + * gets rid of the kernel's automatically assigned random MAC. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int ifSetInterfaceMac(brControl *ctl, const char *ifname, + const unsigned char *macaddr) +{ + struct ifreq ifr; + + if (!ctl || !ifname) + return EINVAL; + + memset(&ifr, 0, sizeof(struct ifreq)); + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) + return EINVAL; + + /* To fill ifr.ifr_hdaddr.sa_family field */ + if (ioctl(ctl->fd, SIOCGIFHWADDR, &ifr) != 0) + return errno; + + memcpy(ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN); + + return ioctl(ctl->fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; +} + +/** * ifGetMtu * @ctl: bridge control pointer * @ifname: interface name get MTU for @@ -430,6 +462,7 @@ brProbeVnetHdr(int tapfd) * @ctl: bridge control pointer * @bridge: the bridge name * @ifname: the interface name (or name template) + * @macaddr: desired MAC address (VIR_MAC_BUFLEN long) * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device * @@ -447,6 +480,7 @@ int brAddTap(brControl *ctl, const char *bridge, char **ifname, + const unsigned char *macaddr, int vnet_hdr, int *tapfd) { @@ -478,6 +512,14 @@ brAddTap(brControl *ctl, if (ioctl(fd, TUNSETIFF, &ifr) < 0) goto error; + /* We need to set the interface MAC before adding it + * to the bridge, because the bridge assumes the lowest + * MAC of all enslaved interfaces & we don't want it + * seeing the kernel allocate random MAC for the TAP + * device before we set our static MAC. + */ + if ((errno = ifSetInterfaceMac(ctl, ifr.ifr_name, macaddr))) + goto error; /* We need to set the interface MTU before adding it * to the bridge, because the bridge will have its * MTU adjusted automatically when we add the new interface. diff --git a/src/util/bridge.h b/src/util/bridge.h index d37d7db..96696ac 100644 --- a/src/util/bridge.h +++ b/src/util/bridge.h @@ -68,7 +68,8 @@ enum { int brAddTap (brControl *ctl, const char *bridge, char **ifname, - int features, + const unsigned char *macaddr, + int vnet_hdr, int *tapfd); int brDeleteTap (brControl *ctl, -- 1.7.1.1

2 1

[libvirt] A problem in live migration
by 姚远 21 Jul '10

21 Jul '10

In virsh, I use command "migrate --live 1 qemu+ssh://10.1.10.60/system" to do live migration,but it shows error "internal error hostname on destination resolved to localhost, but migration requires an FQDN". I don't know why, and who do live migration successfully can help me. Thank you! My source and destination system are all fedora-13-x86_64, and the version of libvirt is 0.8.2

1 0

[libvirt] How to replace the management procedure in the virsh
by 姚远 21 Jul '10

21 Jul '10

In virsh, I usr "version" and it shows 编译使用的库：libvir 0.8.2 使用的库：libvir 0.8.2 使用的 API: QEMU 0.8.2 运行管理程序: QEMU 0.9.1 I want to replace QEMU 0.9.1 to QEMU 0.12.2, because 0.12.2 adds many new functions. I download qemu-kvm-0.12.2.tar.gz and install it, but the management procedure is not replaced. I know I should modify the profile of libvirt but I don't know where it is and how to modify it.

1 0

[libvirt] Unmarshalling error with migrate command
by Doug Goldstein 20 Jul '10

20 Jul '10

Hey guys, I'm using a server running libvirt 0.8.2 and my desktop running libvirt 0.8.2. My desktop has virt-manager 0.8.4 and I've got a Linux VM running on the server. I'm looking to use the new migration support to migrate the VM to my desktop from the server. Everytime I attempt the migration I get an error dialog containing the following (I've actually snagged this out of ~/.virt-manager/virt-manager.log [Wed, 07 Jul 2010 18:13:23 virt-manager 18880] DEBUG (migrate:456) Migrating vm=CentOS-5.4-i686-PAE from qemu+ssh://root@codeine/system to qemu:///system [Wed, 07 Jul 2010 18:13:23 virt-manager 18880] DEBUG (domain:1351) Migrating: conn=<libvirt.virConnect instance at 0x2a305f0> flags=7 dname=None uri=qemu://doug-pc/system rate=0[Wed, 07 Jul 2010 18:13:23 virt-manager 18880] DEBUG (error:86) Uncaught Error: unmarshalling remote_error : Unable to migrate guest: Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/migrate.py", line 457, in _async_migrate vm.migrate(dstconn, migrate_uri, rate, live, secure) File "/usr/share/virt-manager/virtManager/domain.py", line 1352, in migrate self._backend.migrate(destconn.vmm, flags, newname, interface, rate) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 479, in migrate prefer to invoke virDomainMigrateToURI, avoiding the need to libvirtError: unmarshalling remote_error If anyone has any ideas, please let me know. -- Doug Goldstein

2 2

[libvirt] [PATCH 0/2] Fix two problems with creating new storage volumes
by Laine Stump 20 Jul '10

20 Jul '10

Both of these problems can occur only if a new storage volume is created by copying it from an existing volume. The first is a problem if the new volume is longer than the old (the new volume won't be zero-filled at the end), and the second happens if the new and old volumes are the same length (fsync wouldn't be called at the end of writing the new volume) (actually, before the 1st fix is applied, that problem would exist for *all* new volumes created as copies of existing volumes).

2 6

[libvirt] [PATCH] Fix a deadlock in bi-directional p2p concurrent migration.
by Chris Lalancette 20 Jul '10

20 Jul '10

If you try to execute two concurrent migrations p2p from A->B and B->A, the two libvirtd's will deadlock trying to perform the migrations. The reason for this is that in p2p migration, the libvirtd's are responsible for making the RPC Prepare, Migrate, and Finish calls. However, they are currently holding the driver lock while doing so, which basically guarantees deadlock in this scenario. This patch fixes the situation by adding qemuDomainObjEnterRemoteWithDriver and qemuDomainObjExitRemoteWithDriver helper methods. The Enter take an additional object reference, then drops both the domain object lock and the driver lock. The Exit takes both the driver and domain object lock, then drops the reference. Adding calls to these Enter and Exit helpers around remote calls in the various migration methods seems to fix the problem for me in testing. This should make the situation safe. The additional domain object reference ensures that the domain object won't disappear while this operation is happening. The BeginJob that is called inside of qemudDomainMigratePerform ensures that we can't execute a second migrate (or shutdown, or save, etc) job while the migration is active. Finally, the additional check on the state of the vm after we reacquire the locks ensures that we can't be surprised by an external event (domain crash, etc). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 57 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5f2607c..1eff4bc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -531,6 +531,21 @@ static void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virD } } +static void qemuDomainObjEnterRemoteWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + virDomainObjRef(obj); + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); +} + +static void qemuDomainObjExitRemoteWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + qemuDriverLock(driver); + virDomainObjLock(obj); + virDomainObjUnref(obj); +} static int qemuCgroupControllerActive(struct qemud_driver *driver, int controller) @@ -10753,14 +10768,25 @@ static int doTunnelMigrate(virDomainPtr dom, /* virStreamNew only fails on OOM, and it reports the error itself */ goto cleanup; + qemuDomainObjEnterRemoteWithDriver(driver, vm); internalret = dconn->driver->domainMigratePrepareTunnel(dconn, st, flags, dname, resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (internalret < 0) /* domainMigratePrepareTunnel sets the error for us */ goto cleanup; + /* the domain may have shutdown or crashed while we had the locks dropped + * in qemuDomainObjEnterRemoteWithDriver, so check again + */ + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } + /* 3. start migration on source */ qemuDomainObjEnterMonitorWithDriver(driver, vm); if (flags & VIR_MIGRATE_NON_SHARED_DISK) @@ -10833,8 +10859,10 @@ cancel: finish: dname = dname ? dname : dom->name; + qemuDomainObjEnterRemoteWithDriver(driver, vm); ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, NULL, 0, uri, flags, retval); + qemuDomainObjExitRemoteWithDriver(driver, vm); cleanup: if (client_sock != -1) @@ -10873,19 +10901,32 @@ static int doNonTunnelMigrate(virDomainPtr dom, virDomainPtr ddomain = NULL; int retval = -1; char *uri_out = NULL; + int rc; + qemuDomainObjEnterRemoteWithDriver(driver, vm); /* NB we don't pass 'uri' into this, since that's the libvirtd * URI in this context - so we let dest pick it */ - if (dconn->driver->domainMigratePrepare2(dconn, - NULL, /* cookie */ - 0, /* cookielen */ - NULL, /* uri */ - &uri_out, - flags, dname, - resource, dom_xml) < 0) + rc = dconn->driver->domainMigratePrepare2(dconn, + NULL, /* cookie */ + 0, /* cookielen */ + NULL, /* uri */ + &uri_out, + flags, dname, + resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); + if (rc < 0) /* domainMigratePrepare2 sets the error for us */ goto cleanup; + /* the domain may have shutdown or crashed while we had the locks dropped + * in qemuDomainObjEnterRemoteWithDriver, so check again + */ + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } + if (uri_out == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); @@ -10899,8 +10940,10 @@ static int doNonTunnelMigrate(virDomainPtr dom, finish: dname = dname ? dname : dom->name; + qemuDomainObjEnterRemoteWithDriver(driver, vm); ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, NULL, 0, uri_out, flags, retval); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (ddomain) virUnrefDomain(ddomain); -- 1.7.1.1

2 3

[libvirt] [PATCH] Make virsh setmaxmem balloon only when successful.
by Chris Lalancette 20 Jul '10

20 Jul '10

After playing around with virsh setmaxmem for a bit, I ran into some surprising behavior; if a hypervisor does not support the virDomainSetMaxMemory() API, but the value specified for setmaxmem is less than the current amount of memory in the domain, the domain would be ballooned down *before* an error was reported. To make this more consistent, run virDomainSetMaxMemory() before trying to shrink; that way, if an error is thrown, no changes to the running domain are made. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0631590..97bfa20 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2529,19 +2529,19 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) return FALSE; } + if (virDomainSetMaxMemory(dom, kilobytes) != 0) { + vshError(ctl, "%s", _("Unable to change MaxMemorySize")); + virDomainFree(dom); + return FALSE; + } + if (kilobytes < info.memory) { if (virDomainSetMemory(dom, kilobytes) != 0) { - virDomainFree(dom); vshError(ctl, "%s", _("Unable to shrink current MemorySize")); - return FALSE; + ret = FALSE; } } - if (virDomainSetMaxMemory(dom, kilobytes) != 0) { - vshError(ctl, "%s", _("Unable to change MaxMemorySize")); - ret = FALSE; - } - virDomainFree(dom); return ret; } -- 1.6.6.1

2 3

[libvirt] [PATCH] Use unsigned long in cmdSetmem.
by Chris Lalancette 20 Jul '10

20 Jul '10

The virsh command "setmem" takes as input a number that should represent an unsigned long number of kilobytes. Fix cmdSetmem to properly parse this as an unsigned long instead of an int. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 551e97b..63816dc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -223,6 +223,8 @@ static int vshCmddefHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); +static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, + int *found); static char *vshCommandOptString(const vshCmd *cmd, const char *name, int *found); static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, @@ -2534,7 +2536,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainInfo info; - int kilobytes; + unsigned long kilobytes; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -2543,10 +2545,10 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); + kilobytes = vshCommandOptUL(cmd, "kilobytes", NULL); if (kilobytes <= 0) { virDomainFree(dom); - vshError(ctl, _("Invalid value of %d for memory size"), kilobytes); + vshError(ctl, _("Invalid value of %lu for memory size"), kilobytes); return FALSE; } @@ -2558,7 +2560,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (kilobytes > info.maxMem) { virDomainFree(dom); - vshError(ctl, _("Requested memory size %d kb is larger than maximum of %lu kb"), + vshError(ctl, _("Requested memory size %lu kb is larger than maximum of %lu kb"), kilobytes, info.maxMem); return FALSE; } @@ -9628,6 +9630,26 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) return res; } +static unsigned long +vshCommandOptUL(const vshCmd *cmd, const char *name, int *found) +{ + vshCmdOpt *arg = vshCommandOpt(cmd, name); + unsigned long res = 0; + int num_found = FALSE; + char *end_p = NULL; + + if ((arg != NULL) && (arg->data != NULL)) { + res = strtoul(arg->data, &end_p, 10); + if ((arg->data == end_p) || (*end_p!= 0)) + num_found = FALSE; + else + num_found = TRUE; + } + if (found) + *found = num_found; + return res; +} + /* * Returns option as STRING */ -- 1.7.1.1

2 3

[libvirt] Libvirt segmentation fault on non root user
by Vasco Silva 20 Jul '10

20 Jul '10

Dear all, Im trying to connet to libvirtd on my local machine, but i only can contact as root user. When i run virsh command as root user, all works as expected: [root@localhost libvirt]# virsh list Id Name State ---------------------------------- When i try to run virsh as user, i get the following errors: [user@localhost ~]$ virsh list error: unable to connect to '@/home/user/.libvirt/libvirt-sock', libvirtd may need to be started: Connection refused error: failed to connect to the hypervisor on /var/log/messages, i found a segmentation fault: Jul 20 02:46:00 localhost kernel: libvirtd[22177]: segfault at 28 ip 0000000000496ca7 sp 00007f72a328bdf8 error 4 in libvirtd[400000+cc000] on my /etc/libvirt/libvirtd.conf, i have uncommented these 3 entries: listen_tls = 0 listen_tcp = 1 auth_tcp = "none" my system: Linux localhost 2.6.33.5-desktop-2xcm #1 SMP Tue Jun 22 15:53:23 WEST 2010 x86_64 x86_64 x86_64 GNU/Linux - Mandriva Free 2010 libvirt-utils-0.8.0-2mdv2010.1 I don't know how to resolve this segmentation fault, and what is the cause. Any help will be appreciated. Thanks, Vasco Silva

2 2

[libvirt] A problem about live migration of kvm
by 姚远 20 Jul '10

20 Jul '10

>From qemu-kvm-0.12.1, kvm has the function about live migration with non-shared storage. But I don't know how to use it. In the qemu monitor, "migrate -d tcp:10.1.10.42:444" which is based on shared storage is going well. I don't know how to use the command of "-b or -i" or maybe I don't know the correct format of uri. the source and destination system is Fedora-13, and the version of kvm is qemu-kvm-0.12.3. When I use the "migrate -d -b tcp:10.1.10.42:4444", the qemu monitor don't show nothing. When I use "info migrate",there shows "migrate status: failed". I don't know why? I hope someone who used this command successfully would help me, thank you.

2 1

[libvirt] ChangeLog-old file: do we need it?
by Justin Clift 20 Jul '10

20 Jul '10

Hi us, We have an old ChangeLog file in the base directory that seems to just be hanging around and not really serving a useful purpose. And takes up space. Can we remove it? Regards and best wishes, Justin Clift

2 1

[libvirt] How to use live migration of kvm with non-shared storage
by 姚远 20 Jul '10

20 Jul '10

>From qemu-kvm-0.12.1, kvm has the function about live migration with non-shared storage. But I don't know how to use it. In the qemu monitor, "migrate -d tcp:10.1.10.42:444" which is based on shared storage is going well. I don't know how to use the command of "-b or -i" or maybe I don't know the correct format of uri. the source and destination system is Fedora-13, and the version of kvm is qemu-kvm-0.12.3. When I use the "migrate -d -b tcp:10.1.10.42:4444", the qemu monitor don't show nothing. When I use "info migrate",there shows "migrate status: failed". I don't know why? I hope someone who used this command successfully would help me, thank you

1 0