- Devel - libvirt List Archives

[libvirt] [PATCH 1/3] LXC: avoid useless memory free in lxcContainerIdentifyCGroups
by Gao feng 19 Jun '12

19 Jun '12

when lxcContainerIdentifyCGroups failed, lxcContainerSetupPivortRoot and lxcContainerSetupExtraMounts will free the memory that allocated in lxcContainerIdentifyCGroups. So we need not call lxcContainerCGroupFree when lxcContainerIdentifyCGroups failed. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4fbceb4..87de463 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1236,17 +1236,16 @@ static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, } } - *mountsret = mounts; - *nmountsret = nmounts; ret = 0; cleanup: + *mountsret = mounts; + *nmountsret = nmounts; + closedir(dh); endmntent(procmnt); VIR_FREE(path); - if (ret < 0) - lxcContainerCGroupFree(mounts, nmounts); return ret; } -- 1.7.7.6

3 7

[libvirt] [PATCH] LXC: fix memory leak in lxcContainerGetSubtree
by Gao feng 19 Jun '12

19 Jun '12

when libvirt_lxc trigger oom error in lxcContainerGetSubtree we should free the alloced memory for mounts. so when lxcContainerGetSubtree failed,we should do some memory cleanup in lxcContainerUnmountSubtree. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 5651255..633218c 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1118,10 +1118,11 @@ static int lxcContainerGetSubtree(const char *prefix, virReportOOMError(); goto cleanup; } - if (!(mounts[nmounts++] = strdup(mntent.mnt_dir))) { + if (!(mounts[nmounts] = strdup(mntent.mnt_dir))) { virReportOOMError(); goto cleanup; } + nmounts++; VIR_DEBUG("Grabbed %s", mntent.mnt_dir); } @@ -1129,11 +1130,10 @@ static int lxcContainerGetSubtree(const char *prefix, qsort(mounts, nmounts, sizeof(mounts[0]), lxcContainerChildMountSort); - *mountsret = mounts; - *nmountsret = nmounts; ret = 0; - cleanup: + *mountsret = mounts; + *nmountsret = nmounts; endmntent(procmnt); return ret; } @@ -1151,7 +1151,7 @@ static int lxcContainerUnmountSubtree(const char *prefix, VIR_DEBUG("Unmount subtreee from %s", prefix); if (lxcContainerGetSubtree(prefix, &mounts, &nmounts) < 0) - return -1; + goto cleanup; for (i = 0 ; i < nmounts ; i++) { VIR_DEBUG("Umount %s", mounts[i]); if (umount(mounts[i]) < 0) { -- 1.7.7.6

3 4

[libvirt] [PATCH 1/2] virsh: Tweak attach-* documentation
by Michal Privoznik 18 Jun '12

18 Jun '12

as we are missing: attach-disk: --type can accept 'lun' too, not just cdrom or floppy. attach-disk: --target specify logical device name, not path attach-interface: --target silently drops strings with vnet* prefix --- tools/virsh.pod | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 910a187..4729127 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1586,10 +1586,11 @@ needed if the device does not use managed mode. [I<--multifunction>] Attach a new disk device to the domain. -I<source> and I<target> are paths for the files and devices. -I<driver> can be I<file>, I<tap> or I<phy> for the Xen hypervisor depending on -the kind of access; or I<qemu> for the QEMU emulator. -I<type> can indicate I<cdrom> or I<floppy> as alternative to the disk default, +I<source> is path for the files and devices. I<target> controls the bus or +device under which the disk is exposed to the guest OS. It indicates the +"logical" device name. I<driver> can be I<file>, I<tap> or I<phy> for the Xen +hypervisor depending on the kind of access; or I<qemu> for the QEMU emulator. +I<type> can indicate I<lun>, I<cdrom> or I<floppy> as alternative to the disk default, although this use only replaces the media within the existing virtual cdrom or floppy device; consider using B<update-device> for this usage instead. I<mode> can specify the two specific mode I<readonly> or I<shareable>. @@ -1614,7 +1615,8 @@ Attach a new network interface to the domain. I<type> can be either I<network> to indicate a physical network device or I<bridge> to indicate a bridge to a device. I<source> indicates the source device. -I<target> allows to indicate the target device in the guest. +I<target> allows to indicate the target device in the guest. Names starting +with 'vnet' are considered as auto-generated an hence blanked out. I<mac> allows to specify the MAC address of the network interface. I<script> allows to specify a path to a script handling a bridge instead of the default one. -- 1.7.8.5

3 5

[libvirt] [PATCH 1/2] qemu: don't bootup guest in reboot operation if the migration job is running
by Guannan Ren 18 Jun '12

18 Jun '12

After an reboot operation, the guest will shutdown first then bootup in a separate thread from the eventloop thread. If we start the migration job, according to the time gap between reboot and migrate command, the system_reset action of bootup operation will probably block from the migration job utill timeouts. In this case, the solution is that we don't bootup the guest on the source server, we pass the task to target machine. --- src/qemu/qemu_process.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1df3637..7c7132a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -632,14 +632,14 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { struct qemud_driver *driver = qemu_driver; - qemuDomainObjPrivatePtr priv; + qemuDomainObjPrivatePtr priv = vm->privateData; + struct qemuDomainJobObj *job = &priv->job; virDomainEventPtr event = NULL; VIR_DEBUG("vm=%p", vm); virDomainObjLock(vm); - priv = vm->privateData; if (priv->gotShutdown) { VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", vm->def->name); @@ -668,6 +668,17 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SHUTDOWN); + /* + * When a vm is in the job of migrating out and meanwhile + * the guest is shutting down for an reboot, we keep the + * shutdown state of the vm on the source server, letting + * the target machine do the booting work after migration. + */ + if (priv->fakeReboot && + job->asyncJob && + job->asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) + goto unlock; + qemuProcessShutdownOrReboot(driver, vm); unlock: -- 1.7.7.5

1 1

[libvirt] [PATCH] LXC: fix memory leak in lxcContainerMountFSBlockHelper
by Gao feng 18 Jun '12

18 Jun '12

we alloc the memory for format in lxcContainerMountDetectFilesystem but without free it in lxcContainerMountFSBlockHelper. this patch just call VIR_FREE to free it. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 297bd6d..5651255 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1014,6 +1014,7 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, } cleanup: + VIR_FREE(format); return ret; } -- 1.7.7.6

2 2

[libvirt] [PATCH v2] virsh: Update vol-create-as manpage
by Michal Privoznik 18 Jun '12

18 Jun '12

as we support qed format as well. --- docs/schemas/storagevol.rng | 1 + tools/virsh.c | 2 +- tools/virsh.pod | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 8edb877..7a74331 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -153,6 +153,7 @@ <value>iso</value> <value>qcow</value> <value>qcow2</value> + <value>qed</value> <value>vmdk</value> <value>vpc</value> </choice> diff --git a/tools/virsh.c b/tools/virsh.c index 4d34d49..1e1de39 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11351,7 +11351,7 @@ static const vshCmdOptDef opts_vol_create_as[] = { {"allocation", VSH_OT_STRING, 0, N_("initial allocation size, as scaled integer (default bytes)")}, {"format", VSH_OT_STRING, 0, - N_("file format type raw,bochs,qcow,qcow2,vmdk")}, + N_("file format type raw,bochs,qcow,qcow2,qed,vmdk")}, {"backing-vol", VSH_OT_STRING, 0, N_("the backing volume if taking a snapshot")}, {"backing-vol-format", VSH_OT_STRING, 0, diff --git a/tools/virsh.pod b/tools/virsh.pod index 4729127..1a6bef2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2163,11 +2163,12 @@ I<capacity> is the size of the volume to be created, as a scaled integer I<--allocation> I<size> is the initial size to be allocated in the volume, also as a scaled integer defaulting to bytes. I<--format> I<string> is used in file based storage pools to specify the volume -file format to use; raw, bochs, qcow, qcow2, vmdk. +file format to use; raw, bochs, qcow, qcow2, vmdk, qed. I<--backing-vol> I<vol-name-or-key-or-path> is the source backing volume to be used if taking a snapshot of an existing volume. I<--backing-vol-format> I<string> is the format of the snapshot backing volume; -raw, bochs, qcow, qcow2, vmdk, host_device. +raw, bochs, qcow, qcow2, qed, vmdk, host_device. These are, however, meant for +file based storage pools. =item B<vol-clone> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> I<name> -- 1.7.8.5

2 2

[libvirt] [PATCH] Add a custom 404 error page for the website
by Daniel P. Berrange 18 Jun '12

18 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- docs/404.html.in | 23 +++++++++++++++++++++++ docs/libvirtLogo404.png | Bin 0 -> 32442 bytes 2 files changed, 23 insertions(+) create mode 100644 docs/404.html.in create mode 100644 docs/libvirtLogo404.png diff --git a/docs/404.html.in b/docs/404.html.in new file mode 100644 index 0000000..9363871 --- /dev/null +++ b/docs/404.html.in @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<html> + <body> + <h1>404 page not found</h1> + + <p> + Someone appears to have eaten the <del>penguin</del> + page you were looking for. You might want to try + </p> + <ul> + <li>going back to the <a href="http://libvirt.org/">home page</a> to find + a collection of links to interesting pages on this site</li> + <li>using the search box at the top right corner of the screen to + locate the content on this site or mailing list archives</li> + </ul> + + <p class="image"> + <img src="libvirtLogo404.png" alt="libvirt Logo"/> + </p> + + + </body> +</html> diff --git a/docs/libvirtLogo404.png b/docs/libvirtLogo404.png new file mode 100644 index 0000000000000000000000000000000000000000..059c0ebeccf5ad2e1fa4f99dc3e91299ae607bf5 GIT binary patch literal 32442 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 literal 0 HcmV?d00001 -- 1.7.10.2

2 2

[libvirt] [PATCH libvirt-gconfig] Remove bogus check against -1 of gvir_config_genum_get_value return value
by Daniel P. Berrange 18 Jun '12

18 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The gvir_config_domain_disk class was checking the return value of gvir_config_genum_get_value against -1. This is impossible, since this method will return the default enum value --- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index a29ea47..5041393 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -85,8 +85,6 @@ gvir_config_domain_disk_new_from_tree(GVirConfigXmlDoc *doc, type = gvir_config_genum_get_value(GVIR_CONFIG_TYPE_DOMAIN_DISK_TYPE, type_str, GVIR_CONFIG_DOMAIN_DISK_FILE); - if (type == -1) - return NULL; object = gvir_config_object_new_from_tree(GVIR_CONFIG_TYPE_DOMAIN_DISK, doc, NULL, tree); -- 1.7.10.2

2 1

[libvirt] [sandbox] random hang in g_poll
by Radu Caragea 18 Jun '12

18 Jun '12

Hello, I am building a tool on top of libvirt-sandbox and I've noticed that there are random hangs in the g_main_loop_run call. Normally, only very rarely does it actually hang, the problem appears let's say 4 out of 5 times when I run the program under valgrind or when I am using an LD_PRELOAD for checking gobject ref counts (gobject-list). I ran these directly on virt-sandbox to ensure that it's not from my code and it still happens. Attached is the output of a run that hangs followed by the backtrace. As I'm new to the gmainloop mechanisms I don't really know where to start debugging. Any ideas would be appreciated. Thanks, Radu Caragea.

2 2

[libvirt] [PATCH] add handling EINTR to test example of event loop
by Royce Lv 18 Jun '12

18 Jun '12

some system calls 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

2 1

[libvirt] [libvirt-glib] Add getter for GVirConfigDomainOs.os_type
by Zeeshan Ali (Khattak) 18 Jun '12

18 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-os.c | 12 ++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-os.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 1 + 3 files changed, 14 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.c b/libvirt-gconfig/libvirt-gconfig-domain-os.c index 2e4a69a..c91936f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.c @@ -81,6 +81,18 @@ void gvir_config_domain_os_set_os_type(GVirConfigDomainOs *os, "type", type_str); } +GVirConfigDomainOsType gvir_config_domain_os_get_os_type(GVirConfigDomainOs *os) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_OS(os), + GVIR_CONFIG_DOMAIN_OS_TYPE_HVM); + + return gvir_config_object_get_node_content_genum + (GVIR_CONFIG_OBJECT(os), + "type", + GVIR_CONFIG_TYPE_DOMAIN_OS_TYPE, + GVIR_CONFIG_DOMAIN_OS_TYPE_HVM); +} + /** * gvir_config_domain_os_set_kernel: * @os: a #GVirConfigDomainOs diff --git a/libvirt-gconfig/libvirt-gconfig-domain-os.h b/libvirt-gconfig/libvirt-gconfig-domain-os.h index 62c1fbe..6a8a8d3 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-os.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-os.h @@ -83,6 +83,7 @@ GVirConfigDomainOs *gvir_config_domain_os_new(void); GVirConfigDomainOs *gvir_config_domain_os_new_from_xml(const gchar *xml, GError **error); void gvir_config_domain_os_set_os_type(GVirConfigDomainOs *os, GVirConfigDomainOsType type); +GVirConfigDomainOsType gvir_config_domain_os_get_os_type(GVirConfigDomainOs *os); const char *gvir_config_domain_os_get_arch(GVirConfigDomainOs *os); void gvir_config_domain_os_set_arch(GVirConfigDomainOs *os, const char *arch); GList *gvir_config_domain_os_get_boot_devices(GVirConfigDomainOs *os); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 761a96b..5473148 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -383,6 +383,7 @@ LIBVIRT_GCONFIG_0.0.9 { gvir_config_domain_os_get_arch; gvir_config_domain_os_get_boot_devices; + gvir_config_domain_os_get_os_type; gvir_config_capabilities_get_host; gvir_config_capabilities_get_guests; -- 1.7.10.2

2 1

[libvirt] Autogenerate AUTHORS?
by Cole Robinson 18 Jun '12

18 Jun '12

Hi, The AUTHORS file causes a lot of pain doing backports to -maint branches. It almost always causes conflicts, and the changes can't just be dropped otherwise 'make syntax-check' breaks. Is there anything preventing us from just auto generating this at dist time? Besides, of course, needing someone to actually implement it. Thanks, Cole

3 3

[libvirt] ANNOUNCE: libvirt 0.9.6.1 maintenance release
by Cole Robinson 17 Jun '12

17 Jun '12

libvirt 0.9.6.1 maintenance release is now available. This is libvirt 0.9.6 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.6.1.tar.gz I tried to be fairly conservative here, only pulling in patches we either already carried in Fedora 16, or fixed bugs filed against Fedora 16. If anyone else is planning on using this release, and knows of useful and safe backport candidates for future releases, please let me know. Changes in this version: * Stable release 0.9.6.1 * Pull in GNULIB regex module for benefit of test suite on Win32 (cherry picked from commit f94d9c5793cc57b5228c7f1915bdc76c84f0a923) * Fix typos in API XML file paths * 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 * 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 * lxc: use hand-rolled code in place of unlockpt and grantpt * xen: do not use ioemu type for any emulated NIC * xend_internal: Use domain/status for shutdown check * xen-xm: SIGSEGV in xenXMDomainDefineXML: filename * xen_xm: Fix SIGSEGV in xenXMDomainDefineXML * xen: Don't add <console> to xml for dom0 * xen_xs: Guard against set but empty kernel argument * xen: add error handling to UUID parsing * xenParseXM: don't dereference NULL pointer when script is empty (cherry picked from commit 6dd8532d96b0512ddb3b10cae8f51e16389d9cc7) * Fix sync issue in virNetClientStreamEventRemoveCallback * fdstream: Add internal callback on stream close * fdstream: Emit stream abort callback even if poll() doesnt. * Don't return a fatal error if receiving unexpected stream data * Fix handling of stream EOF * If receiving a stream error, mark EOF on the stream * Set to NULL members that have been freed to prevent crashes * Fix synchronous reading of stream data * build: fix stamp file name * Install API XML desc to a standard location * tests: work around pdwtags 1.9 failure * xenapi: remove unused variable * build: fix 'make distcheck' * build: fix 'make distcheck' with pdwtags installed * python: Fix doc directory name for stable releases * docs: Serialize running apibuild.py * configure: Use ustar format for dist tarball * Fix parallel build in docs/ directory * tests: avoid test failure on rawhide gnutls * storage: Fix any VolLookupByPath if we have an empty logical pool * daemon: Remove deprecated HAL from init script dependencies * virCommand: Properly handle POLLHUP * qemu: Check for domain being active on successful job acquire * Avoid crash in shunloadtest * spec: make it easier to autoreconf when building rpm * test: replace deprecated "fedora-13" machine with "pc-0.13" * network: don't add iptables rules for externally managed networks * spec: fix logic bug in deciding to turn on cgconfig * spec: don't use chkconfig --list * spec: add dmidecode as prereq * Fix incorrect symbols for virtime.h module breaking Mingw32 * spec: mark directories in /var/run as ghosts * Remove time APIs from src/util/util.h * Make logging async signal safe wrt time stamp generation * Add internal APIs for dealing with time * logging: Add date to log timestamp (cherry picked from commit 11c6e094e4e8789174502bd52c1441caa5865276) * logging: Do not log timestamp through syslog * qemu: make PCI multifunction support more manual * conf: remove unused VIR_ENUM_DECL * spec: F15 still uses cgconfig, RHEL lacks hyperv For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

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

17 Jun '12

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: /usr/libexec/qemu-kvm -S -M pc-0.14 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name test -uuid 4b39bb5e-3994-9529-b554-2610f905945d -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/test.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0,format=raw,cache=none,aio=threads -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,format=raw -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev tap,fd=24,id=hostnet0 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:e4:2e:c1,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 -vga cirrus -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 Note the -netdev tap,fd=24 If I use predefined tap dev name to define: <interface type='ethernet'> <mac address='f6:19:e0:6c:84:c3'/> <script path=''/> <target dev='tap10'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> The process will be run as: /usr/libexec/qemu-kvm -S -M pc-0.14 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name test-clone -uuid c188ef83-82a4-23bb-dd81-b364e0b4d055 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/test-clone.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -drive file=/var/lib/libvirt/images/test-clone.img,if=none,id=drive-virtio-disk0,format=raw,cache=none,aio=threads -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,format=raw -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev tap,ifname=tap10,script=,id=hostnet0 -device rtl8139,netdev=hostnet0,id=net0,mac=f6:19:e0:6c:84:c3,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:1 -vga cirrus -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 please note the -netdev tap,ifname=tap10 Thanks Yong Sheng Gong

2 2

[libvirt] [PATCH 0/2] qemu_agent: Switch to event driven impl
by Michal Privoznik 16 Jun '12

16 Jun '12

Qemu fixed some qemu-ga commands reporting bogus success: http://www.mail-archive.com/qemu-devel@nongnu.org/msg110261.html Therefore we need an implementation which won't wait for qemu-ga to reply and hence block indefinitely. Fortunately, we can take events on qemu monitor as indication of success. Michal Privoznik (2): qemu_agent: Add some more debug prints qemu_agent: Wait for events instead of agent response src/qemu/qemu_agent.c | 52 +++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_agent.h | 9 ++++++++ src/qemu/qemu_process.c | 9 ++++++++ 3 files changed, 64 insertions(+), 6 deletions(-) -- 1.7.8.5

2 5

[libvirt] [PATCH] build: hoist qemu dependence on yajl to configure
by Eric Blake 16 Jun '12

16 Jun '12

Commit 6e769eba made it a runtime error if libvirt was compiled without yajl support but targets a new enough qemu. But enough users are hitting this on self-compiled libvirt that it is worth erroring out at compilation time, rather than an obscure failure when trying to use the built executable. * configure.ac: If qemu is requested and -version works, require yajl if qemu version is new enough. * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags): Add comment. --- configure.ac | 19 ++++++++++++++++++- src/qemu/qemu_capabilities.c | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dda764d..0ba0598 100644 --- a/configure.ac +++ b/configure.ac @@ -991,6 +990,24 @@ AC_ARG_WITH([yajl], [], [with_yajl=check]) +if test "$with_qemu:$with_yajl" = yes:check; then + dnl Some versions of qemu require the use of yajl; try to detect them + dnl here, although we do not require qemu to exist in order to compile. + dnl This check mirrors src/qemu/qemu_capabilities.c + AC_PATH_PROGS([QEMU], [qemu-kvm qemu kvm qemu-system-x86_64], + [], [$PATH:/usr/bin:/usr/libexec]) + if test -x "$QEMU"; then + if `$QEMU -help | grep libvirt` >/dev/null; then + with_yajl=yes + else + [qemu_version_sed='s/.*ersion $[0-9.,]*$.*/\1/'] + qemu_version=`$QEMU -version | sed "$qemu_version_sed"` + AS_VERSION_COMPARE([$qemu_version], [0.15], + [], [with_yajl=yes], [with_yajl=yes]) + fi + fi +fi + YAJL_CFLAGS= YAJL_LIBS= with_yajl2=no diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b410648..f263375 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1206,7 +1206,8 @@ qemuCapsComputeCmdFlags(const char *help, * forgot to include YAJL libraries when building their own * libvirt but is targetting a newer qemu, we are better off * telling them to recompile (the spec file includes the - * dependency, so distros won't hit this). */ + * dependency, so distros won't hit this). This check is + * also in configure.ac (see $with_yajl). */ if (version >= 15000 || (version >= 12000 && strstr(help, "libvirt"))) { if (check_yajl) { -- 1.7.10.2

