- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Improve error when trying to change vm's cpu count 0
by Peter Krempa 22 Jun '12

22 Jun '12

This patch adds a check for the count of processors the user requests for the guest machine so that invalid values produce a more helpful error message. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 55cbe2b..2ec84cd 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5755,7 +5755,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(cmd, "count", &count) < 0) { + if (vshCommandOptInt(cmd, "count", &count) < 0 || count <= 0) { vshError(ctl, "%s", _("Invalid number of virtual CPUs")); goto cleanup; } -- 1.7.8.6

2 2

[libvirt] [PATCH] Add support for shared sanlock leases
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> A sanlock lease can be marked as shared (rather than exclusive) using SANLK_RES_SHARED flag. This adds support for that flag and ensures that in auto disk mode, any shared disks use shared leases. This also makes any read-only disks be completely ignored. These changes remove the need for the option ignore_readonly_and_shared_disks so that is removed Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 38 +++++++++++-------------------- src/locking/sanlock.conf | 7 ------ src/locking/test_libvirt_sanlock.aug.in | 1 - 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 146aefd..16941c9 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -65,7 +65,6 @@ struct _virLockManagerSanlockDriver { bool requireLeaseForDisks; int hostID; bool autoDiskLease; - bool ignoreReadonlyShared; char *autoDiskLeasePath; }; @@ -115,10 +114,6 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) CHECK_TYPE("auto_disk_leases", VIR_CONF_LONG); if (p) driver->autoDiskLease = p->l; - p = virConfGetValue(conf, "ignore_readonly_and_shared_disks"); - CHECK_TYPE("ignore_readonly_and_shared_disks", VIR_CONF_LONG); - if (p) driver->ignoreReadonlyShared = p->l; - p = virConfGetValue(conf, "disk_lease_dir"); CHECK_TYPE("disk_lease_dir", VIR_CONF_STRING); if (p && p->str) { @@ -428,7 +423,8 @@ static int virLockManagerSanlockDiskLeaseName(const char *path, static int virLockManagerSanlockAddLease(virLockManagerPtr lock, const char *name, size_t nparams, - virLockManagerParamPtr params) + virLockManagerParamPtr params, + bool shared) { virLockManagerSanlockPrivatePtr priv = lock->privateData; int ret = -1; @@ -440,6 +436,7 @@ static int virLockManagerSanlockAddLease(virLockManagerPtr lock, goto cleanup; } + res->flags = shared ? SANLK_RES_SHARED : 0; res->num_disks = 1; if (!virStrcpy(res->name, name, SANLK_NAME_LEN)) { virLockError(VIR_ERR_INTERNAL_ERROR, @@ -485,7 +482,8 @@ cleanup: static int virLockManagerSanlockAddDisk(virLockManagerPtr lock, const char *name, size_t nparams, - virLockManagerParamPtr params ATTRIBUTE_UNUSED) + virLockManagerParamPtr params ATTRIBUTE_UNUSED, + bool shared) { virLockManagerSanlockPrivatePtr priv = lock->privateData; int ret = -1; @@ -503,6 +501,7 @@ static int virLockManagerSanlockAddDisk(virLockManagerPtr lock, goto cleanup; } + res->flags = shared ? SANLK_RES_SHARED : 0; res->num_disks = 1; if (virLockManagerSanlockDiskLeaseName(name, res->name, SANLK_NAME_LEN) < 0) goto cleanup; @@ -630,27 +629,15 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock, return -1; } - if ((flags & (VIR_LOCK_MANAGER_RESOURCE_READONLY | - VIR_LOCK_MANAGER_RESOURCE_SHARED)) && - driver->ignoreReadonlyShared) { - return 0; - } - - if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) { - virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Readonly leases are not supported")); - return -1; - } - if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED) { - virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Shareable leases are not supported")); - return -1; - } + /* Treat R/O resources as a no-op lock request */ + if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) + return 0; switch (type) { case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK: if (driver->autoDiskLease) { - if (virLockManagerSanlockAddDisk(lock, name, nparams, params) < 0) + if (virLockManagerSanlockAddDisk(lock, name, nparams, params, + !!(flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)) < 0) return -1; if (virLockManagerSanlockCreateLease(priv->res_args[priv->res_count-1]) < 0) @@ -664,7 +651,8 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock, break; case VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE: - if (virLockManagerSanlockAddLease(lock, name, nparams, params) < 0) + if (virLockManagerSanlockAddLease(lock, name, nparams, params, + !!(flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)) < 0) return -1; break; diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf index 19ab2b3..efc35ee 100644 --- a/src/locking/sanlock.conf +++ b/src/locking/sanlock.conf @@ -52,10 +52,3 @@ # to enabled, otherwise it defaults to disabled. # #require_lease_for_disks = 1 - -# -# Enable this flag to have sanlock ignore readonly and shared disks. -# If disabled, then this rejects attempts to share resources until -# sanlock gains support for shared locks. -# -#ignore_readonly_and_shared_disks = 1 diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_libvirt_sanlock.aug.in index 1f05558..288f329 100644 --- a/src/locking/test_libvirt_sanlock.aug.in +++ b/src/locking/test_libvirt_sanlock.aug.in @@ -6,4 +6,3 @@ module Test_libvirt_sanlock = { "disk_lease_dir" = "/var/lib/libvirt/sanlock" } { "host_id" = "1" } { "require_lease_for_disks" = "1" } -{ "ignore_readonly_and_shared_disks" = "1" } -- 1.7.10.2

3 3

[libvirt] [PATCH] Allow NOCONFIGURE=1 to make autogen.sh skip ./configure
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Sometimes it is useful to re-bootstrap libvirt without running through a ./configure invocation immediately. eg if you want to run ./configure for Mingw32 rather than native. --- autogen.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autogen.sh b/autogen.sh index f1591d8..95598e2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -70,6 +70,8 @@ if test -d .git; then fi fi +test -n "$NOCONFIGURE" && exit 0 + cd "$THEDIR" if test "x$OBJ_DIR" != x; then -- 1.7.10.2

2 1

[libvirt] [PATCH] Fix unused parameters / functions in virsh on Win32
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The vshPrintRaw function is not used on Win32, and neither is the 'msg' parameter of vshAskReedit. Change the nesting of #ifdef WIN32 conditionals to address this --- tools/virsh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1b4f771..b84c4bc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -655,6 +655,7 @@ vshReconnect(vshControl *ctl) ctl->useSnapshotOld = false; } +#ifndef WIN32 static void vshPrintRaw(vshControl *ctl, ...) { @@ -684,7 +685,6 @@ vshPrintRaw(vshControl *ctl, ...) static int vshAskReedit(vshControl *ctl, const char *msg) { -#ifndef WIN32 int c = -1; struct termios ttyattr; @@ -720,12 +720,16 @@ vshAskReedit(vshControl *ctl, const char *msg) vshPrint(ctl, "\r\n"); return c; +} #else +static int +vshAskReedit(vshControl *ctl, const char *msg ATTRIBUTE_UNUSED) +{ vshDebug(ctl, VSH_ERR_WARNING, "%s", _("This function is not " "supported on WIN32 platform")); return 0; -#endif } +#endif /* --------------- * Commands -- 1.7.10.2

2 1

[libvirt] [PATCH] winsock2.h must always be included before windows.h
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some GNULIB headers (eg unistd.h) will often need to include winsock2.h for various symbols. There is a rule that winsock2.h must be included before windows.h. This means that any file which does #ifdef WIN32 #include <windows.h> #endif #include <unistd.h> is potentially broken. A simple rule is that /all/ includes of windows.h must be matched with a preceeding include of winsock2.h regardless of whether unistd.h is used currently --- src/util/util.c | 3 +++ src/vbox/vbox_MSCOMGlue.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/util/util.c b/src/util/util.c index 28a4fe7..a71b0d6 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -65,6 +65,9 @@ #endif #ifdef WIN32 +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# endif # include <windows.h> # include <shlobj.h> #endif diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index b07d6a7..68810fb 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -22,6 +22,9 @@ #include <config.h> +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +#endif #include <windows.h> #define nsCID CLSID -- 1.7.10.2

2 1

[libvirt] [PATCH] Update to latest GNULIB to fix compat with Mingw64 toolchain
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> On both x86_64-w64-mingw32 and i686-w64-mingw32 there were the following warnings/errors: CC fstat.lo ../../../gnulib/lib/fstat.c:27:0: warning: "stat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/fstat.c:25: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:258:0: note: this is the location of the previous definition ../../../gnulib/lib/fstat.c:28:0: warning: "fstat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/fstat.c:25: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:259:0: note: this is the location of the previous definition CC stat.lo ../../../gnulib/lib/stat.c:32:0: warning: "stat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/stat.c:27: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:258:0: note: this is the location of the previous definition CC stdio-read.lo ../../../gnulib/lib/stdio-read.c:102:1: error: redefinition of 'vscanf' In file included from ./stdio.h:43:0, from ../../../gnulib/lib/stdio-read.c:21: /usr/x86_64-w64-mingw32/sys-root/mingw/include/stdio.h:397:7: note: previous definition of 'vscanf' was here ../../../gnulib/lib/stdio-read.c:108:1: error: redefinition of 'vfscanf' In file included from ./stdio.h:43:0, from ../../../gnulib/lib/stdio-read.c:21: /usr/x86_64-w64-mingw32/sys-root/mingw/include/stdio.h:384:7: note: previous definition of 'vfscanf' was here make[3]: *** [stdio-read.lo] Error 1 make[3]: Leaving directory `/home/berrange/src/virt/libvirt/build/gnulib/lib' While on x86_64-w64-mingw32 only there was: In file included from ../../../gnulib/lib/regex.c:69:0: ../../../gnulib/lib/regcomp.c: In function 'parse_dup_op': ../../../gnulib/lib/regcomp.c:2624:39: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../../../gnulib/lib/regcomp.c: In function 'mark_opt_subexp': ../../../gnulib/lib/regcomp.c:3859:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] --- .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 77cef20..a02ba4b 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 77cef2022004c4066e805da09a83b2c77f17bdd3 +Subproject commit a02ba4bf889fee4622db87f185c3d0af84d74ae7 -- 1.7.10.2

2 1

[libvirt] KVM Forum and oVirt Workshop Europe 2012 Save the Date
by KVM Forum 2012 Program Committee 21 Jun '12

21 Jun '12

KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. We are also excited to announce the oVirt Workshop will run in parallel with the KVM Forum, bringing in a community focused on enterprise datacenter virtualization management built on KVM. So mark your calendar and join us in advancing KVM. Once again we are colocated with The Linux Foundation's LinuxCon, Based on feedback from last year, this time it's LinuxCon Europe! Conference: November 7 - 9, 2012 Location: Hotel Fira Palace - Barcelona, Spain Details regarding registration and proposal submission are forthcoming. thanks, your KVM Forum 2012 Program Commitee

1 0

[libvirt] [PATCH 5/5] S390: Adding testcases for s390
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

Add minimal s390-virtio domain testcase and testcases for virtio serial, net, disk for the virtio-s390 bus. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- .../qemuxml2argv-console-virtio-s390.args | 9 ++++++ .../qemuxml2argv-console-virtio-s390.xml | 24 +++++++++++++++ .../qemuxml2argv-disk-virtio-s390.args | 5 +++ .../qemuxml2argv-disk-virtio-s390.xml | 22 ++++++++++++++ .../qemuxml2argv-minimal-s390.args | 5 +++ .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 +++++++++++++ .../qemuxml2argv-net-virtio-s390.args | 5 +++ .../qemuxml2argv-net-virtio-s390.xml | 22 ++++++++++++++ tests/qemuxml2argvtest.c | 8 +++++ tests/testutilsqemu.c | 31 ++++++++++++++++++++ 10 files changed, 152 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args new file mode 100644 index 0000000..3388a35 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +s390-virtio -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev \ +socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ +chardev=charmonitor,id=monitor,mode=readline -no-acpi \ +-boot c -device virtio-serial-s390,id=virtio-serial0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml new file mode 100644 index 0000000..5a4a9d4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <os> + <type arch='s390x' machine='s390-virtio'>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='virtio'/> + </disk> + <console type='pty'> + <target type='virtio'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args new file mode 100644 index 0000000..66bdf1e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml new file mode 100644 index 0000000..9ce6c18 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='s390x' machine='s390-virtio'>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='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args new file mode 100644 index 0000000..4e7bf05 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ +-name QEMUGuest1 -S -M s390-virtio -m 214 -smp 1 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ +-boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml new file mode 100644 index 0000000..7378bd4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <os> + <type arch='s390x' machine='s390-virtio'>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='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args new file mode 100644 index 0000000..700ea84 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \ +-net user,vlan=0,name=hostnet0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml new file mode 100644 index 0000000..f42fadd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='s390x' machine='s390-virtio'>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> + <interface type='user'> + <mac address='00:11:22:33:44:55'/> + <model type='virtio'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3b339be..8cd8a91 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -341,6 +341,7 @@ mymain(void) unsetenv("SDL_AUDIODRIVER"); DO_TEST("minimal", false, QEMU_CAPS_NAME); + DO_TEST("minimal-s390", false, QEMU_CAPS_NAME); DO_TEST("machine-aliases1", false, NONE); DO_TEST("machine-aliases2", true, NONE); DO_TEST("boot-cdrom", false, NONE); @@ -393,6 +394,8 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE); DO_TEST("disk-many", false, NONE); DO_TEST("disk-virtio", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT); + DO_TEST("disk-virtio-s390", false, QEMU_CAPS_DRIVE, + QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-order", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); @@ -552,6 +555,8 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-netdev", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_NODEFCONFIG); + DO_TEST("net-virtio-s390", false, + QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390); DO_TEST("net-eth", false, NONE); DO_TEST("net-eth-ifname", false, NONE); DO_TEST("net-eth-names", false, QEMU_CAPS_NET_NAME); @@ -609,6 +614,9 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("console-virtio-many", false, QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + DO_TEST("console-virtio-s390", false, + QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_S390); DO_TEST("channel-spicevmc", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8d5a3bf..74b9122 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -87,6 +87,34 @@ error: return -1; } +static int testQemuAddS390Guest(virCapsPtr caps) +{ + static const char *s390_machines[] = { "s390-virtio"}; + virCapsGuestMachinePtr *machines = NULL; + virCapsGuestPtr guest; + + machines = virCapabilitiesAllocMachines(s390_machines, + ARRAY_CARDINALITY(s390_machines)); + if (!machines) + goto error; + + guest = virCapabilitiesAddGuest(caps, "hvm", "s390x", 64, + "/usr/bin/qemu-system-s390x", NULL, + ARRAY_CARDINALITY(s390_machines), + machines); + if (!guest) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL)) + goto error; + + return 0; + +error: + virCapabilitiesFreeMachines(machines, ARRAY_CARDINALITY(s390_machines)); + return -1; +} + virCapsPtr testQemuCapsInit(void) { virCapsPtr caps; virCapsGuestPtr guest; @@ -208,6 +236,9 @@ virCapsPtr testQemuCapsInit(void) { if (testQemuAddPPC64Guest(caps)) goto cleanup; + if (testQemuAddS390Guest(caps)) + goto cleanup; + if (virTestGetDebug()) { char *caps_str; -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 4/5] S390: Domain Schema for s390-virtio machines.
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

Added s390-virtio machine type to the XML schema for domains in order to not fail the domain schema tests. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- docs/schemas/domaincommon.rng | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 46e539d..a80f8b9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -283,6 +283,7 @@ <ref name="hvmsparc"/> <ref name="hvmppc"/> <ref name="hvmppc64"/> + <ref name="hvms390"/> </choice> </optional> <value>hvm</value> @@ -369,6 +370,25 @@ </optional> </group> </define> + <define name="hvms390"> + <group> + <optional> + <attribute name="arch"> + <choice> + <value>s390</value> + <value>s390x</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="machine"> + <choice> + <value>s390-virtio</value> + </choice> + </attribute> + </optional> + </group> + </define> <define name="osexe"> <element name="os"> <element name="type"> -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 3/5] S390: Add support for virtio-s390 devices.
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

The s390(x) architecture doesn't feature a PCI bus. For the purpose of supporting virtio devices a virtual bus called virtio-s390 is used. A new address type VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 is used to distinguish the virtio devices on s390 from PCI-based virtio devices. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 11 +++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 98 +++++++++++++++++++++++++++++++++++++++-- 5 files changed, 110 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 81c6308..4db771e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -150,7 +150,8 @@ VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "virtio-serial", "ccid", "usb", - "spapr-vio") + "spapr-vio", + "virtio-s390") VIR_ENUM_IMPL(virDomainDeviceAddressPciMulti, VIR_DOMAIN_DEVICE_ADDRESS_PCI_MULTI_LAST, @@ -2130,7 +2131,8 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) return 0; /* We'll be in domain/devices/[device type]/ so 3 level indent */ @@ -4121,6 +4123,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Controllers must use the 'pci' address type")); @@ -4646,6 +4649,7 @@ virDomainNetDefParseXML(virCapsPtr caps, * them we should make sure address type is correct */ if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Network interfaces must use 'pci' address type")); @@ -9048,7 +9052,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->memballoon = memballoon; VIR_FREE(nodes); - } else { + } else if (!STREQ(def->os.arch,"s390x")) { + /* TODO: currently no balloon support on s390 -> no default balloon */ if (def->virtType == VIR_DOMAIN_VIRT_XEN || def->virtType == VIR_DOMAIN_VIRT_QEMU || def->virtType == VIR_DOMAIN_VIRT_KQEMU || diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 44280ba..0b54646 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -172,6 +172,7 @@ enum virDomainDeviceAddressType { VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0c01cb0..9e8bded 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -165,6 +165,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "hda-micro", /* 95 */ "dump-guest-memory", + "virtio-s390", ); @@ -1427,6 +1428,12 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_USB_HUB); if (strstr(str, "name \"ich9-ahci\"")) qemuCapsSet(flags, QEMU_CAPS_ICH9_AHCI); + if (strstr(str, "name \"virtio-blk-s390\"")) + qemuCapsSet(flags, QEMU_CAPS_VIRTIO_S390); + if (strstr(str, "name \"virtio-net-s390\"")) + qemuCapsSet(flags, QEMU_CAPS_VIRTIO_S390); + if (strstr(str, "name \"virtio-serial-s390\"")) + qemuCapsSet(flags, QEMU_CAPS_VIRTIO_S390); /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ if (!qemuCapsGet(flags, QEMU_CAPS_CHARDEV_SPICEVMC) && diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 640f7f5..c117a39 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -132,6 +132,7 @@ enum qemuCapsFlags { QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ + QEMU_CAPS_VIRTIO_S390 = 97, /* -device virtio-*-s390 */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bee48e1..8b14d10 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -734,6 +734,67 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virBitmapPtr qemuCaps) return -1; } +static void +qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, + enum virDomainDeviceAddressType type) +{ + /* + declare address-less virtio devices to be of address type 'type' + only disks, networks, consoles and controllers for now + */ + int i; + + for (i = 0; i < def->ndisks ; i++) { + if (def->disks[i]->bus == VIR_DOMAIN_DISK_BUS_VIRTIO && + def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->disks[i]->info.type = type; + } + + for (i = 0; i < def->nnets ; i++) { + if (STREQ(def->nets[i]->model,"virtio") && + def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->nets[i]->info.type = type; + } + + for (i = 0; i < def->ncontrollers ; i++) { + if (def->controllers[i]->type == + VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL && + def->controllers[i]->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->controllers[i]->info.type = type; + } + +} + +static int +qemuDomainAssignS390Addresses(virDomainDefPtr def, virBitmapPtr qemuCaps) +{ + int ret = -1; + virBitmapPtr localCaps = NULL; + + if (!qemuCaps) { + /* need to get information from real environment */ + if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + NULL, + &localCaps) < 0) + goto cleanup; + qemuCaps = localCaps; + } + + if (qemuCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { + /* deal with legacy virtio-s390 */ + qemuDomainPrimeS390VirtioDevices( + def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390); + } + + ret = 0; + +cleanup: + qemuCapsFree(localCaps); + + return ret; +} + static int qemuSpaprVIOFindByReg(virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, @@ -1001,6 +1062,10 @@ int qemuDomainAssignAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps, if (rc) return rc; + rc = qemuDomainAssignS390Addresses(def, qemuCaps); + if (rc) + return rc; + return qemuDomainAssignPCIAddresses(def, qemuCaps, obj); } @@ -1545,7 +1610,10 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) continue; - if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + /* don't touch s390 devices */ + if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI || + def->disks[i]->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) continue; if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { @@ -2020,7 +2088,13 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - /* Each virtio drive is a separate PCI device, no unit/busid or index */ + if (qemuCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390) && + (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)) { + /* Paranoia - leave in here for now */ + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected address type for s390-virtio disk")); + goto error; + } idx = -1; break; @@ -2450,7 +2524,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, disk->info.addr.drive.unit); break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - virBufferAddLit(&opt, "virtio-blk-pci"); + if (disk->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + virBufferAddLit(&opt, "virtio-blk-s390"); + } else { + virBufferAddLit(&opt, "virtio-blk-pci"); + } qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); if (disk->event_idx && qemuCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_EVENT_IDX)) { @@ -2706,6 +2785,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virBufferAddLit(&buf, "virtio-serial-pci"); + } else if (def->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + virBufferAddLit(&buf, "virtio-serial-s390"); } else { virBufferAddLit(&buf, "virtio-serial"); } @@ -2801,7 +2883,12 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, if (!net->model) { nic = "rtl8139"; } else if (STREQ(net->model, "virtio")) { - nic = "virtio-net-pci"; + if (net->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { + nic = "virtio-net-s390"; + } else { + nic = "virtio-net-pci"; + } usingVirtio = true; } else { nic = net->model; @@ -3604,7 +3691,8 @@ qemuBuildVirtioSerialPortDevStr(virDomainChrDefPtr dev, return NULL; } - if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { /* Check it's a virtio-serial address */ if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL) -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 2/5] S390: Change tests to use (modified) qemuDomainAssignAddresses
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

Rewrote the device assignment parts in tests to use qemuDomainAssignAddresses. This way the tests will work for new device address types as they show up in the future (like s390 device types). Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- tests/qemuxml2argvtest.c | 12 +----------- tests/qemuxmlnstest.c | 13 ++----------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7b00ea2..3b339be 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -149,21 +149,11 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out; if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE)) { - qemuDomainPCIAddressSetPtr pciaddrs; - - if (qemuDomainAssignSpaprVIOAddresses(vmdef)) { + if(qemuDomainAssignAddresses(vmdef, extraFlags, NULL)) { if (expectError) goto ok; goto out; } - - if (!(pciaddrs = qemuDomainPCIAddressSetCreate(vmdef))) - goto out; - - if (qemuAssignDevicePCISlots(vmdef, pciaddrs) < 0) - goto out; - - qemuDomainPCIAddressSetFree(pciaddrs); } log = virtTestLogContentAndReset(); diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 8eca466..0bc821d 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -95,17 +95,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (qemudCanonicalizeMachine(&driver, vmdef) < 0) goto fail; - if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE)) { - qemuDomainPCIAddressSetPtr pciaddrs; - if (!(pciaddrs = qemuDomainPCIAddressSetCreate(vmdef))) - goto fail; - - if (qemuAssignDevicePCISlots(vmdef, pciaddrs) < 0) - goto fail; - - qemuDomainPCIAddressSetFree(pciaddrs); - } - + if (qemuCapsGet(extraFlags, QEMU_CAPS_DEVICE)) + qemuDomainAssignAddresses(vmdef, extraFlags, NULL); log = virtTestLogContentAndReset(); VIR_FREE(log); -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 1/5] S390: Extended qemuDomainAssignAddresses to be callable from everywhere
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

