- Devel - libvirt List Archives

[libvirt] [PATCH] sexpr: Improve serialization error reporting
by Matthias Bolte 27 May '11

27 May '11

--- src/util/sexpr.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/util/sexpr.c b/src/util/sexpr.c index d8d4c2d..0e30087 100644 --- a/src/util/sexpr.c +++ b/src/util/sexpr.c @@ -215,7 +215,7 @@ sexpr2string(const struct sexpr *sexpr, virBufferPtr buffer) virBufferAddChar(buffer, '('); if (sexpr2string(sexpr->u.s.car, buffer) < 0) - goto error; + return -1; while (sexpr->u.s.cdr->kind != SEXPR_NIL) { sexpr = sexpr->u.s.cdr; @@ -223,7 +223,7 @@ sexpr2string(const struct sexpr *sexpr, virBufferPtr buffer) virBufferAddChar(buffer, ' '); if (sexpr2string(sexpr->u.s.car, buffer) < 0) - goto error; + return -1; } virBufferAddChar(buffer, ')'); @@ -241,14 +241,12 @@ sexpr2string(const struct sexpr *sexpr, virBufferPtr buffer) virBufferAddLit(buffer, "()"); break; default: - goto error; + virSexprError(VIR_ERR_SEXPR_SERIAL, + _("unknown s-expression kind %d"), sexpr->kind); + return -1; } return 0; - - error: - virSexprError(VIR_ERR_SEXPR_SERIAL, NULL); - return -1; } #define IS_SPACE(c) ((c == 0x20) || (c == 0x9) || (c == 0xD) || (c == 0xA)) -- 1.7.0.4

2 2

[libvirt] [PATCH] Ensure hvsupport.html.in is built before HTML validation
by Daniel P. Berrange 27 May '11

27 May '11

In a parallel make, HTML validation tries to run before hvsupport.html.in has been built. * docs/Makefile.am: List hvsupport.html.in as a built source --- docs/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 59ae685..2b6ccf7 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -8,6 +8,8 @@ DOC_SOURCE_DIR=../src DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt +BUILT_SOURCES=hvsupport.html.in + apihtml = \ html/index.html \ html/libvirt-libvirt.html \ -- 1.7.4.4

3 2

[libvirt] FYI: qemu silently clipping large integers in JSON protocol
by Richard W.M. Jones 27 May '11

27 May '11

This thread may be of interest: http://lists.gnu.org/archive/html/qemu-devel/2011-05/threads.html#02162 Currently, qemu silently clips any JSON integer in the range 0x8000_0000_0000_0000 - 0xffff_ffff_ffff_ffff (all numbers in this range will be clipped to 0x7fff_ffff_ffff_ffff == LLONG_MAX). This basically could affect any libvirt code in this file which uses the "U:..." prefix as far as I can tell: http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/qemu/qemu_monitor_json.c… Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 1

[libvirt] Fwd: Re: ports/157024: [new port] devel/libvirt: Toolkit to interact with virtualization capabilities
by Jason Helfman 27 May '11

27 May '11

Port was committed to the FreeBSD portstree! Many thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

2 1

[libvirt] [PATCH 00/10 v4] Integration of lock managers in QEMU
by Daniel P. Berrange 27 May '11

27 May '11

An update to http://www.redhat.com/archives/libvir-list/2011-May/msg00622.html New in this series: - Split the QEMU lock manager integration into 3 patches for easier review - Actually implemented the lease hotplug/unplug code fully - Fixes from previous review of patches 1+2 - Fix QEMU startup to not rely on uninitialized variable !

3 26

[libvirt] [PATCH 0/3] Allow extra URI and target VM XML when migrating
by Daniel P. Berrange 27 May '11

27 May '11

This series takes advantage of the fact that we've not yet released the v3 migration protocol, to add support for some extra migration parameters.

2 4

[libvirt] [PATCH] Fix build with --with-driver-modules enabled
by Matthias Bolte 27 May '11

27 May '11

