- Devel - libvirt List Archives

[libvirt] [PATCH 1/1] Clarify the purpose of domxml-from-native
by Dave Allan 06 Feb '12

06 Feb '12

Someone mentioned to me that they interpreted this section of the KVM driver page as suggesting that new guests should be created by creating a qemu commandline and converting it to XML with domxml-from-native. I don't think that's the intent of domxml-from-native, so I added that clarification. --- docs/drvqemu.html.in | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fa5496c..09c4f95 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -432,9 +432,15 @@ mount -t cgroup none /dev/cgroup -o devices <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3> <p> - The <code>virsh domxml-from-native</code> provides a way to convert an - existing set of QEMU args into a guest description using libvirt Domain XML - that can then be used by libvirt. + The <code>virsh domxml-from-native</code> provides a way to + convert an existing set of QEMU args into a guest description + using libvirt Domain XML that can then be used by libvirt. + Please note that this command is intended to be used to convert + existing qemu guests previously started from the command line to + be managed through libvirt. It should not be used a method of + creating new guests from scratch. New guests should be created + using an application calling the libvirt APIs or by manually + crafting XML to pass to virsh. </p> <pre>$ cat > demo.args <<EOF -- 1.7.7.6

2 1

[libvirt] [PATCH v2 0/5] Introduce sVirt to LXC driver
by Daniel P. Berrange 06 Feb '12

06 Feb '12

This is an update of https://www.redhat.com/archives/libvir-list/2012-January/msg00418.html Changes since v1: - Pushed the first 2 patches which passed review - Update to include all Eric's suggested changes - Rebase to latest GIT master

3 19

[libvirt] [RFC PATCH V2] Add proxy FS support to libvirt
by M. Mohan Kumar 06 Feb '12

06 Feb '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> A new FS driver type 'proxy' is added to QEMU 9p server. This patch adds support for using proxy FS driver from libvirt. QEMU proxy FS driver uses socket for communicating between helper and qemu proxy FS driver. Proxy helper (a stand alone binary part of qemu) is invoked with one of the descriptors created using socketpair call and the share path. Similarly QEMU is invoked with another descriptor created using the same socketpair system call and with other required FS driver parameters. Need for proxy FS driver ======================== Pass through security model in QEMU 9p server has following issues: 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue (pass through security model needs root privilege). Proxy FS driver is implemented to solve these issues. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations in a chroot environment using socket IO. Proxy helper is invoked with root privileges and chroots into 9p export path. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- Changes from previous version * Remove the xml node for specifying the virtfs-proxy-helper, now it is determined from qemu binary. docs/formatdomain.html.in | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 71 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 3 +- 8 files changed, 81 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 18b7e22..e398779 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1336,7 +1336,8 @@ This mode also has an optional sub-element <code>driver</code>, with an attribute <code>type='path'</code> - or <code>type='handle'</code> <span class="since">(since + or <code>type='handle'</code> + or <code>type='proxy'</code> <span class="since">(since 0.9.7)</span>. </dd> <dt><code>type='template'</code></dt> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0190a81..2d45324 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -250,7 +250,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 03aa5b6..3796da4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -466,6 +466,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -491,7 +492,6 @@ struct _virDomainFSDef { virDomainDeviceInfo info; }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 43c7578..9c01a3b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,6 +144,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", + "fsdev-proxy", ); struct qemu_feature_flags { @@ -1083,6 +1084,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV); if (strstr(fsdev, "readonly")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c759baf..e129e35 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -117,6 +117,7 @@ enum qemuCapsFlags { QEMU_CAPS_ICH9_AHCI = 77, /* -device ich9-ahci */ QEMU_CAPS_NO_ACPI = 78, /* -no-acpi */ QEMU_CAPS_FSDEV_READONLY =79, /* -fsdev readonly supported */ + QEMU_CAPS_FSDEV_PROXY = 80, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f2e9cfa..0c79340 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -44,6 +44,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <fcntl.h> +#include <libgen.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -106,7 +107,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2080,9 +2082,43 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *emulator, int sock, const char *path) +{ +#define HELPER "virtfs-proxy-helper" + int ret_val, status; + virCommandPtr cmd; + char *helper, *dname; + + dname = dirname(strdup(emulator)); + if (virAsprintf(&helper, "%s/%s", dname, HELPER) < 0) { + VIR_FREE(dname); + virReportOOMError(); + return -1; + } + + cmd = virCommandNewArgList(helper, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), helper); + virCommandFree(cmd); + VIR_FREE(helper); + VIR_FREE(dname); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2108,6 +2144,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBufferAddLit(&opt, ",security_model=none"); } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -4426,10 +4466,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("socketpair failed")); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->emulator, sockets[0], + fs->src) < 0) { + VIR_FORCE_CLOSE(sockets[0]); + VIR_FORCE_CLOSE(sockets[1]); + goto error; + } + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index de61cf3..8e4f335 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 60155e7..455a7e1 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -648,7 +648,8 @@ mymain(void) QEMU_CAPS_PCI_ROMBAR, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_NO_ACPI, - QEMU_CAPS_FSDEV_READONLY); + QEMU_CAPS_FSDEV_READONLY, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.6