This is in preparation of the enablement of s390 guests with virtio devices. The assignment of device addresses happens in different places, i.e. the qemu driver and process modules as well as in the unit tests in slightly different flavors. Currently, these are PPC spapr-vio and PCI devices, virtio-s390 (not PCI based) will follow. By optionally passing to qemuDomainAssignAddresses the domain object and the capabilities it is now possible to call the function from most of the places (except for hotplug) where address assignment is done. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 42 +++++++++++++++++++++++++++++++++--------- src/qemu/qemu_command.h | 6 ++++-- src/qemu/qemu_driver.c | 14 +++++++------- src/qemu/qemu_process.c | 42 ++++-------------------------------------- 4 files changed, 48 insertions(+), 56 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd4f96a..bee48e1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -941,16 +941,23 @@ cleanup: int -qemuDomainAssignPCIAddresses(virDomainDefPtr def) +qemuDomainAssignPCIAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps, + virDomainObjPtr obj) { int ret = -1; - virBitmapPtr qemuCaps = NULL; + virBitmapPtr localCaps = NULL; qemuDomainPCIAddressSetPtr addrs = NULL; + qemuDomainObjPrivatePtr priv = NULL; - if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, - NULL, - &qemuCaps) < 0) - goto cleanup; + + if (!qemuCaps) { + /* need to get information from real environment */ + if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + NULL, + &localCaps) < 0) + goto cleanup; + qemuCaps = localCaps; + } if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (!(addrs = qemuDomainPCIAddressSetCreate(def))) @@ -960,16 +967,33 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def) goto cleanup; } + if (obj && obj->privateData) { + priv = obj->privateData; + if (addrs) { + /* if this is the live domain object, we persist the PCI addresses*/ + if (priv->pciaddrs) { + qemuDomainPCIAddressSetFree(priv->pciaddrs); + priv->pciaddrs = NULL; + } + priv->persistentAddrs = 1; + priv->pciaddrs = addrs; + addrs = NULL; + } else { + priv->persistentAddrs = 0; + } + } + ret = 0; cleanup: - qemuCapsFree(qemuCaps); + qemuCapsFree(localCaps); qemuDomainPCIAddressSetFree(addrs); return ret; } -int qemuDomainAssignAddresses(virDomainDefPtr def) +int qemuDomainAssignAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps, + virDomainObjPtr obj) { int rc; @@ -977,7 +1001,7 @@ int qemuDomainAssignAddresses(virDomainDefPtr def) if (rc) return rc; - return qemuDomainAssignPCIAddresses(def); + return qemuDomainAssignPCIAddresses(def, qemuCaps, obj); } static void diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 1eafeb3..dd104d6 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -175,10 +175,12 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, virDomainChrSourceDefPtr *monConfig, bool *monJSON); -int qemuDomainAssignAddresses(virDomainDefPtr def); +int qemuDomainAssignAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps, + virDomainObjPtr); int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def); -int qemuDomainAssignPCIAddresses(virDomainDefPtr def); +int qemuDomainAssignPCIAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps, + virDomainObjPtr obj); qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def); int qemuDomainPCIAddressReserveFunction(qemuDomainPCIAddressSetPtr addrs, int slot, int function); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2177c30..7f53444 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1404,7 +1404,7 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (qemudCanonicalizeMachine(driver, def) < 0) goto cleanup; - if (qemuDomainAssignAddresses(def) < 0) + if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) goto cleanup; if (!(vm = virDomainAssignDef(driver->caps, @@ -5069,7 +5069,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { if (qemudCanonicalizeMachine(driver, def) < 0) goto cleanup; - if (qemuDomainAssignAddresses(def) < 0) + if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) goto cleanup; if (!(vm = virDomainAssignDef(driver->caps, @@ -5547,7 +5547,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) if (virDomainDefAddImplicitControllers(vmdef) < 0) return -1; - if (qemuDomainAssignAddresses(vmdef) < 0) + if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) return -1; break; @@ -5565,7 +5565,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, return -1; } dev->data.net = NULL; - if (qemuDomainAssignAddresses(vmdef) < 0) + if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) return -1; break; @@ -5581,7 +5581,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, return -1; } dev->data.hostdev = NULL; - if (qemuDomainAssignAddresses(vmdef) < 0) + if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) return -1; break; @@ -5735,7 +5735,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, vmdef->nets[pos] = net; dev->data.net = NULL; - if (qemuDomainAssignAddresses(vmdef) < 0) + if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0) return -1; break; @@ -11733,7 +11733,7 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn, if (qemudCanonicalizeMachine(driver, def) < 0) goto cleanup; - if (qemuDomainAssignAddresses(def) < 0) + if (qemuDomainAssignAddresses(def, NULL, NULL) < 0) goto cleanup; if (!(vm = virDomainAssignDef(driver->caps, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1df3637..e8461b3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3090,13 +3090,8 @@ qemuProcessReconnect(void *opaque) goto endjob; } - if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - priv->persistentAddrs = 1; - - if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(obj->def)) || - qemuAssignDevicePCISlots(obj->def, priv->pciaddrs) < 0) - goto error; - } + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) + qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj); if (virSecurityManagerReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; @@ -3539,22 +3534,7 @@ int qemuProcessStart(virConnectPtr conn, */ if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { VIR_DEBUG("Assigning domain PCI addresses"); - /* Populate cache with current addresses */ - if (priv->pciaddrs) { - qemuDomainPCIAddressSetFree(priv->pciaddrs); - priv->pciaddrs = NULL; - } - if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(vm->def))) - goto cleanup; - - - /* Assign any remaining addresses */ - if (qemuAssignDevicePCISlots(vm->def, priv->pciaddrs) < 0) - goto cleanup; - - priv->persistentAddrs = 1; - } else { - priv->persistentAddrs = 0; + qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm); } VIR_DEBUG("Building emulator command line"); @@ -4236,21 +4216,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, */ if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { VIR_DEBUG("Assigning domain PCI addresses"); - /* Populate cache with current addresses */ - if (priv->pciaddrs) { - qemuDomainPCIAddressSetFree(priv->pciaddrs); - priv->pciaddrs = NULL; - } - if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(vm->def))) - goto cleanup; - - /* Assign any remaining addresses */ - if (qemuAssignDevicePCISlots(vm->def, priv->pciaddrs) < 0) - goto cleanup; - - priv->persistentAddrs = 1; - } else { - priv->persistentAddrs = 0; + qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm); } if ((timestamp = virTimeStringNow()) == NULL) { -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 0/5] Virtio support for S390
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

This series adds support for the s390 flavor of virtio devices. Since the s390 virtio devices are not implemented as PCI devices it is necessary to refactor some of the device address assignment code. Viktor Mihajlovski (5): S390: Extended qemuDomainAssignAddresses to be callable from everywhere. S390: Change tests to use (modified) qemuDomainAssignAddresses S390: Add support for virtio-s390 devices. S390: Domain Schema for s390-virtio machines. S390: Adding testcases for s390 docs/schemas/domaincommon.rng | 20 +++ src/conf/domain_conf.c | 11 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 7 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 140 ++++++++++++++++++-- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_process.c | 42 +------ .../qemuxml2argv-console-virtio-s390.args | 9 ++ .../qemuxml2argv-console-virtio-s390.xml | 24 ++++ .../qemuxml2argv-disk-virtio-s390.args | 5 + .../qemuxml2argv-disk-virtio-s390.xml | 22 +++ .../qemuxml2argv-minimal-s390.args | 5 + .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 +++ .../qemuxml2argv-net-virtio-s390.args | 5 + .../qemuxml2argv-net-virtio-s390.xml | 22 +++ tests/qemuxml2argvtest.c | 20 ++-- tests/qemuxmlnstest.c | 13 +-- tests/testutilsqemu.c | 31 +++++ 20 files changed, 333 insertions(+), 86 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 5/5] S390: Added sysinfo for host on s390x.
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