Export a bunch of missing symbols and link the remote driver to gnulib. --- src/Makefile.am | 8 +++++++- src/libvirt_private.syms | 3 +++ src/libvirt_xenxs.syms | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletions(-) create mode 100644 src/libvirt_xenxs.syms diff --git a/src/Makefile.am b/src/Makefile.am index c3d3102..02d53ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -553,6 +553,7 @@ libvirt_driver_remote_la_CFLAGS = \ libvirt_driver_remote_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_remote_la_LIBADD = $(GNUTLS_LIBS) $(SASL_LIBS) if WITH_DRIVER_MODULES +libvirt_driver_remote_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_remote_la_LDFLAGS += -module -avoid-version endif libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES) @@ -1077,6 +1078,10 @@ if WITH_VMX USED_SYM_FILES += libvirt_vmx.syms endif +if WITH_XENXS +USED_SYM_FILES += libvirt_xenxs.syms +endif + EXTRA_DIST += \ libvirt_public.syms \ libvirt_private.syms \ @@ -1086,7 +1091,8 @@ EXTRA_DIST += \ libvirt_macvtap.syms \ libvirt_daemon.syms \ libvirt_nwfilter.syms \ - libvirt_vmx.syms + libvirt_vmx.syms \ + libvirt_xenxs.syms BUILT_SOURCES += libvirt.syms libvirt.def libvirt_qemu.def diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4cb8dda..2088f38 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -929,6 +929,7 @@ virEventRemoveHandle; virExec; virExecWithHook; virFileAbsPath; +virFileBuildPath; virFileDeletePid; virFileExists; virFileFindMountPoint; @@ -1017,6 +1018,8 @@ virStrerror; # xml.h +virXMLParseFileHelper; +virXMLParseHelper; virXMLParseStrHelper; virXMLPropString; virXPathBoolean; diff --git a/src/libvirt_xenxs.syms b/src/libvirt_xenxs.syms new file mode 100644 index 0000000..3d794d6 --- /dev/null +++ b/src/libvirt_xenxs.syms @@ -0,0 +1,21 @@ +# +# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via WITH_LIBXL. +# + +# xen_sxpr.h +xenFormatSxpr; +xenFormatSxprChr; +xenFormatSxprDisk; +xenFormatSxprNet; +xenFormatSxprOnePCI; +xenFormatSxprSound; +xenGetDomIdFromSxpr; +xenGetDomIdFromSxprString; +xenParseSxpr; +xenParseSxprChar; +xenParseSxprSound; +xenParseSxprString; + +# xen_xm.h +xenFormatXM; +xenParseXM; -- 1.7.0.4

2 2

[libvirt] virsh list didn't show anything
by YAO 27 May '11

27 May '11

Hi, I tried to connect xen using latest libvirt When I connected to xend, "virsh list --all" gave me the right output. But when I connected to libxl, the virsh didn't show anything only as follows Id Name State ---------------------------------- I think at least Domain-0 should show up. Did I miss some point or something broken with the libxl_driver?

1 0

[libvirt] [PATCH] qemu : support persistent add/delete network interface
by KAMEZAWA Hiroyuki 27 May '11

27 May '11