1 1

[libvirt] [PATCH] maint: Add test output files to .gitignore
by Peter Krempa 06 Feb '12

06 Feb '12

Commit 8f00276c8a6140cec6a6d50441c802981d329c0c consolidated other .gitignore files to the master one, but forgot to add some test output files. --- Detected by git status on a cleaned repo with make check done: # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # tests/commandtest # tests/virtimetest .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3e85e4d..b7561dc 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ /tests/*.pid /tests/*xml2*test /tests/commandhelper +/tests/commandtest /tests/conftest /tests/cputest /tests/domainsnapshotxml2xmltest @@ -142,6 +143,7 @@ /tests/virhashtest /tests/virnet*test /tests/virshtest +/tests/virtimetest /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -- 1.7.3.4

2 2

[libvirt] [PATCH] Update myself in AUTHORS
by ajia＠redhat.com 06 Feb '12

06 Feb '12

From: Alex Jia <ajia(a)redhat.com> Move myself from 'Previous maintainers' section to 'the primary maintainers and people with commit access rights' section, because I have a commit right now. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- AUTHORS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index ee510ab..578a377 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,6 +30,7 @@ The primary maintainers and people with commit access rights: Michal Prívozník <mprivozn(a)redhat.com> Peter Krempa <pkrempa(a)redhat.com> Christophe Fergeau <cfergeau(a)redhat.com> + Alex Jia <ajia(a)redhat.com> Previous maintainers: Karel Zak <kzak(a)redhat.com> @@ -182,7 +183,6 @@ Patches have also been contributed by: Guannan Ren <gren(a)redhat.com> John Williams <john.williams(a)petalogix.com> Michael Santos <michael.santos(a)gmail.com> - Alex Jia <ajia(a)redhat.com> Oskari Saarenmaa <os(a)ohmu.fi> Nan Zhang <nzhang(a)redhat.com> Wieland Hoffmann <themineo(a)googlemail.com> -- 1.7.1

3 3

[libvirt] Are they reasonable FD leaks?
by Alex Jia 06 Feb '12

06 Feb '12

Hi all, I met some FD leaks when I tried the following scenario: % dd if=/dev/null of=/var/lib/libvirt/images/foo bs=1 count=1 seek=10M % virsh define foo.xml (disk source file points to '/var/lib/libvirt/images/foo') % virsh vol-clone foo foo-clone default (the original guest name is 'foo') % virsh pool-refresh default % virsh vol-list default (make sure 'foo-clone' volume exists) % virsh define foo-clone.xml (disk source file points to '/var/lib/libvirt/images/foo-clone') % valgrind -v --track-fds=yes virsh undefine foo-clone --remove-all-storage <snip> ==21003== FILE DESCRIPTORS: 10 open at exit. ==21003== Open file descriptor 9: ==21003== at 0x39CF0D8BB7: pipe2 (in /lib64/libc-2.12.so) ==21003== by 0x4E4FC97: rpl_pipe2 (pipe2.c:59) ==21003== by 0x4D5C3FA: virNetClientNew (virnetclient.c:278) ==21003== by 0x4D5C7B2: virNetClientNewUNIX (virnetclient.c:352) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) ==21003== ==21003== Open file descriptor 8: ==21003== at 0x39CF0D8BB7: pipe2 (in /lib64/libc-2.12.so) ==21003== by 0x4E4FC97: rpl_pipe2 (pipe2.c:59) ==21003== by 0x4D5C3FA: virNetClientNew (virnetclient.c:278) ==21003== by 0x4D5C7B2: virNetClientNewUNIX (virnetclient.c:352) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) ==21003== ==21003== Open AF_UNIX socket 7: <unknown> ==21003== at 0x39CF0E67B7: socket (in /lib64/libc-2.12.so) ==21003== by 0x4D6B0F0: virNetSocketNewConnectUNIX (virnetsocket.c:490) ==21003== by 0x4D5C79F: virNetClientNewUNIX (virnetclient.c:349) ==21003== by 0x4D47EAA: doRemoteOpen (remote_driver.c:601) ==21003== by 0x4D499AF: remoteOpen (remote_driver.c:873) ==21003== by 0x4D12D23: do_open (libvirt.c:1196) ==21003== by 0x4D13EE5: virConnectOpenAuth (libvirt.c:1422) ==21003== by 0x415040: vshReconnect (virsh.c:637) ==21003== by 0x4152A7: vshCommandRun (virsh.c:17688) ==21003== by 0x4264D3: main (virsh.c:19270) </snip> It seems libvirt deliberately leaks these FDs, right? Regards, Alex

3 4