In order to retrieve some sysinfo data we need to parse /proc/sysinfo and /proc/cpuinfo. Signed-off-by: Thang Pham <thang.pham(a)us.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/sysinfo.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index 78efc32..01cce98 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -44,6 +44,7 @@ __FUNCTION__, __LINE__, __VA_ARGS__) #define SYSINFO_SMBIOS_DECODER "dmidecode" +#define SYSINFO "/proc/sysinfo" #define CPUINFO "/proc/cpuinfo" VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST, @@ -241,6 +242,159 @@ no_memory: return NULL; } +#elif defined(__s390__) || defined(__s390x__) + +static int +virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) +{ + char *cur, *eol = NULL; + const char *property; + + /* Return if Manufacturer field is not found */ + if ((cur = strstr(base, "Manufacturer")) == NULL) + return 0; + + base = cur; + if ((cur = strstr(base, "Manufacturer")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); + if ((eol) && ((property = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&property); + ret->system_manufacturer = (char *) property; + } + if ((cur = strstr(base, "Type")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); + if ((eol) && ((property = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&property); + ret->system_family = (char *) property; + } + if ((cur = strstr(base, "Sequence Code")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); + if ((eol) && ((property = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&property); + ret->system_serial = (char *) property; + } + + return 0; + +no_memory: + return -1; +} + +static int +virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) +{ + char *cur, *eol, *tmp_base; + char *manufacturer; + const char *tmp; + virSysinfoProcessorDefPtr processor; + + if ((cur = strstr(base, "vendor_id")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); + if ((eol) && ((tmp = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + virSkipSpaces(&tmp); + manufacturer = (char *) tmp; + } + + /* Find processor N: line and gather the processor manufacturer, version, serial number, and family */ + while((tmp_base = strstr(base, "processor ")) != NULL) { + base = tmp_base; + eol = strchr(base, '\n'); + cur = strchr(base, ':') + 1; + + if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { + goto no_memory; + } + + processor = &ret->processor[ret->nprocessor - 1]; + + /* Set the processor manufacturer */ + processor->processor_manufacturer = manufacturer; + + if ((cur = strstr(base, "version =")) != NULL) { + cur += sizeof("version ="); + eol = strchr(cur, ','); + if ((eol) && + ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + } + if ((cur = strstr(base, "identification =")) != NULL) { + cur += sizeof("identification ="); + eol = strchr(cur, ','); + if ((eol) && + ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + } + if ((cur = strstr(base, "machine =")) != NULL) { + cur += sizeof("machine ="); + eol = strchr(cur, '\n'); + if ((eol) && + ((processor->processor_family = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + } + + base = cur; + } + + return 0; + +no_memory: + return -1; +} + +/* virSysinfoRead for s390x + * Gathers sysinfo data from /proc/sysinfo and /proc/cpuinfo */ +virSysinfoDefPtr +virSysinfoRead(void) { + virSysinfoDefPtr ret = NULL; + char *outbuf = NULL; + + if (VIR_ALLOC(ret) < 0) + goto no_memory; + + /* Gather info from /proc/cpuinfo */ + if(virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + virSmbiosReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to open %s"), CPUINFO); + return NULL; + } + + ret->nprocessor = 0; + ret->processor = NULL; + if (virSysinfoParseProcessor(outbuf, ret) < 0) + goto no_memory; + + /* Free buffer before reading next file */ + VIR_FREE(outbuf); + + /* Gather info from /proc/sysinfo */ + if(virFileReadAll(SYSINFO, 4096, &outbuf) < 0) { + virSmbiosReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to open %s"), SYSINFO); + return NULL; + } + + if (virSysinfoParseSystem(outbuf, ret) < 0) + goto no_memory; + + return ret; + +no_memory: + VIR_FREE(outbuf); + return NULL; +} + #elif defined(WIN32) || \ !(defined(__x86_64__) || \ defined(__i386__) || \ -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 4/5] S390: Fixed core identification for s390
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

For the s390x architecture the sysfs core_id alone is not unique. As a result it can happen that libvirt thinks there are less host CPUs available than really present. Currently, a logical CPU is equivalent to a core for s390x. We therefore produce a fake core id from the CPU number. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 7eb5ae5..819f954 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -355,7 +355,13 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, nodeinfo->cpus++; /* Parse core */ +# if defined(__s390__) || \ + defined(__s390x__) + /* logical cpu is equivalent to a core on s390 */ + core = cpu; +# else core = virNodeGetCpuValue(sysfs_cpudir, cpu, "topology/core_id", false); +# endif if (!CPU_ISSET(core, &core_mask)) { CPU_SET(core, &core_mask); nodeinfo->cores++; -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 3/5] S390: Fixed Parser for /proc/cpuinfo needs to be adapted for your architecture
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

Minimal CPU "parser" for s390 to avoid compile time warning. Signed-off-by: Thang Pham <thang.pham(a)us.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index f7d0cc6..7eb5ae5 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -315,6 +315,11 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * and parsed in next iteration, because it is not in expected * format and thus lead to error. */ } +# elif defined(__s390__) || \ + defined(__s390x__) + /* s390x has no realistic value for CPU speed, + * assign a value of zero to signify this */ + nodeinfo->mhz = 0; # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH 2/5] S390: CPU support for s390(x)
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

Adding CPU encoder/decoder for s390 to avoid runtime error messages. Signed-off-by: Thang Pham <thang.pham(a)us.ibm.com> Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu_s390x.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu_s390x.h | 31 +++++++++++++++++++ 4 files changed, 114 insertions(+), 0 deletions(-) create mode 100644 src/cpu/cpu_s390x.c create mode 100644 src/cpu/cpu_s390x.h diff --git a/src/Makefile.am b/src/Makefile.am index e40909b..b0bd3e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -566,6 +566,7 @@ CPU_SOURCES = \ cpu/cpu.h cpu/cpu.c \ cpu/cpu_generic.h cpu/cpu_generic.c \ cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \ + cpu/cpu_s390x.h cpu/cpu_s390x.c \ cpu/cpu_map.h cpu/cpu_map.c cpu/cpu_powerpc.h \ cpu/cpu_powerpc.c diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index b8ccd24..08cb144 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -29,6 +29,7 @@ #include "cpu.h" #include "cpu_x86.h" #include "cpu_powerpc.h" +#include "cpu_s390x.h" #include "cpu_generic.h" @@ -38,6 +39,7 @@ static struct cpuArchDriver *drivers[] = { &cpuDriverX86, &cpuDriverPowerPC, + &cpuDriverS390X, /* generic driver must always be the last one */ &cpuDriverGeneric }; diff --git a/src/cpu/cpu_s390x.c b/src/cpu/cpu_s390x.c new file mode 100644 index 0000000..da45433 --- /dev/null +++ b/src/cpu/cpu_s390x.c @@ -0,0 +1,80 @@ +/* + * cpu_s390x.c: CPU driver for s390x CPUs + * + * Copyright IBM Corp. 2012 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Thang Pham <thang.pham(a)us.ibm.com> + */ + +#include <config.h> + +#include "memory.h" +#include "cpu.h" + + +#define VIR_FROM_THIS VIR_FROM_CPU + +static const char *archs[] = { "s390", "s390x" }; + +static union cpuData * +s390xNodeData(void) +{ + union cpuData *data; + + if (VIR_ALLOC(data) < 0) { + virReportOOMError(); + return NULL; + } + + return data; +} + + +static int +s390xDecode(virCPUDefPtr cpu ATTRIBUTE_UNUSED, + const union cpuData *data ATTRIBUTE_UNUSED, + const char **models ATTRIBUTE_UNUSED, + unsigned int nmodels ATTRIBUTE_UNUSED, + const char *preferred ATTRIBUTE_UNUSED) +{ + return 0; +} + +static void +s390xDataFree(union cpuData *data) +{ + if (data == NULL) + return; + + VIR_FREE(data); +} + +struct cpuArchDriver cpuDriverS390X = { + .name = "s390x", + .arch = archs, + .narch = ARRAY_CARDINALITY(archs), + .compare = NULL, + .decode = s390xDecode, + .encode = NULL, + .free = s390xDataFree, + .nodeData = s390xNodeData, + .guestData = NULL, + .baseline = NULL, + .update = NULL, + .hasFeature = NULL, +}; diff --git a/src/cpu/cpu_s390x.h b/src/cpu/cpu_s390x.h new file mode 100644 index 0000000..f91377f --- /dev/null +++ b/src/cpu/cpu_s390x.h @@ -0,0 +1,31 @@ +/* + * cpu_s390x.c: CPU driver for s390x CPUs + * + * Copyright IBM Corp. 2012 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Thang Pham <thang.pham(a)us.ibm.com> + */ + +#ifndef __VIR_CPU_S390X_H__ +# define __VIR_CPU_S390X_H__ + +# include "cpu.h" + +extern struct cpuArchDriver cpuDriverS390X; + +#endif /* __VIR_CPU_S390X_H__ */ -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0

[libvirt] [PATCH v2] add xhci support
by Gerd Hoffmann 21 Jun '12

21 Jun '12

qemu 1.1 features a xhci controller, this patch adds support for it. [v2: rebased, added docs/ updates ] Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- docs/formatdomain.html.in | 4 ++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1f30772..e1c0af5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1820,8 +1820,8 @@ A "usb" controller has an optional attribute <code>model</code>, which is one of "piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", - "vt82c686b-uhci" or "pci-ohci". The PowerPC64 "spapr-vio" - addresses do not have an associated controller. + "vt82c686b-uhci", "pci-ohci" or "nec-xhci". The PowerPC64 + "spapr-vio" addresses do not have an associated controller. </p> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 46e539d..8630625 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1201,6 +1201,7 @@ <value>ich9-uhci3</value> <value>vt82c686b-uhci</value> <value>pci-ohci</value> + <value>nec-xhci</value> </choice> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 81c6308..4651765 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -257,7 +257,8 @@ VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", - "pci-ohci") + "pci-ohci", + "nec-xhci") 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 44280ba..3712785 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -631,6 +631,7 @@ enum virDomainControllerModelUSB { VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3, VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI, VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI, + VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4308833..578daeb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -165,6 +165,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "hda-micro", /* 95 */ "dump-guest-memory", + "nec-usb-xhci", ); @@ -1421,6 +1422,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_VT82C686B_USB_UHCI); if (strstr(str, "name \"pci-ohci\"")) qemuCapsSet(flags, QEMU_CAPS_PCI_OHCI); + if (strstr(str, "name \"nec-usb-xhci\"")) + qemuCapsSet(flags, QEMU_CAPS_NEC_USB_XHCI); if (strstr(str, "name \"usb-redir\"")) qemuCapsSet(flags, QEMU_CAPS_USB_REDIR); if (strstr(str, "name \"usb-hub\"")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 640f7f5..83c135b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -132,6 +132,7 @@ enum qemuCapsFlags { QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ QEMU_CAPS_HDA_MICRO = 95, /* -device hda-micro */ QEMU_CAPS_DUMP_GUEST_MEMORY = 96, /* dump-guest-memory command */ + QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd4f96a..6549f57 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -106,7 +106,8 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "ich9-usb-uhci2", "ich9-usb-uhci3", "vt82c686b-usb-uhci", - "pci-ohci"); + "pci-ohci", + "nec-usb-xhci"); VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, @@ -2598,6 +2599,8 @@ qemuControllerModelUSBToCaps(int model) return QEMU_CAPS_VT82C686B_USB_UHCI; case VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI: return QEMU_CAPS_PCI_OHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI: + return QEMU_CAPS_NEC_USB_XHCI; default: return -1; } -- 1.7.1

2 1

[libvirt] [PATCH] Switch automated builds to use Mingw64 toolchain instead of Mingw32
by Daniel P. Berrange 21 Jun '12