>From 226239905ec9b01fd0bd0ce050de97d7f0d9e19c Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Wed, 18 May 2011 15:14:28 +0900 Subject: [PATCH] qemu - support persistent add/delete network interface This patch allows to modify interfaces of domain(qemu). Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> * src/conf/domain_conf.c: (virDomainNetInsert) : Insert a network device to domain definition. (virDomainNetIndexByMac/Ifname) : Returns an index of net device in array. (virDomainNetRemoveByMac): Remove a NIC of passed MAC address. * src/qemu/qemu_driver.c (qemuDomainAttachDeviceConfig): add codes for NIC. (qemuDomainDetachDeviceConfig): add codes for NIC. --- src/conf/domain_conf.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 5 ++++ src/libvirt_private.syms | 4 +++ src/qemu/qemu_driver.c | 32 ++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 498438a..de9abe9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5163,6 +5163,61 @@ int virDomainDiskRemoveByName(virDomainDefPtr def, const char *name) return 0; } +int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) +{ + if (VIR_REALLOC_N(def->nets, def->nnets) < 0) + return -1; + def->nets[def->nnets] = net; + def->nnets++; + return 0; +} + +int virDomainNetIndexByMac(virDomainDefPtr def, const unsigned char *mac) +{ + int i; + + for (i = 0; i < def->nnets; i++) + if (!memcmp(def->nets[i]->mac, mac, VIR_MAC_BUFLEN)) + return i; + return -1; +} + +int virDomainNetIndexByIfname(virDomainDefPtr def, const char *name) +{ + int i; + + for (i = 0; i < def->nnets; i++) + if (def->nets[i]->ifname && STREQ(def->nets[i]->ifname, name)) + return i; + return -1; +} + +static void virDomainNetRemove(virDomainDefPtr def, size_t i) +{ + if (def->nnets > 1) { + memmove(def->nets + i, + def->nets + i + 1, + sizeof(*def->nets) * (def->nnets - (i + 1))); + def->nnets--; + if (VIR_REALLOC_N(def->nets, def->nnets) < 0) { + /* ignore harmless */ + } + } else { + VIR_FREE(def->nets); + def->nnets = 0; + } +} + +int virDomainNetRemoveByMac(virDomainDefPtr def, const unsigned char *mac) +{ + int i = virDomainNetIndexByMac(def, mac); + + if (i < 0) + return -1; + virDomainNetRemove(def, i); + return 0; +} + int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fe42f21..274e22b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1359,6 +1359,11 @@ int virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def); void virDomainDiskRemove(virDomainDefPtr def, size_t i); int virDomainDiskRemoveByName(virDomainDefPtr def, const char *name); +int virDomainNetIndexByMac(virDomainDefPtr def, const unsigned char *mac); +int virDomainNetIndexByIfname(virDomainDefPtr def, const char *iface); +int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net); +int virDomainNetRemoveByMac(virDomainDefPtr def, const unsigned char *mac); + int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); void virDomainControllerInsertPreAlloced(virDomainDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7b6151c..2695c2e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -290,6 +290,10 @@ virDomainLoadAllConfigs; virDomainMemballoonModelTypeFromString; virDomainMemballoonModelTypeToString; virDomainNetDefFree; +virDomainNetIndexByIfname; +virDomainNetIndexByMac; +virDomainNetInsert; +virDomainNetRemoveByMac; virDomainNetTypeToString; virDomainObjAssignDef; virDomainObjCopyPersistentDef; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fdb3b30..0a547eb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4245,6 +4245,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr disk; + virDomainNetDefPtr net; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -4267,6 +4268,28 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, return -1; break; + case VIR_DOMAIN_DEVICE_NET: + net = dev->data.net; + if (net->ifname && virDomainNetIndexByIfname(vmdef, net->ifname)) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("iface %s already exists"), net->ifname); + return -1; + } + if (virDomainNetIndexByMac(vmdef, net->mac) >= 0) { + char macbuf[VIR_MAC_STRING_BUFLEN]; + virFormatMacAddr(net->mac, macbuf); + qemuReportError(VIR_ERR_INVALID_ARG, + _("mac %s already exists"), macbuf); + return -1; + } + if (virDomainNetInsert(vmdef, net)) { + virReportOOMError(); + return -1; + } + dev->data.net = NULL; + if (qemuDomainAssignPCIAddresses(vmdef) < 0) + return -1; + break; default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent attach of device is not supported")); @@ -4281,6 +4304,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr disk; + virDomainNetDefPtr net; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -4291,6 +4315,14 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, return -1; } break; + case VIR_DOMAIN_DEVICE_NET: + net = dev->data.net; + if (virDomainNetRemoveByMac(vmdef, net->mac)) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("no target device %s"), disk->dst); + return -1; + } + break; default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent detach of device is not supported")); -- 1.7.4.1

3 5

[libvirt] [PATCH 0/3] Add device disk attach/detach support to libxl driver
by Markus Groß 27 May '11

27 May '11

This patch series adds the infrastructure to support attaching and detaching of devices to the libxl driver. Currently only disk devices are supported. The first patch refactors some functions that are needed to create the appropriate datastructures for the libxenlight interface. The second patch fixes the handling of vm def's on cleanup. The last patch finally adds the device attach/detach code and follows qemu's implementation. Markus Groß (3): Refactored libxl datastructure instantiation Fix libxl vm def handling on domU cleanup Add disk attach/detach support to libxl driver src/libxl/libxl_conf.c | 304 ++++++++++++++------------- src/libxl/libxl_conf.h | 8 + src/libxl/libxl_driver.c | 526 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 697 insertions(+), 141 deletions(-) -- 1.7.5.1

3 7