[libvirt] [PATCH] virsh: Fix resource leak while listing inactive domains with titles
by Peter Krempa 06 Feb '12

06 Feb '12

Commit fad5cd210899dfde4afe36712754dc921c3f3051 introduces a new flag that allows to show domain's title with domains. This commit introduced resource leak while listing inactive domains with titles. --- Sadly, I missed this even when it was incorrectly intended. :( (extra context for easier review) tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1613d2e..d6fe680 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1000,34 +1000,34 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (desc) { if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) goto cleanup; vshPrint(ctl, "%-5s %-30s %-10s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state)), title); VIR_FREE(title); } else { vshPrint(ctl, " %-5s %-30s %s\n", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state))); + } virDomainFree(dom); VIR_FREE(names[i]); - } } ret = true; cleanup: VIR_FREE(ids); VIR_FREE(names); return ret; } /* * "desc" command for managing domain description and title */ static const vshCmdInfo info_desc[] = { {"help", N_("show or set domain's description or title")}, {"desc", N_("Allows to show or modify description or title of a domain.")}, -- 1.7.3.4

2 2

[libvirt] [libvirt-glib 1/7] Fix gvir_config_object_new_from_xml error reporting
by Christophe Fergeau 06 Feb '12

06 Feb '12

It's currently failing to report parsing errors if the passed in error is NULL. --- libvirt-gconfig/libvirt-gconfig-object.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index 2e28208..7e3cb88 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -636,10 +636,13 @@ GVirConfigObject *gvir_config_object_new_from_xml(GType type, GVirConfigObject *object; GVirConfigXmlDoc *doc; xmlNodePtr node; + GError *tmp_error = NULL; - node = gvir_config_xml_parse(xml, root_name, error); - if ((error != NULL) && (*error != NULL)) + node = gvir_config_xml_parse(xml, root_name, &tmp_error); + if (tmp_error != NULL) { + g_propagate_error(error, tmp_error); return NULL; + } doc = gvir_config_xml_doc_new(node->doc); object = GVIR_CONFIG_OBJECT(g_object_new(type, "doc", doc, -- 1.7.7.6

2 15

[libvirt] [PATCH] xen_xm: Fix SIGSEGV in xenXMDomainDefineXML
by Philipp Hahn 06 Feb '12

06 Feb '12

On CentOS5 with xen-3.0.3: Program received signal SIGSEGV, Segmentation fault. virFree (ptrptr=0x8) at util/memory.c:310 310 free(*(void**)ptrptr); (gdb) bt #0 virFree (ptrptr=0x8) at util/memory.c:310 #1 0x00002aaaaae167c8 in xenXMDomainDefineXML (conn=0x694e80, xml=0x6b2ce0 "P\fk") at xen/xm_internal.c:1199 #2 0x00002aaaaae070d7 in xenUnifiedDomainDefineXML (conn=0x8, xml=0x6ac040 "<domain type='xen'>\n <name>pv</name>\n <uuid>20291bc0-453a-4d6c-c6ac-4e5af63b932c</uuid>\n <memory>1048576</memory>\n <currentMemory>1048576</currentMemory>\n <vcpu>1</vcpu>\n <os>\n <type arch='x8"...) at xen/xen_driver.c:1524 #3 0x00002aaaaada7803 in virDomainDefineXML (conn=0x694e80, xml=0x6ac040 "<domain type='xen'>\n <name>pv</name>\n <uuid>20291bc0-453a-4d6c-c6ac-4e5af63b932c</uuid>\n <memory>1048576</memory>\n <currentMemory>1048576</currentMemory>\n <vcpu>1</vcpu>\n <os>\n <type arch='x8"...) at libvirt.c:7823 #4 0x0000000000426173 in cmdEdit (ctl=0x7fffffffb8e0, cmd=<value optimized out>) at virsh.c:14882 #5 0x000000000041c9ce in vshCommandRun (ctl=0x7fffffffb8e0, cmd=0x658c50) at virsh.c:17712 #6 0x000000000042c3b9 in main (argc=1, argv=<value optimized out>) at virsh.c:19317 Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/xen/xm_internal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index a34e906..02a0e1d 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1196,7 +1196,8 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) error: VIR_FREE(filename); - VIR_FREE(entry->filename); + if (entry) + VIR_FREE(entry->filename); VIR_FREE(entry); virDomainDefFree(def); xenUnifiedUnlock(priv); -- 1.7.1

2 1

[libvirt] [libvirt-glib] Don't assign const char * to non-const
by Christophe Fergeau 06 Feb '12

06 Feb '12

This causes a gcc warning. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index db496f3..5a4b4bc 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -548,7 +548,7 @@ GVirStorageVol *gvir_storage_pool_create_volume } GVirStorageVol *volume; - char *name; + const char *name; volume = GVIR_STORAGE_VOL(g_object_new(GVIR_TYPE_STORAGE_VOL, "handle", handle, -- 1.7.7.6

2 1