21 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Mingw32 toolchain is broadly obsoleted by the Mingw64 toolchain. The latter has been adopted by Fedora 17 and newer. Maintaining a RPM spec for Mingw32 is a needless burden, so switch to a Mingw64 RPM spec (which provides 32 & 64 bit builds). --- .gitignore | 2 +- Makefile.am | 2 +- autobuild.sh | 46 +++++--- configure.ac | 2 +- mingw-libvirt.spec.in | 298 +++++++++++++++++++++++++++++++++++++++++++++++ mingw32-libvirt.spec.in | 216 ---------------------------------- 6 files changed, 334 insertions(+), 232 deletions(-) create mode 100644 mingw-libvirt.spec.in delete mode 100644 mingw32-libvirt.spec.in diff --git a/.gitignore b/.gitignore index d535398..cd978d2 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,7 @@ /ltmain.sh /m4/* /maint.mk -/mingw32-libvirt.spec +/mingw-libvirt.spec /mkinstalldirs /po/* /proxy/ diff --git a/Makefile.am b/Makefile.am index 75cff8d..41636b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ XML_EXAMPLES = \ EXTRA_DIST = \ ChangeLog-old \ libvirt.spec libvirt.spec.in \ - mingw32-libvirt.spec.in \ + mingw-libvirt.spec.in \ libvirt.pc.in \ autobuild.sh \ Makefile.nonreentrant \ diff --git a/autobuild.sh b/autobuild.sh index 7e8f645..d167ebb 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -50,30 +50,30 @@ test -x /usr/bin/lcov && make cov rm -f *.tar.gz make dist -if [ -n "$AUTOBUILD_COUNTER" ]; then +if test -n "$AUTOBUILD_COUNTER" ; then EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" else NOW=`date +"%s"` EXTRA_RELEASE=".$USER$NOW" fi -if [ -f /usr/bin/rpmbuild ]; then +if test -f /usr/bin/rpmbuild ; then rpmbuild --nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean libvirt.spec fi -# Test mingw cross-compile -if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then +# Test mingw32 cross-compile +if test -x /usr/bin/i686-w64-mingw32-gcc ; then make distclean - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="i686-pc-mingw32-gcc" \ + PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ + CC="i686-w64-mingw32-gcc" \ ../configure \ - --build=$(uname -m)-pc-linux \ - --host=i686-pc-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \ + --build=$(uname -m)-w64-linux \ + --host=i686-w64-mingw32 \ + --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ --enable-werror \ --without-libvirtd \ --without-python @@ -81,13 +81,33 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then make make install - #set -o pipefail - #make check 2>&1 | tee "$RESULTS" +fi + +# Test mingw64 cross-compile +if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then + make distclean + + PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ + CC="x86_64-w64-mingw32-gcc" \ + ../configure \ + --build=$(uname -m)-w64-linux \ + --host=x86_64-w64-mingw32 \ + --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ + --enable-werror \ + --without-libvirtd \ + --without-python + + make + make install + +fi + - if [ -f /usr/bin/rpmbuild ]; then +if test -x /usr/bin/i686-w64-mingw32-gcc -a test -x /usr/bin/x86_64-w64-mingw32-gcc ; then + if test -f /usr/bin/rpmbuild ; then rpmbuild --nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ - -ba --clean mingw32-libvirt.spec + -ba --clean mingw-libvirt.spec fi fi diff --git a/configure.ac b/configure.ac index dda764d..d8aa6af 100644 --- a/configure.ac +++ b/configure.ac @@ -2752,7 +2752,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/schemas/Makefile \ gnulib/lib/Makefile \ gnulib/tests/Makefile \ - libvirt.pc libvirt.spec mingw32-libvirt.spec \ + libvirt.pc libvirt.spec mingw-libvirt.spec \ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \ diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in new file mode 100644 index 0000000..68fc5fc --- /dev/null +++ b/mingw-libvirt.spec.in @@ -0,0 +1,298 @@ +%{?mingw_package_header} + +# Default to skipping autoreconf. Distros can change just this one line +# (or provide a command-line override) if they backport any patches that +# touch configure.ac or Makefile.am. +%{!?enable_autotools:%define enable_autotools 0} + +# The mingw build is client only. Set up defaults for hypervisor drivers +# that talk via a native remote protocol, and for which prereq mingw +# libraries exist. +%define with_phyp 0%{!?_without_phyp:1} +%define with_esx 0%{!?_without_esx:1} +# missing libwsman, so can't build hyper-v +%define with_hyperv 0%{!?_without_hyperv:0} +%define with_xenapi 0%{!?_without_xenapi:1} + +# RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) +%if 0%{?rhel} +%define with_phyp 0 +%define with_xenapi 0 +%define with_hyperv 0 +%endif + +Name: mingw-libvirt +Version: @VERSION@ +Release: 1%{?dist}%{?extra_release} +Summary: MinGW Windows libvirt virtualization library + +License: LGPLv2+ +Group: Development/Libraries +URL: http://libvirt.org/ +Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz +Patch1: 0001-build-do-not-build-shunloadtest-if-pthread-missing.patch +Patch2: 0002-build-fix-output-of-pid-values.patch +Patch3: 0003-build-update-pid_t-type-static-check.patch +# Mingw-w64 trunk (jan 27 2012) contains an inline implementation of the +# vscanf and vfscanf functions in stdio.h. This break compilation of gnulib +# which tries to provide its own implementation for the vscanf and vfscanf +# functions. Workaround is by making sure that the inline implementation +# isn't triggered by #include <stdio.h> +Patch4: libvirt-gnulib-workaround-mingw-w64-vfscanf-failure.patch + +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw32-gcc +BuildRequires: mingw64-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw64-binutils +BuildRequires: mingw32-libgpg-error +BuildRequires: mingw64-libgpg-error +BuildRequires: mingw32-libgcrypt +BuildRequires: mingw64-libgcrypt +BuildRequires: mingw32-gnutls +BuildRequires: mingw64-gnutls +BuildRequires: mingw32-gettext +BuildRequires: mingw64-gettext +BuildRequires: mingw32-libxml2 +BuildRequires: mingw64-libxml2 +BuildRequires: mingw32-portablexdr +BuildRequires: mingw64-portablexdr + +BuildRequires: pkgconfig +# Need native version for msgfmt +BuildRequires: gettext +%if 0%{?enable_autotools} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel +BuildRequires: libtool +%endif + +%if %{with_phyp} +BuildRequires: mingw32-libssh2 +BuildRequires: mingw64-libssh2 +%endif +%if %{with_esx} +BuildRequires: mingw32-curl +BuildRequires: mingw64-curl +%endif + +BuildArch: noarch + +%description +MinGW Windows libvirt virtualization library. + +# Mingw32 +%package -n mingw32-libvirt +Summary: %{summary} + +%description -n mingw32-libvirt +MinGW Windows libvirt virtualization library. + +%package -n mingw32-libvirt-static +Summary: %{summary} +Requires: mingw32-libvirt = %{version}-%{release} + +%description -n mingw32-libvirt-static +MinGW Windows libvirt virtualization library, static version. + +# Mingw64 +%package -n mingw64-libvirt +Summary: %{summary} + +%description -n mingw64-libvirt +MinGW Windows libvirt virtualization library. + +%package -n mingw64-libvirt-static +Summary: %{summary} +Requires: mingw64-libvirt = %{version}-%{release} + +%description -n mingw64-libvirt-static +MinGW Windows libvirt virtualization library, static version. + +%{?mingw_debug_package} + + +%prep +%setup -q -n libvirt-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p0 + +%build +%if ! %{with_phyp} +%define _without_phyp --without-phyp +%endif + +%if ! %{with_esx} +%define _without_esx --without-esx +%endif + +%if ! %{with_hyperv} +%define _without_hyperv --without-hyperv +%endif + +%if ! %{with_xenapi} +%define _without_xenapi --without-xenapi +%endif + +%if 0%{?enable_autotools} +autoreconf -if +%endif + +# XXX enable SASL in future +%mingw_configure \ + --enable-static \ + --without-xen \ + --without-qemu \ + --without-openvz \ + --without-lxc \ + --without-vbox \ + %{?_without_xenapi} \ + --without-sasl \ + --without-avahi \ + --without-polkit \ + --without-python \ + --without-libvirtd \ + --without-uml \ + %{?_without_phyp} \ + %{?_without_esx} \ + %{?_without_hyperv} \ + --without-vmware \ + --without-netcf \ + --without-audit \ + --without-dtrace + + +%mingw_make %{?_smp_mflags} + + +%install +%mingw_make_install "DESTDIR=$RPM_BUILD_ROOT" + +# Libtool files don't need to be bundled +find $RPM_BUILD_ROOT -name "*.la" -delete + +rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter +rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/* +rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/* +rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/* +rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/* + +rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe +rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe + + +# Mingw32 +%files -n mingw32-libvirt +%dir %{mingw32_sysconfdir}/libvirt/ +%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf + +%{mingw32_bindir}/libvirt-0.dll +%{mingw32_bindir}/virsh.exe +%{mingw32_bindir}/virt-xml-validate +%{mingw32_bindir}/virt-pki-validate +%{mingw32_bindir}/virt-host-validate.exe +%{mingw32_bindir}/libvirt-qemu-0.dll + +%{mingw32_libdir}/libvirt.dll.a +%{mingw32_libdir}/pkgconfig/libvirt.pc +%{mingw32_libdir}/libvirt-qemu.dll.a + +%dir %{mingw32_datadir}/libvirt/ +%dir %{mingw32_datadir}/libvirt/schemas/ +%{mingw32_datadir}/libvirt/schemas/basictypes.rng +%{mingw32_datadir}/libvirt/schemas/capability.rng +%{mingw32_datadir}/libvirt/schemas/domain.rng +%{mingw32_datadir}/libvirt/schemas/domaincommon.rng +%{mingw32_datadir}/libvirt/schemas/domainsnapshot.rng +%{mingw32_datadir}/libvirt/schemas/interface.rng +%{mingw32_datadir}/libvirt/schemas/network.rng +%{mingw32_datadir}/libvirt/schemas/networkcommon.rng +%{mingw32_datadir}/libvirt/schemas/nodedev.rng +%{mingw32_datadir}/libvirt/schemas/nwfilter.rng +%{mingw32_datadir}/libvirt/schemas/secret.rng +%{mingw32_datadir}/libvirt/schemas/storageencryption.rng +%{mingw32_datadir}/libvirt/schemas/storagepool.rng +%{mingw32_datadir}/libvirt/schemas/storagevol.rng +%dir %{mingw32_datadir}/libvirt/api/ +%{mingw32_datadir}/libvirt/api/libvirt-api.xml +%{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml + +%{mingw32_datadir}/libvirt/cpu_map.xml + +%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo + +%dir %{mingw32_includedir}/libvirt +%{mingw32_includedir}/libvirt/libvirt.h +%{mingw32_includedir}/libvirt/virterror.h +%{mingw32_includedir}/libvirt/libvirt-qemu.h + +%{mingw32_mandir}/man1/virsh.1* +%{mingw32_mandir}/man1/virt-xml-validate.1* +%{mingw32_mandir}/man1/virt-pki-validate.1* +%{mingw32_mandir}/man1/virt-host-validate.1* + +%files -n mingw32-libvirt-static +%{mingw32_libdir}/libvirt.a +%{mingw32_libdir}/libvirt-qemu.a + +# Mingw64 +%files -n mingw64-libvirt +%dir %{mingw64_sysconfdir}/libvirt/ +%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf + +%{mingw64_bindir}/libvirt-0.dll +%{mingw64_bindir}/virsh.exe +%{mingw64_bindir}/virt-xml-validate +%{mingw64_bindir}/virt-pki-validate +%{mingw64_bindir}/virt-host-validate.exe +%{mingw64_bindir}/libvirt-qemu-0.dll + +%{mingw64_libdir}/libvirt.dll.a +%{mingw64_libdir}/pkgconfig/libvirt.pc +%{mingw64_libdir}/libvirt-qemu.dll.a + +%dir %{mingw64_datadir}/libvirt/ +%dir %{mingw64_datadir}/libvirt/schemas/ +%{mingw64_datadir}/libvirt/schemas/basictypes.rng +%{mingw64_datadir}/libvirt/schemas/capability.rng +%{mingw64_datadir}/libvirt/schemas/domain.rng +%{mingw64_datadir}/libvirt/schemas/domaincommon.rng +%{mingw64_datadir}/libvirt/schemas/domainsnapshot.rng +%{mingw64_datadir}/libvirt/schemas/interface.rng +%{mingw64_datadir}/libvirt/schemas/network.rng +%{mingw64_datadir}/libvirt/schemas/networkcommon.rng +%{mingw64_datadir}/libvirt/schemas/nodedev.rng +%{mingw64_datadir}/libvirt/schemas/nwfilter.rng +%{mingw64_datadir}/libvirt/schemas/secret.rng +%{mingw64_datadir}/libvirt/schemas/storageencryption.rng +%{mingw64_datadir}/libvirt/schemas/storagepool.rng +%{mingw64_datadir}/libvirt/schemas/storagevol.rng +%dir %{mingw64_datadir}/libvirt/api/ +%{mingw64_datadir}/libvirt/api/libvirt-api.xml +%{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml + +%{mingw64_datadir}/libvirt/cpu_map.xml + +%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo + +%dir %{mingw64_includedir}/libvirt +%{mingw64_includedir}/libvirt/libvirt.h +%{mingw64_includedir}/libvirt/virterror.h +%{mingw64_includedir}/libvirt/libvirt-qemu.h + +%{mingw64_mandir}/man1/virsh.1* +%{mingw64_mandir}/man1/virt-xml-validate.1* +%{mingw64_mandir}/man1/virt-pki-validate.1* +%{mingw64_mandir}/man1/virt-host-validate.1* + +%files -n mingw64-libvirt-static +%{mingw64_libdir}/libvirt.a +%{mingw64_libdir}/libvirt-qemu.a + + +%changelog diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in deleted file mode 100644 index 4d23c75..0000000 --- a/mingw32-libvirt.spec.in +++ /dev/null @@ -1,216 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} -%define __debug_install_post %{_mingw32_debug_install_post} - -# Default to skipping autoreconf. Distros can change just this one line -# (or provide a command-line override) if they backport any patches that -# touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 0} - -# The mingw build is client only. Set up defaults for hypervisor drivers -# that talk via a native remote protocol, and for which prereq mingw -# libraries exist. -%define with_phyp 0%{!?_without_phyp:1} -%define with_esx 0%{!?_without_esx:1} -# missing libwsman, so can't build hyper-v -%define with_hyperv 0%{!?_without_hyperv:0} -%define with_xenapi 0%{!?_without_xenapi:1} - -# RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) -%if 0%{?rhel} -%define with_phyp 0 -%define with_xenapi 0 -%define with_hyperv 0 -%endif - -Name: mingw32-libvirt -Version: @VERSION@ -Release: 3%{?dist}%{?extra_release} -Summary: MinGW Windows libvirt virtualization library - -License: LGPLv2+ -Group: Development/Libraries -URL: http://libvirt.org/ -Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: mingw32-filesystem >= 23 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-libgpg-error -BuildRequires: mingw32-libgcrypt -BuildRequires: mingw32-gnutls -BuildRequires: mingw32-gettext -BuildRequires: mingw32-libxml2 -BuildRequires: mingw32-portablexdr -BuildRequires: pkgconfig -# Need native version for msgfmt -BuildRequires: gettext -%if 0%{?enable_autotools} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-devel -BuildRequires: libtool -%endif - -%if %{with_phyp} -BuildRequires: mingw32-libssh2 -%endif -%if %{with_esx} -BuildRequires: mingw32-curl -%endif - -BuildArch: noarch - -%{?_mingw32_debug_package} - -%description -MinGW Windows libvirt virtualization library. - - -%prep -%setup -q -n libvirt-%{version} - - -%build -%if ! %{with_phyp} -%define _without_phyp --without-phyp -%endif - -%if ! %{with_esx} -%define _without_esx --without-esx -%endif - -%if ! %{with_hyperv} -%define _without_hyperv --without-hyperv -%endif - -%if ! %{with_xenapi} -%define _without_xenapi --without-xenapi -%endif - -%if 0%{?enable_autotools} -autoreconf -if -%endif -# XXX enable SASL in future -%{_mingw32_configure} \ - --without-xen \ - --without-qemu \ - --without-openvz \ - --without-lxc \ - --without-vbox \ - %{?_without_xenapi} \ - --without-sasl \ - --without-avahi \ - --without-polkit \ - --without-python \ - --without-libvirtd \ - --without-uml \ - %{?_without_phyp} \ - %{?_without_esx} \ - %{?_without_hyperv} \ - --without-vmware \ - --without-netcf \ - --without-audit \ - --without-dtrace -make - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/libvirt/nwfilter -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/* -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/* - -rm -rf $RPM_BUILD_ROOT%{_mingw32_libexecdir}/libvirt_iohelper.exe - -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt-qemu.a - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%dir %{_mingw32_sysconfdir}/libvirt/ -%config(noreplace) %{_mingw32_sysconfdir}/libvirt/libvirt.conf - -%{_mingw32_bindir}/libvirt-0.dll -%{_mingw32_bindir}/virsh.exe -%{_mingw32_bindir}/virt-xml-validate -%{_mingw32_bindir}/virt-pki-validate -%{_mingw32_bindir}/virt-host-validate.exe -%{_mingw32_bindir}/libvirt-qemu-0.dll - -%{_mingw32_libdir}/libvirt.dll.a -%{_mingw32_libdir}/libvirt.la -%{_mingw32_libdir}/pkgconfig/libvirt.pc -%{_mingw32_libdir}/libvirt-qemu.dll.a -%{_mingw32_libdir}/libvirt-qemu.la - -%dir %{_mingw32_datadir}/libvirt/api/ -%{_mingw32_datadir}/libvirt/api/libvirt-api.xml -%{_mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml - -%dir %{_mingw32_datadir}/libvirt/ -%dir %{_mingw32_datadir}/libvirt/schemas/ -%{_mingw32_datadir}/libvirt/schemas/basictypes.rng -%{_mingw32_datadir}/libvirt/schemas/capability.rng -%{_mingw32_datadir}/libvirt/schemas/domain.rng -%{_mingw32_datadir}/libvirt/schemas/domaincommon.rng -%{_mingw32_datadir}/libvirt/schemas/domainsnapshot.rng -%{_mingw32_datadir}/libvirt/schemas/interface.rng -%{_mingw32_datadir}/libvirt/schemas/network.rng -%{_mingw32_datadir}/libvirt/schemas/networkcommon.rng -%{_mingw32_datadir}/libvirt/schemas/nodedev.rng -%{_mingw32_datadir}/libvirt/schemas/nwfilter.rng -%{_mingw32_datadir}/libvirt/schemas/secret.rng -%{_mingw32_datadir}/libvirt/schemas/storageencryption.rng -%{_mingw32_datadir}/libvirt/schemas/storagepool.rng -%{_mingw32_datadir}/libvirt/schemas/storagevol.rng - -%{_mingw32_datadir}/libvirt/cpu_map.xml - -%{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo - -%dir %{_mingw32_includedir}/libvirt -%{_mingw32_includedir}/libvirt/libvirt.h -%{_mingw32_includedir}/libvirt/virterror.h -%{_mingw32_includedir}/libvirt/libvirt-qemu.h - -%{_mingw32_mandir}/man1/virsh.1* -%{_mingw32_mandir}/man1/virt-xml-validate.1* -%{_mingw32_mandir}/man1/virt-pki-validate.1* -%{_mingw32_mandir}/man1/virt-host-validate.1* - - -%changelog -* Thu Sep 25 2008 Richard Jones <rjones(a)redhat.com> - 0.4.6-3 -- BuildArch should be noarch - -* Wed Sep 24 2008 Richard W.M. Jones <rjones(a)redhat.com> - 0.4.6-2 -- Whitespace removal. - -* Wed Sep 24 2008 Richard W.M. Jones <rjones(a)redhat.com> - 0.4.6-1 -- New upstream release 0.4.6. -- Rename mingw -> mingw32. - -* Mon Sep 22 2008 Daniel P. Berrange <berrange(a)redhat.com> - 0.4.5-4%{?extra_release} -- Import crash fix from rawhide - -* Thu Sep 11 2008 Daniel P. Berrange <berrange(a)redhat.com> - 0.4.5-3%{?extra_release} -- Add dep on gettext & pkgconfig - -* Wed Sep 10 2008 Richard W.M. Jones <rjones(a)redhat.com> - 0.4.5-2 -- Remove static lib. - -* Tue Sep 2 2008 Daniel P. Berrange <berrange(a)redhat.com> - 0.4.4-1 -- Initial RPM release, largely based on earlier work from several sources. -- 1.7.10.2

1 0

[libvirt] Libvirt / GNULIB failures using Mingw64 toolchain
by Daniel P. Berrange 21 Jun '12

21 Jun '12

With current Libvirt master + GNULIB (77cef20) I can successfully compile using the Mingw32 toolchain. If attempting to use the alternative Mingw64 toolchain, however, I get a number of errors. On both x86_64-w64-mingw32 and i686-w64-mingw32 I see the following: CC fstat.lo ../../../gnulib/lib/fstat.c:27:0: warning: "stat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/fstat.c:25: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:258:0: note: this is the location of the previous definition ../../../gnulib/lib/fstat.c:28:0: warning: "fstat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/fstat.c:25: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:259:0: note: this is the location of the previous definition CC stat.lo ../../../gnulib/lib/stat.c:32:0: warning: "stat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/stat.c:27: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:258:0: note: this is the location of the previous definition CC stdio-read.lo ../../../gnulib/lib/stdio-read.c:102:1: error: redefinition of 'vscanf' In file included from ./stdio.h:43:0, from ../../../gnulib/lib/stdio-read.c:21: /usr/x86_64-w64-mingw32/sys-root/mingw/include/stdio.h:397:7: note: previous definition of 'vscanf' was here ../../../gnulib/lib/stdio-read.c:108:1: error: redefinition of 'vfscanf' In file included from ./stdio.h:43:0, from ../../../gnulib/lib/stdio-read.c:21: /usr/x86_64-w64-mingw32/sys-root/mingw/include/stdio.h:384:7: note: previous definition of 'vfscanf' was here make[3]: *** [stdio-read.lo] Error 1 make[3]: Leaving directory `/home/berrange/src/virt/libvirt/build/gnulib/lib' While on x86_64-w64-mingw32 only I see: In file included from ../../../gnulib/lib/regex.c:69:0: ../../../gnulib/lib/regcomp.c: In function 'parse_dup_op': ../../../gnulib/lib/regcomp.c:2624:39: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../../../gnulib/lib/regcomp.c: In function 'mark_opt_subexp': ../../../gnulib/lib/regcomp.c:3859:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 8

[libvirt] [PATCH 0/4] Various minor fixes
by Martin Kletzander 21 Jun '12

21 Jun '12

I stumbled upon few things that would be nice to have when fixed, so I separated them into sensible groups. Martin Kletzander (4): docs: allow custom link elements docs: fix 404 page when fetched from different location docs: update and fix search page docs/virsh: various minor fixes docs/404.html.in | 5 ++- docs/api_extension.html.in | 4 -- docs/page.xsl | 3 ++ docs/pending.html.in | 4 -- docs/search.php | 80 +++++++++++++++++++++++++++++-------------- tools/virsh.c | 4 +- 6 files changed, 63 insertions(+), 37 deletions(-) -- 1.7.8.6

2 9

[libvirt] [PATCH] Initialize random generator in lxc controller
by Jim Fehlig 21 Jun '12

21 Jun '12

I'm having some problems sending patches to the list via git send-email. The messages are being delivered to my MTA afaict, and I can send patches to my personal and corporate accounts. Until I get this resolved, attaching a patch to fix a segfault in libvirt_lxc. Regards, Jim

3 3

[libvirt] Freeze for next release
by Daniel Veillard 21 Jun '12

21 Jun '12

As suggested before, I think we should aim at a release by the end of the month. Which mean we should enter freeze over the week-end (with an rc1 release). Any objection or is there something that ought to be reviewed in time for the freeze ? Thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] util: Fix the indention
by Osier Yang 21 Jun '12

21 Jun '12

src/util/util.c: virFileOpenAs. Pushed under trivial rule. --- src/util/util.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 28a4fe7..ce98d20 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -995,14 +995,14 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, /* allow using -1 to mean "current value" */ if (uid == (uid_t) -1) - uid = getuid(); + uid = getuid(); if (gid == (gid_t) -1) - gid = getgid(); + gid = getgid(); /* treat absence of both flags as presence of both for simpler * calling. */ if (!(flags & (VIR_FILE_OPEN_NOFORK|VIR_FILE_OPEN_FORK))) - flags |= VIR_FILE_OPEN_NOFORK|VIR_FILE_OPEN_FORK; + flags |= VIR_FILE_OPEN_NOFORK|VIR_FILE_OPEN_FORK; if ((flags & VIR_FILE_OPEN_NOFORK) || (getuid() != 0) -- 1.7.7.3

1 0

[libvirt] [PATCH] storage: Set the perms if the pool target already exists for fs pools
by Osier Yang 21 Jun '12

21 Jun '12

The comment says: /* Now create the final dir in the path with the uid/gid/mode * requested in the config. If the dir already exists, just set * the perms. */ However, virDirCreate is only invoked if the target path doesn't exist yet (which is opposite with the comment), or the uid from the config is not -1 (I don't understand why, think it's just another mistake). And the result is the perms of the pool won't be changed if one tries to build the pool with different perms again. Besides these logic error fix, if no uid and gid are specified in the config, the practical used uid, gid are reflected. --- src/storage/storage_backend_fs.c | 44 +++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 169037b..ed0d6ec 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -789,30 +789,32 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, /* Now create the final dir in the path with the uid/gid/mode * requested in the config. If the dir already exists, just set * the perms. */ + uid_t uid; + gid_t gid; - struct stat st; - - if ((stat(pool->def->target.path, &st) < 0) - || (pool->def->target.perms.uid != -1)) { - - uid_t uid = (pool->def->target.perms.uid == -1) - ? getuid() : pool->def->target.perms.uid; - gid_t gid = (pool->def->target.perms.gid == -1) - ? getgid() : pool->def->target.perms.gid; - - if ((err = virDirCreate(pool->def->target.path, - pool->def->target.perms.mode, - uid, gid, - VIR_DIR_CREATE_FORCE_PERMS | - VIR_DIR_CREATE_ALLOW_EXIST | - (pool->def->type == VIR_STORAGE_POOL_NETFS - ? VIR_DIR_CREATE_AS_UID : 0)) < 0)) { - virReportSystemError(-err, _("cannot create path '%s'"), - pool->def->target.path); - goto error; - } + uid = (pool->def->target.perms.uid == -1) + ? getuid() : pool->def->target.perms.uid; + gid = (pool->def->target.perms.gid == -1) + ? getgid() : pool->def->target.perms.gid; + + if ((err = virDirCreate(pool->def->target.path, + pool->def->target.perms.mode, + uid, gid, + VIR_DIR_CREATE_FORCE_PERMS | + VIR_DIR_CREATE_ALLOW_EXIST | + (pool->def->type == VIR_STORAGE_POOL_NETFS + ? VIR_DIR_CREATE_AS_UID : 0)) < 0)) { + virReportSystemError(-err, _("cannot create path '%s'"), + pool->def->target.path); + goto error; } + /* Reflect the actual uid and gid to the config. */ + if (pool->def->target.perms.uid == -1) + pool->def->target.perms.uid = uid; + if (pool->def->target.perms.gid == -1) + pool->def->target.perms.gid = gid; + if (flags != 0) { ret = virStorageBackendMakeFileSystem(pool, flags); } else { -- 1.7.7.3

2 4

[libvirt] [PATCHv2 variant 1] snapshot: implement new APIs for esx and vbox
by Eric Blake 20 Jun '12

20 Jun '12

The two new APIs are rather trivial; based on bits and pieces of other existing APIs. But rather than blindly return 0 or 1 for HasMetadata, I chose to first validate that the snapshot in question in fact exists. In the process, I noticed other APIs that were blindly succeeding instead of checking for existence. * src/esx/esx_driver.c (esxDomainSnapshotIsCurrent) (esxDomainSnapshotHasMetadata): New functions. (esxDomainIsUpdated, esxDomainIsPersistent): Add existence checks. * src/vbox/vbox_tmpl.c (vboxDomainSnapshotIsCurrent) (vboxDomainSnapshotHasMetadata): New functions. (vboxDomainIsPersistent, vboxDomainIsUpdated): Add existence checks. --- v2: add existence checks to other functions I like this version better. However, while it compiles, I'm completely unable to runtime test it, so I'd appreciate a good review. src/esx/esx_driver.c | 116 ++++++++++++++++++++++++++++++++++++++-- src/vbox/vbox_tmpl.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 253 insertions(+), 8 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b3f1948..db2144c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4243,10 +4243,28 @@ esxDomainIsActive(virDomainPtr domain) static int -esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED) +esxDomainIsPersistent(virDomainPtr domain) { - /* ESX has no concept of transient domains, so all of them are persistent */ - return 1; + /* ESX has no concept of transient domains, so all of them are + * persistent. However, we do want to check for existence. */ + int result = -1; + esxPrivate *priv = domain->conn->privateData; + esxVI_ObjectContent *virtualMachine = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0) + return -1; + + if (esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, + NULL, &virtualMachine, + esxVI_Occurrence_RequiredItem) < 0) + goto cleanup; + + result = 1; + +cleanup: + esxVI_ObjectContent_Free(&virtualMachine); + + return result; } @@ -4254,7 +4272,26 @@ esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED) static int esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) { - return 0; + /* ESX domains never have a persistent state that differs from + * current state. However, we do want to check for existence. */ + int result = -1; + esxPrivate *priv = domain->conn->privateData; + esxVI_ObjectContent *virtualMachine = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0) + return -1; + + if (esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, + NULL, &virtualMachine, + esxVI_Occurrence_RequiredItem) < 0) + goto cleanup; + + result = 0; + +cleanup: + esxVI_ObjectContent_Free(&virtualMachine); + + return result; } @@ -4707,6 +4744,75 @@ esxDomainSnapshotCurrent(virDomainPtr domain, unsigned int flags) } +static int +esxDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, unsigned int flags) +{ + esxPrivate *priv = snapshot->domain->conn->privateData; + esxVI_VirtualMachineSnapshotTree *currentSnapshotTree = NULL; + esxVI_VirtualMachineSnapshotTree *rootSnapshotList = NULL; + esxVI_VirtualMachineSnapshotTree *snapshotTree = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + /* Check that snapshot exists. */ + if (esxVI_LookupRootSnapshotTreeList(priv->primary, snapshot->domain->uuid, + &rootSnapshotList) < 0 || + esxVI_GetSnapshotTreeByName(rootSnapshotList, snapshot->name, + &snapshotTree, NULL, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + if (esxVI_LookupCurrentSnapshotTree(priv->primary, snapshot->domain->uuid, + &currentSnapshotTree, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + ret = STREQ(snapshot->name, currentSnapshotTree->name); + +cleanup: + esxVI_VirtualMachineSnapshotTree_Free(&currentSnapshotTree); + esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); + return ret; +} + + +static int +esxDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, unsigned int flags) +{ + esxPrivate *priv = snapshot->domain->conn->privateData; + esxVI_VirtualMachineSnapshotTree *rootSnapshotList = NULL; + esxVI_VirtualMachineSnapshotTree *snapshotTree = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + /* Check that snapshot exists. If so, there is no metadata. */ + if (esxVI_LookupRootSnapshotTreeList(priv->primary, snapshot->domain->uuid, + &rootSnapshotList) < 0 || + esxVI_GetSnapshotTreeByName(rootSnapshotList, snapshot->name, + &snapshotTree, NULL, + esxVI_Occurrence_RequiredItem) < 0) { + goto cleanup; + } + + ret = 0; + +cleanup: + esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotList); + return ret; +} + static int esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) @@ -5021,6 +5127,8 @@ static virDriver esxDriver = { .domainSnapshotGetParent = esxDomainSnapshotGetParent, /* 0.9.7 */ .domainSnapshotCurrent = esxDomainSnapshotCurrent, /* 0.8.0 */ .domainRevertToSnapshot = esxDomainRevertToSnapshot, /* 0.8.0 */ + .domainSnapshotIsCurrent = esxDomainSnapshotIsCurrent, /* 0.9.13 */ + .domainSnapshotHasMetadata = esxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainSnapshotDelete = esxDomainSnapshotDelete, /* 0.8.0 */ .isAlive = esxIsAlive, /* 0.9.8 */ }; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 4b0ee2e..8b7415a 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1490,14 +1490,54 @@ static int vboxDomainIsActive(virDomainPtr dom) { } -static int vboxDomainIsPersistent(virDomainPtr dom ATTRIBUTE_UNUSED) { - /* All domains are persistent. */ - return 1; +static int vboxDomainIsPersistent(virDomainPtr dom ATTRIBUTE_UNUSED) +{ + /* All domains are persistent. However, we do want to check for + * existence. */ + VBOX_OBJECT_CHECK(dom->conn, int, -1); + vboxIID iid = VBOX_IID_INITIALIZER; + IMachine *machine = NULL; + nsresult rc; + + vboxIIDFromUUID(&iid, dom->uuid); + rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine); + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching UUID")); + goto cleanup; + } + + ret = 1; + +cleanup: + VBOX_RELEASE(machine); + vboxIIDUnalloc(&iid); + return ret; } static int vboxDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) { - return 0; + /* VBox domains never have a persistent state that differs from + * current state. However, we do want to check for existence. */ + VBOX_OBJECT_CHECK(dom->conn, int, -1); + vboxIID iid = VBOX_IID_INITIALIZER; + IMachine *machine = NULL; + nsresult rc; + + vboxIIDFromUUID(&iid, dom->uuid); + rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine); + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching UUID")); + goto cleanup; + } + + ret = 0; + +cleanup: + VBOX_RELEASE(machine); + vboxIIDUnalloc(&iid); + return ret; } static int vboxDomainSuspend(virDomainPtr dom) { @@ -6426,6 +6466,101 @@ cleanup: return ret; } +static int +vboxDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainPtr dom = snapshot->domain; + VBOX_OBJECT_CHECK(dom->conn, int, -1); + vboxIID iid = VBOX_IID_INITIALIZER; + IMachine *machine = NULL; + ISnapshot *snap = NULL; + ISnapshot *current = NULL; + PRUnichar *nameUtf16 = NULL; + char *name = NULL; + nsresult rc; + + virCheckFlags(0, -1); + + vboxIIDFromUUID(&iid, dom->uuid); + rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine); + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching UUID")); + goto cleanup; + } + + if (!(snap = vboxDomainSnapshotGet(data, dom, machine, snapshot->name))) + goto cleanup; + + rc = machine->vtbl->GetCurrentSnapshot(machine, &current); + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not get current snapshot")); + goto cleanup; + } + if (!current) { + ret = 0; + goto cleanup; + } + + rc = current->vtbl->GetName(current, &nameUtf16); + if (NS_FAILED(rc) || !nameUtf16) { + vboxError(VIR_ERR_INTERNAL_ERROR, "%s", + _("could not get current snapshot name")); + goto cleanup; + } + + VBOX_UTF16_TO_UTF8(nameUtf16, &name); + if (!name) { + virReportOOMError(); + goto cleanup; + } + + ret = STREQ(snapshot->name, name); + +cleanup: + VBOX_UTF8_FREE(name); + VBOX_UTF16_FREE(nameUtf16); + VBOX_RELEASE(current); + VBOX_RELEASE(machine); + vboxIIDUnalloc(&iid); + return ret; +} + +static int +vboxDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, + unsigned int flags) +{ + virDomainPtr dom = snapshot->domain; + VBOX_OBJECT_CHECK(dom->conn, int, -1); + vboxIID iid = VBOX_IID_INITIALIZER; + IMachine *machine = NULL; + ISnapshot *snap = NULL; + nsresult rc; + + virCheckFlags(0, -1); + + vboxIIDFromUUID(&iid, dom->uuid); + rc = VBOX_OBJECT_GET_MACHINE(iid.value, &machine); + if (NS_FAILED(rc)) { + vboxError(VIR_ERR_NO_DOMAIN, "%s", + _("no domain with matching UUID")); + goto cleanup; + } + + /* Check that snapshot exists. If so, there is no metadata. */ + if (!(snap = vboxDomainSnapshotGet(data, dom, machine, snapshot->name))) + goto cleanup; + + ret = 0; + +cleanup: + VBOX_RELEASE(machine); + vboxIIDUnalloc(&iid); + return ret; +} + #if VBOX_API_VERSION < 3001 static int vboxDomainSnapshotRestore(virDomainPtr dom, @@ -9172,6 +9307,8 @@ virDriver NAME(Driver) = { .domainHasCurrentSnapshot = vboxDomainHasCurrentSnapshot, /* 0.8.0 */ .domainSnapshotGetParent = vboxDomainSnapshotGetParent, /* 0.9.7 */ .domainSnapshotCurrent = vboxDomainSnapshotCurrent, /* 0.8.0 */ + .domainSnapshotIsCurrent = vboxDomainSnapshotIsCurrent, /* 0.9.13 */ + .domainSnapshotHasMetadata = vboxDomainSnapshotHasMetadata, /* 0.9.13 */ .domainRevertToSnapshot = vboxDomainRevertToSnapshot, /* 0.8.0 */ .domainSnapshotDelete = vboxDomainSnapshotDelete, /* 0.8.0 */ .isAlive = vboxIsAlive, /* 0.9.8 */ -- 1.7.10.2