2 3

[libvirt] [PATCH] autogen: Always abide --system
by Cole Robinson 15 Jun '12

15 Jun '12

If we do ./autogen.sh && ./configure, then later try ./autogen.sh --system, configure isn't invoked with the requested params. Instead config.status --recheck is run. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/autogen.sh b/autogen.sh index f1591d8..53db06f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -77,7 +77,7 @@ if test "x$OBJ_DIR" != x; then cd "$OBJ_DIR" fi -if test -z "$*" && test -f config.status; then +if test -z "$*" && test -z "$EXTRA_ARGS" && test -f config.status; then ./config.status --recheck else $srcdir/configure $EXTRA_ARGS "$@" -- 1.7.7.6

2 2

[libvirt] [PATCH] Check for errors when parsing bridge interface XML
by Jim Fehlig 15 Jun '12

15 Jun '12

I sent this small patch yesterday, but it never made it to the list afaict. Resending... Regards, Jim

2 2

[libvirt] libvirtd can not start up
by Lin Qing 15 Jun '12

15 Jun '12

Hi all: I met a issue during boot libvirtd.When I use "libvirtd --daemon " , libvirtd didn't start up. And I am using the latest libvirt source code . Here is the libvirtd.log /usr/local/var/log/libvirt/libvirtd.log 2012-06-15 06:35:04.230+0000: 16193: info : libvirt version: 0.9.12 2012-06-15 06:35:04.230+0000: 16193: error : virStateInitialize:781 : Initialization of NWFilter state driver failed 2012-06-15 06:35:05.079+0000: 16193: error : daemonRunStateInit:752 : Driver state initialization failed anybody konws what 's going on ? Thanks Lin Qing.

3 4

[libvirt] libvirtd stopped launching
by Zeeshan Ali (Khattak) 15 Jun '12

15 Jun '12

Hi everyone, After I updated my libvirt repo/install from latest git master yesterday, libvirtd won't just launch for me anymore. The error in log was: 2012-06-13 11:59:47.427+0000: 30501: error : virStateInitialize:781 : Initialization of NWFilter state driver failed 2012-06-13 11:59:48.601+0000: 30501: error : daemonRunStateInit:752 : Driver state initialization failed Daniel asked me to enable more debug to find the cause and here is the output: http://static.fi/~zeenix/tmp/libvirt.out Does anyone know whats going on and how can I fix this? In the meantime I'll try to see reverting to some older commit helps and if so, I'll do a git bisect.. -- Regards, Zeeshan Ali (Khattak) FSF member#5124

3 3

[libvirt] Website sidebar not consistent between libvirt.org and wiki.libvirt.org
by Cole Robinson 15 Jun '12

15 Jun '12

The sidebar here looks right: http://libvirt.org/ But the sidebar here seems pretty out of date: http://wiki.libvirt.org/ Including missing options, and the FAQ link pointing to the old FAQ.html file which shouldn't exist anymore. Any one know how to fix? Thanks, Cole

2 4

[libvirt] [PATCH] docs: Update domain XML schema
by Osier Yang 15 Jun '12

15 Jun '12

'boot' tag shouldn't be exclusive with 'kernel', 'initrd', and 'cmdline', though the boot sequence doesn't make sense when the guest boots from kernel directly. But it's useful if booting from kernel is to install a newly guest, even it's not to install a guest, there is no hurt. And on the other hand, we allow 'boot' and the kernel tags when parsing. --- docs/schemas/domaincommon.rng | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 62c28c8..46e539d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -222,12 +222,14 @@ <ref name="absFilePath"/> </element> </optional> - <choice> + <optional> <ref name="osbootkernel"/> + </optional> + <optional> <zeroOrMore> <ref name="osbootdev"/> </zeroOrMore> - </choice> + </optional> <optional> <element name="bootmenu"> <attribute name="enable"> -- 1.7.7.3

2 2

[libvirt] [PATCH] Add more debug logging for libvirtd startup
by Daniel P. Berrange 15 Jun '12