3 5

[libvirt] ANNOUNCE: libvirt 0.9.11.4 maintenance release
by Cole Robinson 20 Jun '12

20 Jun '12

libvirt 0.9.11.4 maintenance release is now available. This is libvirt 0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.11.4.tar.gz List of changes since libvirt-0.9.11.3: * Stable release 0.9.11.4 * build: fix build of fresh checkout * build: fix 'make distcheck' issues * build: fix 'make dist' on virgin checkout * Improve error message diagnosing incorrect XML CPU mode * qemu: Enable disconnecting SPICE clients without changing password * qemu: Fix off-by-one error while unescaping monitor strings * virsh: Don't generate invalid XML in attach-disk command * Fix typo in RPM specfile * python: fix snapshot listing bugs * python: use simpler methods * qemu: Don't overwrite security labels * qemuProcessStop: Switch to flags * docs: minor fixes to domain interface documentation * docs: link to FLOSS Weekly podcast, virt blogs * Two RPM conditional fixes for RHEL-7 * snapshot: avoid virsh crash with older servers * Update AUTHORS * LXC: fix memory leak in lxcContainerMountFSBlockAuto * LXC: fix incorrect parameter of mount in lxcContainerMountFSBind * Only check for cluster fs if we're using a filesystem * Fix missing ) in 2 strings * Assign correct address type to spapr-vlan and spapr-vty. * maint: make it easier to copy FORTIFY_SOURCE snippet * command: avoid potential deadlock on handshake * spec: Build against systemd for udev * virsh: Back out if the argument for vol-create-as is malformed (cherry picked from commit ee58b581c4b275f06904253285b7ad562dc09745) * virsh: Accept UUID as an argument for net-info and net-start (cherry picked from commit 68fcfdb8bd33ef323c6c4c5b9a92b1a44829eb6a) * virsh: Accept UUID as an argument for storage commands * Fix for parallel port passthrough for QEMU * maint: command.c whitespace cleanups * command: avoid deadlock on EPIPE situation * build: allow building with newer glibc-headers and -O0 * command: Fix debug message during handshake * Fix sync issue in virNetClientStreamEventRemoveCallback * qemu: fix netdev alias name assignment wrt type='hostdev' * tools: make virt-pki-validate work with acls and xattrs * qemu: avoid closing fd more than once * command: check for fork error before closing fd * fdstream: avoid double close bug * command: avoid double close bugs * avoid fd leak * avoid closing uninitialized fd * build: silence warning from autoconf * virCommand: Extend debug message for handshake * lxc: return correct number of CPUs * examples: add consolecallback example python script * leak_fix.diff * docs: typo in acceleration element * Re-order config options in qemu driver augeas lens * Fix mistakes in augeas lens * Standardize whitespace used in example config files * Fix check for socket existance / daemon spawn * Remove last usage of PATH_MAX and ban its future use * maint: avoid new automake warning about AM_PROG_CC_STDC * Improve docs about compiling libvirt from GIT * tests: run valgrind on real executables, not libtool wrappers * qemu augeas: Add spice_tls/spice_tls_x509_cert_dir * tests: back to short test names * Add parsing for VIR_ENUM_IMPL & VIR_ENUM_DECL in apibuild.py * Add stub impl of virNetlinkEventServiceLocalPid for Win32 * Fix dep from libvirt-lock-sanlock RPM * Remove more bogus systemd service dependencies * Revert "rpc: Discard non-blocking calls only when necessary" * qemu_hotplug: Don't free the PCI device structure after hot-unplug * build: fix unused variable after last patch * Fix potential events deadlock when unref'ing virConnectPtr * Fix build when configuring with polkit0 * build: fix virnetlink on glibc 2.11 * qemu: Don't delete USB device on failed qemuPrepareHostdevUSBDevices * qemu: Rollback on used USB devices * Reject any non-option command line arguments * Remove bogus udev.target dep from libvirtd unit * Set a sensible default master start port for ehci companion controllers * Fix logic for assigning PCI addresses to USB2 companion controllers * Fix virDomainDeviceInfoIsSet() to check all struct fields * Allow stack traces to be included with log messages * Add bundled(gnulib) to RPM specfile * libvirt-guests: Remove LISTFILE if it's empty when stopping service * qemu: Use the CPU index in capabilities to map NUMA node to cpu list. * Assign spapr-vio bus address to ibmvscsi controller * esx: Fix memory leaks in error paths related to transferred ownership * qemu: Don't skip detection of virtual cpu's on non KVM targets * qemu: Re-detect virtual cpu threads after cpu hot (un)plug. * qemu: Refactor qemuDomainSetVcpusFlags * usb: fix crash when failing to attach a second usb device * docs: mention migration issue of which credentials are used * build: Fix the typo in configure.ac * qemu: fix build when !HAVE_NUMACTL * Report error when parsing character device target type * numad: Update comments in libvirt.spec.in * numad: Check numactl-devel if compiled with numad support * snapshot: allow block devices past cgroup * tests: add some self-documentation to tests * build: avoid link failure on Windows * virsh: avoid heap corruption leading to virsh abort * util: set src_pid for virNetlinkCommand when appropriate * util: function to get local nl_pid used by netlink event socket * util: allow specifying both src and dst pid in virNetlinkCommand * util: fix libvirtd startup failure due to netlink error * qemu: call usb search function for hostdev initialization and hotplug * usb: create functions to search usb device accurately * rpm: Handle different source URLs for maint releases (cherry picked from commit f4345ac21fead319a22a5761e86a46752df23402) * qemu: Emit compatible XML when migrating a domain * qemu: Don't use virDomainDefFormat* directly * qemu: reject blockiotune if qemu too old * qemu: don't modify domain on failed blockiotune * util: remove error log from stubs of virNetlinkEventServiceStart|Stop * node_device: fix possible non-terminated string * uuid: fix possible non-terminated string * tests: fix resource leak * qemu: fix resource leak * vmx: fix resource leak * Coverity: Fix resource leak in virnetlink.c (cherry picked from commit fd2b41574e05510ddeffbf9acbf06584acb3c2b2) * Coverity: Fix resource leak in nodeinfo.c * Coverity: Fix resource leak in test driver * Coverity: Fix resource leak in xen driver * Coverity: Fix resource leaks in phyp driver * Coverity: Fix the forward_null error in Python binding codes * build: fix build on cygwin * Correct indent errors in the function qemuDomainNetsRestart * build: update pid_t type static check * build: fix output of pid values * virsh: make -h always give help * build: make ATTRIBUTE_NONNULL() a NOP unless STATIC_ANALYSIS is on * Make lxcContainerSetStdio the last thing to be called in container startup * Ensure logging is initialized early in libvirt_lxc * Ensure LXC security driver is set unconditonally * Ensure libvirt_lxc process loads the live XML config * maint: avoid false positives on unmarked diagnostics * qemu: allow snapshotting of sheepdog and rbd disks * qemu: change rbd auth_supported separation character to ; * util: Avoid libvirtd crash in virNetDevTapCreate * storage: Break out the loop if duplicate pool is found * qemu: Make sure qemu can access its directory in hugetlbfs * qemu_agent: Report error class at least * More coverity findings addressed * lxc: Fix coverity findings * build: fix stamp file name * Revert "building: remove libvirt_dbus.syms from EXTRA_DIST" For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

2 1

[libvirt] [PATCH v3 0/5] file descriptor passing using pass-fd
by Corey Bryant 20 Jun '12

20 Jun '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the pass-fd QMP monitor command, which allows an fd to be passed via SCM_RIGHTS, and returns the received file descriptor. Support is also added to the block layer to allow QEMU to dup the fd when the filename is of the /dev/fd/X format. This is useful if MAC policy prevents QEMU from opening specific types of files. One nice thing about this approach is that no new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (5): qapi: Convert getfd and closefd qapi: Add pass-fd QMP command osdep: Enable qemu_open to dup pre-opened fd block: Convert open calls to qemu_open block: Prevent /dev/fd/X filename from being detected as floppy block/raw-posix.c | 22 ++++++++++--------- block/raw-win32.c | 4 ++-- block/vdi.c | 5 +++-- block/vmdk.c | 21 ++++++++---------- block/vpc.c | 2 +- block/vvfat.c | 21 +++++++++--------- hmp-commands.hx | 6 ++---- hmp.c | 18 ++++++++++++++++ hmp.h | 2 ++ monitor.c | 61 +++++++++++++++++++++++++++++++++++++++-------------- osdep.c | 13 ++++++++++++ qapi-schema.json | 54 +++++++++++++++++++++++++++++++++++++++++++++++ qmp-commands.hx | 48 +++++++++++++++++++++++++++++++++++++---- 13 files changed, 216 insertions(+), 61 deletions(-) -- 1.7.10.2

5 35

[libvirt] [PATCH] Add support for RAM filesystems for LXC
by Daniel P. Berrange 20 Jun '12