15 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> To facilitate future troubleshooting add a bunch more debugging statements into important startup parts of libvirt --- daemon/libvirtd.c | 40 +++++++++++++++++++++++++++++----------- src/libvirt.c | 15 +++++++++------ src/util/hooks.c | 3 +++ src/util/virnetlink.c | 1 + 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c1ee3f4..9c06344 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -461,6 +461,7 @@ static int daemonSetupNetworking(virNetServerPtr srv, goto error; } + VIR_DEBUG("Registering unix socket %s", sock_path); if (!(svc = virNetServerServiceNewUNIX(sock_path, unix_sock_rw_mask, unix_sock_gid, @@ -469,15 +470,17 @@ static int daemonSetupNetworking(virNetServerPtr srv, config->max_client_requests, NULL))) goto error; - if (sock_path_ro && - !(svcRO = virNetServerServiceNewUNIX(sock_path_ro, - unix_sock_ro_mask, - unix_sock_gid, - config->auth_unix_ro, - true, - config->max_client_requests, - NULL))) - goto error; + if (sock_path_ro) { + VIR_DEBUG("Registering unix socket %s", sock_path_ro); + if (!(svcRO = virNetServerServiceNewUNIX(sock_path_ro, + unix_sock_ro_mask, + unix_sock_gid, + config->auth_unix_ro, + true, + config->max_client_requests, + NULL))) + goto error; + } if (virNetServerAddService(srv, svc, config->mdns_adv && !ipsock ? @@ -491,6 +494,8 @@ static int daemonSetupNetworking(virNetServerPtr srv, if (ipsock) { if (config->listen_tcp) { + VIR_DEBUG("Registering TCP socket %s:%s", + config->listen_addr, config->tcp_port); if (!(svcTCP = virNetServerServiceNewTCP(config->listen_addr, config->tcp_port, config->auth_tcp, @@ -527,6 +532,8 @@ static int daemonSetupNetworking(virNetServerPtr srv, goto error; } + VIR_DEBUG("Registering TLS socket %s:%s", + config->listen_addr, config->tls_port); if (!(svcTLS = virNetServerServiceNewTCP(config->listen_addr, config->tls_port, @@ -1070,8 +1077,10 @@ int main(int argc, char **argv) { } if (!privileged && - migrateProfile() < 0) + migrateProfile() < 0) { + VIR_ERROR(_("Exiting due to failure to migrate profile")); exit(EXIT_FAILURE); + } if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { @@ -1090,6 +1099,7 @@ int main(int argc, char **argv) { VIR_ERROR(_("Can't determine pid file path.")); exit(EXIT_FAILURE); } + VIR_DEBUG("Decided on pid file path '%s'", NULLSTR(pid_file)); if (daemonUnixSocketPaths(config, privileged, @@ -1098,6 +1108,8 @@ int main(int argc, char **argv) { VIR_ERROR(_("Can't determine socket paths")); exit(EXIT_FAILURE); } + VIR_DEBUG("Decided on socket paths '%s' and '%s'", + sock_file, NULLSTR(sock_file_ro)); if (godaemon) { char ebuf[1024]; @@ -1135,6 +1147,7 @@ int main(int argc, char **argv) { old_umask = umask(022); else old_umask = umask(077); + VIR_DEBUG("Ensuring run dir '%s' exists", run_dir); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, @@ -1171,6 +1184,7 @@ int main(int argc, char **argv) { /* Beyond this point, nothing should rely on using * getuid/geteuid() == 0, for privilege level checks. */ + VIR_DEBUG("Dropping privileges (if required)"); if (daemonSetupPrivs() < 0) { ret = VIR_DAEMON_ERR_PRIVS; goto cleanup; @@ -1207,11 +1221,13 @@ int main(int argc, char **argv) { goto cleanup; } - if (timeout != -1) + if (timeout != -1) { + VIR_DEBUG("Registering shutdown timeout %d", timeout); virNetServerAutoShutdown(srv, timeout, daemonShutdownCheck, NULL); + } if ((daemonSetupSignals(srv)) < 0) { ret = VIR_DAEMON_ERR_SIGNAL; @@ -1219,11 +1235,13 @@ int main(int argc, char **argv) { } if (config->audit_level) { + VIR_DEBUG("Attempting to configure auditing subsystem"); if (virAuditOpen() < 0) { if (config->audit_level > 1) { ret = VIR_DAEMON_ERR_AUDIT; goto cleanup; } + VIR_DEBUG("Proceeding without auditing"); } } virAuditLog(config->audit_logging); diff --git a/src/libvirt.c b/src/libvirt.c index 16afd58..99e85e4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -769,20 +769,23 @@ virRegisterStateDriver(virStateDriverPtr driver) * Returns 0 if all succeed, -1 upon any failure. */ int virStateInitialize(int privileged) { - int i, ret = 0; + int i; if (virInitialize() < 0) return -1; for (i = 0 ; i < virStateDriverTabCount ; i++) { - if (virStateDriverTab[i]->initialize && - virStateDriverTab[i]->initialize(privileged) < 0) { - VIR_ERROR(_("Initialization of %s state driver failed"), + if (virStateDriverTab[i]->initialize) { + VIR_DEBUG("Running global init for %s state driver", virStateDriverTab[i]->name); - ret = -1; + if (virStateDriverTab[i]->initialize(privileged) < 0) { + VIR_ERROR(_("Initialization of %s state driver failed"), + virStateDriverTab[i]->name); + return -1; + } } } - return ret; + return 0; } /** diff --git a/src/util/hooks.c b/src/util/hooks.c index f89a40f..e0d6bf0 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -271,6 +271,9 @@ virHookCall(int driver, return -1; } + VIR_DEBUG("Calling hook opstr=%s subopstr=%s extra=%s", + opstr, subopstr, extra); + cmd = virCommandNewArgList(path, id, opstr, subopstr, extra, NULL); virCommandAddEnvPassCommon(cmd); diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 9539694..bb0dae9 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -130,6 +130,7 @@ virNetlinkStartup(void) { if (placeholder_nlhandle) return 0; + VIR_DEBUG("Running global netlink initialization"); placeholder_nlhandle = virNetlinkAlloc(); if (!placeholder_nlhandle) { virReportSystemError(errno, "%s", -- 1.7.10.2

2 1

[libvirt] [PATCH] Fix launch of libvirtd when DHCP snooping support is not available.
by Daniel P. Berrange 15 Jun '12

15 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When libpcap is not available, the NWFilter driver provides a no-op stub for the DHCP snooping initialization. This was mistakenly returning '-1' instead of '0', so the entire driver initialization failed --- src/nwfilter/nwfilter_dhcpsnoop.c | 5 ++++- src/nwfilter/nwfilter_gentech_driver.c | 1 + src/nwfilter/nwfilter_learnipaddr.c | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 22f76e2..5dffaad 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -2056,6 +2056,8 @@ virNWFilterDHCPSnoopInit(void) if (virNWFilterSnoopState.snoopReqs) return 0; + VIR_DEBUG("Initializing DHCP snooping"); + if (virMutexInitRecursive(&virNWFilterSnoopState.snoopLock) < 0 || virMutexInit(&virNWFilterSnoopState.activeLock) < 0 || virAtomicIntInit(&virNWFilterSnoopState.nLeases) < 0 || @@ -2176,7 +2178,8 @@ virNWFilterDHCPSnoopShutdown(void) int virNWFilterDHCPSnoopInit(void) { - return -1; + VIR_DEBUG("No DHCP snooping support available"); + return 0; } void diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 4769d21..d833bbb 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -57,6 +57,7 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = { void virNWFilterTechDriversInit(bool privileged) { int i = 0; + VIR_DEBUG("Initializing NWFilter technology drivers"); while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) filter_tech_drivers[i]->init(privileged); diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index af13738..a891377 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -782,6 +782,7 @@ virNWFilterLearnInit(void) { if (pendingLearnReq) return 0; + VIR_DEBUG("Initializing IP address learning"); threadsTerminate = false; pendingLearnReq = virHashCreate(0, freeLearnReqEntry); -- 1.7.10.2

2 1

[libvirt] RFC: spice-server default listen behaviour change
by David Jaša 15 Jun '12

15 Jun '12

Hi, I learned few things about ipv6 lately. Most importantly about dual-socket that means that a process that opens ::0 automatically listens on both ipv4 _and_ ipv6 unless it sets IPV6_ONLY option of setsockopt() to 0. This is pretty important wrt dual-stack configurations because they can be implemented with just slight changes to spice server (unlike the old RFE requesting listening on multiple addresses): * when no addr= or ipvx options are set, listen on ::0 * when ipv4 and no addr= option is set, listen on 0.0.0.0 * when ipv6 is set, set IPV6_ONLY to 1 to make sure that spice server won't listen on ipv4 * when conflicting ipvx and addr= options are set, error out (this already works fine) This will affect upper layers though, given bugs like https://bugzilla.redhat.com/show_bug.cgi?id=832121 , but it seems to me like the step in the right direction. Any thoughts/comments before I file this as a bug? David -- David Jaša, RHCE SPICE QE based in Brno GPG Key: 22C33E24 Fingerprint: 513A 060B D1B4 2A72 7F0D 0278 B125 CD00 22C3 3E24

3 11

[libvirt] [PATCH 0/3 v5] use qemu's dump-guest-meory when vm uses host device
by Wen Congyang 15 Jun '12

15 Jun '12

Currently, we use migrate to dump guest's memory. There is one restriction in migrate command: the device's status should be stored in qemu because the device's status should be passed to target machine. If we passthrough a host device to guest, the device's status is stored in the real device. So migrate command will fail. We usually use dump when guest is panicked. So there is no need to store device's status in the vmcore. qemu have a new monitor command dump-guest-memory to dump guest memory, but it doesn't support async now(it will support later when the common async API is implemented). Changes from v4 to v5: 1. address Martin Kletzander's comment Changes from v3 to v4: 1. allow the user to specify the core file's format Changes from v2 to v3: 1. qemu supports the fd that is associated with a pipe, socket, or FIFO. So pass a pipe fd to qemu and O_DIRECT can work now. Change from v1 to v2: 1. remove the implemention for text mode. Wen Congyang (3): qemu: implement qemu's dump-guest-memory qemu: allow the client to choose the vmcore's format virsh: allow the user to specify vmcore's format include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_capabilities.c | 5 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 60 ++++++++++++++++++++++++++++++++--------- src/qemu/qemu_monitor.c | 37 ++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 12 ++++++++ src/qemu/qemu_monitor_json.c | 34 +++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++++ tools/virsh.c | 3 ++ tools/virsh.pod | 5 +++- 12 files changed, 152 insertions(+), 14 deletions(-)

3 8

[libvirt] [PATCH] qemu: fix potential dead lock
by Wen Congyang 15 Jun '12

15 Jun '12

If we lock the qemu_driver, we should call qemuDomainObjBeginJobWithDriver() not qemuDomainObjBeginJob(). --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 39b27b1..3d62aab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8905,7 +8905,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, goto cleanup; asyncJob = QEMU_ASYNC_JOB_MIGRATION_OUT; } else { - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; asyncJob = QEMU_ASYNC_JOB_NONE; } -- 1.7.1

3 2

[libvirt] RPC ref count question
by Radu Caragea 15 Jun '12

15 Jun '12

Hi everyone, >From what I understand after defining a domain with remoteDomainCreateXML, the corresponding destroy call is remoteDomainDestroy, both from the automatically generated remote_client_bodies.h My question is why the domain isn't freed in the destroy procedure (with virUnrefDomain or other) ? Is it supposed to be called separately or is it a bug ? I'm asking because from what I saw the connection refcount increments in domain creation but doesn't decrement in destroy.

2 1

[libvirt] can not connect hypervisor using libvirt-0.9.11 on windows
by xuteng 15 Jun '12

15 Jun '12

Hi,ALL: I compiled the libvirt-0.9.11 source code with mingw on windows according to the website: https://github.com/photron/msys_setup Then I wrote a simple test case ,as below: #include <stdio.h> #include <stdlib.h> #include "libvirt/libvirt.h" int main(int argc,char **argv) { virConnectPtr conn; conn = virConnectOpen("qemu+tcp://192.168.1.6/system"); if (conn = NULL) { fprintf(stderr,"Failed to open connection to qemu+tcp://192.168.1.6/system"); return 1; } virConnectClose(conn); return 0; } When linked to the dll just compiled , it came out with error : NOTE: you should run 'diskperf -y' to enable the disk statistics libvir: RPC error : Unable to set close-on-exec flag: No such file or directory libvir: error : invalid connection pointer in virConnectClose When using gdb to debug the testcase , break the function virConnectOpen , then step ,the error info was: Program received signal ?,Unknown signal. 0x7c92e4ff in ntdll!LdrAlternateResourcesEnabled () from C:\WINDOWS.0\system32\ntdll.dll Any suggestion would be appreciated ! Best Regards! xuteng via foxmail

1 0

[libvirt] [PATCH] virsh: Null terminated the string memcpy from buffer explicitly
by Osier Yang 15 Jun '12

15 Jun '12

--- tools/virsh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 98305c0..4509020 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -15069,11 +15069,13 @@ cleanup: VIR_FREE(device_type); VIR_FREE(disk_type); if (xml_buf) { - if (VIR_ALLOC_N(ret, xmlBufferLength(xml_buf)) < 0) { + int len = xmlBufferLength(xml_buf); + if (VIR_ALLOC_N(ret, len + 1) < 0) { virReportOOMError(); return NULL; } - memcpy(ret, (char *)xmlBufferContent(xml_buf), xmlBufferLength(xml_buf)); + memcpy(ret, (char *)xmlBufferContent(xml_buf), len); + ret[len] = '\0'; xmlBufferFree(xml_buf); } return ret; -- 1.7.7.3

2 2

[libvirt] [PATCH] Always pivot_root event if the new root source is '/'
by Daniel P. Berrange 14 Jun '12

14 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> This reverts commit c16b4c43fcdd8ec02581f38377983b2e0925bfcd Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Fri May 11 15:09:27 2012 +0100 Avoid LXC pivot root in the root source is still / This commit broke setup of /dev, because the code which deals with setting up a private /dev and /dev/pts only works if you do a pivotroot. The original intent of avoiding the pivot root was to try and ensure the new root has a minimumal mount tree. The better way todo this is to just unmount the bits we don't want (ie old /proc & /sys subtrees. So apply the logic from commit c529b47a756960d332fbe9903943dae855e7b949 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Fri May 11 11:35:28 2012 +0100 Trim /proc & /sys subtrees before mounting new instances to the pivot_root codepath as well --- src/lxc/lxc_container.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index bad7938..b8fb14e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1345,6 +1345,13 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root) < 0) goto cleanup; + /* Gets rid of any existing stuff under /proc, since we need new + * namespace aware versions of those. We must do /proc second + * otherwise we won't find /proc/mounts :-) */ + if (lxcContainerUnmountSubtree("/sys", false) < 0 || + lxcContainerUnmountSubtree("/proc", false) < 0) + goto cleanup; + /* Mounts the core /proc, /sys, etc filesystems */ if (lxcContainerMountBasicFS(vmDef, true, securityDriver) < 0) goto cleanup; @@ -1472,11 +1479,7 @@ static int lxcContainerSetupMounts(virDomainDefPtr vmDef, if (lxcContainerResolveSymlinks(vmDef) < 0) return -1; - /* If the user has specified a dst '/' with a source of '/' - * then we don't really want to go down the pivot root - * path, as we're just tuning the existing root - */ - if (root && root->src && STRNEQ(root->src, "/")) + if (root && root->src) return lxcContainerSetupPivotRoot(vmDef, root, ttyPaths, nttyPaths, securityDriver); else return lxcContainerSetupExtraMounts(vmDef, root, securityDriver); -- 1.7.10.2

2 1

[libvirt] [PATCH] Improve error message diagnosing incorrect XML CPU mode
by Daniel P. Berrange 14 Jun '12

14 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Tell the user what CPU mode value is wrong --- src/conf/cpu_conf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 018d571..b520f7c 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -234,13 +234,15 @@ virCPUDefParseXML(const xmlNodePtr node, goto error; } else { def->mode = virCPUModeTypeFromString(cpuMode); - VIR_FREE(cpuMode); if (def->mode < 0) { - virCPUReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Invalid mode attribute")); + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid mode attribute '%s'"), + cpuMode); + VIR_FREE(cpuMode); goto error; } + VIR_FREE(cpuMode); } } else { if (def->type == VIR_CPU_TYPE_HOST) -- 1.7.10.2

2 1

Re: [libvirt] [Qemu-devel] [PATCH v2 2/4] qapi: Add passfd QMP command
by Luiz Capitulino 14 Jun '12

14 Jun '12

On Fri, 8 Jun 2012 11:42:57 -0400 Corey Bryant <coreyb(a)linux.vnet.ibm.com> wrote: > This patch adds the passfd QMP command using the QAPI framework. > Like the getfd command, it is used to pass a file descriptor via > SCM_RIGHTS. However, the passfd command also returns the received > file descriptor, which is a difference in behavior from the getfd > command, which returns nothing. Let's call it pass-fd instead. Also, getfd automatically closes a fd if an existing fdname is passed again. I don't think this is a good behavior, I think pass-fd should fail instead (note that we can't fix getfd though). > > The closefd command can be used to close a file descriptor that was > passed with the passfd command. > > v2: > -Introduce new QMP command to pass/return fd (lcapitulino(a)redhat.com) > -Use passfd as command name (berrange(a)redhat.com) > > Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> > --- > monitor.c | 14 ++++++++++---- > qapi-schema.json | 15 +++++++++++++++ > qmp-commands.hx | 27 +++++++++++++++++++++++++++ > 3 files changed, 52 insertions(+), 4 deletions(-) > > diff --git a/monitor.c b/monitor.c > index 4c53cb6..980a226 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2182,7 +2182,7 @@ static void do_inject_mce(Monitor *mon, const QDict *qdict) > } > #endif > > -void qmp_getfd(const char *fdname, Error **errp) > +int64_t qmp_passfd(const char *fdname, Error **errp) > { > mon_fd_t *monfd; > int fd; > @@ -2190,13 +2190,13 @@ void qmp_getfd(const char *fdname, Error **errp) > fd = qemu_chr_fe_get_msgfd(cur_mon->chr); > if (fd == -1) { > error_set(errp, QERR_FD_NOT_SUPPLIED); > - return; > + return -1; > } > > if (qemu_isdigit(fdname[0])) { > error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdname", > "a name not starting with a digit"); > - return; > + return -1; > } > > QLIST_FOREACH(monfd, &cur_mon->fds, next) { > @@ -2206,7 +2206,7 @@ void qmp_getfd(const char *fdname, Error **errp) > > close(monfd->fd); > monfd->fd = fd; > - return; > + return fd; > } > > monfd = g_malloc0(sizeof(mon_fd_t)); > @@ -2214,6 +2214,12 @@ void qmp_getfd(const char *fdname, Error **errp) > monfd->fd = fd; > > QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); > + return fd; > +} > + > +void qmp_getfd(const char *fdname, Error **errp) > +{ > + qmp_passfd(fdname, errp); > return; > } > > diff --git a/qapi-schema.json b/qapi-schema.json > index 6be1d90..15da1b8 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1864,6 +1864,21 @@ > { 'command': 'netdev_del', 'data': {'id': 'str'} } > > ## > +# @passfd: > +# > +# Pass a file descriptor via SCM rights and assign it a name > +# > +# @fdname: file descriptor name > +# > +# Returns: The QEMU file descriptor that was received > +# If file descriptor was not received, FdNotSupplied > +# If @fdname is not valid, InvalidParameterType > +# > +# Since: 1.2.0 > +## > +{ 'command': 'passfd', 'data': {'fdname': 'str'}, 'returns': 'int' } > + > +## > # @getfd: > # > # Receive a file descriptor via SCM rights and assign it a name > diff --git a/qmp-commands.hx b/qmp-commands.hx > index f8c0f68..338a0b3 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -869,6 +869,33 @@ Example: > EQMP > > { > + .name = "passfd", > + .args_type = "fdname:s", > + .params = "passfd name", > + .help = "pass a file descriptor via SCM rights and assign it a name", > + .mhandler.cmd_new = qmp_marshal_input_passfd, > + }, > + > +SQMP > +passfd > +------ > + > +Pass a file descriptor via SCM rights and assign it a name. > + > +Arguments: > + > +- "fdname": file descriptor name (json-string) > + > +Return a json-int with the QEMU file descriptor that was received. > + > +Example: > + > +-> { "execute": "passfd", "arguments": { "fdname": "fd1" } } > +<- { "return": 42 } > + > +EQMP > + > + { > .name = "getfd", > .args_type = "fdname:s", > .params = "getfd name",

3 4

[libvirt] [PATCH] qemu: Enable disconnecting SPICE clients without changing password
by Peter Krempa 14 Jun '12

14 Jun '12

Libvirt updates the configuration of SPICE server only when something changes. This is unfortunate when the user wants to disconnect a existing spice session when the connected attribute is already "disconnect". This patch modifies the conditions for calling the password updater to be called when nothing changes, but the connected attribute is already "disconnect". --- src/qemu/qemu_hotplug.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 51b8915..c2fa75b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1539,7 +1539,7 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, _("cannot change listen address setting on spice graphics")); return -1; } - if (STRNEQ_NULLABLE(oldListenNetwork,newListenNetwork)) { + if (STRNEQ_NULLABLE(oldListenNetwork, newListenNetwork)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change listen network setting on spice graphics")); return -1; @@ -1551,11 +1551,16 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, return -1; } - /* If a password lifetime was, or is set, then we must always run, - * even if new password matches old password */ + /* We must reset the password if it has changed but also if: + * - password lifetime is or was set + * - the requested action has changed + * - the action is "disconnect" + */ if (olddev->data.spice.auth.expires || dev->data.spice.auth.expires || olddev->data.spice.auth.connected != dev->data.spice.auth.connected || + dev->data.spice.auth.connected == + VIR_DOMAIN_GRAPHICS_AUTH_CONNECTED_DISCONNECT || STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { VIR_DEBUG("Updating password on SPICE server %p %p", -- 1.7.8.6

2 2

[libvirt] [PATCH v3] virsh: Honor reedit opts printing to a function
by Michal Privoznik 14 Jun '12

14 Jun '12

When printing reedit options we make stdin raw. However, this results in stdout being raw as well. Therefore we need to return carriage when doing new line. Unfortunately, '\r' cannot be part of internationalized messages hence we must move them to formatting string which then in turn become huge and disarranged. To solve this, a new function is introduced which takes variable string arguments and prepend each with "\r\n" just before printing. --- tools/virsh.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 98305c0..938f8c8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -655,6 +655,19 @@ vshReconnect(vshControl *ctl) ctl->useSnapshotOld = false; } +static void +vshPrintRaw(vshControl *ctl, ...) +{ + va_list ap; + char *key; + + va_start(ap, ctl); + while ((key = va_arg(ap, char *)) != NULL) { + vshPrint(ctl, "%s\r\n", key); + } + va_end(ap); +} + /** * vshAskReedit: * @msg: Question to ask user @@ -690,10 +703,13 @@ vshAskReedit(vshControl *ctl, const char *msg) c = c_tolower(getchar()); if (c == '?') { - vshPrint(ctl, "\r\n%s", _("y - yes, start editor again\n" - "n - no, throw away my changes\n" - "f - force, try to redefine again\n" - "? - print this help\n")); + vshPrintRaw(ctl, + "", + _("y - yes, start editor again"), + _("n - no, throw away my changes"), + _("f - force, try to redefine again"), + _("? - print this help"), + NULL); continue; } else if (c == 'y' || c == 'n' || c == 'f') { break; -- 1.7.8.5

2 2

[libvirt] [PATCH] virsh: Report name from edited object
by Michal Privoznik 14 Jun '12

14 Jun '12

There is a little easter egg in virsh: one can easily clone an object (domain, network, ...). Just 'virsh edit' change the name and remove <uuid>. And then, in the end when reporting success the new name was printed out. However, with recent edit rewrite we lost the final part and are still printing the original name out. --- Or even better - if name changes, we can choose better message, something like "New domain %s defined". But I am not sure we want to expose this easter egg to users. tools/virsh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 938f8c8..0b42f1a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8612,7 +8612,7 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" vshPrint(ctl, _("Interface %s XML configuration edited.\n"), - virInterfaceGetName(iface)); + virInterfaceGetName(iface_edited)); ret = true; @@ -10006,7 +10006,7 @@ cmdNWFilterEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" vshPrint(ctl, _("Network filter %s XML configuration edited.\n"), - virNWFilterGetName(nwfilter)); + virNWFilterGetName(nwfilter_edited)); ret = true; @@ -15811,7 +15811,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" vshPrint(ctl, _("Domain %s XML configuration edited.\n"), - virDomainGetName(dom)); + virDomainGetName(dom_edited)); ret = true; @@ -15883,7 +15883,7 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" vshPrint(ctl, _("Network %s XML configuration edited.\n"), - virNetworkGetName(network)); + virNetworkGetName(network_edited)); ret = true; @@ -15938,7 +15938,7 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" vshPrint(ctl, _("Pool %s XML configuration edited.\n"), - virStoragePoolGetName(pool)); + virStoragePoolGetName(pool_edited)); ret = true; -- 1.7.8.5

2 2

[libvirt] [PATCH 0/2] fix two issues while doing virsh attach-disk
by Peter Krempa 14 Jun '12

14 Jun '12

First issue was caused by virsh generating invalid XML to attach the disk, and the second issue is a off-by-one error that crashes the daemon with 50-90% probability while doing virsh attach-disk dom /dev/zero vdx. Peter Krempa (2): virsh: Don't generate invalid XML in attach-disk command qemu: Fix off-by-one error while unescaping monitor strings src/qemu/qemu_monitor.c | 11 +++-------- tools/virsh.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-) -- 1.7.8.6

2 4

[libvirt] [PATCH v2] virsh: Honor reedit opts printing to a function
by Michal Privoznik 14 Jun '12

14 Jun '12

When printing reedit options we make stdin raw. However, this results in stdout being raw as well. Therefore we need to return carriage when doing new line. Unfortunately, '\r' cannot be part of internationalized messages hence we must move them to formatting string which then in turn become huge and disarranged. To solve this, a new function is introduced which takes variable string arguments and prepend each with "\r\n" just before printing. --- tools/virsh.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 98305c0..11dc0e7 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -655,6 +655,19 @@ vshReconnect(vshControl *ctl) ctl->useSnapshotOld = false; } +static void +vshPrintRaw(vshControl *ctl, ...) +{ + va_list ap; + char *key; + + va_start(ap, ctl); + while ((key = va_arg(ap, char *)) != NULL) { + vshPrint(ctl, "\r\n%s", key); + } + va_end(ap); +} + /** * vshAskReedit: * @msg: Question to ask user @@ -690,10 +703,13 @@ vshAskReedit(vshControl *ctl, const char *msg) c = c_tolower(getchar()); if (c == '?') { - vshPrint(ctl, "\r\n%s", _("y - yes, start editor again\n" - "n - no, throw away my changes\n" - "f - force, try to redefine again\n" - "? - print this help\n")); + vshPrintRaw(ctl, + _("y - yes, start editor again"), + _("n - no, throw away my changes"), + _("f - force, try to redefine again"), + _("? - print this help"), + "", + NULL); continue; } else if (c == 'y' || c == 'n' || c == 'f') { break; -- 1.7.8.5

1 0

[libvirt] [PATCH 0/8] API to list all snapshots
by Eric Blake 13 Jun '12

13 Jun '12

Requires these 11 patches to be reviewed first: https://www.redhat.com/archives/libvir-list/2012-June/msg00273.html https://www.redhat.com/archives/libvir-list/2012-June/msg00267.html https://www.redhat.com/archives/libvir-list/2012-May/msg01196.html I'm still working on at least two more patches (actually wiring up domain_conf.c to create the snapshot list, and then fixing qemu_driver.c to use the new domain_conf.c helpers), but wanted to get this out for review, especially since it has some interaction with Peter's series for listing all domains (translation: I've tried to make sure this series complies with the review comments I made against his series): https://www.redhat.com/archives/libvir-list/2012-June/msg00113.html I suppose that means that I technically haven't done any testing other than compilation so far, at least until I post the last two patches for qemu... And I suppose I also ought to try my hand at vbox and esx patches, even though I can't test those (it would be basically copy-and-paste from existing code in those drivers). And if I'm really up to it, I'll add snapshot support to test:///default. Eric Blake (6): 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 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 | 90 +++++++++ src/conf/domain_conf.c | 53 ++++- src/driver.h | 12 ++ src/libvirt.c | 281 ++++++++++++++++++++++---- src/libvirt_public.syms | 2 + src/remote/remote_driver.c | 126 ++++++++++++ src/remote/remote_protocol.x | 26 ++- src/remote_protocol-structs | 26 +++ tools/virsh.c | 83 +++++++- tools/virsh.pod | 14 +- 17 files changed, 849 insertions(+), 67 deletions(-) create mode 100644 python/libvirt-override-virDomain.py create mode 100644 python/libvirt-override-virDomainSnapshot.py -- 1.7.10.2

2 14

[libvirt] [PATCH 0/6] refactor 'virsh snapshot-list'
by Eric Blake 13 Jun '12

13 Jun '12

I'm in the middle of writing a patch series for virDomainListAllSnapshots; this series is preliminary to that, and I'd like to get the review started now. The end result of this series is a net gain in lines of code, but a much nicer framework for changing just one point in the code to use new APIs and having everything else continue to work as before. Eric Blake (6): buf: support peeking at string contents virsh: remove limits on tree listing virsh: make tree listing more flexible snapshot: virsh indentation cleanup snapshot: new virsh function factored from snapshot-list snapshot: use new virsh function for snapshot-list src/libvirt_private.syms | 1 + src/util/buf.c | 22 +- src/util/buf.h | 1 + tests/virbuftest.c | 8 + tools/virsh.c | 735 +++++++++++++++++++++++++++------------------- 5 files changed, 466 insertions(+), 301 deletions(-) -- 1.7.10.2

2 22

Re: [libvirt] [Qemu-devel] [PATCH v2 1/4] qapi: Convert getfd and closefd
by Luiz Capitulino 13 Jun '12

13 Jun '12

On Fri, 8 Jun 2012 11:42:56 -0400 Corey Bryant <coreyb(a)linux.vnet.ibm.com> wrote: > v2: > - Convert getfd and closefd to QAPI (lcapitulino(a)redhat.com) > - Remove changes that returned fd from getfd (lcapitulino(a)redhat.com) > - Wrap hmp_* functions around qmp_* functions (kwolf(a)redhat.com) > - Move hmp_* functions to hmp.c (lcapitulino(a)redhat.com) > - Drop .user_print lines (lcapitulino(a)redhat.com) > - Use 'cmd' instead of 'cmd_new' for HMP (lcapitulino(a)redhat.com) > - Change QMP command existance back to 0.14 (lcapitulino(a)redhat.com) Btw, having the changelog like this is not nice because it becomes part of the history. It's better to move it after the '---' line, so that git ignores it. > > Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> > --- > hmp-commands.hx | 6 ++---- > hmp.c | 18 ++++++++++++++++++ > hmp.h | 2 ++ > monitor.c | 34 ++++++++++++++++------------------ > qapi-schema.json | 29 +++++++++++++++++++++++++++++ > qmp-commands.hx | 6 ++---- > 6 files changed, 69 insertions(+), 26 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index f5d9d91..eea8b32 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1236,8 +1236,7 @@ ETEXI > .args_type = "fdname:s", > .params = "getfd name", > .help = "receive a file descriptor via SCM rights and assign it a name", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_getfd, > + .mhandler.cmd = hmp_getfd, > }, > > STEXI > @@ -1253,8 +1252,7 @@ ETEXI > .args_type = "fdname:s", > .params = "closefd name", > .help = "close a file descriptor previously passed via SCM rights", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_closefd, > + .mhandler.cmd = hmp_closefd, > }, > > STEXI > diff --git a/hmp.c b/hmp.c > index 2ce8cb9..6241856 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -999,3 +999,21 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) > qmp_netdev_del(id, &err); > hmp_handle_error(mon, &err); > } > + > +void hmp_getfd(Monitor *mon, const QDict *qdict) > +{ > + const char *fdname = qdict_get_str(qdict, "fdname"); > + Error *errp = NULL; > + > + qmp_getfd(fdname, &errp); > + hmp_handle_error(mon, &errp); > +} > + > +void hmp_closefd(Monitor *mon, const QDict *qdict) > +{ > + const char *fdname = qdict_get_str(qdict, "fdname"); > + Error *errp = NULL; > + > + qmp_closefd(fdname, &errp); > + hmp_handle_error(mon, &errp); > +} > diff --git a/hmp.h b/hmp.h > index 79d138d..8d2b0d7 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -64,5 +64,7 @@ void hmp_device_del(Monitor *mon, const QDict *qdict); > void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); > void hmp_netdev_add(Monitor *mon, const QDict *qdict); > void hmp_netdev_del(Monitor *mon, const QDict *qdict); > +void hmp_getfd(Monitor *mon, const QDict *qdict); > +void hmp_closefd(Monitor *mon, const QDict *qdict); > > #endif > diff --git a/monitor.c b/monitor.c > index a3bc2c7..4c53cb6 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2182,48 +2182,46 @@ static void do_inject_mce(Monitor *mon, const QDict *qdict) > } > #endif > > -static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) > +void qmp_getfd(const char *fdname, Error **errp) > { > - const char *fdname = qdict_get_str(qdict, "fdname"); > mon_fd_t *monfd; > int fd; > > - fd = qemu_chr_fe_get_msgfd(mon->chr); > + fd = qemu_chr_fe_get_msgfd(cur_mon->chr); > if (fd == -1) { > - qerror_report(QERR_FD_NOT_SUPPLIED); > - return -1; > + error_set(errp, QERR_FD_NOT_SUPPLIED); > + return; > } > > if (qemu_isdigit(fdname[0])) { > - qerror_report(QERR_INVALID_PARAMETER_VALUE, "fdname", > - "a name not starting with a digit"); > - return -1; > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdname", > + "a name not starting with a digit"); > + return; > } > > - QLIST_FOREACH(monfd, &mon->fds, next) { > + QLIST_FOREACH(monfd, &cur_mon->fds, next) { > if (strcmp(monfd->name, fdname) != 0) { > continue; > } > > close(monfd->fd); > monfd->fd = fd; > - return 0; > + return; > } > > monfd = g_malloc0(sizeof(mon_fd_t)); > monfd->name = g_strdup(fdname); > monfd->fd = fd; > > - QLIST_INSERT_HEAD(&mon->fds, monfd, next); > - return 0; > + QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); > + return; > } > > -static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) > +void qmp_closefd(const char *fdname, Error **errp) > { > - const char *fdname = qdict_get_str(qdict, "fdname"); > mon_fd_t *monfd; > > - QLIST_FOREACH(monfd, &mon->fds, next) { > + QLIST_FOREACH(monfd, &cur_mon->fds, next) { > if (strcmp(monfd->name, fdname) != 0) { > continue; > } > @@ -2232,11 +2230,11 @@ static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) > close(monfd->fd); > g_free(monfd->name); > g_free(monfd); > - return 0; > + return; > } > > - qerror_report(QERR_FD_NOT_FOUND, fdname); > - return -1; > + error_set(errp, QERR_FD_NOT_FOUND, fdname); > + return; > } > > static void do_loadvm(Monitor *mon, const QDict *qdict) > diff --git a/qapi-schema.json b/qapi-schema.json > index 3b6e346..6be1d90 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1862,3 +1862,32 @@ > # Since: 0.14.0 > ## > { 'command': 'netdev_del', 'data': {'id': 'str'} } > + > +## > +# @getfd: > +# > +# Receive a file descriptor via SCM rights and assign it a name > +# > +# @fdname: file descriptor name > +# > +# Returns: Nothing on success > +# If file descriptor was not received, FdNotSupplied > +# If @fdname is not valid, InvalidParameterType > +# > +# Since: 0.14.0 > +## > +{ 'command': 'getfd', 'data': {'fdname': 'str'} } > + > +## > +# @closefd: > +# > +# Close a file descriptor previously passed via SCM rights > +# > +# @fdname: file descriptor name > +# > +# Returns: Nothing on success > +# If @fdname is not found, FdNotFound > +# > +# Since: 0.14.0 > +## > +{ 'command': 'closefd', 'data': {'fdname': 'str'} } > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 2e1a38e..f8c0f68 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -873,8 +873,7 @@ EQMP > .args_type = "fdname:s", > .params = "getfd name", > .help = "receive a file descriptor via SCM rights and assign it a name", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_getfd, > + .mhandler.cmd_new = qmp_marshal_input_getfd, > }, > > SQMP > @@ -899,8 +898,7 @@ EQMP > .args_type = "fdname:s", > .params = "closefd name", > .help = "close a file descriptor previously passed via SCM rights", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_closefd, > + .mhandler.cmd_new = qmp_marshal_input_closefd, > }, > > SQMP

3 4

Re: [libvirt] [Qemu-devel] [PATCH v2 1/4] qapi: Convert getfd and closefd
by Luiz Capitulino 13 Jun '12

13 Jun '12

On Fri, 8 Jun 2012 11:42:56 -0400 Corey Bryant <coreyb(a)linux.vnet.ibm.com> wrote: > v2: > - Convert getfd and closefd to QAPI (lcapitulino(a)redhat.com) > - Remove changes that returned fd from getfd (lcapitulino(a)redhat.com) > - Wrap hmp_* functions around qmp_* functions (kwolf(a)redhat.com) > - Move hmp_* functions to hmp.c (lcapitulino(a)redhat.com) > - Drop .user_print lines (lcapitulino(a)redhat.com) > - Use 'cmd' instead of 'cmd_new' for HMP (lcapitulino(a)redhat.com) > - Change QMP command existance back to 0.14 (lcapitulino(a)redhat.com) > > Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> > --- > hmp-commands.hx | 6 ++---- > hmp.c | 18 ++++++++++++++++++ > hmp.h | 2 ++ > monitor.c | 34 ++++++++++++++++------------------ > qapi-schema.json | 29 +++++++++++++++++++++++++++++ > qmp-commands.hx | 6 ++---- > 6 files changed, 69 insertions(+), 26 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index f5d9d91..eea8b32 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1236,8 +1236,7 @@ ETEXI > .args_type = "fdname:s", > .params = "getfd name", > .help = "receive a file descriptor via SCM rights and assign it a name", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_getfd, > + .mhandler.cmd = hmp_getfd, > }, > > STEXI > @@ -1253,8 +1252,7 @@ ETEXI > .args_type = "fdname:s", > .params = "closefd name", > .help = "close a file descriptor previously passed via SCM rights", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_closefd, > + .mhandler.cmd = hmp_closefd, > }, > > STEXI > diff --git a/hmp.c b/hmp.c > index 2ce8cb9..6241856 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -999,3 +999,21 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict) > qmp_netdev_del(id, &err); > hmp_handle_error(mon, &err); > } > + > +void hmp_getfd(Monitor *mon, const QDict *qdict) > +{ > + const char *fdname = qdict_get_str(qdict, "fdname"); > + Error *errp = NULL; > + > + qmp_getfd(fdname, &errp); > + hmp_handle_error(mon, &errp); > +} > + > +void hmp_closefd(Monitor *mon, const QDict *qdict) > +{ > + const char *fdname = qdict_get_str(qdict, "fdname"); > + Error *errp = NULL; > + > + qmp_closefd(fdname, &errp); > + hmp_handle_error(mon, &errp); > +} > diff --git a/hmp.h b/hmp.h > index 79d138d..8d2b0d7 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -64,5 +64,7 @@ void hmp_device_del(Monitor *mon, const QDict *qdict); > void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict); > void hmp_netdev_add(Monitor *mon, const QDict *qdict); > void hmp_netdev_del(Monitor *mon, const QDict *qdict); > +void hmp_getfd(Monitor *mon, const QDict *qdict); > +void hmp_closefd(Monitor *mon, const QDict *qdict); > > #endif > diff --git a/monitor.c b/monitor.c > index a3bc2c7..4c53cb6 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2182,48 +2182,46 @@ static void do_inject_mce(Monitor *mon, const QDict *qdict) > } > #endif > > -static int do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) > +void qmp_getfd(const char *fdname, Error **errp) > { > - const char *fdname = qdict_get_str(qdict, "fdname"); > mon_fd_t *monfd; > int fd; > > - fd = qemu_chr_fe_get_msgfd(mon->chr); > + fd = qemu_chr_fe_get_msgfd(cur_mon->chr); > if (fd == -1) { > - qerror_report(QERR_FD_NOT_SUPPLIED); > - return -1; > + error_set(errp, QERR_FD_NOT_SUPPLIED); > + return; > } > > if (qemu_isdigit(fdname[0])) { > - qerror_report(QERR_INVALID_PARAMETER_VALUE, "fdname", > - "a name not starting with a digit"); > - return -1; > + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdname", > + "a name not starting with a digit"); > + return; > } > > - QLIST_FOREACH(monfd, &mon->fds, next) { > + QLIST_FOREACH(monfd, &cur_mon->fds, next) { > if (strcmp(monfd->name, fdname) != 0) { > continue; > } > > close(monfd->fd); > monfd->fd = fd; > - return 0; > + return; > } > > monfd = g_malloc0(sizeof(mon_fd_t)); > monfd->name = g_strdup(fdname); > monfd->fd = fd; > > - QLIST_INSERT_HEAD(&mon->fds, monfd, next); > - return 0; > + QLIST_INSERT_HEAD(&cur_mon->fds, monfd, next); > + return; You have a few of this kind of gratuitous return, please drop 'em. > } > > -static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) > +void qmp_closefd(const char *fdname, Error **errp) > { > - const char *fdname = qdict_get_str(qdict, "fdname"); > mon_fd_t *monfd; > > - QLIST_FOREACH(monfd, &mon->fds, next) { > + QLIST_FOREACH(monfd, &cur_mon->fds, next) { > if (strcmp(monfd->name, fdname) != 0) { > continue; > } > @@ -2232,11 +2230,11 @@ static int do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) > close(monfd->fd); > g_free(monfd->name); > g_free(monfd); > - return 0; > + return; > } > > - qerror_report(QERR_FD_NOT_FOUND, fdname); > - return -1; > + error_set(errp, QERR_FD_NOT_FOUND, fdname); > + return; > } > > static void do_loadvm(Monitor *mon, const QDict *qdict) > diff --git a/qapi-schema.json b/qapi-schema.json > index 3b6e346..6be1d90 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1862,3 +1862,32 @@ > # Since: 0.14.0 > ## > { 'command': 'netdev_del', 'data': {'id': 'str'} } > + > +## > +# @getfd: > +# > +# Receive a file descriptor via SCM rights and assign it a name > +# > +# @fdname: file descriptor name > +# > +# Returns: Nothing on success > +# If file descriptor was not received, FdNotSupplied > +# If @fdname is not valid, InvalidParameterType Please, add a note explaining that getfd automatically closes fds if fdname matches an existing name. Otherwise this conversion looks very good to me. > +# > +# Since: 0.14.0 > +## > +{ 'command': 'getfd', 'data': {'fdname': 'str'} } > + > +## > +# @closefd: > +# > +# Close a file descriptor previously passed via SCM rights > +# > +# @fdname: file descriptor name > +# > +# Returns: Nothing on success > +# If @fdname is not found, FdNotFound > +# > +# Since: 0.14.0 > +## > +{ 'command': 'closefd', 'data': {'fdname': 'str'} } > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 2e1a38e..f8c0f68 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -873,8 +873,7 @@ EQMP > .args_type = "fdname:s", > .params = "getfd name", > .help = "receive a file descriptor via SCM rights and assign it a name", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_getfd, > + .mhandler.cmd_new = qmp_marshal_input_getfd, > }, > > SQMP > @@ -899,8 +898,7 @@ EQMP > .args_type = "fdname:s", > .params = "closefd name", > .help = "close a file descriptor previously passed via SCM rights", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = do_closefd, > + .mhandler.cmd_new = qmp_marshal_input_closefd, > }, > > SQMP

2 1

[libvirt] [PATCH] network: fully support/use VIR_NETWORK_XML_INACTIVE flag
by Laine Stump 13 Jun '12

13 Jun '12

commit 52d064f42dbc857f4096dc60c0335395ffac73aa added VIR_NETWORK_XML_INACTIVE in order to allow suppressing the auto-generated list of VFs in network definitions, and a --inactive flag to virsh net-dumpxml to take advantage of the flag. However, it missed out on two oppurtunities: 1) Use INACTIVE to get the current config of the network as it exists on disk, rather than the currently active config. 2) Add INACTIVE to the flags used for the virsh net-edit command, so that it won't include the forward-pool interfaces that were autogenerated, and so that a re-edit of the network prior to restarting it will show any other edits made since the last restart of the network. (prior to this patch, if you edited a network a 2nd time without restarting, all of the previous edits would magically disappear). In order to fit with the new #define-based generic edit function in virsh.c, a new function vshNetworkGetXMLDesc() was added. This function first tries to call virNetworkGetXMLDesc with the INACTIVE flag added, then retries without if the first attempt fails (in the manner expected when the server doesn't support it)., --- src/network/bridge_driver.c | 8 +++++++- tools/virsh.c | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5f3132c..79d3010 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2533,6 +2533,7 @@ static char *networkGetXMLDesc(virNetworkPtr net, { struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network; + virNetworkDefPtr def; char *ret = NULL; virCheckFlags(VIR_NETWORK_XML_INACTIVE, NULL); @@ -2547,7 +2548,12 @@ static char *networkGetXMLDesc(virNetworkPtr net, goto cleanup; } - ret = virNetworkDefFormat(network->def, flags); + if ((flags & VIR_NETWORK_XML_INACTIVE) && network->newDef) + def = network->newDef; + else + def = network->def; + + ret = virNetworkDefFormat(def, flags); cleanup: if (network) diff --git a/tools/virsh.c b/tools/virsh.c index 0453b95..1c9e44a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -15806,13 +15806,29 @@ static const vshCmdOptDef opts_network_edit[] = { {NULL, 0, 0, NULL} }; +static char *vshNetworkGetXMLDesc(virNetworkPtr network) +{ + unsigned int flags = VIR_NETWORK_XML_INACTIVE; + char *doc = virNetworkGetXMLDesc(network, flags); + + if (!doc && last_error->code == VIR_ERR_INVALID_ARG) { + /* The server side libvirt doesn't support + * VIR_NETWORK_XML_INACTIVE, so retry without it. + */ + virFreeError(last_error); + last_error = NULL; + flags &= ~VIR_NETWORK_XML_INACTIVE; + doc = virNetworkGetXMLDesc(network, flags); + } + return doc; +} + static bool cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) { bool ret = false; virNetworkPtr network = NULL; virNetworkPtr network_edited = NULL; - unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -15821,7 +15837,7 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) if (network == NULL) goto cleanup; -#define EDIT_GET_XML virNetworkGetXMLDesc(network, flags) +#define EDIT_GET_XML vshNetworkGetXMLDesc(network) #define EDIT_NOT_CHANGED \ vshPrint(ctl, _("Network %s XML configuration not changed.\n"), \ virNetworkGetName (network)); \ -- 1.7.10.2

2 2

[libvirt] [PATCH] storage backend: Add sheepdog support
by Sebastian Wiedenroth 13 Jun '12

13 Jun '12

Signed-off-by: Sebastian Wiedenroth <wiedi(a)frubar.net> --- This patch adds support for sheepdog pools and volumes. Thanks go to Frank Spijkerman who started the initial work on this and Wido den Hollander for his RBD support on which this is partly based. configure.ac | 23 ++ docs/drivers.html.in | 1 + docs/schemas/storagepool.rng | 17 ++ docs/schemas/storagevol.rng | 3 +- docs/storage.html.in | 62 +++++ po/POTFILES.in | 1 + src/Makefile.am | 8 + src/conf/storage_conf.c | 17 +- src/conf/storage_conf.h | 1 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_sheepdog.c | 323 +++++++++++++++++++++++++ src/storage/storage_backend_sheepdog.h | 39 +++ tests/Makefile.am | 13 + tests/storagebackendsheepdogtest.c | 196 +++++++++++++++ tests/storagepoolxml2xmlin/pool-sheepdog.xml | 8 + tests/storagepoolxml2xmlout/pool-sheepdog.xml | 11 + tests/storagepoolxml2xmltest.c | 1 + tests/storagevolxml2xmlin/vol-sheepdog.xml | 10 + tests/storagevolxml2xmlout/vol-sheepdog.xml | 17 ++ tests/storagevolxml2xmltest.c | 1 + tools/virsh.c | 3 + 21 files changed, 757 insertions(+), 4 deletions(-) create mode 100644 src/storage/storage_backend_sheepdog.c create mode 100644 src/storage/storage_backend_sheepdog.h create mode 100644 tests/storagebackendsheepdogtest.c create mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml create mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml create mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml create mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml diff --git a/configure.ac b/configure.ac index dda764d..774a9dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1807,6 +1807,8 @@ AC_ARG_WITH([storage-disk], AC_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=check@:>@]),[],[with_storage_disk=check]) AC_ARG_WITH([storage-rbd], AC_HELP_STRING([--with-storage-rbd], [with RADOS Block Device backend for the storage driver @<:@default=check@:>@]),[],[with_storage_rbd=check]) +AC_ARG_WITH([storage-sheepdog], + AC_HELP_STRING([--with-storage-sheepdog], [with Sheepdog backend for the storage driver @<:@default=check@:>@]),[],[with_storage_sheepdog=check]) if test "$with_libvirtd" = "no"; then with_storage_dir=no @@ -1817,6 +1819,7 @@ if test "$with_libvirtd" = "no"; then with_storage_mpath=no with_storage_disk=no with_storage_rbd=no + with_storage_sheepdog=no fi if test "$with_storage_dir" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend for storage driver is enabled]) @@ -1991,6 +1994,25 @@ fi AM_CONDITIONAL([WITH_STORAGE_RBD], [test "$with_storage_rbd" = "yes"]) AC_SUBST([LIBRBD_LIBS]) +if test "$with_storage_sheepdog" = "yes" || test "$with_storage_sheepdog" = "check"; then + AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin]) + + if test "$with_storage_sheepdog" = "yes" ; then + if test -z "$COLLIE" ; then AC_MSG_ERROR([We need collie for Sheepdog storage driver]) ; fi + else + if test -z "$COLLIE" ; then with_storage_sheepdog=no ; fi + + if test "$with_storage_sheepdog" = "check" ; then with_storage_sheepdog=yes ; fi + fi + + if test "$with_storage_sheepdog" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1, [whether Sheepdog backend for storage driver is enabled]) + AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program]) + fi +fi +AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG], [test "$with_storage_sheepdog" = "yes"]) + + LIBPARTED_CFLAGS= LIBPARTED_LIBS= if test "$with_storage_disk" = "yes" || @@ -2806,6 +2828,7 @@ AC_MSG_NOTICE([ SCSI: $with_storage_scsi]) AC_MSG_NOTICE([ mpath: $with_storage_mpath]) AC_MSG_NOTICE([ Disk: $with_storage_disk]) AC_MSG_NOTICE([ RBD: $with_storage_rbd]) +AC_MSG_NOTICE([Sheepdog: $with_storage_sheepdog]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Security Drivers]) AC_MSG_NOTICE([]) diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 8ad2c33..90b6196 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -43,6 +43,7 @@ <li><strong><a href="storage.html#StorageBackendSCSI">SCSI backend</a></strong></li> <li><strong><a href="storage.html#StorageBackendMultipath">Multipath backend</a></strong></li> <li><strong><a href="storage.html#StorageBackendRBD">RBD (RADOS Block Device) backend</a></strong></li> + <li><strong><a href="storage.html#StorageBackendSheepdog">Sheepdog backend</a></strong></li> </ul> </body> </html> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 75b6b51..039798a 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -20,6 +20,7 @@ <ref name='poolscsi'/> <ref name='poolmpath'/> <ref name='poolrbd'/> + <ref name='poolsheepdog'/> </choice> </element> </define> @@ -115,6 +116,15 @@ <ref name='sourcerbd'/> </define> + <define name='poolsheepdog'> + <attribute name='type'> + <value>sheepdog</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcesheepdog'/> + </define> + <define name='sourceinfovendor'> <optional> <element name='vendor'> @@ -496,6 +506,13 @@ </element> </define> + <define name='sourcesheepdog'> + <element name='source'> + <ref name='sourceinfohost'/> + <ref name='sourceinfoname'/> + </element> + </define> + <define name='name'> <data type='string'> <param name="pattern">[a-zA-Z0-9_\+\-]+</param> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 8edb877..83148ca 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -67,7 +67,7 @@ <element name='target'> <optional> <element name='path'> - <ref name='absFilePath'/> + <data type='anyURI'/> </element> </optional> <ref name='format'/> @@ -144,6 +144,7 @@ <define name='formatfile'> <choice> + <value>unknown</value> <value>raw</value> <value>dir</value> <value>bochs</value> diff --git a/docs/storage.html.in b/docs/storage.html.in index b3484e8..8730164 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -110,6 +110,9 @@ <li> <a href="#StorageBackendRBD">RBD (RADOS Block Device) backend</a> </li> + <li> + <a href="#StorageBackendSheepdog">Sheepdog backend</a> + </li> </ul> <h2><a name="StorageBackendDir">Directory pool</a></h2> @@ -565,5 +568,64 @@ The RBD pool does not use the volume format type element. </p> + <h2><a name="StorageBackendSheepdog">Sheepdog pools</a></h2> + <p> + This provides a pool based on a Sheepdog Cluster. + Sheepdog is a distributed storage system for QEMU/KVM. + It provides highly available block level storage volumes that + can be attached to QEMU/KVM virtual machines. + + The cluster must already be formated. + + <span class="since">Since 0.9.13</span> + </p> + + <h3>Example pool input</h3> + <pre> + <pool type="sheepdog"> + <name>mysheeppool</name> + <source> + <name>mysheeppool</name> + <host name='localhost' port='7000'/> + </source> + </pool></pre> + + <h3>Example volume output</h3> + <pre> + <volume> + <name>myvol</name> + <key>sheep/myvol</key> + <source> + </source> + <capacity unit='bytes'>53687091200</capacity> + <allocation unit='bytes'>53687091200</allocation> + <target> + <path>sheepdog:myvol</path> + <format type='unknown'/> + <permissions> + <mode>00</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> + </volume></pre> + + <h3>Example disk attachement</h3> + <p>Sheepdog images can be attached to Qemu guests. + Information about attaching a Sheepdog image to a + guest can be found + at the <a href="formatdomain.html#elementsDisks">format domain</a> + page.</p> + + <h3>Valid pool format types</h3> + <p> + The Sheepdog pool does not use the pool format type element. + </p> + + <h3>Valid volume format types</h3> + <p> + The Sheepdog pool does not use the volume format type element. + </p> + </body> </html> diff --git a/po/POTFILES.in b/po/POTFILES.in index 31246f7..33a2ace 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -108,6 +108,7 @@ src/storage/storage_backend_logical.c src/storage/storage_backend_mpath.c src/storage/storage_backend_rbd.c src/storage/storage_backend_scsi.c +src/storage/storage_backend_sheepdog.c src/storage/storage_driver.c src/test/test_driver.c src/uml/uml_conf.c diff --git a/src/Makefile.am b/src/Makefile.am index 60f5442..82238b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -506,6 +506,9 @@ STORAGE_DRIVER_DISK_SOURCES = \ STORAGE_DRIVER_RBD_SOURCES = \ storage/storage_backend_rbd.h storage/storage_backend_rbd.c +STORAGE_DRIVER_SHEEPDOG_SOURCES = \ + storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c + STORAGE_HELPER_DISK_SOURCES = \ storage/parthelper.c @@ -1009,6 +1012,10 @@ libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) libvirt_driver_storage_la_LIBADD += $(LIBRBD_LIBS) endif +if WITH_STORAGE_SHEEPDOG +libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +endif + if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals if WITH_DRIVER_MODULES @@ -1107,6 +1114,7 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_MPATH_SOURCES) \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(STORAGE_DRIVER_RBD_SOURCES) \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index bf4567f..8ca6b1e 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -52,7 +52,7 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi", "mpath", "rbd") + "scsi", "mpath", "rbd", "sheepdog") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, @@ -206,6 +206,17 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .formatToString = virStoragePoolFormatDiskTypeToString, } }, + { .poolType = VIR_STORAGE_POOL_SHEEPDOG, + .poolOptions = { + .flags = (VIR_STORAGE_POOL_SOURCE_HOST | + VIR_STORAGE_POOL_SOURCE_NETWORK | + VIR_STORAGE_POOL_SOURCE_NAME), + }, + .volOptions = { + .defaultFormat = VIR_STORAGE_FILE_RAW, + .formatToString = virStoragePoolFormatDiskTypeToString, + } + }, { .poolType = VIR_STORAGE_POOL_MPATH, .volOptions = { .formatToString = virStoragePoolFormatDiskTypeToString, @@ -1011,9 +1022,9 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { if (virStoragePoolSourceFormat(&buf, options, &def->source) < 0) goto cleanup; - /* RBD devices are not local block devs nor files, so it doesn't + /* RBD and Sheepdog devices are not local block devs nor files, so it doesn't * have a target */ - if (def->type != VIR_STORAGE_POOL_RBD) { + if (def->type != VIR_STORAGE_POOL_RBD && def->type != VIR_STORAGE_POOL_SHEEPDOG) { virBufferAddLit(&buf," <target>\n"); if (def->target.path) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 5733b57..dcf976f 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -121,6 +121,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_SCSI, /* SCSI HBA */ VIR_STORAGE_POOL_MPATH, /* Multipath devices */ VIR_STORAGE_POOL_RBD, /* RADOS Block Device */ + VIR_STORAGE_POOL_SHEEPDOG, /* Sheepdog device */ VIR_STORAGE_POOL_LAST, }; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e2e9b51..93964d6 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -80,6 +80,9 @@ #if WITH_STORAGE_RBD # include "storage_backend_rbd.h" #endif +#if WITH_STORAGE_SHEEPDOG +# include "storage_backend_sheepdog.h" +#endif #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -109,6 +112,9 @@ static virStorageBackendPtr backends[] = { #if WITH_STORAGE_RBD &virStorageBackendRBD, #endif +#if WITH_STORAGE_SHEEPDOG + &virStorageBackendSheepdog, +#endif NULL }; diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c new file mode 100644 index 0000000..b003856 --- /dev/null +++ b/src/storage/storage_backend_sheepdog.c @@ -0,0 +1,323 @@ +/* + * storage_backend_sheepdog.c: storage backend for Sheepdog handling + * + * Copyright (C) 2012 Wido den Hollander + * Copyright (C) 2012 Frank Spijkerman + * Copyright (C) 2012 Sebastian Wiedenroth + * + * 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 + * + * Author: Wido den Hollander <wido(a)widodh.nl> + * Frank Spijkerman <frank.spijkerman(a)avira.com> + * Sebastian Wiedenroth <sebastian.wiedenroth(a)skylime.net> + */ + +#include <config.h> + +#include "virterror_internal.h" +#include "storage_backend_sheepdog.h" +#include "storage_conf.h" +#include "util/command.h" +#include "util.h" +#include "memory.h" +#include "logging.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +static int virStorageBackendSheepdogRefreshVol(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol); + +void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, + virStoragePoolObjPtr pool); + +int +virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, + char *output) +{ + /* example output: + * 0 15245667872 117571104 0% + * Total 15245667872 117571104 0% 20972341 + */ + + const char *p, *next; + + pool->allocation = pool->capacity = pool->available = 0; + + p = output; + do { + char *end; + + if ((next = strchr(p, '\n'))) + ++next; + else + return -1; + + if (!STRPREFIX(p, "Total ")) + continue; + + p = p + 6; + + if (virStrToLong_ull(p, &end, 10, &pool->capacity) < 0) + return -1; + + if ((p = end + 1) > next) + return -1; + + if (virStrToLong_ull(p, &end, 10, &pool->allocation) < 0) + return -1; + + pool->available = pool->capacity - pool->allocation; + return 0; + + } while ((p = next)); + + return -1; +} + +void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, virStoragePoolObjPtr pool) +{ + const char *address = "localhost"; + int port = 7000; + if (pool->def->source.nhost > 0) { + if (pool->def->source.hosts[0].name != NULL) { + address = pool->def->source.hosts[0].name; + } + if (pool->def->source.hosts[0].port) { + port = pool->def->source.hosts[0].port; + } + } + virCommandAddArg(cmd, "-a"); + virCommandAddArgFormat(cmd, "%s", address); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%d", port); +} + + +static int +virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + int ret; + + char *output = NULL; + + virCommandPtr cmd; + + cmd = virCommandNew(COLLIE); + virCommandAddArgList(cmd, "node", "info", "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + if (ret == 0) + ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + + virCommandFree(cmd); + VIR_FREE(output); + return ret; +} + + +static int +virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool + ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol, + unsigned int flags) +{ + + if (flags & VIR_STORAGE_VOL_DELETE_ZEROED) { + VIR_WARN("%s", _("This storage backend does not supported zeroed removal of volumes")); + } + + virCommandPtr cmd = virCommandNew(COLLIE); + + virCommandAddArgList(cmd, "vdi", "delete", vol->name, NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + int ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; +} + + +static int +virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool + ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol) +{ + + int ret; + + if (vol->target.encryption != NULL) { + virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("storage pool does not support encrypted volumes")); + return -1; + } + + virCommandPtr cmd = virCommandNew(COLLIE); + + virCommandAddArgList(cmd, "vdi", "create", vol->name, NULL); + virCommandAddArgFormat(cmd, "%llu", vol->capacity); + virStorageBackendSheepdogAddHostArg(cmd, pool); + ret = virCommandRun(cmd, NULL); + + virStorageBackendSheepdogRefreshVol(conn, pool, vol); + + virCommandFree(cmd); + return ret; +} + + +int +virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, + char *output) +{ + /* example output: + * s test 1 10 0 0 1336556634 7c2b25 + * s test 2 10 0 0 1336557203 7c2b26 + * = test 3 10 0 0 1336557216 7c2b27 + */ + + int id; + + const char *p, *next; + + vol->allocation = vol->capacity = 0; + + p = output; + do { + char *end; + + if ((next = strchr(p, '\n'))) + ++next; + + /* ignore snapshots */ + if (*p != '=') + continue; + + /* skip space */ + if (p + 2 < next) { + p += 2; + } else { + return -1; + } + + /* skip name */ + while (*p != '\0' + && (*p != ' ' || (*p == ' ' && (*(p - 1) == '\\')))) + ++p; + + if (virStrToLong_i(p, &end, 10, &id) < 0) + return -1; + + p = end + 1; + + if (virStrToLong_ull(p, &end, 10, &vol->capacity) < 0) + return -1; + + p = end + 1; + + if (virStrToLong_ull(p, &end, 10, &vol->allocation) < 0) + return -1; + + return 0; + } while ((p = next)); + + return -1; +} + +static int +virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool + ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol) +{ + int ret; + + char *output = NULL; + + virCommandPtr cmd; + + cmd = virCommandNew(COLLIE); + virCommandAddArgList(cmd, "vdi", "list", vol->name, "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + + if (ret < 0) + goto cleanup; + + if ((ret = virStorageBackendSheepdogParseVdiList(vol, output)) < 0) + goto cleanup; + + vol->type = VIR_STORAGE_VOL_NETWORK; + + VIR_FREE(vol->key); + if (virAsprintf(&vol->key, "%s/%s", + pool->def->source.name, vol->name) == -1) { + virReportOOMError(); + goto cleanup; + } + + VIR_FREE(vol->target.path); + if (virAsprintf(&vol->target.path, "sheepdog:%s", vol->name) == -1) { + virReportOOMError(); + goto cleanup; + } + + + +cleanup: + virCommandFree(cmd); + return ret; +} + + +static int +virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool + ATTRIBUTE_UNUSED, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + + virCheckFlags(0, -1); + + virCommandPtr cmd = virCommandNew(COLLIE); + + virCommandAddArgList(cmd, "vdi", "resize", vol->name, NULL); + virCommandAddArgFormat(cmd, "%llu", capacity); + virStorageBackendSheepdogAddHostArg(cmd, pool); + int ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; + +} + + + +virStorageBackend virStorageBackendSheepdog = { + .type = VIR_STORAGE_POOL_SHEEPDOG, + + .refreshPool = virStorageBackendSheepdogRefreshPool, + .createVol = virStorageBackendSheepdogCreateVol, + .refreshVol = virStorageBackendSheepdogRefreshVol, + .deleteVol = virStorageBackendSheepdogDeleteVol, + .resizeVol = virStorageBackendSheepdogResizeVol, +}; diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h new file mode 100644 index 0000000..51ef7a4 --- /dev/null +++ b/src/storage/storage_backend_sheepdog.h @@ -0,0 +1,39 @@ +/* + * storage_backend_sheepog.h: storage backend for Sheepdog handling + * + * Copyright (C) 2012 Wido den Hollander + * Copyright (C) 2012 Frank Spijkerman + * Copyright (C) 2012 Sebastian Wiedenroth + * + * 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 + * + * Author: Wido den Hollander <wido(a)widodh.nl> + * Frank Spijkerman <frank.spijkerman(a)avira.com> + * Sebastian Wiedenroth <sebastian.wiedenroth(a)skylime.net> + */ + +#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_H__ +# define __VIR_STORAGE_BACKEND_SHEEPDOG_H__ + +# include "storage_backend.h" + +int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, + char *output); +int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, + char *output); + +extern virStorageBackend virStorageBackendSheepdog; + +#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index e3bd6d1..a466480 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -141,6 +141,10 @@ if WITH_NETWORK test_programs += networkxml2argvtest endif +if WITH_STORAGE_SHEEPDOG +test_programs += storagebackendsheepdogtest +endif + test_programs += nwfilterxml2xmltest test_programs += storagevolxml2xmltest storagepoolxml2xmltest @@ -398,6 +402,15 @@ else EXTRA_DIST += networkxml2argvtest.c endif +if WITH_STORAGE_SHEEPDOG +storagebackendsheepdogtest_SOURCES = \ + storagebackendsheepdogtest.c \ + testutils.c testutils.h +storagebackendsheepdogtest_LDADD = ../src/libvirt_driver_storage.la $(LDADDS) +else +EXTRA_DIST += storagebackendsheepdogtest.c +endif + nwfilterxml2xmltest_SOURCES = \ nwfilterxml2xmltest.c \ testutils.c testutils.h diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c new file mode 100644 index 0000000..a8f62a4 --- /dev/null +++ b/tests/storagebackendsheepdogtest.c @@ -0,0 +1,196 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> + +#include <sys/types.h> +#include <fcntl.h> + +#include "internal.h" +#include "testutils.h" +#include "storage/storage_backend_sheepdog.h" + + +typedef struct { + const char *output; + int expected_return; + uint64_t expected_capacity; + uint64_t expected_allocation; +} collie_test; + + +static int +test_node_info_parser(collie_test test, char *poolxml) +{ + int ret = -1; + char *output = NULL; + char *poolXmlData = NULL; + virStoragePoolDefPtr pool = NULL; + + if (virtTestLoadFile(poolxml, &poolXmlData) < 0) + goto cleanup; + + if (!(pool = virStoragePoolDefParseString(poolXmlData))) + goto cleanup; + + output = strdup(test.output); + if(!output) { + goto cleanup; + } + + ret = virStorageBackendSheepdogParseNodeInfo(pool, output); + + if (ret != test.expected_return) + goto cleanup; + + if (ret != 0) { + ret = 0; + goto cleanup; + } + + if (pool->capacity == test.expected_capacity + && pool->allocation == test.expected_allocation) + ret = 0; + + cleanup: + VIR_FREE(output); + VIR_FREE(poolXmlData); + virStoragePoolDefFree(pool); + return ret; +} + +static int +test_vdi_list_parser(collie_test test, char *poolxml, char *volxml) +{ + int ret = -1; + char *poolXmlData = NULL; + char *volXmlData = NULL; + char *output = NULL; + virStoragePoolDefPtr pool = NULL; + virStorageVolDefPtr vol = NULL; + + if (virtTestLoadFile(poolxml, &poolXmlData) < 0) + goto cleanup; + if (virtTestLoadFile(volxml, &volXmlData) < 0) + goto cleanup; + + if (!(pool = virStoragePoolDefParseString(poolXmlData))) + goto cleanup; + + if (!(vol = virStorageVolDefParseString(pool, volXmlData))) + goto cleanup; + + output = strdup(test.output); + if(!output) { + goto cleanup; + } + + ret = virStorageBackendSheepdogParseVdiList(vol, output); + + + if (ret != test.expected_return) + goto cleanup; + + if (ret != 0) { + ret = 0; + goto cleanup; + } + + if (vol->capacity == test.expected_capacity + && vol->allocation == test.expected_allocation) + ret = 0; + + cleanup: + VIR_FREE(output); + VIR_FREE(poolXmlData); + VIR_FREE(volXmlData); + virStoragePoolDefFree(pool); + virStorageVolDefFree(vol); + return ret; +} + + +static int +mymain(void) +{ + int ret = -1; + char *poolxml = NULL; + char *volxml = NULL; + + collie_test node_info_tests[] = { + {"", -1, 0, 0}, + {"Total 15245667872 117571104 0% 20972341\n", 0, 15245667872, 117571104}, + {"To", -1, 0, 0}, + {"asdf\nasdf", -1, 0, 0}, + {"Total ", -1, 0, 0}, + {"Total 1", -1, 0, 0}, + {"Total 1\n", -1, 0, 0}, + {"Total 1 ", -1, 0, 0}, + {"Total 1 2", -1, 0, 0}, + {"Total 1 2 ", -1, 0, 0}, + {"Total 1 2\n", 0, 1, 2}, + {"Total 1 2 \n", 0, 1, 2}, + {"Total a 2 \n", -1, 0, 0}, + {"Total 1 b \n", -1, 0, 0}, + {"Total a b \n", -1, 0, 0}, + {"stuff\nTotal 1 2 \n", 0, 1, 2}, + {"0 1 2 3\nTotal 1 2 \n", 0, 1, 2}, + {NULL, 0, 0, 0} + }; + + collie_test vdi_list_tests[] = { + {"", -1, 0, 0}, + {"= test 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, + {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, + {"s test 1 10 20 0 1336556634 7c2b25\n= test 3 50 60 0 1336557216 7c2b27\n", 0, 50, 60}, + {"=", -1, 0, 0}, + {"= test", -1, 0, 0}, + {"= test ", -1, 0, 0}, + {"= test 1", -1, 0, 0}, + {"= test 1 ", -1, 0, 0}, + {"= test 1 2", -1, 0, 0}, + {"= test 1 2 ", -1, 0, 0}, + {"= test 1 2 3", -1, 0, 0}, + {NULL, 0, 0, 0} + }; + + collie_test *test = node_info_tests; + + if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", + abs_srcdir) < 0) + goto cleanup; + + if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", + abs_srcdir) < 0) + goto cleanup; + + while (test->output != NULL) { + ret = test_node_info_parser(*test, poolxml); + virtTestResult("node_info_parser", ret, NULL); + ++test; + if (ret < 0) + return EXIT_FAILURE; + } + + test = vdi_list_tests; + + while (test->output != NULL) { + ret = test_vdi_list_parser(*test, poolxml, volxml); + virtTestResult("vdi_list_parser", ret, NULL); + ++test; + if (ret < 0) + return EXIT_FAILURE; + } + + ret = 0; + + cleanup: + VIR_FREE(poolxml); + VIR_FREE(volxml); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) diff --git a/tests/storagepoolxml2xmlin/pool-sheepdog.xml b/tests/storagepoolxml2xmlin/pool-sheepdog.xml new file mode 100644 index 0000000..1287047 --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-sheepdog.xml @@ -0,0 +1,8 @@ +<pool type='sheepdog'> + <name>sheepdog</name> + <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid> + <source> + <host name='localhost' port='7000'/> + <name>sheepdog</name> + </source> +</pool> diff --git a/tests/storagepoolxml2xmlout/pool-sheepdog.xml b/tests/storagepoolxml2xmlout/pool-sheepdog.xml new file mode 100644 index 0000000..000c068 --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-sheepdog.xml @@ -0,0 +1,11 @@ +<pool type='sheepdog'> + <name>sheepdog</name> + <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <available unit='bytes'>0</available> + <source> + <host name='localhost' port='7000'/> + <name>sheepdog</name> + </source> +</pool> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index d73fc8a..8cac978 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -93,6 +93,7 @@ mymain(void) DO_TEST("pool-mpath"); DO_TEST("pool-iscsi-multiiqn"); DO_TEST("pool-iscsi-vendor-product"); + DO_TEST("pool-sheepdog"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagevolxml2xmlin/vol-sheepdog.xml b/tests/storagevolxml2xmlin/vol-sheepdog.xml new file mode 100644 index 0000000..49e221c --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-sheepdog.xml @@ -0,0 +1,10 @@ +<volume> + <name>test2</name> + <source> + </source> + <capacity unit='bytes'>1024</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>sheepdog:test2</path> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml new file mode 100644 index 0000000..2f19af8 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -0,0 +1,17 @@ +<volume> + <name>test2</name> + <key>(null)</key> + <source> + </source> + <capacity unit='bytes'>1024</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>sheepdog:test2</path> + <format type='unknown'/> + <permissions> + <mode>0600</mode> + <owner>4294967295</owner> + <group>4294967295</group> + </permissions> + </target> +</volume> diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 37c92cd..ee85988 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -112,6 +112,7 @@ mymain(void) DO_TEST("pool-disk", "vol-partition"); DO_TEST("pool-logical", "vol-logical"); DO_TEST("pool-logical", "vol-logical-backing"); + DO_TEST("pool-sheepdog", "vol-sheepdog"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tools/virsh.c b/tools/virsh.c index 744b629..3f24a34 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20229,6 +20229,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_STORAGE_RBD vshPrint(ctl, " RBD"); #endif +#ifdef WITH_STORAGE_SHEEPDOG + vshPrint(ctl, " Sheepdog"); +#endif vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); -- 1.7.9.4

2 2

[libvirt] [libvirt-glib] build: allow building with newer glibc-headers and -O0
by Christophe Fergeau 13 Jun '12

13 Jun '12

Commit log and autoconf snippet written by Eric Blake for libvirt. glibc 2.15 (on Fedora 17) coupled with explicit disabling of optimization during development dies a painful death: In file included from /usr/include/limits.h:27:0, from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/limits.h:169,. from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/syslimits.h:7, from /usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/limits.h:34, from util/bitmap.c:26: /usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] cc1: all warnings being treated as errors Work around this by only conditionally defining _FORTIFY_SOURCE, in the case where glibc can actually use it. The trick is using AH_VERBATIM instead of AC_DEFINE. * m4/virt-compile-warnings.m4 (LIBOSINFO_COMPILE_WARNINGS): Squelch _FORTIFY_SOURCE when needed to avoid glibc #warnings. --- m4/virt-compile-warnings.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index de542cc..99d214e 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -84,8 +84,13 @@ AC_DEFUN([LIBVIRT_GLIB_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=4096]) # Use improved glibc headers - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting newer glibc. */ + #if defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 1.7.10.2

2 1

[libvirt] [sandbox]console-rpc: fix segfault on null stdin
by Radu Caragea 13 Jun '12

13 Jun '12

If gvir_sandbox_console_attach is called with NULL as the stdin parameter it results in a segfault in the console-rpc module from libvirt-sandbox. Calling with NULL is of course useful when running something noninteractive and you don't want it to grab the stdin or pass any fd whatsoever.

2 1

Re: [libvirt] [Qemu-devel] [PATCH v2 0/4] file descriptor passing using passfd
by Kevin Wolf 13 Jun '12

13 Jun '12

Am 08.06.2012 17:42, schrieb Corey Bryant: > 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 passfd 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 (4): > qapi: Convert getfd and closefd > qapi: Add passfd QMP command > osdep: Enable qemu_open to dup pre-opened fd > block: Convert open calls to qemu_open > > block/raw-posix.c | 18 +++++++++--------- > 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 | 36 ++++++++++++++++++++---------------- > osdep.c | 13 +++++++++++++ > qapi-schema.json | 44 ++++++++++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 33 +++++++++++++++++++++++++++++---- > 13 files changed, 163 insertions(+), 60 deletions(-) Looks good to me. If Luiz is okay with the QMP part, I'm going to apply this to the block branch. Corey, please make sure to check the host_floppy problem and send a patch if necessary. Kevin

2 1

Re: [libvirt] [Qemu-devel] [PATCH v2 4/4] block: Convert open calls to qemu_open
by Kevin Wolf 13 Jun '12

13 Jun '12

Am 08.06.2012 17:42, schrieb Corey Bryant: > This patch converts all block layer open calls to qemu_open. This > enables all block layer open paths to dup(X) a pre-opened file > descriptor if the filename is of the format /dev/fd/X. This is > useful if QEMU is restricted from opening certain files. > > Note that this adds the O_CLOEXEC flag to the changed open paths > when the O_CLOEXEC macro is defined. > > v2: > -Convert calls to qemu_open instead of file_open (kwolf(a)redhat.com) > -Mention introduction of O_CLOEXEC (kwolf(a)redhat.com) > > Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> > @@ -950,7 +950,7 @@ static int floppy_probe_device(const char *filename) > if (strstart(filename, "/dev/fd", NULL)) > prio = 50; Good to have this context here. I think this has to be removed in another patch or all our file descriptors will become host_floppy... > > - fd = open(filename, O_RDONLY | O_NONBLOCK); > + fd = qemu_open(filename, O_RDONLY | O_NONBLOCK); > if (fd < 0) { > goto out; > } Kevin

2 1

[libvirt] [PATCH 00/12] rpc: Fix several issues with keepalive messages
by Jiri Denemark 13 Jun '12

13 Jun '12

So far, we were dropping non-blocking calls whenever sending them would block. In case a client is sending lots of stream calls (which are not supposed to generate any reply), the assumption that having other calls in a queue is sufficient to get a reply from the server doesn't work. I tried to fix this in b1e374a7ac56927cfe62435179bf0bba1e08b372 but failed and reverted that commit. While working on the proper fix, I discovered several other issues we had in handling keepalive messages in client RPC code. See individual patches for more details. As a nice bonus, the fixed version is shorter by one line than the current broken version :-) Jiri Denemark (12): client rpc: Improve debug messages in virNetClientIO client rpc: Use event loop for writing client rpc: Don't drop non-blocking calls client rpc: Just queue non-blocking call if another thread has the buck client rpc: Drop unused return value of virNetClientSendNonBlock rpc: Refactor keepalive timer code rpc: Add APIs for direct triggering of keepalive timer client rpc: Separate call creation from running IO loop rpc: Do not use timer for sending keepalive responses rpc: Remove unused parameter in virKeepAliveStopInternal server rpc: Remove APIs for manipulating filters on locked client client rpc: Send keepalive requests from IO event loop src/libvirt_probes.d | 2 +- src/rpc/virkeepalive.c | 233 ++++++++++++-------------- src/rpc/virkeepalive.h | 7 +- src/rpc/virnetclient.c | 368 +++++++++++++++++++++++------------------- src/rpc/virnetserverclient.c | 127 +++++++-------- 5 files changed, 368 insertions(+), 369 deletions(-) -- 1.7.10.2

3 31

[libvirt] [PATCH] build: fix 'make dist' on virgin checkout
by Eric Blake 13 Jun '12

13 Jun '12

'make dist' was depending on *protocol-structs files, which are stored in git but in turn depended on generated files. We still want to ship the protocol-structs files, but by renaming the tests to something not matching a file name, we separate 'make check' (which depends on the generated file) from 'make dist' (which only depends on the git files). After all, the tarball should never depend on a generated file not stored in git. I found one more case of a git file depending on a generated file, in a bogus virkeycode.c listing; but at least this one had no associated rules so it never broke 'make dist'. Reported by Wen Congyang. Latent bug has been present since commit 62dee6f, but only recently exposed by commit 7bff56a. * src/Makefile.am ($(srcdir)/util/virkeycode.c): Drop useless dependency. (BUILT_SOURCES): ...and build virkeymaps.h sooner. (PROTOCOL_STRUCTS): Rather than depend on the struct file... (check-local): ...convert things into a phony target of... (check-protocol): ...a new check. ($(srcdir)/remote_protocol-struct): Rename to isolate the distributed file from the conditional test. (PDWTAGS): Deal with rename. Swap to compare 'expected actual'. --- Posting now for a review. I'm still planning on running a 'make distcheck' on a virgin repository, if that passes and correctly runs the protocol syntax checks, then I will check this in under the build-breaker rule. Or, if someone ACKs this first... src/Makefile.am | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 60f5442..2bcebcf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -113,12 +113,12 @@ UTIL_SOURCES = \ EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py +BUILT_SOURCES += $(srcdir)/util/virkeymaps.h + $(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py <$(srcdir)/util/keymaps.csv >$@ -$(srcdir)/util/virkeycode.c: $(srcdir)/util/virkeycode.h $(srcdir)/util/virkeymaps.h - EXTRA_DIST += util/threads-pthread.c util/threads-win32.c # Internal generic driver infrastructure @@ -293,7 +293,7 @@ PDWTAGS = \ -e '}' \ < $(@F)-t1 > $(@F)-t3; \ case $$? in 8) rm -f $(@F)-t?; exit 0;; 0) ;; *) exit 1;; esac;\ - diff -u $(@F)-t3 $@; st=$$?; rm -f $(@F)-t?; exit $$st; \ + diff -u $(@)s $(@F)-t3; st=$$?; rm -f $(@F)-t?; exit $$st; \ fi; \ else \ echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \ @@ -306,21 +306,24 @@ PROTOCOL_STRUCTS = \ $(srcdir)/virnetprotocol-structs \ $(srcdir)/virkeepaliveprotocol-structs if WITH_REMOTE +check-protocol: $(PROTOCOL_STRUCTS) $(PROTOCOL_STRUCTS:structs=struct) + # The .o file that pdwtags parses is created as a side effect of running # libtool; but from make's perspective we depend on the .lo file. -$(srcdir)/%_protocol-structs: libvirt_driver_remote_la-%_protocol.lo - $(PDWTAGS) -$(srcdir)/virnetprotocol-structs: libvirt_net_rpc_la-virnetprotocol.lo +$(srcdir)/remote_protocol-struct $(srcdir)/qemu_protocol-struct: \ + $(srcdir)/%-struct: libvirt_driver_remote_la-%.lo $(PDWTAGS) -$(srcdir)/virkeepaliveprotocol-structs: libvirt_net_rpc_la-virkeepaliveprotocol.lo +$(srcdir)/virnetprotocol-struct $(srcdir)/virkeepaliveprotocol-struct: \ + $(srcdir)/%-struct: libvirt_net_rpc_la-%.lo $(PDWTAGS) else !WITH_REMOTE -# These generated files must live in git, because they cannot be re-generated -# when configured --without-remote. -$(PROTOCOL_STRUCTS): +# The $(PROTOCOL_STRUCTS) files must live in git, because they cannot be +# re-generated when configured --without-remote. +check-protocol: endif EXTRA_DIST += $(PROTOCOL_STRUCTS) -check-local: $(PROTOCOL_STRUCTS) +check-local: check-protocol +.PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc TEST_DRIVER_SOURCES = \ -- 1.7.10.2

1 1