20 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Introduce a new syntax for filesystems to allow use of a RAM filesystem <filesystem type='ram'> <source usage='1024'/> <target dir='/mnt'/> </filesystem> The usasge is in KB to limit consumption of host memory. * docs/formatdomain.html.in: Document new syntax * docs/schemas/domaincommon.rng: Add new attributes * src/conf/domain_conf.c: Parsing/formatting of RAM filesystems * src/lxc/lxc_container.c: Mounting of RAM filesystems Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/formatdomain.html.in | 9 +++++++- docs/schemas/domaincommon.rng | 13 +++++++++++ src/conf/domain_conf.c | 43 ++++++++++++++++++++---------------- src/lxc/lxc_container.c | 49 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 20 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e1fe0c4..9d1e02b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1617,6 +1617,12 @@ format will be autodetected. Only used by LXC driver <span class="since">(since 0.9.5)</span>. </dd> + <dt><code>type='ram'</code></dt> + <dd> + An in-memory filesystem, using memory from the host OS. + The source element has a single attribute <code>usage</code> + which gives the memory usage limit in kilobytes. + <span class="since"> (since 0.9.13)</span></dd> </dl> The filesystem block has an optional attribute <code>accessmode</code> @@ -1656,7 +1662,8 @@ The resource on the host that is being accessed in the guest. The <code>name</code> attribute must be used with <code>type='template'</code>, and the <code>dir</code> attribute must - be used with <code>type='mount'</code> + be used with <code>type='mount'</code>. The <code>usage</code> attribute + is used with <code>type='ram'</code> to set the memory limit in KB. </dd> <dt><code>target</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8419ccc..884680a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1271,6 +1271,19 @@ </element> </interleave> </group> + <group> + <attribute name="type"> + <value>ram</value> + </attribute> + <interleave> + <element name="source"> + <attribute name="usage"> + <ref name="unsignedLong"/> + </attribute> + <empty/> + </element> + </interleave> + </group> </choice> <interleave> <element name="target"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c82971a..5d692d6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4177,7 +4177,8 @@ virDomainFSDefParseXML(xmlNodePtr node, def->wrpolicy = VIR_DOMAIN_FS_WRPOLICY_DEFAULT; } - if (source == NULL) { + if (source == NULL && + def->type != VIR_DOMAIN_FS_TYPE_RAM) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); goto error; @@ -11086,27 +11087,31 @@ virDomainFSDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - if (def->src) { - switch (def->type) { - case VIR_DOMAIN_FS_TYPE_MOUNT: - virBufferEscapeString(buf, " <source dir='%s'/>\n", - def->src); - break; + switch (def->type) { + case VIR_DOMAIN_FS_TYPE_MOUNT: + virBufferEscapeString(buf, " <source dir='%s'/>\n", + def->src); + break; - case VIR_DOMAIN_FS_TYPE_BLOCK: - virBufferEscapeString(buf, " <source dev='%s'/>\n", - def->src); - break; + case VIR_DOMAIN_FS_TYPE_BLOCK: + virBufferEscapeString(buf, " <source dev='%s'/>\n", + def->src); + break; - case VIR_DOMAIN_FS_TYPE_FILE: - virBufferEscapeString(buf, " <source file='%s'/>\n", - def->src); - break; + case VIR_DOMAIN_FS_TYPE_FILE: + virBufferEscapeString(buf, " <source file='%s'/>\n", + def->src); + break; - case VIR_DOMAIN_FS_TYPE_TEMPLATE: - virBufferEscapeString(buf, " <source name='%s'/>\n", - def->src); - } + case VIR_DOMAIN_FS_TYPE_TEMPLATE: + virBufferEscapeString(buf, " <source name='%s'/>\n", + def->src); + break; + + case VIR_DOMAIN_FS_TYPE_RAM: + virBufferAsprintf(buf, " <source usage='%lld'/>\n", + def->usage); + break; } virBufferEscapeString(buf, " <target dir='%s'/>\n", diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 0636eab..f35b8f9 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -338,6 +338,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) ret = -1; + VIR_DEBUG("Pivot via %s", root->src); + /* root->parent must be private, so make / private. */ if (mount("", "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", @@ -995,6 +997,47 @@ cleanup: } +static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs) +{ + int ret = -1; + char *data = NULL; + + if (virAsprintf(&data, "size=%lldk", fs->usage) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virFileMakePath(fs->dst) < 0) { + virReportSystemError(errno, + _("Failed to create %s"), + fs->dst); + goto cleanup; + } + + if (mount("tmpfs", fs->dst, "tmpfs", 0, data) < 0) { + virReportSystemError(errno, + _("Failed to mount directory %s as tmpfs"), + fs->dst); + goto cleanup; + } + + if (fs->readonly) { + VIR_DEBUG("Binding %s readonly", fs->dst); + if (mount(fs->dst, fs->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { + virReportSystemError(errno, + _("Failed to make directory %s readonly"), + fs->dst); + } + } + + ret = 0; + +cleanup: + VIR_FREE(data); + return ret; +} + + static int lxcContainerMountFS(virDomainFSDefPtr fs, const char *srcprefix) { @@ -1007,6 +1050,10 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, if (lxcContainerMountFSBlock(fs, srcprefix) < 0) return -1; break; + case VIR_DOMAIN_FS_TYPE_RAM: + if (lxcContainerMountFSTmpfs(fs) < 0) + return -1; + break; case VIR_DOMAIN_FS_TYPE_FILE: lxcError(VIR_ERR_INTERNAL_ERROR, _("Unexpected filesystem type %s"), @@ -1196,6 +1243,8 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) for (i = 0 ; i < vmDef->nfss ; i++) { virDomainFSDefPtr fs = vmDef->fss[i]; + if (!fs->src) + continue; if (virFileResolveAllLinks(fs->src, &newroot) < 0) return -1; -- 1.7.10.1

4 7

[libvirt] [PATCHv3 00/12] Add api for atomic listing of domains
by Peter Krempa 20 Jun '12

20 Jun '12

This is the third respin of the series. I've incorporated suggestions from Eric's review and cleaned up some nits that I found while polishing the series. This respin also contains two new cleanup patches: driver: Clean up driver header to space indentation maint: include ignore-value in internal.h Peter Krempa (12): lib: Add public api to enable atomic listing of guest virsh: add support for virConnectListAllDomains and clean up cmdList python: add API exports for virConnectListAllDomains() remote: implement remote protocol for virConnectListAllDomains() conf: Store managed save image existence in virDomainObj conf: Add helper for listing domains on drivers supporting virDomainObj drivers: Implement virListAllDomains for drivers using virDomainObj vbox: Add support for virConnectListAllDomains() hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() driver: Clean up driver header to space indentation maint: include ignore-value in internal.h daemon/remote.c | 54 +++ include/libvirt/libvirt.h.in | 36 ++- python/generator.py | 1 + python/libvirt-override-api.xml | 12 +- python/libvirt-override-virConnect.py | 12 + python/libvirt-override.c | 50 +++- src/Makefile.am | 8 +- src/conf/domain_audit.c | 1 - src/conf/domain_conf.c | 1 - src/conf/domain_conf.h | 2 + src/conf/virdomainlist.c | 181 ++++++++ src/conf/virdomainlist.h | 66 +++ src/driver.h | 729 +++++++++++++++++---------------- src/esx/esx_driver.c | 194 +++++++++ src/hyperv/hyperv_driver.c | 136 ++++++ src/internal.h | 1 + src/libvirt.c | 124 ++++++- src/libvirt_private.syms | 4 + src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 61 +++- src/lxc/lxc_driver.c | 19 + src/network/bridge_driver.c | 1 - src/node_device/node_device_hal.c | 1 - src/openvz/openvz_conf.c | 1 - src/openvz/openvz_driver.c | 19 + src/qemu/qemu_domain.c | 1 - src/qemu/qemu_driver.c | 67 +++- src/qemu/qemu_monitor_json.c | 1 - src/remote/remote_driver.c | 64 +++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 12 + src/test/test_driver.c | 19 + src/uml/uml_driver.c | 18 + src/util/command.c | 1 - src/util/event_poll.c | 1 - src/util/logging.c | 1 - src/util/memory.c | 1 - src/util/threadpool.c | 1 - src/util/virfile.h | 1 - src/util/virnetdevbandwidth.c | 1 - src/vbox/vbox_tmpl.c | 170 ++++++++ src/vmware/vmware_driver.c | 20 + src/xenapi/xenapi_driver.c | 1 - tests/shunloadtest.c | 1 - tools/virsh.c | 555 +++++++++++++++++-------- tools/virsh.pod | 91 +++-- 46 files changed, 2155 insertions(+), 601 deletions(-) create mode 100644 src/conf/virdomainlist.c create mode 100644 src/conf/virdomainlist.h -- 1.7.3.4

2 32

[libvirt] [sandbox][PATCH] Add module directory prefix selection feature
by Radu Caragea 20 Jun '12

20 Jun '12

Add module directory prefix selection feature This is useful when running as a non-privileged user if we want to boot a custom compiled kernel: we might not have rights to install in /lib/modules/<kernel release> so when compiling the kernel we can use "make modules_install INSTALL_MOD_PATH=/path" which installs in /path/lib/modules/<kernel release>. By setting with gvir_sandbox_config_set_moddirprefix(cfg, "/path") we can now achieve just that.

2 5

[libvirt] [qpid PATCH] doc: fixed search form action
by Martin Kletzander 20 Jun '12

20 Jun '12

Search was giving 404 because of missing {$href_base} in "action" property. Also one whitespace character got removed from end of the line because my before-save-hook. --- Pushed under the 'trivial' rule. doc/architecture.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/architecture.html b/doc/architecture.html index a564fa8..5b0f2bd 100644 --- a/doc/architecture.html +++ b/doc/architecture.html @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="http://libvirt.org/qpid/main.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Architecture</title><meta name="description" content="libvirt, virtualization, virtualization API, qpid" /></head><body><div id="header"><div id="headerLogo"></div><div id="headerSearch"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div><input id="query" name="query" type="text" size="12" value="" /><input id="submit" name="submit" type="submit" value="Search" /></div></form></div></div><div id="body"><div id="menu"><ul class="l0"><li><div><a href="index.html" class="inactive">Home</a></div></li><li><a href="http://libvirt.org/" class="inactive">libvirt</a></li><li><div><a href="releases.html" class="inactive">Releases</a></div></li><li><div><a href="architecture.html" class="inac! tive">Architecture</a></div></li><li><a href="https://www.redhat.com/mailman/listinfo/libvir-list" class="inactive">Mailing list</a></li></ul></div><div id="content"><h1 class="style1">Architecture</h1><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="http://libvirt.org/qpid/main.css" /><link rel="SHORTCUT ICON" href="/32favicon.png" /><title>Architecture</title><meta name="description" content="libvirt, virtualization, virtualization API, qpid" /></head><body><div id="header"><div id="headerLogo"></div><div id="headerSearch"><form action="{$href_base}search.php" enctype="application/x-www-form-urlencoded" method="get"><div><input id="query" name="query" type="text" size="12" value="" /><input id="submit" name="submit" type="submit" value="Search" /></div></form></div></div><div id="body"><div id="menu"><ul class="l0"><li><div><a href="index.html" class="inactive">Home</a></div></li><li><a href="http://libvirt.org/" class="inactive">libvirt</a></li><li><div><a href="releases.html" class="inactive">Releases</a></div></li><li><div><a href="architecture.html"! class="inactive">Architecture</a></div></li><li><a href="https://www.redhat.com/mailman/listinfo/libvir-list" class="inactive">Mailing list</a></li></ul></div><div id="content"><h1 class="style1">Architecture</h1><p> libvirt-qpid is an agent that runs on a given host. It will connect to both the local libvirtd and to a qpid broker. It then queries libvirtd every 5 seconds and maintains objects of various classes that reflect the activity and configuration of libvirtd. </p><p> - The classes include the node (the host), domains, storage pools, + The classes include the node (the host), domains, storage pools, and storage volumes. A complete synchronization takes place each iteration so that any state changes that happen outside of the channel provided by libvirt-qpid will be reflected in the objects -- 1.7.8.6

1 0

[libvirt] NEED HELP on libvirt guest resource control
by Zhimou Peng 20 Jun '12

20 Jun '12

Hi all, I'm from libvirt Section 3 I'm tracking "guest resource control" test from kvm, and i found kvm support more than libvirt. they support these: https://riddler.bne.redhat.com/IEEE_Test_Plans/en-US/RHEL/6.3/html-single/K… guest blkio bandwidth and blkio throttle limitation, guest memory limitation, migrate guest from one memory to another, guest CPU bandwidth limitation, guest freezing, pin guest to certain host CPU, guest net limitation. I want to know what the current libvirt support status and if libvirt will support all these feature in the future? BR zhpeng

1 0

[libvirt] [PATCH] conf: Format numatune XML correctly while placement is none
by Osier Yang 20 Jun '12

20 Jun '12

setNumaParameters tunes the numa setting using cgroup, it's another entry except libnuma/numad for numa tuning. And it doesn't set the placement, and further more, the formating codes doesn't take this into consideration. How to reproduce: conn = libvirt.open(None) dom = conn.lookupByName('linux') param = {'numa_nodeset': '0', 'numa_mode': 1} dom.setNumaParameters(param, 2) % virsh start linux error: Failed to start domain rhel6.3rc error: (domain_definition):8: error parsing attribute name <memory mode='preferred' </numatune> -------------------------------^ --- By the way, I see problems of setNumaParameters too. conn = libvirt.open(None) dom = conn.lookupByName('linux') param = {'numa_mode': 1} dom.setNumaParameters(param, 2) The numa 'mode' will be just ignored, and no 'numatune' XML is formated, as neither 'nodeset' nor 'placement' is specified. I'd think it's right to ignore it when formating, it's meaningless to only specify the 'mode'. However, we might have to fix setNumaParameters to prevent setting the numa mode without nodeset, and error out, as it's really a bad user experience to see the API call succeeded, but the expected XML doesn't show up in the end. --- src/conf/domain_conf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 81c6308..c44d89d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12795,23 +12795,26 @@ virDomainDefFormatInternal(virDomainDefPtr def, const char *placement; mode = virDomainNumatuneMemModeTypeToString(def->numatune.memory.mode); - virBufferAsprintf(buf, " <memory mode='%s' ", mode); + virBufferAsprintf(buf, " <memory mode='%s'", mode); - if (def->numatune.memory.placement_mode == - VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_STATIC) { + if (def->numatune.memory.nodemask) { nodemask = virDomainCpuSetFormat(def->numatune.memory.nodemask, - VIR_DOMAIN_CPUMASK_LEN); + VIR_DOMAIN_CPUMASK_LEN); if (nodemask == NULL) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to format nodeset for " "NUMA memory tuning")); goto cleanup; } - virBufferAsprintf(buf, "nodeset='%s'/>\n", nodemask); + virBufferAsprintf(buf, " nodeset='%s'/>\n", nodemask); VIR_FREE(nodemask); - } else if (def->numatune.memory.placement_mode) { + } else if (def->numatune.memory.placement_mode == + VIR_DOMAIN_NUMATUNE_MEM_PLACEMENT_MODE_AUTO) { placement = virDomainNumatuneMemPlacementModeTypeToString(def->numatune.memory.placement_mode); - virBufferAsprintf(buf, "placement='%s'/>\n", placement); + virBufferAsprintf(buf, " placement='%s'/>\n", placement); + } else { + /* Should not hit here. */ + virBufferAddLit(buf, "/>\n"); } virBufferAddLit(buf, " </numatune>\n"); } -- 1.7.7.3

2 1

[libvirt] [PATCH] openvz: Fix wordsize on 64 bit architectures
by Guido Günther 20 Jun '12

20 Jun '12

The word size there is 64 bit not 8. --- Came across this while browsing the source. O.k. to apply? -- Guido src/openvz/openvz_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index ad4ed74..007f9fe 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -195,7 +195,7 @@ virCapsPtr openvzCapsInit(void) if ((guest = virCapabilitiesAddGuest(caps, "exe", utsname.machine, - sizeof(int) == 4 ? 32 : 8, + sizeof(int) == 4 ? 32 : 64, NULL, NULL, 0, -- 1.7.10.4

3 7

[libvirt] [PATCH 1/2] Fix default USB controller for ppc64
by Dipankar Sarma 20 Jun '12

20 Jun '12

From: Dipankar Sarma <dipankar(a)in.ibm.com> Fix the default usb controller for pseries systems if none specified. Signed-off-by: Dipankar Sarma <dipankar(a)in.ibm.com> --- src/qemu/qemu_command.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a34c707..bd4f96a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2605,7 +2605,8 @@ qemuControllerModelUSBToCaps(int model) static int -qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, +qemuBuildUSBControllerDevStr(virDomainDefPtr domainDef, + virDomainControllerDefPtr def, virBitmapPtr qemuCaps, virBuffer *buf) { @@ -2614,8 +2615,12 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, model = def->model; - if (model == -1) - model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; + if (model == -1) { + if (STREQ(domainDef->os.arch, "ppc64")) + model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; + else + model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; + } smodel = qemuControllerModelUSBTypeToString(model); caps = qemuControllerModelUSBToCaps(model); @@ -2701,7 +2706,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, break; case VIR_DOMAIN_CONTROLLER_TYPE_USB: - if (qemuBuildUSBControllerDevStr(def, qemuCaps, &buf) == -1) + if (qemuBuildUSBControllerDevStr(domainDef, def, qemuCaps, &buf) == -1) goto error; if (nusbcontroller)

2 4

[libvirt] Fwd: libvirt secret support password or encryption keys?
by Zhimou Peng 20 Jun '12

20 Jun '12

FWD Hi, all PLS help, i'm reviewing man doc of libvirt secrets # man virsh ... SECRET COMMMANDS The following commands manipulate "secrets" (e.g. passwords, passphrases -----> secret-set-value only support base64 "passphrases" and encryption keys). Libvirt can store secrets independently from their use, and other objects (e.g. volumes or domains) can refer to the secrets for encryption or possibly other uses. Secrets are identified using an UUID. See <http://libvirt.org/formatsecret.html> for documentation of the XML format used to represent properties of secrets. ... So, I want to know that if libvirt support other 2 kinds of "secrets". And if so, How to use password and encrytion keys ? If libvirt not support that, i will file a bug of this man doc. BR zhpeng ----- Forwarded Message ----- From: "Zhimou Peng" <zhpeng(a)redhat.com> To: "Daniel Berrange" <berrange(a)redhat.com> Sent: Thursday, June 14, 2012 1:38:09 PM Subject: Fwd: libvirt secret support password or encryption keys? Hi, Daniel I saw your blog:http://berrange.com/posts/2009/12/02/using-qcow2-disk-encryption-with-… and there is only "type=passphrases", so how can i use password or encrytion keys? zhpeng BR ----- Forwarded Message ----- From: "Zhimou Peng" <zhpeng(a)redhat.com> To: "Daniel Berrange" <berrange(a)redhat.com> Cc: "s3-bug-review" <s3-bug-review(a)redhat.com> Sent: Tuesday, June 12, 2012 2:03:05 PM Subject: libvirt secret support password or encryption keys? Hi all, # man virsh ... SECRET COMMMANDS The following commands manipulate "secrets" (e.g. passwords, passphrases -----> secret-set-value only support base64 "passphrases" and encryption keys). Libvirt can store secrets independently from their use, and other objects (e.g. volumes or domains) can refer to the secrets for encryption or possibly other uses. Secrets are identified using an UUID. See <http://libvirt.org/formatsecret.html> for documentation of the XML format used to represent properties of secrets. ... So, I want to know that if libvirt support other 2 kinds of "secrets". And if so, How to use password and encrytion keys ? If libvirt not support that, i will file a bug of this man doc. zhpeng BR

2 2

[libvirt] [PATCHv2 00/13] list all snapshots
by Eric Blake 19 Jun '12

19 Jun '12

This is a v2 of the remaining patches in: https://www.redhat.com/archives/libvir-list/2012-June/msg00273.html https://www.redhat.com/archives/libvir-list/2012-June/msg00284.html It assumes that Peter's list all domain patches have been applied already, at least through patch 6/12: https://www.redhat.com/archives/libvir-list/2012-June/msg00316.html In other words, this series will not apply to current libvirt.git at the time of this mail. And since I developed against v3 of Peter's patches and he has some tweaks to make, I will probably have to make minor tweaks to rebase on top of his eventual v4. I will follow up with a link to a git repo with Peter's v3 and my series, and/or my rebase on top of his v4. Overall changes since v1: actually tested this time address review comments lots of bug fixes due to corner case testing rearrange the patch series so that metaroot comes before filtering pick up some good ideas from Peter's v3 More details in some of the individual patches, if I can remember everything I did. In particular, I'm quite pleased that the overall diffstat for domain_conf.c reduced in size in spite of adding features :) Eric Blake (13): snapshot: new virsh function factored from snapshot-list snapshot: use new virsh function for snapshot-list snapshot: use metaroot node to simplify management snapshot: merge domain and snapshot computation snapshot: merge count and name collectoin snapshot: add additional filters when getting lists snapshot: expose new flags in virsh list: add virDomainListAllSnapshots API list: use the new snapshot API in virsh when possible list: provide python bindings for snapshots list: provide RPC call for snapshots list: new helper function to collect snapshots list: add qemu snapshot list support daemon/remote.c | 126 ++++++ include/libvirt/libvirt.h.in | 35 +- python/Makefile.am | 2 + python/generator.py | 2 + python/libvirt-override-api.xml | 16 +- python/libvirt-override-virDomain.py | 11 + python/libvirt-override-virDomainSnapshot.py | 11 + python/libvirt-override.c | 92 +++++ src/conf/domain_conf.c | 250 ++++------- src/conf/domain_conf.h | 19 +- src/conf/virdomainlist.c | 44 +- src/conf/virdomainlist.h | 18 + src/driver.h | 12 + src/libvirt.c | 275 +++++++++++-- src/libvirt_private.syms | 3 +- src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 137 +++++-- src/qemu/qemu_migration.c | 3 +- src/remote/remote_driver.c | 126 ++++++ src/remote/remote_protocol.x | 26 +- src/remote_protocol-structs | 26 ++ tools/virsh.c | 570 +++++++++++++++++--------- tools/virsh.pod | 14 +- 23 files changed, 1371 insertions(+), 449 deletions(-) create mode 100644 python/libvirt-override-virDomain.py create mode 100644 python/libvirt-override-virDomainSnapshot.py -- 1.7.10.2

2 37

[libvirt] [PATCH] domain_conf: fix possible memory leak
by Martin Kletzander 19 Jun '12

19 Jun '12

Until now, it was possible to crash libvirtd when defining domain with channel device with missing source element. When creating new virDomainChrDef, target.port is set to -1, but unfortunately it is an union with addresses that virDomainChrDefFree tries to free in case the deviceType is channel. Having the port set to -1 is intended, however the cleanest way to get around the problems with the crash seems to be renumbering the VIR_DOMAIN_CHR_CHANNEL_ target types to cover new NONE type (with value 0) being the default (no target type yet). --- src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7bd61a5..41f22d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -307,6 +307,7 @@ VIR_ENUM_IMPL(virDomainNetInterfaceLinkState, VIR_DOMAIN_NET_INTERFACE_LINK_STAT VIR_ENUM_IMPL(virDomainChrChannelTarget, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, + "none", "guestfwd", "virtio") diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d627ad8..531176c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -855,7 +855,8 @@ enum virDomainChrDeviceType { }; enum virDomainChrChannelTargetType { - VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD = 0, + VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE = 0, + VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, -- 1.7.8.6

2 2

[libvirt] [PATCH] virsh: fix few typos on desc command
by Martin Kletzander 19 Jun '12

19 Jun '12

virsh help fix: - <--title> can also /get/ the title virsh man page: - missing <domain-id> - <new_desc> should be <new-desc> --- tools/virsh.c | 2 +- tools/virsh.pod | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4d34d49..036e018 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1227,7 +1227,7 @@ static const vshCmdOptDef opts_desc[] = { {"live", VSH_OT_BOOL, 0, N_("modify/get running state")}, {"config", VSH_OT_BOOL, 0, N_("modify/get persistent configuration")}, {"current", VSH_OT_BOOL, 0, N_("modify/get current state configuration")}, - {"title", VSH_OT_BOOL, 0, N_("modify the title instead of description")}, + {"title", VSH_OT_BOOL, 0, N_("modify/get the title instead of description")}, {"edit", VSH_OT_BOOL, 0, N_("open an editor to modify the description")}, {"new-desc", VSH_OT_ARGV, 0, N_("message")}, {NULL, 0, 0, NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index 910a187..252512a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -497,8 +497,9 @@ Define a domain from an XML <file>. The domain definition is registered but not started. If domain is already running, the changes will take effect on the next boot. -=item B<desc> [[I<--live>] [I<--config>] | [I<--current>]] [I<--title>] - [I<--edit>] [I<--new-desc> New description or title message] +=item B<desc> I<domain-id> [[I<--live>] [I<--config>] | + [I<--current>]] [I<--title>] [I<--edit>] [I<--new-desc> + New description or title message] Show or modify description and title of a domain. These values are user fields that allow to store arbitrary textual data to allow easy @@ -516,7 +517,7 @@ description or title should be opened and the contents saved back afterwards. Flag I<--title> selects operation on the title field instead of description. -If neither of I<--edit> and I<--new_desc> are specified the note or description +If neither of I<--edit> and I<--new-desc> are specified the note or description is displayed instead of being modified. =item B<destroy> I<domain-id> [I<--graceful>] -- 1.7.8.6

2 2

[libvirt] [PATCH] error: Fix macro checking for NULL arguments
by Peter Krempa 19 Jun '12

19 Jun '12

Macro virCheckNullArgGoto is supposed to check for NULL argument but checks non-NULL instead. --- src/internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/internal.h b/src/internal.h index 1b1598b..b09609e 100644 --- a/src/internal.h +++ b/src/internal.h @@ -241,21 +241,21 @@ # define virCheckNonNullArgReturn(argname, retval) \ do { \ if (argname == NULL) { \ virReportInvalidNullArg(argname); \ return retval; \ } \ } while (0) # define virCheckNullArgGoto(argname, label) \ do { \ - if (argname == NULL) { \ + if (argname != NULL) { \ virReportInvalidNullArg(argname); \ goto label; \ } \ } while (0) # define virCheckNonNullArgGoto(argname, label) \ do { \ if (argname == NULL) { \ virReportInvalidNonNullArg(argname); \ goto label; \ } \ -- 1.7.8.6

2 4

Re: [libvirt] ask for help to explain the network about tap
by Yong Sheng Gong 19 Jun '12

19 Jun '12

Can any one help? thanks -----Yong Sheng Gong/China/IBM wrote: ----- To: Eric Blake <eblake(a)redhat.com> From: Yong Sheng Gong/China/IBM Date: 06/17/2012 11:11AM Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] ask for help to explain the network about tap Hi Eric, Thanks for the reply. I have a new question. I found I cannot ping the VM with predefined tap device in domain xml from other host(means the machine other than the hyper visor is running on): <interface type='ethernet'> <mac address='f6:19:e0:6c:84:c3'/> <script path=''/> <target dev='tap10'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> But I can ping the VM with libvirtd defined tap device in domain xml from other host: <interface type='bridge'> <mac address='52:54:00:e4:2e:c1'/> <source bridge='br200'/> <target dev='vnet0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> [root@robinlinux ~]# brctl show bridge name bridge id STP enabled interfaces br100 8000.0021cc6d4440 no eth0 br200 8000.0021cc6d4443 no eth0.1000 gw200 tap10 vnet0 And I can ping both of VMs from local host. What does libvirtd do to allow the bridge to forward the packet to the tap device attached by target VM? As far as I know all the packets destined to the bridge's ports from outside will be consumed by bridge itself, not xmit to particular port. Thanks Yong Sheng Gong -----Eric Blake <eblake(a)redhat.com> wrote: ----- To: Yong Sheng Gong/China/IBM@IBMCN From: Eric Blake <eblake(a)redhat.com> Date: 06/15/2012 12:36PM Cc: libvir-list(a)redhat.com Subject: Re: [libvirt] ask for help to explain the network about tap On 06/14/2012 08:49 PM, Yong Sheng Gong wrote: > > Hi, > I don't know who helps qemu-kvm to create and open the tap file and when if I define an interface of a kvm vm like: > <interface type='bridge'> > <mac address='52:54:00:e4:2e:c1'/> > <source bridge='br200'/> > <model type='virtio'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> > </interface> > > The qemu-kvm process's command line will be: <snip> > > Note the -netdev tap,fd=24 That's libvirtd that opened the tap file, and passed it by inheritance to the new qemu process. Unfortunately, this means that you can't recreate the same qemu process without also opening the tap device yourself the same way that libvirtd would do it. But this approach of fd passing is essential to security, since libvirtd intentionally removes capabilities that prevent qemu from opening the tap itself, so libvirtd must pass in the fd pre-opened. Did you have specific questions about which functions in libvirt source code open the tap device? Also, note that libvirtd will issue an audit log event for every tapfd that it opens and gives to qemu. The fd number is unpredictable, but the fact that an fd was opened as backed by a tap device is pretty easy to follow in the audit logs. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org [attachment "signature.asc" removed by Yong Sheng Gong/China/IBM]

1 0

[libvirt] [PATCH] virsh: make domiftune interface help string consistent
by Martin Kletzander 19 Jun '12

19 Jun '12

Append '(MAC Address)' after the help string of domiftune virsh command as it takes the same type of argument as domif-{get,set}link which have it specified. --- Pushed under 'trivial' rule. tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1e1de39..fffa482 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2019,7 +2019,7 @@ static const vshCmdInfo info_domiftune[] = { static const vshCmdOptDef opts_domiftune[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface device")}, + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, N_("interface device (MAC Address)")}, {"inbound", VSH_OT_DATA, VSH_OFLAG_NONE, N_("control domain's incoming traffics")}, {"outbound", VSH_OT_DATA, VSH_OFLAG_NONE, N_("control domain's outgoing traffics")}, {"config", VSH_OT_BOOL, VSH_OFLAG_NONE, N_("affect next boot")}, -- 1.7.8.6

1 0

[libvirt] [sandbox][PATCH] Typo and example fix
by Radu Caragea 19 Jun '12

19 Jun '12

I fixed a typo in the strace debug feature, if you specified LIBVIRT_SANDBOX_STRACE=poll it would write "strace =poll" in the kernel command line and consequently it wouldn't get picked up because of that extra space. Also, the example virt-sandbox.py was a bit outdated so I updated it. The shell.py doesn't work as it has serial1 hardcoded for qemu. I haven't checked the rest.

2 1

[libvirt] [PATCH] add handling EINTR to test example of event loop
by lvroyce＠linux.vnet.ibm.com 19 Jun '12

19 Jun '12

From: lvroyce <lvroyce(a)linux.vnet.ibm.com> some system call and signal will interrupt poll, making event loop stops and fails to react events and keepalive message from libvirt. adding handling EINTR to poll to make it more robust Signed-off-by: lvroyce <lvroyce(a)linux.vnet.ibm.com> --- examples/domain-events/events-python/event-test.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 96dc268..b446c21 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -188,7 +188,13 @@ class virEventLoopPure: sleep = (next - now) / 1000.0 debug("Poll with a sleep of %d" % sleep) - events = self.poll.poll(sleep) + try: + events = self.poll.poll(sleep) + except select.error, e: + self.runningPoll = False + if not e.errno in (errno.EINTR, errno.EAGAIN): + raise + return # Dispatch any file handle events that occurred for (fd, revents) in events: -- 1.7.7.6

3 3

[libvirt] [PATCH 02/02] libvirt-java add domain flags and error constants up to 0.9, 2
by Stefan Majer 19 Jun '12

19 Jun '12

-- Stefan Majer

1 0

[libvirt] [PATCH 01/02] libvirt-java add domain flags and error constants up to 0.9, 2
by Stefan Majer 19 Jun '12

19 Jun '12

-- Stefan Majer

1 0

[libvirt] [PATCH v2] LXC: avoid useless duplicate memory free
by Gao feng 19 Jun '12

19 Jun '12

when lxcContainerIdentifyCGroups failed, the memory it allocated has been freed, so we should not free this memory again in lxcContainerSetupPivortRoot and lxcContainerSetupExtraMounts. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9045a7d..24b1017 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1323,7 +1323,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Before pivoting we need to identify any * cgroups controllers that are mounted */ if (lxcContainerIdentifyCGroups(&mounts, &nmounts) < 0) - goto cleanup; + return -1; /* Gives us a private root, leaving all parent OS mounts on /.oldroot */ if (lxcContainerPivotRoot(root) < 0) @@ -1406,7 +1406,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, /* Before replacing /sys we need to identify any * cgroups controllers that are mounted */ if (lxcContainerIdentifyCGroups(&mounts, &nmounts) < 0) - goto cleanup; + return -1; /* Gets rid of any existing stuff under /proc, since we need new * namespace aware versions of those. We must do /proc second -- 1.7.7.6

2 2

[libvirt] [PATCHv2] adding handling EINTR to poll to make it more robust
by lvroyce＠linux.vnet.ibm.com 19 Jun '12

19 Jun '12

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> some system call and signal will interrupt poll, making event loop stops and fails to react events and keepalive message from libvirt. adding handling EINTR to poll to make it more robust Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- examples/domain-events/events-python/event-test.py | 95 +++++++++++--------- 1 files changed, 51 insertions(+), 44 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 96dc268..7832d13 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -2,9 +2,9 @@ # # # -################################################################################# +############################################################################## # Start off by implementing a general purpose event loop for anyones use -################################################################################# +############################################################################## import sys import getopt @@ -27,11 +27,14 @@ import threading use_pure_python_event_loop = True do_debug = False + + def debug(msg): global do_debug if do_debug: print msg + # # This general purpose event loop will support waiting for file handle # I/O and errors events, as well as scheduling repeatable timers with @@ -97,7 +100,6 @@ class virEventLoopPure: self.cb(self.timer, self.opaque) - def __init__(self): self.poll = select.poll() self.pipetrick = os.pipe() @@ -178,48 +180,53 @@ class virEventLoopPure: def run_once(self): sleep = -1 self.runningPoll = True - next = self.next_timeout() - debug("Next timeout due at %d" % next) - if next > 0: - now = int(time.time() * 1000) - if now >= next: - sleep = 0 - else: - sleep = (next - now) / 1000.0 - - debug("Poll with a sleep of %d" % sleep) - events = self.poll.poll(sleep) - - # Dispatch any file handle events that occurred - for (fd, revents) in events: - # See if the events was from the self-pipe - # telling us to wakup. if so, then discard - # the data just continue - if fd == self.pipetrick[0]: - self.pendingWakeup = False - data = os.read(fd, 1) - continue - - h = self.get_handle_by_fd(fd) - if h: - debug("Dispatch fd %d handle %d events %d" % (fd, h.get_id(), revents)) - h.dispatch(self.events_from_poll(revents)) + try: + next = self.next_timeout() + debug("Next timeout due at %d" % next) + if next > 0: + now = int(time.time() * 1000) + if now >= next: + sleep = 0 + else: + sleep = (next - now) / 1000.0 + + debug("Poll with a sleep of %d" % sleep) + events = self.poll.poll(sleep) + + # Dispatch any file handle events that occurred + for (fd, revents) in events: + # See if the events was from the self-pipe + # telling us to wakup. if so, then discard + # the data just continue + if fd == self.pipetrick[0]: + self.pendingWakeup = False + data = os.read(fd, 1) + continue + + h = self.get_handle_by_fd(fd) + if h: + debug("Dispatch fd %d handle %d events %d" % (fd, h.get_id(), revents)) + h.dispatch(self.events_from_poll(revents)) - now = int(time.time() * 1000) - for t in self.timers: - interval = t.get_interval() - if interval < 0: - continue - - want = t.get_last_fired() + interval - # Deduct 20ms, since schedular timeslice - # means we could be ever so slightly early - if now >= (want-20): - debug("Dispatch timer %d now %s want %s" % (t.get_id(), str(now), str(want))) - t.set_last_fired(now) - t.dispatch() - - self.runningPoll = False + now = int(time.time() * 1000) + for t in self.timers: + interval = t.get_interval() + if interval < 0: + continue + + want = t.get_last_fired() + interval + # Deduct 20ms, since schedular timeslice + # means we could be ever so slightly early + if now >= (want-20): + debug("Dispatch timer %d now %s want %s" % (t.get_id(), str(now), str(want))) + t.set_last_fired(now) + t.dispatch() + + except (os.error, select.error), e: + if e.errno != errno.EINTR: + raise + finally: + self.runningPoll = False # Actually the event loop forever -- 1.7.7.6

1 0

[libvirt] pool-create/pool-create-as should include build pool then start?
by Zhimou Peng 19 Jun '12

19 Jun '12

Hi all, According to https://bugzilla.redhat.com/show_bug.cgi?id=830056#c5, i think we should talk about this: Description If pool environment is not built, pool-create/pool-create-as will always fail. I think pool-create should build the pool. Version qemu-kvm-0.12.1.2-2.295.el6.x86_64 kernel-2.6.32-276.el6.x86_64 libvirt-0.9.10-21.el6.x86_64 Steps For example: dir pool virsh # pool-create dirpool.xml error: Failed to create pool from dirpool.xml error: cannot open path '/var/lib/libvirt/dir': No such file or directory disk pool virsh # pool-create diskpool.xml error: Failed to create pool from diskpool.xml error: internal error Child process (/usr/libexec/libvirt_parthelper /dev/sdb) status unexpected: exit status 2 fs pool virsh # pool-create fspool.xml error: Failed to create pool from fspool.xml error: internal error Child process (/bin/mount -t ext4 /dev/sda7 /var/lib/libvirt/images/fspool) status unexpected: exit status 32 Steps are the same of other pools

2 2