- Devel - libvirt List Archives

[libvirt] How does libvirt 0.6.3 load kvm driver
by Jason Wong 30 Jun '09

30 Jun '09

Dear all, I found that libvirt 0.6.3 seems does not load KVM driver while libvirt 0.3.3 does. Situation description: I am using CentOS 5.3, and the kernel I used is 2.6.30. I downloaded the kernel from kernel.org andcompile it. KVM was compiled as a module. libvirt: libvirt 0.6.3, released by Eucalyptus(a cloud computing infrastructure software which supports KVM as well) (1) libvirt 0.6.3 does not load KVM driver After booting the machine with kernel 2.6.30 and probe KVM related module. I started libvirtd 0.6.3 and set LD_LIBRARY_PATH to "$LIBVIRT_063_HOME/lib:$LIBVIRT_063_HOME/usr/lib:$LD_LIBRARY_PATH". I found that I am not able to connect to libvirtd using "virsh --connect qemu:///system"(the virsh used is virsh 0.6.3 that shipped with libvirt 0.6.3), here is the debug message: ======================================= debug message ========================================= 17:41:11.219: debug : virInitialize:290 : register drivers 17:41:11.219: debug : virRegisterDriver:667 : registering Test as driver 0 17:41:11.219: debug : virRegisterNetworkDriver:567 : registering Test as network driver 0 17:41:11.219: debug : virRegisterStorageDriver:598 : registering Test as storage driver 0 17:41:11.219: debug : virRegisterDeviceMonitor:629 : registering Test as device driver 0 17:41:11.219: debug : virRegisterDriver:667 : registering Xen as driver 1 17:41:11.219: debug : vboxRegister:68 : VBoxCGlueInit failed: 0.0.0, errorval=-1 17:41:11.219: debug : virRegisterDriver:667 : registering VBOX as driver 2 17:41:11.219: debug : virConnectOpen:1050 : name=qemu:///system 17:41:11.219: debug : do_open:920 : name "qemu:///system" to URI components: scheme qemu opaque (null) authority (null) server (null) user (null) port 0 path /system 17:41:11.219: debug : do_open:930 : trying driver 0 (Test) ... 17:41:11.219: debug : do_open:936 : driver 0 Test returned DECLINED 17:41:11.219: debug : do_open:930 : trying driver 1 (Xen) ... 17:41:11.219: debug : do_open:936 : driver 1 Xen returned DECLINED 17:41:11.219: debug : do_open:930 : trying driver 2 (VBOX) ... 17:41:11.219: debug : do_open:936 : driver 2 VBOX returned DECLINED libvir: error : could not connect to qemu:///system 17:41:11.219: debug : virUnrefConnect:210 : unref connection 0x60dd00 1 17:41:11.219: debug : virReleaseConnect:171 : release connection 0x60dd00 libvirt error: could not connect to qemu:///system (code=5) error: failed to connect to hypervisor ================================end of debug message ========================================= It seems that libvirt 0.6.3 does not load QEMU driver. (2) libvirt 0.3.3 does load KVM driver However, when I run the command "lsmod | grep kvm". I found KVM module was present: ================================= result of lsmod ============================================== [root@node2 ~]# lsmod | grep kvm kvm_intel 46664 0 kvm 166224 1 kvm_intel [root@node2 ~]# ================================= end of result of lsmod ========================================= I stopped libvirtd 0.6.3 and then started libvirtd 0.3.3(the one shipped with CentOS 5.3). The virtual machine manager works well and I can use "virsh --connect qemu:///system"(the virsh used is virsh 0.3.3 that shipped with CentOS 5.3) to connect to libvirtd. I dig into libvirt source code. I found that in libvirt 0.3.3: There is qemudRegister() in libvirt.c. I think this function call is responsible for loading qemu(kvm) driver. And in libvirt 0.6.3: I cannot found qemudRegister() or virDriverLoadModule("qemu") in the source code. My question is: Does libvirt 0.6.3 support KVM? If yes, how does it load KVM driver? I want to find out why libvirt 0.3.3 works well while libvirt 0.6.3 does not work in my computer. Thanks. -- Jason Wong System engineer Cluster Technology Limited Email: hcwong(a)clustertech.com Direct Line: (852) 2655-6129 Tel: (852) 2655-6100 Fax: (852) 2994-2101 Website: www.clustertech.com ------------------------------ ************************************************************************** The information and attachment contained in this e-mail originating from Cluster Technology Limited is confidential and intended solely for the specified addressees. If you have received this email in error, please do not read, copy, distribute, disclose or use any information of this email in any way and please immediately notify the sender and delete this email. Thank you for your cooperation. **************************************************************************

2 4

[libvirt] hooking a physical nic to a bridge with net-create
by Shahar Klein 29 Jun '09

29 Jun '09

Hi I trying to set up a network configuration using libvirt The setup is: 1. a VM using virtio using a tap device connected to a bridge device 2. on the host side eth0 added to the same bridge device(without ip) using libvirt application (say virsh) I want to launch this set up: virsh net-create for the second part virsh create for the first part(tap, virtio, vm etc) I can set the first part(vm, tap, virtio) using the domain xml but I'm also interested in XMLing the second part and net-create it. I tried but only suceeded in creating the bridge Is it possible? am I missing somthing? Thanks in advance

4 7

[libvirt] HACKING file on website
by Daniel P. Berrange 29 Jun '09

29 Jun '09

FYI, I just committed a patch to add the contents of the 'HACKING' file to the website, under the section 'Documentation -> Internals -> Contributor Guidelines No content changes from HACKING, just html-ized existing content. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] identi.ca micro-blogging group for libvirt & related apps
by Daniel P. Berrange 29 Jun '09

29 Jun '09

Micro-blogging is very popular these days and I know a number of people working on / with libvirt are using twitter/identi.ca So I decided it was worth creating a libvirt group on identi.ca for targetting notices relating to libvirt and any apps built using libvirt. You can find it here http://identi.ca/group/libvirt Any posting you make containing the magic word '!libvirt' will appear in the group page. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] [PATCH] Fixing issues in re-detection of transient VMs
by Federico Simoncelli 29 Jun '09

29 Jun '09

Re-detection of transient VMs had two issues described in bugs 507304 and 507537: https://bugzilla.redhat.com/show_bug.cgi?id=507304 Summary: After a migration the domain status is saved as "paused" and it is not updated to "running". A following libvirtd restart will detect the vm as "paused" (instead of "running"). https://bugzilla.redhat.com/show_bug.cgi?id=507537 Summary: Destroying a transient re-detected domain leaves the domain defined (instead of completely remove it). Patches in attachment (and available in the bug report). -- Federico Simoncelli.

2 2

[libvirt] [PATCH] don't break on libnuma failures
by Daniel Veillard 28 Jun '09

28 Jun '09

Another patch hanging in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=506590 sometimes libnuma can't handle some topologies, but those failures should not completely break libvirt, patch by Dan Berrange. Look sane to me, fixes the main problem for the reporter, so I applied and commited it, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] unchecked malloc+syscall uses
by Jim Meyering 28 Jun '09

28 Jun '09

I was looking through recent changes and spotted two potential NULL-dereferences in this change set: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff;h=70c01b4c1adea75e9 In src/opennebula/one_client.c: + one_client.url=(char *)malloc(64); + snprintf(one_client.url, 63, "http://localhost:%d/RPC2", ONED_PORT); +#else + one_client.url=(char *)"http://localhost:2633/RPC2"; +#endif -- + file_text=(char *)malloc(size+1); + bytes_read=read(file, file_text, size); + close(file); + + if(bytes_read==size) { Perhaps of more immediate concern, these syscalls are not checked for failure: + file=open(template_file, O_RDONLY); + size=lseek(file, 0, SEEK_END); + lseek(file, 0, SEEK_SET); and same for the "read" syscall above. Note, this is just the result of a few minutes cursory review.

2 1

[libvirt] More then one pci device possible with libvirt and pci passthrough?
by Mirko Raasch 28 Jun '09

28 Jun '09

Hi, i want to use more then one pci card in my debian guest. But when i start the guest, the log says: libvirtd: 15:44:55.459: warning : pciTrySecondaryBusReset:483 : Other devices on bus with 0000:05:01.0, not doing bus reset With "/usr/bin/qemu-system-x86_64 -m 512 -name test -hda /media/vm/test.img -boot c -vnc :2 -k de -pcidevice host=05:01.0 -pcidevice host=05:02.0 -pcidevice host=05:03.0" there seems to be no problems. How can i start my guest with three pci devices passed through and libvirt? My hostdev section in the xml looks like this: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x05' slot='0x01' function='0x0'/> </source> </hostdev> <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x05' slot='0x02' function='0x0'/> </source> </hostdev> <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x05' slot='0x03' function='0x0'/> </source> </hostdev> Greetings Mirko

1 0

[libvirt] Can't scale XP on remote
by sean darcy 27 Jun '09

27 Jun '09

Just starting out with an XP guest on Fedora 11 kvm. I'm using virt-manager to connect from a laptop. Server: kernel-2.6.29.4-167.fc11.x86_64 qemu-*-0.10.50-6.kvm86.fc11.x86_64 libvirt-0.6.4-2.fc11.x86_64 On the laptop: virt-manager-0.7.0-5.fc11.i586 libvirt-0.6.2-11.fc11.i586 The console comes, and XP runs fine. But, screen is scaled too large vertically for my laptop screen which is 1280x800. Only with fullscreen can I see the bottom menu bar. I would have assumed I could change the size of the screen (even if not the aspect ratio), but I can't. Am I doing something wrong, or is this just The Way Things Are? sean

3 6

[libvirt] [PATCH] avoid dumpXML segfault with recent Xen (3.4.0)
by Daniel Veillard 26 Jun '09

26 Jun '09

This is basically the patch by Sascha at https://bugzilla.redhat.com/show_bug.cgi?id=503254 with a couple of cleanups. I think it's low risk, and avoid a crash so I commited it. Basically ths SXPR syntax changed from (type vnc) to (vnc 1) for VNC vfb devices, and assuming something similar for sdl. The code checks first for type then backoff for vnc/sdl so I think this is backward compatible. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH 3/5] disk geometry
by Henrik Persson 26 Jun '09

26 Jun '09

Reads the disk geometry to be able to align disk partitions on cylinder boundries. Msdos partition tables really like this stuff.

4 3

[libvirt] [PATCH 0/5] Create storage volumes with disk backend
by Henrik Persson 26 Jun '09

26 Jun '09

Hi, These patches make it possible to create storage volumes when having a disk as backend. As sent in earlier mail, it does not handle LVM and RAID partition currently. /Henrik

2 1

[libvirt] [PATCH] Don't disable all logging with --disable-debug
by Amy Griffis 26 Jun '09

26 Jun '09

This patch changes the automake conditional for debugging to disable only the debug output, not the entire logging module. Since the logging symbols are always visible now, I moved them to libvirt_private.syms and got rid of libvirt_debug.syms. I noticed that debugFlag wasn't being used anymore, so I removed that too. There was some code in __virExec where if you called with NULLs for childout and childerr, it would conditionally set the fds to either -1 or the /dev/null fd depending on ENABLE_DEBUG. I'm not sure why the difference, but it seemed safe to remove the entire conditional section since either setting is effectively treated the same way in the following code. Signed-off-by: Amy Griffis <amy.griffis(a)hp.com> diff --git a/src/Makefile.am b/src/Makefile.am index f65e7ad..23a1843 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -498,10 +498,6 @@ EXTRA_DIST += \ # symbols aren't present at all. # -if ENABLE_DEBUG -USED_SYM_FILES += libvirt_debug.syms -endif - if WITH_DRIVER_MODULES USED_SYM_FILES += libvirt_driver_modules.syms endif @@ -517,7 +513,6 @@ endif EXTRA_DIST += \ libvirt_public.syms \ libvirt_private.syms \ - libvirt_debug.syms \ libvirt_driver_modules.syms \ libvirt_bridge.syms \ libvirt_linux.syms diff --git a/src/libvirt.c b/src/libvirt.c index bf49018..bcb707e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -256,9 +256,7 @@ winsock_init (void) int virInitialize(void) { -#ifdef ENABLE_DEBUG char *debugEnv; -#endif if (initialized) return(0); @@ -269,7 +267,6 @@ virInitialize(void) virRandomInitialize(time(NULL) ^ getpid())) return -1; -#ifdef ENABLE_DEBUG debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && *debugEnv != '0') { if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) @@ -287,7 +284,6 @@ virInitialize(void) debugEnv = getenv("LIBVIRT_LOG_OUTPUTS"); if (debugEnv) virLogParseOutputs(debugEnv); -#endif DEBUG0("register drivers"); @@ -1055,13 +1051,11 @@ do_open (const char *name, /* Secondary driver for storage. Optional */ for (i = 0; i < virStorageDriverTabCount; i++) { res = virStorageDriverTab[i]->open (ret, auth, flags); -#ifdef ENABLE_DEBUG DEBUG("storage driver %d %s returned %s", i, virStorageDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); -#endif if (res == VIR_DRV_OPEN_ERROR) { if (0 && STREQ(virStorageDriverTab[i]->name, "remote")) { virLibConnWarning (NULL, VIR_WAR_NO_STORAGE, diff --git a/src/libvirt_debug.syms b/src/libvirt_debug.syms deleted file mode 100644 index 1742a0b..0000000 --- a/src/libvirt_debug.syms +++ /dev/null @@ -1,19 +0,0 @@ -# -# These symbols are dependent upon --enable-debug. -# - - -# libvirt_internal.h -debugFlag; - - -# logging.h -virLogMessage; -virLogSetDefaultPriority; -virLogDefineFilter; -virLogDefineOutput; -virLogParseFilters; -virLogParseOutputs; -virLogStartup; -virLogShutdown; -virLogReset; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 309d7f9..3958d9b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -192,6 +192,18 @@ virRegisterStorageDriver; virRegisterDeviceMonitor; +# logging.h +virLogMessage; +virLogSetDefaultPriority; +virLogDefineFilter; +virLogDefineOutput; +virLogParseFilters; +virLogParseOutputs; +virLogStartup; +virLogShutdown; +virLogReset; + + # memory.h virAlloc; virAllocN; diff --git a/src/logging.c b/src/logging.c index 83e07cc..fd1d5d4 100644 --- a/src/logging.c +++ b/src/logging.c @@ -39,9 +39,6 @@ #include "util.h" #include "threads.h" -#ifdef ENABLE_DEBUG -int debugFlag = 0; - /* * Macro used to format the message as a string in virLogMessage * and borrowed from libxml2 (also used in virRaiseError) @@ -793,5 +790,4 @@ int virLogParseFilters(const char *filters) { } return(ret); } -#endif /* ENABLE_DEBUG */ diff --git a/src/logging.h b/src/logging.h index 7ea8935..d99bb31 100644 --- a/src/logging.h +++ b/src/logging.h @@ -32,22 +32,17 @@ #ifdef ENABLE_DEBUG #define VIR_DEBUG_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_DEBUG, f, l, 0, fmt, __VA_ARGS__) +#else +#define VIR_DEBUG_INT(category, f, l, fmt,...) \ + do { } while (0) +#endif /* !ENABLE_DEBUG */ + #define VIR_INFO_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_INFO, f, l, 0, fmt, __VA_ARGS__) #define VIR_WARN_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_WARN, f, l, 0, fmt, __VA_ARGS__) #define VIR_ERROR_INT(category, f, l, fmt,...) \ virLogMessage(category, VIR_LOG_ERROR, f, l, 0, fmt, __VA_ARGS__) -#else -#define VIR_DEBUG_INT(category, f, l, fmt,...) \ - do { } while (0) -#define VIR_INFO_INT(category, f, l, fmt,...) \ - do { } while (0) -#define VIR_WARN_INT(category, f, l, fmt,...) \ - do { } while (0) -#define VIR_ERROR_INT(category, f, l, fmt,...) \ - do { } while (0) -#endif /* !ENABLE_DEBUG */ #define VIR_DEBUG(fmt,...) \ VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) @@ -108,8 +103,6 @@ typedef int (*virLogOutputFunc) (const char *category, int priority, */ typedef void (*virLogCloseFunc) (void *data); -#ifdef ENABLE_DEBUG - extern int virLogSetDefaultPriority(int priority); extern int virLogDefineFilter(const char *match, int priority, int flags); extern int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, @@ -128,18 +121,4 @@ extern void virLogMessage(const char *category, int priority, const char *funcname, long long linenr, int flags, const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 6, 7); -#else /* ENABLE_DEBUG */ - -#define virLogSetDefaultPriority(p) -#define virLogDefineFilter(m, p, f) -#define virLogDefineOutput(func, c, d, p, f) -#define virLogStartup() -#define virLogReset() -#define virLogShutdown() -#define virLogParseFilters(f) -#define virLogParseOutputs(o) -#define virLogMessage(c, p, func, l, f, fmt, __VA_ARGS__) - -#endif /* ENABLE_DEBUG */ - #endif diff --git a/src/util.c b/src/util.c index 8b746f5..408e17a 100644 --- a/src/util.c +++ b/src/util.c @@ -349,10 +349,6 @@ __virExec(virConnectPtr conn, } else { childout = *outfd; } -#ifndef ENABLE_DEBUG - } else { - childout = null; -#endif } if (errfd != NULL) { @@ -380,10 +376,6 @@ __virExec(virConnectPtr conn, } else { childerr = *errfd; } -#ifndef ENABLE_DEBUG - } else { - childerr = null; -#endif } if ((pid = fork()) < 0) {

3 2

[libvirt] [PATCH 0/1] Fix bogus WWNs
by David Allan 26 Jun '09

26 Jun '09

When HBA kernel modules are loaded while libvirt is running, libvirt will often read bogus WWNs from sysfs as at least some modules trigger the HAL event notifying libvirt of adapters' existence before the sysfs info is correct. The following patch causes libvirt to reread the WWNs whenever dumpxml is called so the capability information about the WWNs will be up to date. I pulled the logic to read the WWNs into two separate functions, and the patch is slightly more invasive as a result. The resulting code is smaller and cleaner for it, though, so I think this is the right way to go. (The diff is also very ugly; it should make sense once applied.) Dave

3 3

[libvirt] virStorageVolCreateXMLFrom
by Kenneth Nagin 26 Jun '09

26 Jun '09

I'd like to get a better understanding of the virStorageVolCreateXMLFrom api Its name and signature imply that it is a cloning operation that copies a volume from one location to another. Is this correct? Assuming that the answer is yes I have few other questions: Does it support remote copy of non-shared storage, e.g. from a http server? Is there any thought about adding digest validation check, e.g. with a md5 digest? Is copy-on-write cloning supported in this command? Kenneth Nagin

3 3

[libvirt] [PATCH 5/5] create storage volumes, take 2
by Henrik Persson 26 Jun '09

26 Jun '09

Here is a updated patch that defines a enum for mapping parition code to parted's fs-type. /Henrik

1 0

[libvirt] [PATCH] For comment/critique only - netcf backend for virInterface*.
by Laine Stump 26 Jun '09

26 Jun '09

This is the backend for the interface driver (virInterface*()) that uses netcf. There are a few issues with it: 1) It doesn't yet implement the backend for virConnectListDefinedInterfaces() and virConnectNumOfDefinedInterfaces() (although it does use my patched netcf API to list only active interfaces for virConnectListInterfaces()). (That patch isn't committed to netcf yet, btw; it's functional, but a bit rough and hackish) 2) interfaceLookupByMACString() still uses the old arg convention for ncf_lookup_by_mac_string(), which returned a single interface. That function has been changed to potentially return multiple interfaces. To fully support that, we would need to change the libvirt API. What should we do here? 3) The XML in interfaceDefineXML() isn't validated, although the spot to do it is clearly marked. 4) There's no comment in the place where we could, in the future, transform the XML returned to interfaceGetXMLDesc() by netcf. Currently the two use the same RNG. Since it would be a null transform, and that will only change under our control, that isn't an *immediate* problem, but shouldn't be forgotten. Parts that I'm unsure of: 1) changes to the Makefile, particularly surrounding "DRIVER_MODULES". 2) Is it registered in the proper places? 3) Could it (should it?) be added to other hypervisor drivers? (Currently I only put it in qemud.c) --- qemud/Makefile.am | 4 + qemud/qemud.c | 6 + src/Makefile.am | 16 ++- src/interface_driver.c | 381 ++++++++++++++++++++++++++++++++++++++++++++++++ src/interface_driver.h | 34 +++++ 5 files changed, 440 insertions(+), 1 deletions(-) create mode 100644 src/interface_driver.c create mode 100644 src/interface_driver.h diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 403846a..9f982ba 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -134,6 +134,10 @@ if WITH_NETWORK libvirtd_LDADD += ../src/libvirt_driver_network.la endif +if WITH_NETCF + libvirtd_LDADD += ../src/libvirt_driver_interface.la +endif + if WITH_NODE_DEVICES libvirtd_LDADD += ../src/libvirt_driver_nodedev.la endif diff --git a/qemud/qemud.c b/qemud/qemud.c index b5e3665..9326ce9 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -81,6 +81,9 @@ #ifdef WITH_NETWORK #include "network_driver.h" #endif +#ifdef WITH_NETCF +#include "interface_driver.h" +#endif #ifdef WITH_STORAGE_DIR #include "storage_driver.h" #endif @@ -822,6 +825,9 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_NETWORK networkRegister(); #endif +#ifdef WITH_NETCF + interfaceRegister(); +#endif #ifdef WITH_STORAGE_DIR storageRegister(); #endif diff --git a/src/Makefile.am b/src/Makefile.am index f65e7ad..f5bf1b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -154,6 +154,9 @@ ONE_DRIVER_SOURCES = \ NETWORK_DRIVER_SOURCES = \ network_driver.h network_driver.c +INTERFACE_DRIVER_SOURCES = \ + interface_driver.h interface_driver.c + # Storage backend specific impls STORAGE_DRIVER_SOURCES = \ storage_driver.h storage_driver.c \ @@ -381,8 +384,18 @@ libvirt_driver_network_la_SOURCES = $(NETWORK_DRIVER_SOURCES) endif if WITH_NETCF -libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) libvirt_driver_interface_la_LDFLAGS = $(NETCF_LIBS) +libvirt_driver_interface_la_CFLAGS = $(NETCF_CFLAGS) +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_interface.la +else +noinst_LTLIBRARIES += libvirt_driver_interface.la +libvirt_la_LIBADD += libvirt_driver_interface.la +endif +if WITH_DRIVER_MODULES +libvirt_driver_interface_la_LDFLAGS += -module -avoid-version +endif +libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) endif # Needed to keep automake quiet about conditionals @@ -467,6 +480,7 @@ EXTRA_DIST += \ $(OPENVZ_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ + $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ $(STORAGE_DRIVER_LVM_SOURCES) \ diff --git a/src/interface_driver.c b/src/interface_driver.c new file mode 100644 index 0000000..b6cf510 --- /dev/null +++ b/src/interface_driver.c @@ -0,0 +1,381 @@ +/* + * interface_driver.c: backend driver methods to handle physical + * interface configuration using the netcf library. + * + * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * 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: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <sys/types.h> +#include <sys/poll.h> +#include <dirent.h> +#include <limits.h> +#include <string.h> +#include <stdio.h> +#include <strings.h> +#include <stdarg.h> +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <sys/utsname.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <signal.h> +#include <paths.h> +#include <pwd.h> +#include <stdio.h> +#include <sys/wait.h> +#include <sys/ioctl.h> +#include <netcf.h> + +#include "virterror_internal.h" +#include "datatypes.h" +#include "interface_driver.h" +#include "driver.h" +#include "event.h" +#include "buf.h" +#include "util.h" +#include "memory.h" +#include "logging.h" + +#define VIR_FROM_THIS VIR_FROM_INTERFACE + +#define interfaceReportError(conn, dom, net, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_THIS, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt) + +/* Main driver state */ +struct interface_driver +{ + virMutex lock; + struct netcf *netcf; +}; + + +static void interfaceDriverLock(struct interface_driver *driver) +{ + virMutexLock(&driver->lock); +} + +static void interfaceDriverUnlock(struct interface_driver *driver) +{ + virMutexUnlock(&driver->lock); +} + + +static struct interface_driver *driverState = NULL; + +static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (VIR_ALLOC(driverState) < 0) + { + virReportOOMError(conn); + goto alloc_error; + } + + /* initialize non-0 stuff in driverState */ + if (virMutexInit(&driverState->lock) < 0) + { + /* what error to report? */ + goto mutex_error; + } + + /* open netcf */ + if (ncf_init(&driverState->netcf, NULL) != 0) + { + /* what error to report? */ + goto netcf_error; + } + + conn->interfacePrivateData = driverState; + return 0; + +netcf_error: + if (driverState->netcf) + { + ncf_close(driverState->netcf); + } + virMutexDestroy (&driverState->lock); +mutex_error: + VIR_FREE(driverState); +alloc_error: + return -1; +} + +static int interfaceCloseInterface(virConnectPtr conn) +{ + + if (conn->interfacePrivateData != NULL) + { + struct interface_driver *driver + = (struct interface_driver *)conn->interfacePrivateData; + + /* close netcf instance */ + ncf_close(driver->netcf); + /* destroy lock */ + virMutexDestroy(&driver->lock); + /* free driverState */ + VIR_FREE(driver); + } + conn->interfacePrivateData = NULL; + return 0; +} + +static int interfaceNumInterfaces(virConnectPtr conn) +{ + int count; + struct interface_driver *driver = conn->interfacePrivateData; + + interfaceDriverLock(driver); + count = ncf_num_of_interfaces(driver->netcf, NETCF_FLAG_ACTIVE); + interfaceDriverUnlock(driver); + return count; +} + +static int interfaceListInterfaces(virConnectPtr conn, char **const names, int nnames) +{ + struct interface_driver *driver = conn->interfacePrivateData; + int count; + + interfaceDriverLock(driver); + + count = ncf_list_interfaces(driver->netcf, nnames, names, NETCF_FLAG_ACTIVE); + /* netcf cleans up in the case of errors */ + interfaceDriverUnlock(driver); + + return count; + +} + +static virInterfacePtr interfaceLookupByName(virConnectPtr conn, + const char *name) +{ + struct interface_driver *driver = conn->interfacePrivateData; + struct netcf_if *iface; + virInterfacePtr ret = NULL; + + interfaceDriverLock(driver); + iface = ncf_lookup_by_name(driver->netcf, name); + + if (!iface) { + interfaceReportError(conn, NULL, NULL, VIR_ERR_NO_INTERFACE, + "%s", _("no interface with matching name")); + goto cleanup; + } + + ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static virInterfacePtr interfaceLookupByMACString(virConnectPtr conn, + const char *macstr) +{ + struct interface_driver *driver = conn->interfacePrivateData; + struct netcf_if *iface; + virInterfacePtr ret = NULL; + + interfaceDriverLock(driver); + iface = ncf_lookup_by_mac_string(driver->netcf, macstr); + + if (!iface) { + interfaceReportError(conn, NULL, NULL, VIR_ERR_NO_INTERFACE, + "%s", _("no interface with matching MAC address")); + goto cleanup; + } + + ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static char *interfaceGetXMLDesc(virInterfacePtr ifinfo, + unsigned int flags ATTRIBUTE_UNUSED) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + char *ret = NULL; + + interfaceDriverLock(driver); + iface = ncf_lookup_by_name(driver->netcf, ifinfo->name); + + if (!iface) { + /* May want to check by name here, but probably pointless */ + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("no interface with matching MAC Address")); + goto cleanup; + } + + ret = ncf_if_xml_desc(iface); + if (!ret) { + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("could not get interface XML description")); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static virInterfacePtr interfaceDefineXML(virConnectPtr conn, + const char *xml, + unsigned int flags ATTRIBUTE_UNUSED) +{ + struct interface_driver *driver = conn->interfacePrivateData; + struct netcf_if *iface = NULL; + virInterfacePtr ret = NULL; + + interfaceDriverLock(driver); + + /* + * This is where we will want to validate the XML, and possibly + * transform it before sending it on. + */ + + iface = ncf_define(driver->netcf, xml); + if (!iface) { + interfaceReportError(conn, NULL, NULL, VIR_ERR_INVALID_INTERFACE, + "%s", _("failed to define new interface from XML")); + goto cleanup; + } + + ret = virGetInterface(conn, ncf_if_name(iface), ncf_if_mac_string(iface)); + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceUndefine(virInterfacePtr ifinfo) { + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + int ret = -1; + + interfaceDriverLock(driver); + + iface = ncf_lookup_by_name(driver->netcf, ifinfo->name); + if (!iface) { + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("no interface with matching MAC address")); + goto cleanup; + } + + ret = ncf_if_undefine(iface); + if (ret < 0) { + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("failed to undefine interface")); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceCreate(virInterfacePtr ifinfo, + unsigned int flags ATTRIBUTE_UNUSED) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + int ret = -1; + + interfaceDriverLock(driver); + + iface = ncf_lookup_by_name(driver->netcf, ifinfo->name); + if (!iface) { + interfaceReportError(ifinfo->conn, NULL, ifincof, VIR_ERR_INVALID_INTERFACE, + "%s", _("no interface with matching MAC address")); + goto cleanup; + } + + ret = ncf_if_up(iface); + if (ret < 0) { + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("failed to create (start) interface")); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static int interfaceDestroy(virInterfacePtr ifinfo, + unsigned int flags ATTRIBUTE_UNUSED) +{ + struct interface_driver *driver = ifinfo->conn->interfacePrivateData; + struct netcf_if *iface = NULL; + int ret = -1; + + interfaceDriverLock(driver); + + iface = ncf_lookup_by_name(driver->netcf, ifinfo->name); + if (!iface) { + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("no interface with matching MAC address")); + goto cleanup; + } + + ret = ncf_if_down(iface); + if (ret < 0) { + interfaceReportError(ifinfo->conn, NULL, ifinfo, VIR_ERR_INVALID_INTERFACE, + "%s", _("failed to destroy (stop) interface")); + goto cleanup; + } + +cleanup: + ncf_if_free(iface); + interfaceDriverUnlock(driver); + return ret; +} + +static virInterfaceDriver interfaceDriver = { + "Interface", + interfaceOpenInterface, /* open */ + interfaceCloseInterface, /* close */ + interfaceNumInterfaces, /* numOfInterfaces */ + interfaceListInterfaces, /* listInterfaces */ + interfaceLookupByName, /* interfaceLookupByName */ + interfaceLookupByMACString, /* interfaceLookupByMACSTring */ + interfaceGetXMLDesc, /* interfaceGetXMLDesc */ + interfaceDefineXML, /* interfaceDefineXML */ + interfaceUndefine, /* interfaceUndefine */ + interfaceCreate, /* interfaceCreate */ + interfaceDestroy, /* interfaceDestroy */ +}; + +int interfaceRegister(void) { + virRegisterInterfaceDriver(&interfaceDriver); + return 0; +} diff --git a/src/interface_driver.h b/src/interface_driver.h new file mode 100644 index 0000000..be00e0b --- /dev/null +++ b/src/interface_driver.h @@ -0,0 +1,34 @@ +/* + * interface_driver.h: core driver methods for managing physical host interfaces + * + * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * 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: Daniel P. Berrange <berrange(a)redhat.com> + */ + + +#ifndef __VIR_INTERFACE__DRIVER_H +#define __VIR_INTERFACE__DRIVER_H + +#include <config.h> + +#include "internal.h" + +int interfaceRegister(void); + +#endif /* __VIR_INTERFACE__DRIVER_H */ -- 1.6.0.6

2 1

[libvirt] VMware ESX driver status update
by Matthias Bolte 26 Jun '09

26 Jun '09

Hi, I'm still working on the VMX config to domain XML mapping for dump/create XML, but it's not complete yet. I got distracted by other urgent, Uni related work that had to be done first. So I won't be able to complete the dump/create XML implementation until tomorrow (freeze for the 0.6.5 release) that was requested in order to get the driver merged into the official repository. But well, with the short release cycle of libvirt not much is lost :) Some details on the VMX config to domain XML mapping: I claimed before that I would need to read most information needed for dump XML from the VMX config file. That's not true. Possibly all information can be retrieved via VI API, but the information is scattered in various places in the VI API object model. I'm currently heading for reading this information from the VMX config file, because all needed information is concentrated in this file. Also, if one changes properties of a virtual machine via VI API and this properties is reflected in the VMX config, the ESX host updates the VMX config, so the information is kept in sync between the object model and the config file. I guess, that the VMX config files contains enough information to fill all or at least most fields of a virDomainDef. So the first goal is to fill a virDomainDef for dump XML. The next goal would be a basic create XML. I claimed before that I would need to write an VMX config file to the ESX host in order to create a new virtual machine, but as I dig trough the VI API in more detail, it seems that this claim maybe false. I'll just have to test this, but haven't had time to do it yet. One problem here is the essential guestOS field of the VMX config, see http://sanbarrow.com/vmx/vmx-guestos.html . For a first try I would set it to 'other' by default, because there is currently no field available in the domain XML to map this information to. But to allow the user to set this filed, I would want to extend to domain XML definition in order to reuse existing code. So how would I do this? Currently I'm just using the virDomainDef struct and the related parse and format functions. One option would be to add a guest field to the virDomainOSDef struct and extend the parse and format functions to handle it. The parse and format functions take flags already, so a flag could be added to indicate if the guest field should be handled or not (just like the VMX extension for the virConfParser). Regards, Matthias

4 5

[libvirt] [PATCH 0/3] Control Linux capabilities in libvirt
by Daniel P. Berrange 26 Jun '09

26 Jun '09

The libvirtd system instance runs privileged (as root), and likewise so do VMs run from it. This is undesirable for obvious security reasons, even if you do have SELinux available. Linux has a concept of capabilities which are actually what gives 'root' its power. If you take away all capabilities from a process running root, you significantly limit its power. eg if you take away CAP_DAC_OVERRIDE, root can now only read files explicitly owned by root, not any other users. There are about 30-something capabilities at this time - see 'man 7 capabilities' for a full list and examples of what each allows you todo Historically it has needed alot of code to manage/modify capabilities, but there is a new library for managing Linux capabilities recently released, which makes their use significantly easier. This is known as libcap-ng http://people.redhat.com/sgrubb/libcap-ng/ I anticipate a several step process 1. Drop all capabilities from spawned processes which don't need it 2. Reduce capabilities from the libvirtd daemon 3. Run VM processes as non-root, unprivileged users 4. Run the libvirtd daemon as as a non-root, semi-privileged user This series of patches lays the very *basic* groundwork for controlling Linux capabilities, doing options 1 and 2. Option '3' is what I'd really like to get working, but it is more invasive, because it will need changes to the QEMU driver so it will chown disks to the 'kvm' user before spawning kvm (likewise for PCI devs, USB devs, etc). Step 1 is a mild security benefit, adding step 3 is a significant step forward. Step 2 doesn't have much tangible benefit, since our functionality requires that we need CAP_DAC_OVERRIDE, CAP_SYS_ADMIN and CAP_NET_ADMIN. Once you give a process those, its pretty much game over for security benefits of removing other capabilities. The 4th option *could* help security, but only if there are some changes to the way distros deploy apps. In particular they'd need to make sure binaries are installed with correct file capabilities, before we could use it, otherwise we wouldnt' be able to get child processes we spawn to keep capabilities they need. In addition, with step 4, we'd be asking admins to trade off functionality against security. eg, we could only drop CAP_DAC_OVERRIDE, if you turned off certain features. It is certainly desirable for users who want to tightly lock down their system, but not for a general purpose install. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 13

[libvirt] [PATCH 5/5] create storage volumes
by Henrik Persson 25 Jun '09

25 Jun '09

This patch does the last magic to be able to create storage volumes when using a disk as backend

3 3

[libvirt] [PATCH] Fix reading storage pool defs on driver startup
by Cole Robinson 25 Jun '09

25 Jun '09

The recent storage refactoring I committed broke reading pool definitions from disk on driver startup: the result was that none of your pools would be defined. Frankly not sure how I managed to miss the brokenness, sorry about that! Also refactor the startup code to match the existing network and domain conventions. Thanks, Cole

2 1

[libvirt] Fix the no debug build
by Amy Griffis 25 Jun '09

25 Jun '09

The --enable-debug=no build breaks building the UML driver because of __VA_ARGS__ in the virLogMessage macro. I fixed this by converting umlLog() calls to use the standard logging macros instead. The only problem I see with doing this is what Daniel had mentioned a while back. Disabling debug actually turns off the entire logging module instead of just the debug output. I can work on fixing that part in another patch. Signed-off-by: Amy Griffis <amy.griffis(a)hp.com> diff --git a/src/uml_driver.c b/src/uml_driver.c index 7949d4f..7aeb7bf 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -66,9 +66,6 @@ static int umlShutdown(void); -#define umlLog(level, msg, ...) \ - virLogMessage(__FILE__, level, __func__, __LINE__, 0, msg, __VA_ARGS__) - static void umlDriverLock(struct uml_driver *driver) { virMutexLock(&driver->lock); @@ -95,8 +92,7 @@ static int umlSetCloseExec(int fd) { goto error; return 0; error: - umlLog(VIR_LOG_ERROR, - "%s", _("Failed to set close-on-exec file descriptor flag\n")); + VIR_ERROR0(_("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -136,7 +132,7 @@ umlAutostartConfigs(struct uml_driver *driver) { !virDomainIsActive(driver->domains.objs[i]) && umlStartVMDaemon(conn, driver, driver->domains.objs[i]) < 0) { virErrorPtr err = virGetLastError(); - umlLog(VIR_LOG_ERROR, _("Failed to autostart VM '%s': %s\n"), + VIR_ERROR(_("Failed to autostart VM '%s': %s"), driver->domains.objs[i]->def->name, err->message); } } @@ -368,13 +364,13 @@ umlStartup(int privileged) { if ((uml_driver->inotifyFD = inotify_init()) < 0) { - umlLog(VIR_LOG_ERROR, "%s", _("cannot initialize inotify")); + VIR_ERROR0(_("cannot initialize inotify")); goto error; } if (virFileMakePath(uml_driver->monitorDir) < 0) { char ebuf[1024]; - umlLog(VIR_LOG_ERROR, _("Failed to create monitor directory %s: %s"), + VIR_ERROR(_("Failed to create monitor directory %s: %s"), uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -407,8 +403,7 @@ umlStartup(int privileged) { return 0; out_of_memory: - umlLog (VIR_LOG_ERROR, - "%s", _("umlStartup: out of memory\n")); + VIR_ERROR0(_("umlStartup: out of memory")); error: VIR_FREE(userdir); @@ -825,25 +820,25 @@ static int umlStartVMDaemon(virConnectPtr conn, tmp = progenv; while (*tmp) { if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) - umlLog(VIR_LOG_WARN, _("Unable to write envv to logfile: %s\n"), + VIR_WARN(_("Unable to write envv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfd, " ", 1) < 0) - umlLog(VIR_LOG_WARN, _("Unable to write envv to logfile: %s\n"), + VIR_WARN(_("Unable to write envv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { if (safewrite(logfd, *tmp, strlen(*tmp)) < 0) - umlLog(VIR_LOG_WARN, _("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfd, " ", 1) < 0) - umlLog(VIR_LOG_WARN, _("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } if (safewrite(logfd, "\n", 1) < 0) - umlLog(VIR_LOG_WARN, _("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); vm->monitor = -1; @@ -888,8 +883,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, vm->monitor = -1; if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) { - umlLog(VIR_LOG_WARN, - _("Got unexpected pid %d != %d\n"), + VIR_WARN(_("Got unexpected pid %d != %d"), ret, vm->pid); }

3 2

[libvirt] Memory leak in node_device_conf.c
by Dave Allan 25 Jun '09

25 Jun '09

I found what I assume is a memory leak in the node device code while working on a separate problem; patch attached. Dave diff --git a/src/node_device_conf.c b/src/node_device_conf.c index 1fbf9dc..56a9bb5 100644 --- a/src/node_device_conf.c +++ b/src/node_device_conf.c @@ -1203,6 +1203,8 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(data->net.address); break; case VIR_NODE_DEV_CAP_SCSI_HOST: + VIR_FREE(data->scsi_host.wwnn); + VIR_FREE(data->scsi_host.wwpn); break; case VIR_NODE_DEV_CAP_SCSI: VIR_FREE(data->scsi.type);

3 2

[libvirt] Re: [netcf-devel] Multiple interfaces with identical mac-addresses
by Laine Stump 25 Jun '09

25 Jun '09

(expanding Cc to include libvir-list, because this is more of a libvirt issue) On 06/24/2009 01:52 PM, David Lutterkort wrote: > On Wed, 2009-06-24 at 18:22 +0100, Daniel P. Berrange wrote: > >> On Wed, Jun 24, 2009 at 10:20:00AM -0700, David Lutterkort wrote: >> >>> On Tue, 2009-06-23 at 21:47 +0100, Daniel P. Berrange wrote: >>> >>>> Why would we ever have duplicate MAC addresses? >>>> >>> VLANs: >>> >>> # vconfig add eth0 42 >>> # cat /sys/class/net/eth0.42/address >>> 00:15:58:81:5b:0e >>> # cat /sys/class/net/eth0/address >>> 00:15:58:81:5b:0e >>> >> Ok, so for the libvirt API we should define that the lookup-by-mac API >> will not return VLAN devices, since we cant provide a 1-1 lookup there >> > > Why would you do that ? When the user asks for interfaces with a MAC, > you don't know if they are looking for a VLAN or base device. If they > want the VLAN, how would they look that up ? > I think we need to do one of two things: 1) Modify the existing virInterfaceLookupByMACString() api to return a list of virInterfaces. Although the public API has been in one release, there has been no functionality behind the API, so there's nobody using it as it is, and nobody is going to expect to use it as it is either. Because of that, "backward compatibility" isn't as much of an issue, and maybe we could let this modification to the API slide. 2) If we want to be really anal, we could modify virInterfaceLookupByMACString() to return an error if there are multiple interfaces with that particular MAC address, then provide a new function (name suggestion?) that would return a list of interfaces.

2 1

[libvirt] [PATCH] fix virsh dominfo returns error when virNodeGetSecurityModel() is not supported.
by Tatsuro Enokura 25 Jun '09

25 Jun '09

Hi all I try virsh dominfo in upstream libvirt on xen machine, the commands returns -1 as follows: [root@vmi20 ~]# virsh dominfo rhel53rc2_pv_sdb3 Id: 1 Name: rhel53rc2_pv_sdb3 UUID: 05ba9be8-f4e9-e208-11c7-fc936655cd8e OS Type: linux State: idle CPU(s): 2 CPU time: 8.8s Max memory: 1048576 kB Used memory: 716800 kB Autostart: disable error: this function is not supported by the hypervisor: virNodeGetSecurityModel [root@vmi20 ~]# echo $? 1 The explanation of virNodeGetSecurityModel() and virNodeGetSecurityModel() in libvirt.c is return -2 when hypervisor drivers don't support these operations. But these functions return -1 in this case, and so cmdDominfo() in virsh.c returns FALSE. I make a patch. - virNodeGetSecurityModel() and virNodeGetSecurityModel() return -2 when drivers don't supprted these operations. - In CmdDominfo(), it is no operation when virNodeGetSecurityModel() and virNodeGetSecurityModel() return -2. Signed-off-by: Tatsuro Enokura <fj2026af(a)aa.jp.fujitsu.com> Thanks Tatsuro Enokura

3 8

[libvirt] [PATCH] OpenNebula driver changes
by Javier Fontan 25 Jun '09

25 Jun '09

Hello, The first patch makes OpenNebula driver compilable in recent codebase. The second one adds direct calls to xmlrpc library so it does not depend on OpenNebula libraries and can be licensed as LGPL. I have compiled libvirt with the modifications without errors but with the current version I checked out from git repository I am having problems: --8<------ (LD) -o libvirtd libvirtd-event.o libvirtd-qemud.o libvirtd-remote.o libvirtd-remote_protocol.o ../src/.libs/libvirt_driver_storage.a(storage_backend.o): In function `virStorageBackendWaitForDevices': /home/jfontan/git/libvirt.git/src/storage_backend.c:262: undefined reference to `virNodeDeviceWaitForDevices' ------>8-- Patches are made from 0a29f59e3b8e2c1fb797d2fa93831f21a3e1711e Bye -- Javier Fontan, Grid & Virtualization Technology Engineer/Researcher DSA Research Group: http://dsa-research.org Globus GridWay Metascheduler: http://www.GridWay.org OpenNebula Virtual Infrastructure Engine: http://www.OpenNebula.org

4 5

[libvirt] [PATCH 2/5] Add partition type
by Henrik Persson 25 Jun '09

25 Jun '09

This patch add the partition type (primary, extended, logical) in internal libvirt data structure. This is important when deciding what kind of partition should be created.

2 1

[libvirt] [PATCH 1/5] Add type of free area
by Henrik Persson 25 Jun '09

25 Jun '09

This patch adds the type of the free area, since this is important when creating logical partitions.

2 1

[libvirt] [PATCH 4/5] free extent fix
by Henrik Persson 25 Jun '09

25 Jun '09

Parted reports that the first block of the disk is free, even if it is occupied by the partition table.

2 1

[libvirt] libvirt support for qemu downscript
by Shahar Klein 24 Jun '09

24 Jun '09

Hi I'm using virsh to launch a VM. the if-up script works perfectly but I couldn't find any reference to using down script I 'gueesed ' and put something like that: <interface type='ethernet'> . . <script path='ifup'/> <downscript path='ifdwon'/> . . </interface> but the down script is not called on shutdown am I missing something? thanks Shahar

1 0

[libvirt] virsh hangs
by Garry Dolley 24 Jun '09

24 Jun '09

My system: Ubuntu Jaunty 9.04 libvirt 0.6.4 kvm 0.8.4 qemu 0.10.0 I'm not sure what triggered this, I was working with several VMs, and then found that virsh decided to hang: garry@kvr02:~$ virsh list Connecting to uri: qemu:///system <hang> I have to ^C out of it. If I 'force-stop' and then 'start' libvirt-bin: garry@kvr02:~$ sudo /etc/init.d/libvirt-bin force-stop * Forcefully stopping libvirt management daemon libvirtd ...done. garry@kvr02:~$ sudo /etc/init.d/libvirt-bin start * Starting libvirt management daemon libvirtd ...done. I can then get something: garry@kvr02:~$ virsh list Connecting to uri: qemu:///system Id Name State ---------------------------------- 1 vm1 running 4 s3-lax running 14 freebsd-test running 19 freebsd-2 running <hang> But it hangs after that 4th one. I must ^C it again. If I do 'virsh list' again, it'll then show nothing (hangs like it does above). Any suggestions? Thanks -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

3 6

Re: [libvirt] virsh hangs
by Garry Dolley 23 Jun '09

23 Jun '09

On Tue, Jun 23, 2009 at 04:08:25PM -0300, Itamar Reis Peixoto wrote: > why you don't try Fedora 11 > > it's have newer versions of libvirt and KVM > > and if you have problem's you can report a bug or talk with developers using IRC Why don't I use Fedora? Let's not go there... ;) -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

1 0

[libvirt] [RFC][PATCH] lxc: drop CAP_SYS_BOOT capability to prevent rebooting from inside containers
by Ryota Ozaki 23 Jun '09

23 Jun '09

Hi, Current lxc driver unexpectedly allows users inside containers to reboot host physical machine. This patch prevents this by dropping CAP_SYS_BOOT capability in the bounding set of the init processes in every containers. Note that the patch intends to make it easy to add further capabilities to drop if needed, although I'm not sure which capabilities should be dropped. (We might need to drop CAP_SETFCAP as well to be strict...) Thanks, ozaki-r Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> >From 0e7a7622bc6411bbe76c05c63c6e6e61d379d97b Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Fri, 8 May 2009 04:29:24 +0900 Subject: [PATCH] lxc: drop CAP_SYS_BOOT capability to prevent rebooting from inside containers Current lxc driver unexpectedly allows users inside containers to reboot host physical machine. This patch prevents this by dropping CAP_SYS_BOOT capability in the bounding set of the init processes in every containers. --- src/lxc_container.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/lxc_container.c b/src/lxc_container.c index 3946b84..37ab216 100644 --- a/src/lxc_container.c +++ b/src/lxc_container.c @@ -32,6 +32,8 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/wait.h> +#include <sys/prctl.h> +#include <sys/capability.h> #include <unistd.h> #include <mntent.h> @@ -639,6 +641,30 @@ static int lxcContainerSetupMounts(virDomainDefPtr vmDef, return lxcContainerSetupExtraMounts(vmDef); } + +static int lxcContainerDropCapabilities( virDomainDefPtr vmDef ) +{ + int i; + const struct { + int id; + const char *name; + } caps[] = { +#define ID_STRING(name) name, #name + { ID_STRING(CAP_SYS_BOOT) }, + }; + + for (i = 0 ; i < ARRAY_CARDINALITY(caps) ; i++) { + if (prctl(PR_CAPBSET_DROP, caps[i].id, 0, 0, 0)) { + lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("failed to drop %s"), caps[i].name); + return -1; + } + } + + return 0; +} + + /** * lxcChild: * @argv: Pointer to container arguments @@ -705,6 +731,10 @@ static int lxcContainerChild( void *data ) if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) return -1; + /* drop a set of root capabilities */ + if (lxcContainerDropCapabilities(vmDef) < 0) + return -1; + /* this function will only return if an error occured */ return lxcContainerExecInit(vmDef); } -- 1.6.0.6

6 15

[libvirt] [PATCH] Avoid unecessary SELinux setfilecon
by Daniel Veillard 23 Jun '09

23 Jun '09

As pointed by Tim Waugh in https://bugzilla.redhat.com/show_bug.cgi?id=507555 there are times where setting an SELinux file context is not possible, so if the context is already set appropriately the operation should be skipped Patch from Tim looks fine by me though I'm not versed in SELinux Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Do a correct format mapping of partitions
by Henrik Persson E 23 Jun '09

23 Jun '09

This patch reads the partition type and sets the correct target format of the storage volume when based on physical disk. --- libvirt-0.6.4.org/src/parthelper.c 2008-09-02 11:24:21.000000000 +0200 +++ libvirt-0.6.4/src/parthelper.c 2009-06-22 16:29:49.108681000 +0200 @@ -67,6 +67,7 @@ while (part) { const char *type; const char *content; + int partType = 0; if (part->type & PED_PARTITION_LOGICAL) { type = "logical"; if (part->type & PED_PARTITION_FREESPACE) @@ -92,26 +93,35 @@ content = "data"; } + /* Get partition type */ + if(ped_partition_is_active(part)) { + if(ped_partition_is_flag_available(part, PED_PARTITION_TYPE)) { + partType = ped_partition_get_flag(part,PED_PARTITION_TYPE); + } + } + /* We do +1 on geom.end, because we want end of the last sector * in bytes, not the last sector number */ if (part->num != -1) { - printf("%s%d%c%s%c%s%c%llu%c%llu%c%llu%c", + printf("%s%d%c%s%c%s%c%llu%c%llu%c%llu%c%d%c", part->geom.dev->path, part->num, '\0', type, '\0', content, '\0', part->geom.start * 512llu, '\0', (part->geom.end + 1 ) * 512llu, '\0', - part->geom.length * 512llu, '\0'); + part->geom.length * 512llu, '\0', + partType, '\0'); } else { - printf("%s%c%s%c%s%c%llu%c%llu%c%llu%c", + printf("%s%c%s%c%s%c%llu%c%llu%c%llu%c%d%c", "-", '\0', type, '\0', content, '\0', part->geom.start * 512llu, '\0', (part->geom.end + 1 ) * 512llu, '\0', - part->geom.length * 512llu, '\0'); + part->geom.length * 512llu, '\0', + partType, '\0'); } part = ped_disk_next_partition(disk, part); } --- libvirt-0.6.4.org/src/storage_backend_disk.c 2009-04-02 11:50:10.000000000 +0200 +++ libvirt-0.6.4/src/storage_backend_disk.c 2009-06-22 18:25:14.095095000 +0200 @@ -36,6 +36,35 @@ #define PARTHELPER BINDIR "/libvirt_parthelper" +/* Map partition types to internal enum */ +static int +virStorageBackendDiskMapPartitionType(const char* partType) +{ + switch(atoi(partType)) { + case 0x05: + case 0x0f: + return VIR_STORAGE_VOL_DISK_EXTENDED; + case 0x06: + case 0x0e: + return VIR_STORAGE_VOL_DISK_FAT16; + case 0x0b: + case 0x0c: + return VIR_STORAGE_VOL_DISK_FAT32; + case 0x82: + return VIR_STORAGE_VOL_DISK_LINUX_SWAP; + case 0x83: + return VIR_STORAGE_VOL_DISK_LINUX; + case 0x8e: + return VIR_STORAGE_VOL_DISK_LINUX_LVM; + case 0xfd: + return VIR_STORAGE_VOL_DISK_LINUX_RAID; + default: + return VIR_STORAGE_VOL_DISK_NONE; + + } +} + + static int virStorageBackendDiskMakeDataVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -128,6 +157,9 @@ if (virStorageBackendUpdateVolInfo(conn, vol, 1) < 0) return -1; + /* virStorageBackendUpdateVolInfo sets format incorrect for partitions */ + vol->target.format = virStorageBackendDiskMapPartitionType(groups[6]); + vol->type = VIR_STORAGE_VOL_BLOCK; /* The above gets allocation wrong for @@ -250,7 +282,7 @@ return virStorageBackendRunProgNul(conn, pool, prog, - 6, + 7, virStorageBackendDiskMakeVol, vol); }

2 1

[libvirt] virsh -no-kvm problem on debian install
by ChaosMedia > WebDev 23 Jun '09

23 Jun '09

Hi, i've installed lastest kvm-86 and libvirt-0.6.4 tarballs on my debian stable and have a problem using virsh No matter what i do in the guest domain config or with /usr/bin/ symlinks, libvirt keeps using the -no-kvm option when starting guests when my cpu has kvm-amd support, modules are loaded and /dev/kvm exists, and starting the guests thru command line works fine, and faster. debian seems to install the following binary /usr/bin/qemu-system-x86_64, i had to add "/usr/bin/qemu" to get virsh to work, otherwise it will say it can't connect to qemu:///system here's some command output : #virsh -c qemu:///system capabilities <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> </capabilities> and tried adding "/usr/bin/qemu-kvm" symlink <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> </domain> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> </domain> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> </capabilities> So far i had no luck getting virsh to use kvm, it always adds the -no-kvm option, i'm not sure how to specify the domain type in the guest config, using the <emulator>/usr/bin/qemu-kvm</emulator> won't help. i've found that thread discussing the binaries and options but don't know if that patch was already added or if i have to patch my tarball.. http://www.redhat.com/archives/libvir-list/2009-March/msg00281.html please let me know if there's some way to let libvirt know that kvm exists on a debian install, using /usr/bin/qemu-system-x86_64 thx, Marc

2 2

[libvirt] [RFC] Reporting host interface status/statistics via netcf/libvirt, and listing active vs. inactive interfaces
by Laine Stump 22 Jun '09

22 Jun '09

I've already been working on incorporating physical host interface configuration into libvirt by way of using libnetcf on the backend. It's becoming apparent that, in addition to modifying and reporting the current configuration of interfaces, libvirt users also want to query current status of each interface (up/down, possibly other flags, packet/byte/error counts, current IP address, etc). There are two possible ways of doing this: 1) maintain libnetcf's focus on just interface configuration, and add code directly into libvirt to grab this information via appropriate ioctls or 2) add the functionality to libnetcf, and have libvirt call the new libnetcf API. (2) seems to make the most sense, because likely other libnetcf consumers will want this capability too. I'm thinking of a single API, something like: int netcf_if_status(netcf_if *, netcf_if_stats *); (or maybe int netcf_if_info(netcf_if *, netcf_if_info *)) I haven't really put much thought into the details of what should be in netcf_if_stats yet (beyond what I listed above), but wanted to get this idea out there so people can start sounding off (if I'm going down the wrong road, I'd rather be put on the right path before I get too far along!) This function could be exposed in the libvirt API as something like: int virInterfaceStatus|Info(virInterffacePtr iface, virInterfaceStats|Info *info); Any comments/ideas on this? (One possible complication I can see is interfaces with multiple associated IPs. On some platforms, each interface can have only a single IPv4 and a single IPv6 address (more IPs == more interfaces), but on others there can be multiples.) A (kind of) separate issue: In libvirt we want to be able to list active (up) and inactive (down) interfaces separately. For consistency, libvirt's way of exposing that will be to mimic what is done with virConnectListNetworks() (active) vs. virConnectListDefinedNetworks() (inactive). But netcf could do it with an extra argument to ncf_list_interfaces(). If the latter, should the default behavior be to list all interfaces, with flags set to eliminate up or down interfaces? 0 (list all) NETCF_NOLIST_UP NETCF_NOLIST_DOWN Or should the values be something like this: 0 (list all) NETCF_LIST_UP_ONLY NETCF_LIST_DOWN_ONLY (UP_ONLY + DOWN_ONLY would be equivalent to 0. As long as nobody came up with a good reason for "0". So should we do one of those, or should we mimic libirt's virNetwork API in libnetcf too?

5 55

[libvirt] [PATCH] Refactor storage XML parsing to be consistent with domain/network conf.
by Cole Robinson 22 Jun '09

22 Jun '09

The storage driver arranges its parsing routines in a way that make them difficult to use in the test driver for non-default file parsing. This refactoring moves things to be consistent with the way domain_conf and network_conf do things. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt_private.syms | 8 ++- src/storage_conf.c | 163 ++++++++++++++++++++++++++++++++-------------- src/storage_conf.h | 26 ++++++-- src/storage_driver.c | 8 +- src/test.c | 25 ++----- 5 files changed, 150 insertions(+), 80 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f63fa05..309d7f9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -267,7 +267,9 @@ virSecurityDriverGetModel; # storage_conf.h virStoragePoolDefFormat; virStoragePoolDefFree; -virStoragePoolDefParse; +virStoragePoolDefParseString; +virStoragePoolDefParseFile; +virStoragePoolDefParseNode; virStoragePoolLoadAllConfigs; virStoragePoolObjAssignDef; virStoragePoolObjClearVols; @@ -284,7 +286,9 @@ virStorageVolDefFindByName; virStorageVolDefFindByPath; virStorageVolDefFormat; virStorageVolDefFree; -virStorageVolDefParse; +virStorageVolDefParseFile; +virStorageVolDefParseString; +virStorageVolDefParseNode; virStoragePoolFormatDiskTypeToString; virStoragePoolFormatFileSystemTypeToString; virStoragePoolFormatFileSystemNetTypeToString; diff --git a/src/storage_conf.c b/src/storage_conf.c index 5f724dc..7d495ec 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -452,14 +452,12 @@ error: return ret; } - static virStoragePoolDefPtr -virStoragePoolDefParseDoc(virConnectPtr conn, - xmlXPathContextPtr ctxt, - xmlNodePtr root) { +virStoragePoolDefParseXML(virConnectPtr conn, + xmlXPathContextPtr ctxt) { virStoragePoolOptionsPtr options; virStoragePoolDefPtr ret; - xmlChar *type = NULL; + char *type = NULL; char *uuid = NULL; char *authType = NULL; @@ -468,13 +466,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, return NULL; } - if (STRNEQ((const char *)root->name, "pool")) { - virStorageReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("unknown root element for storage pool")); - goto cleanup; - } - - type = xmlGetProp(root, BAD_CAST "type"); + type = virXPathString(conn, "string(./@type)", ctxt); if ((ret->type = virStoragePoolTypeFromString((const char *)type)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("unknown storage pool type %s"), (const char*)type); @@ -656,6 +648,32 @@ catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) } virStoragePoolDefPtr +virStoragePoolDefParseNode(virConnectPtr conn, + xmlDocPtr xml, + xmlNodePtr root) { + xmlXPathContextPtr ctxt = NULL; + virStoragePoolDefPtr def = NULL; + + if (STRNEQ((const char *)root->name, "pool")) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("unknown root element for storage pool")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + def = virStoragePoolDefParseXML(conn, ctxt); +cleanup: + xmlXPathFreeContext(ctxt); + return def; +} + +static virStoragePoolDefPtr virStoragePoolDefParse(virConnectPtr conn, const char *xmlStr, const char *filename) { @@ -663,7 +681,6 @@ virStoragePoolDefParse(virConnectPtr conn, xmlParserCtxtPtr pctxt; xmlDocPtr xml = NULL; xmlNodePtr node = NULL; - xmlXPathContextPtr ctxt = NULL; /* Set up a parser context so we can catch the details of XML errors. */ pctxt = xmlNewParserCtxt (); @@ -673,10 +690,17 @@ virStoragePoolDefParse(virConnectPtr conn, pctxt->_private = conn; if (conn) virResetError (&conn->err); - xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, - filename ? filename : "storage.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); + if (filename) { + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } else { + xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, + "storage.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } + if (!xml) { if (conn && conn->err.code == VIR_ERR_NONE) virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -684,12 +708,6 @@ virStoragePoolDefParse(virConnectPtr conn, goto cleanup; } - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto cleanup; - } - node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -697,21 +715,33 @@ virStoragePoolDefParse(virConnectPtr conn, goto cleanup; } - ret = virStoragePoolDefParseDoc(conn, ctxt, node); + ret = virStoragePoolDefParseNode(conn, xml, node); xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return ret; cleanup: xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return NULL; } +virStoragePoolDefPtr +virStoragePoolDefParseString(virConnectPtr conn, + const char *xmlStr) +{ + return virStoragePoolDefParse(conn, xmlStr, NULL); +} + +virStoragePoolDefPtr +virStoragePoolDefParseFile(virConnectPtr conn, + const char *filename) +{ + return virStoragePoolDefParse(conn, NULL, filename); +} + static int virStoragePoolSourceFormat(virConnectPtr conn, virBufferPtr buf, @@ -916,10 +946,9 @@ virStorageSize(virConnectPtr conn, } static virStorageVolDefPtr -virStorageVolDefParseDoc(virConnectPtr conn, +virStorageVolDefParseXML(virConnectPtr conn, virStoragePoolDefPtr pool, - xmlXPathContextPtr ctxt, - xmlNodePtr root) { + xmlXPathContextPtr ctxt) { virStorageVolDefPtr ret; virStorageVolOptionsPtr options; char *allocation = NULL; @@ -935,12 +964,6 @@ virStorageVolDefParseDoc(virConnectPtr conn, return NULL; } - if (STRNEQ((const char *)root->name, "volume")) { - virStorageReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("unknown root element")); - goto cleanup; - } - ret->name = virXPathString(conn, "string(/volume/name)", ctxt); if (ret->name == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -1028,8 +1051,34 @@ virStorageVolDefParseDoc(virConnectPtr conn, return NULL; } - virStorageVolDefPtr +virStorageVolDefParseNode(virConnectPtr conn, + virStoragePoolDefPtr pool, + xmlDocPtr xml, + xmlNodePtr root) { + xmlXPathContextPtr ctxt = NULL; + virStorageVolDefPtr def = NULL; + + if (STRNEQ((const char *)root->name, "volume")) { + virStorageReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("unknown root element for storage vol")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + def = virStorageVolDefParseXML(conn, pool, ctxt); +cleanup: + xmlXPathFreeContext(ctxt); + return def; +} + +static virStorageVolDefPtr virStorageVolDefParse(virConnectPtr conn, virStoragePoolDefPtr pool, const char *xmlStr, @@ -1038,7 +1087,6 @@ virStorageVolDefParse(virConnectPtr conn, xmlParserCtxtPtr pctxt; xmlDocPtr xml = NULL; xmlNodePtr node = NULL; - xmlXPathContextPtr ctxt = NULL; /* Set up a parser context so we can catch the details of XML errors. */ pctxt = xmlNewParserCtxt (); @@ -1048,10 +1096,18 @@ virStorageVolDefParse(virConnectPtr conn, pctxt->_private = conn; if (conn) virResetError (&conn->err); - xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, - filename ? filename : "storage.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); + + if (filename) { + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } else { + xml = xmlCtxtReadDoc (pctxt, BAD_CAST xmlStr, + "storage.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + } + if (!xml) { if (conn && conn->err.code == VIR_ERR_NONE) virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -1059,12 +1115,6 @@ virStorageVolDefParse(virConnectPtr conn, goto cleanup; } - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto cleanup; - } - node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -1072,21 +1122,34 @@ virStorageVolDefParse(virConnectPtr conn, goto cleanup; } - ret = virStorageVolDefParseDoc(conn, pool, ctxt, node); + ret = virStorageVolDefParseNode(conn, pool, xml, node); xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return ret; cleanup: xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); return NULL; } +virStorageVolDefPtr +virStorageVolDefParseString(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *xmlStr) +{ + return virStorageVolDefParse(conn, pool, xmlStr, NULL); +} + +virStorageVolDefPtr +virStorageVolDefParseFile(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *filename) +{ + return virStorageVolDefParse(conn, pool, NULL, filename); +} static int virStorageVolTargetDefFormat(virConnectPtr conn, diff --git a/src/storage_conf.h b/src/storage_conf.h index 8a4fed2..a2a164e 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -28,6 +28,8 @@ #include "util.h" #include "threads.h" +#include <libxml/tree.h> + /* Shared structs */ @@ -306,16 +308,26 @@ virStorageVolDefPtr virStorageVolDefFindByName(virStoragePoolObjPtr pool, void virStoragePoolObjClearVols(virStoragePoolObjPtr pool); -virStoragePoolDefPtr virStoragePoolDefParse(virConnectPtr conn, - const char *xml, - const char *filename); +virStoragePoolDefPtr virStoragePoolDefParseString(virConnectPtr conn, + const char *xml); +virStoragePoolDefPtr virStoragePoolDefParseFile(virConnectPtr conn, + const char *filename); +virStoragePoolDefPtr virStoragePoolDefParseNode(virConnectPtr conn, + xmlDocPtr xml, + xmlNodePtr root); char *virStoragePoolDefFormat(virConnectPtr conn, virStoragePoolDefPtr def); -virStorageVolDefPtr virStorageVolDefParse(virConnectPtr conn, - virStoragePoolDefPtr pool, - const char *xml, - const char *filename); +virStorageVolDefPtr virStorageVolDefParseString(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *xml); +virStorageVolDefPtr virStorageVolDefParseFile(virConnectPtr conn, + virStoragePoolDefPtr pool, + const char *filename); +virStorageVolDefPtr virStorageVolDefParseNode(virConnectPtr conn, + virStoragePoolDefPtr pool, + xmlDocPtr xml, + xmlNodePtr root); char *virStorageVolDefFormat(virConnectPtr conn, virStoragePoolDefPtr pool, virStorageVolDefPtr def); diff --git a/src/storage_driver.c b/src/storage_driver.c index 5a248a3..5fe22c6 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -466,7 +466,7 @@ storagePoolCreate(virConnectPtr conn, virStorageBackendPtr backend; storageDriverLock(driver); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; pool = virStoragePoolObjFindByUUID(&driver->pools, def->uuid); @@ -518,7 +518,7 @@ storagePoolDefine(virConnectPtr conn, virStorageBackendPtr backend; storageDriverLock(driver); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; if ((backend = virStorageBackendForType(def->type)) == NULL) @@ -1220,7 +1220,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if ((backend = virStorageBackendForType(pool->def->type)) == NULL) goto cleanup; - voldef = virStorageVolDefParse(obj->conn, pool->def, xmldesc, NULL); + voldef = virStorageVolDefParseString(obj->conn, pool->def, xmldesc); if (voldef == NULL) goto cleanup; @@ -1362,7 +1362,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } - newvol = virStorageVolDefParse(obj->conn, pool->def, xmldesc, NULL); + newvol = virStorageVolDefParseString(obj->conn, pool->def, xmldesc); if (newvol == NULL) goto cleanup; diff --git a/src/test.c b/src/test.c index 2a672a3..6874d63 100644 --- a/src/test.c +++ b/src/test.c @@ -286,7 +286,7 @@ static int testOpenDefault(virConnectPtr conn) { netobj->persistent = 1; virNetworkObjUnlock(netobj); - if (!(pooldef = virStoragePoolDefParse(conn, defaultPoolXML, NULL))) + if (!(pooldef = virStoragePoolDefParseString(conn, defaultPoolXML))) goto error; if (!(poolobj = virStoragePoolObjAssignDef(conn, &privconn->pools, @@ -564,22 +564,13 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } - def = virStoragePoolDefParse(conn, NULL, absFile); + def = virStoragePoolDefParseFile(conn, absFile); VIR_FREE(absFile); if (!def) goto error; } else { - xmlBufferPtr buf; - xmlSaveCtxtPtr sctxt; - - buf = xmlBufferCreate(); - sctxt = xmlSaveToBuffer(buf, NULL, 0); - xmlSaveTree(sctxt, pools[i]); - xmlSaveClose(sctxt); - if ((def = virStoragePoolDefParse(conn, - (const char *) buf->content, - NULL)) == NULL) { - xmlBufferFree(buf); + if ((def = virStoragePoolDefParseNode(conn, xml, + pools[i])) == NULL) { goto error; } } @@ -2514,7 +2505,7 @@ testStoragePoolCreate(virConnectPtr conn, virStoragePoolPtr ret = NULL; testDriverLock(privconn); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; pool = virStoragePoolObjFindByUUID(&privconn->pools, def->uuid); @@ -2557,7 +2548,7 @@ testStoragePoolDefine(virConnectPtr conn, virStoragePoolPtr ret = NULL; testDriverLock(privconn); - if (!(def = virStoragePoolDefParse(conn, xml, NULL))) + if (!(def = virStoragePoolDefParseString(conn, xml))) goto cleanup; def->capacity = defaultPoolCap; @@ -3082,7 +3073,7 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; } - privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL); + privvol = virStorageVolDefParseString(pool->conn, privpool->def, xmldesc); if (privvol == NULL) goto cleanup; @@ -3163,7 +3154,7 @@ testStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL); + privvol = virStorageVolDefParseString(pool->conn, privpool->def, xmldesc); if (privvol == NULL) goto cleanup; -- 1.6.3.2

2 3

[libvirt] [PATCH] Fix raw storage volume creation for allocation < capacity.
by Cole Robinson 22 Jun '09

22 Jun '09

CreateXMLFrom changes accidentally caused all raw volume creation to be fully allocated (as though allocation == capacity). Fix this. Also force CreateXMLFrom to maintain the previous behavior: sparseness should still be maintained since we search for holes when copying, and the clone behavior hasn't been tested with anything but the broken behavior. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/storage_backend_fs.c | 2 +- src/storage_driver.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 0e93e54..c3d66b5 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -1047,7 +1047,7 @@ static int createRaw(virConnectPtr conn, goto cleanup; } - remain = vol->capacity; + remain = vol->allocation; if (inputfd != -1) { int amtread = -1; diff --git a/src/storage_driver.c b/src/storage_driver.c index 71e64a4..57a93c1 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -1377,6 +1377,11 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if (newvol->capacity < origvol->capacity) newvol->capacity = origvol->capacity; + /* Make sure allocation is at least as large as the destination cap, + * to make absolutely sure we copy all possible contents */ + if (newvol->allocation < origvol->capacity; + newvol->allocation = origvol->capacity; + if (!backend->buildVolFrom) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support volume creation from an existing volume")); -- 1.6.0.6

3 4

[libvirt] Storage volume issues when creating an LVM or RAID partition
by Henrik Persson E 22 Jun '09

22 Jun '09

Hi everyone, I have currently some patches coming up for storage pools and volumes based on physical disks. However I have an issue that I would like to hear your opinion about. When it comes to storage pools and volumes based on physical disks, the name given does not really have any real meaning, the underlying disk/partition will at the end decide the name of the pool/volume (as soon as a refresh on the pool is made, the user defined names will be gone). This is quite confusion but at the end it still works. But there are cases where it does not work. To be able to create a partition type such as LVM or raid, parted (which is used as the disk management backend) does not support setting this partition type when creating the partition but instead by setting a flag on the partition after it has been created. As it is not possible to decide at which position in the partition table the new partition should be created, parted will just choose the next available number. To be able to set this flag on the partition, we need to know which partition we just created, and suddenly the name of the volume is important, but only if it has followed the rules that parted applied when finding the next available slot. If the name of the volume is incorrect we will end up with a volume created with incorrect type since we can't do 2 operation towards parted in a transaction manner (e.g. Volume name is sdb2 but the newly created partition is sdb1). I see two possible solutions on this problem: 1. We add volume name constraints in this case that makes sure that when a volume is created by a user (by checking the pool and scan all ready existing volumes in that pool), it has to create a name that is correct according to parted's rules. In that case we can use the volume name to find the partition just created and we can set the flag on the partition in a safe way 2. we extend the libvirt_parthelper and uses the libparted instead to create a partition, which then can be made in a more transaction like manner. However, in this case we have to more or less add all the support that parted has for creating a partition which is quite extensive. I put my vote on solution 1 but I like to know your opinion and also if any one knows that the initial plans were. /Henrik

1 0

[libvirt] Extend virConfParser to allow parsing VMware VMX config files
by Matthias Bolte 22 Jun '09

22 Jun '09

Hi, As part of the VMware ESX driver I need to parse VMware VMX config files. This files have basically the same syntax as Xen config files, but the key part of the key=value format is allowed to contain ':' and '.'. The attached patch adds a flag to the virConfParser to enabled a VMX mode for the parser to allow ':' and '.' in the key, as suggested by Daniel P. Berrange on IRC. Regards Matthias

3 5

[libvirt] [PATCH] Cleanup when Storage Pool Create fails.
by Henrik Persson E 22 Jun '09

22 Jun '09

When libvirt fails to create a storage pool (e.g. a disk pool does not have a partition table), the failed storage pool is not cleaned up correctly and is not possible to re-create the pool again. This attached patch addresses this problem. /Henrik

3 2

[libvirt] netbsd5.0
by Fabien Georget 22 Jun '09

22 Jun '09

Hi I want to run netbsd 5.0 with kvm in virt-manager. It works with default option but any network devices is recognized by the netbsd kernel. To enable network with qemu-kvm, we had to disable the acpi and add other options like -tdf, -localtime ... This is an an example who works : http://ghantoos.org/2009/05/12/my-first-shot-of-netbsd/ (An explanation I found is that the new scheduler in netbsd 5.0 cause some problems with virtualization based on VT) Currently, I have not found the way to do it with libvirt (and I don't think it is possible with virt-manager). It be very helpeful if these features can be add to libvirt. Thanks Fabien Georget

2 2

[libvirt] problems with remote authentication with policykit
by Jim Paris 22 Jun '09

22 Jun '09

Hi, I have libvirt 0.6.4 running kvm instances on a headless server. I'm using virt-manager 0.7.0 to manage them. In the past, I would SSH in and run virt-manager as root. Since running GTK apps as root is no good, I've switched to policykit authentication. By default, the libvirt policy only allows management if the user is in the active host session, which isn't the case with my SSH logins. Therefore I've added an override in /etc/PolicyKit/PolicyKit.conf: <match action="org.libvirt.unix.manage"> <return result="auth_admin_keep_session"/> </match> Now things generally work fine when SSHed in: - as root, virsh gives ro and rw access with no password - as jim, virsh gives ro access with no password, but requests a password for rw - as jim, virsh asks for a password for rw access But when accessing remotely, I get no useful error, and a hang: $ virsh -c qemu+ssh://jim@server/system libvir: Remote error : authentication failed <process hangs here> $ virsh --readonly -c qemu+ssh://jim@server/system libvir: Remote error : authentication failed <process hangs here> Furthermore, on the server, this leaves "nc" processes running, and eventually there are enough that libvirtd stops accepting new connections. I was also getting strange errors including: polkit-grant-helper: given auth type (8 -> yes) is bogus but now I can't reproduce that for the life of me, I have no idea what changed. Is policykit authentication supposed to work over qemu+ssh? I was hoping it would at least not break the --readonly case. -jim

3 11

[libvirt] netbsd5.0
by Fabien Georget 21 Jun '09

21 Jun '09

Hi I want to run netbsd 5.0 with kvm in virt-manager. It works with default option but any network devices is recognized by the netbsd kernel. To enable network with qemu-kvm, we had to disable the acpi and add other options like -tdf, -localtime ... This is an an example who works : http://ghantoos.org/2009/05/12/my-first-shot-of-netbsd/ (An explanation I found is that the new scheduler in netbsd 5.0 cause some problems with virtualization based on VT) Currently, I have not found the way to do it with libvirt (and I don't think it is possible with virt-manager). It be very helpeful if these features can be add to libvirt. Thanks Fabien Georget

1 0

[libvirt] [PATCH] Activate virtual networks initialized in custom test driver.
by Cole Robinson 19 Jun '09

19 Jun '09

If specifying a custom test driver, virtual networks were not 'activated' on driver init. This differs from the behavior of domains and storage pools, so fix it. Also improve a couple error messages in that area. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test.c b/src/test.c index 1661144..6f07462 100644 --- a/src/test.c +++ b/src/test.c @@ -462,7 +462,8 @@ static int testOpenFromFile(virConnectPtr conn, if (!(xml = xmlReadFd(fd, file, NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { - testError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("host")); + testError(NULL, VIR_ERR_INTERNAL_ERROR, + _("Invalid XML in file '%s'"), file); goto error; } close(fd); @@ -470,7 +471,8 @@ static int testOpenFromFile(virConnectPtr conn, root = xmlDocGetRootElement(xml); if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "node"))) { - testError(NULL, VIR_ERR_XML_ERROR, "%s", _("node")); + testError(NULL, VIR_ERR_XML_ERROR, "%s", + _("Root element is not 'node'")); goto error; } @@ -622,6 +624,7 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } net->persistent = 1; + net->active = 1; virNetworkObjUnlock(net); } VIR_FREE(networks); -- 1.6.3.2

2 1

[libvirt] [PATCH] Fix storage handling for custom test driver.
by Cole Robinson 19 Jun '09

19 Jun '09

If using a custom test driver, storage pool file parsing was broken, and storage volume parsing was never implemented. Fix these issues, and add some examples in docs/ Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/testnode.xml | 3 ++ docs/testpool.xml | 15 +++++++++ docs/testvol.xml | 6 +++ src/test.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 0 deletions(-) create mode 100644 docs/testpool.xml create mode 100644 docs/testvol.xml diff --git a/docs/testnode.xml b/docs/testnode.xml index be7121d..1ad7a10 100644 --- a/docs/testnode.xml +++ b/docs/testnode.xml @@ -11,6 +11,9 @@ <domain file="testdomfc4.xml"/> <network file="testnetpriv.xml"/> <network file="testnetdef.xml"/> + <pool file="testpool.xml"> + <volume file="testvol.xml"/> + </pool> <cpu> <mhz>6000</mhz> diff --git a/docs/testpool.xml b/docs/testpool.xml new file mode 100644 index 0000000..c1a8dff --- /dev/null +++ b/docs/testpool.xml @@ -0,0 +1,15 @@ +<pool type='dir'> + <name>default-pool</name> + <uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid> + <capacity>107374182400</capacity> + <allocation>0</allocation> + <available>107374182400</available> + <target> + <path>/default-pool</path> + <permissions> + <mode>0700</mode> + <owner>10736</owner> + <group>10736</group> + </permissions> + </target> +</pool> diff --git a/docs/testvol.xml b/docs/testvol.xml new file mode 100644 index 0000000..00198f8 --- /dev/null +++ b/docs/testvol.xml @@ -0,0 +1,6 @@ +<volume> + <name>default-vol</name> + <capacity>1000000</capacity> + <allocation>50000</allocation> + <target/> +</volume> diff --git a/src/test.c b/src/test.c index 6874d63..1661144 100644 --- a/src/test.c +++ b/src/test.c @@ -341,6 +341,87 @@ static char *testBuildFilename(const char *relativeTo, } } +static int testOpenVolumesForPool(virConnectPtr conn, + xmlDocPtr xml, + xmlXPathContextPtr ctxt, + const char *file, + virStoragePoolObjPtr pool, + int poolidx) { + char *vol_xpath; + int i, ret, func_ret = -1; + xmlNodePtr *vols = NULL; + virStorageVolDefPtr def; + + /* Find storage volumes */ + if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", poolidx) < 0) { + virReportOOMError(NULL); + goto error; + } + + ret = virXPathNodeSet(conn, vol_xpath, ctxt, &vols); + VIR_FREE(vol_xpath); + if (ret < 0) { + testError(NULL, VIR_ERR_XML_ERROR, + _("node vol list for pool '%s'"), pool->def->name); + goto error; + } + + for (i = 0 ; i < ret ; i++) { + char *relFile = virXMLPropString(vols[i], "file"); + if (relFile != NULL) { + char *absFile = testBuildFilename(file, relFile); + VIR_FREE(relFile); + if (!absFile) { + testError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("resolving volume filename")); + goto error; + } + + def = virStorageVolDefParseFile(conn, pool->def, absFile); + VIR_FREE(absFile); + if (!def) + goto error; + } else { + if ((def = virStorageVolDefParseNode(conn, pool->def, xml, + vols[i])) == NULL) { + goto error; + } + } + + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count+1) < 0) { + virReportOOMError(conn); + goto error; + } + + if (virAsprintf(&def->target.path, "%s/%s", + pool->def->target.path, + def->name) == -1) { + virReportOOMError(conn); + goto error; + } + + def->key = strdup(def->target.path); + if (def->key == NULL) { + virReportOOMError(conn); + goto error; + } + + pool->def->allocation += def->allocation; + pool->def->available = (pool->def->capacity - + pool->def->allocation); + + pool->volumes.objs[pool->volumes.count++] = def; + def = NULL; + } + + func_ret = 0; +error: + virStorageVolDefFree(def); + VIR_FREE(vols); + return func_ret; +} + static int testOpenFromFile(virConnectPtr conn, const char *file) { int fd = -1, i, ret; @@ -586,6 +667,13 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } pool->active = 1; + + /* Find storage volumes */ + if (testOpenVolumesForPool(conn, xml, ctxt, file, pool, i+1) < 0) { + virStoragePoolObjUnlock(pool); + goto error; + } + virStoragePoolObjUnlock(pool); } VIR_FREE(pools); -- 1.6.3.2

2 1

[libvirt] [PATCH] Fix segfault if storage pool has no type attribute (possibly others)
by Cole Robinson 19 Jun '09

19 Jun '09

virEnumFromString doesn't check for a NULL string, and will segfault if passed one. Lots of calling code protects against this, but at least /pool/@type parsing does not. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util.c b/src/util.c index d8ab37f..8b746f5 100644 --- a/src/util.c +++ b/src/util.c @@ -1622,6 +1622,9 @@ int virEnumFromString(const char *const*types, const char *type) { unsigned int i; + if (!type) + return -1; + for (i = 0 ; i < ntypes ; i++) if (STREQ(types[i], type)) return i; -- 1.6.3.2

3 2

[libvirt] [PATCH 0/1] Fix NPIV on older kernels
by David Allan 19 Jun '09

19 Jun '09

Ok, I redid the patch into a minimal change that fixes NPIV on older kernels. I'll resubmit the rest of it when I decide how I want to deal with the problem of things moving around in /sys. Dave

3 3

[libvirt] [PATCH] Add virsh commands for virInterface* functions - Take 2
by Laine Stump 19 Jun '09

19 Jun '09

This is a resubmission of the virsh commands to expose virInterface* functionality. I've made the following changes from the original: 1) command names changed from if-* to iface-* 2) "if-create" is now "iface-start" 3) iface-edit implementation is manually included directly in virsh.c rather than being generated with a makefile rule. 4) iface-list now has options --inactive and --all, similar to net-list. (4) depends on new functions contained in the patch I submitted yesterday. All of this builds and appears to be correct, but is non-functional until either the netcf backend or test driver backend is committed. The netcf backend is waiting on something in netcf to provide the functionality required for virConnectListDefinedInterfaces(), and the test driver is waiting on XML parsing/formatting functions (and needs a small amount of rework to support inactive interfaces). --- src/virsh.c | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 536 insertions(+), 0 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index f5248d9..6ab6182 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -228,6 +228,7 @@ static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) #define VSH_BYNAME (1 << 3) +#define VSH_BYMAC (1 << 4) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag); @@ -244,6 +245,14 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptNetworkBy(_ctl, _cmd, _name, \ VSH_BYUUID|VSH_BYNAME) +static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag); + +/* default is lookup by Name and MAC */ +#define vshCommandOptInterface(_ctl, _cmd, _name) \ + vshCommandOptInterfaceBy(_ctl, _cmd, _name, \ + VSH_BYMAC|VSH_BYNAME) + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); @@ -275,6 +284,10 @@ static const char *vshDomainVcpuStateToString(int state); static int vshConnectionUsability(vshControl *ctl, virConnectPtr conn, int showerror); +static char *editWriteToTempFile (vshControl *ctl, const char *doc); +static int editFile (vshControl *ctl, const char *filename); +static char *editReadBackFile (vshControl *ctl, const char *filename); + static void *_vshMalloc(vshControl *ctl, size_t sz, const char *filename, int line); #define vshMalloc(_ctl, _sz) _vshMalloc(_ctl, _sz, __FILE__, __LINE__) @@ -2690,6 +2703,106 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) /* + * "iface-edit" command + */ +static const vshCmdInfo info_interface_edit[] = { + {"help", gettext_noop("edit XML configuration for a physical host interface")}, + {"desc", gettext_noop("Edit the XML configuration for a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_edit[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceEdit (vshControl *ctl, const vshCmd *cmd) +{ + int ret = FALSE; + virInterfacePtr iface = NULL; + char *tmp = NULL; + char *doc = NULL; + char *doc_edited = NULL; + char *doc_reread = NULL; + int flags = 0; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + goto cleanup; + + iface = vshCommandOptInterface (ctl, cmd, NULL); + if (iface == NULL) + goto cleanup; + + /* Get the XML configuration of the interface. */ + doc = virInterfaceGetXMLDesc (iface, flags); + if (!doc) + goto cleanup; + + /* Create and open the temporary file. */ + tmp = editWriteToTempFile (ctl, doc); + if (!tmp) goto cleanup; + + /* Start the editor. */ + if (editFile (ctl, tmp) == -1) goto cleanup; + + /* Read back the edited file. */ + doc_edited = editReadBackFile (ctl, tmp); + if (!doc_edited) goto cleanup; + + unlink (tmp); + tmp = NULL; + + /* Compare original XML with edited. Has it changed at all? */ + if (STREQ (doc, doc_edited)) { + vshPrint (ctl, _("Interface %s XML configuration not changed.\n"), + virInterfaceGetName (iface)); + ret = TRUE; + goto cleanup; + } + + /* Now re-read the interface XML. Did someone else change it while + * it was being edited? This also catches problems such as us + * losing a connection or the interface going away. + */ + doc_reread = virInterfaceGetXMLDesc (iface, flags); + if (!doc_reread) + goto cleanup; + + if (STRNEQ (doc, doc_reread)) { + vshError (ctl, FALSE, + "%s", _("ERROR: the XML configuration was changed by another user")); + goto cleanup; + } + + /* Everything checks out, so redefine the interface. */ + virInterfaceFree (iface); + iface = virInterfaceDefineXML (ctl->conn, doc_edited, 0); + if (!iface) + goto cleanup; + + vshPrint (ctl, _("Interface %s XML configuration edited.\n"), + virInterfaceGetName(iface)); + + ret = TRUE; + +cleanup: + if (iface) + virInterfaceFree (iface); + + free (doc); + free (doc_edited); + free (doc_reread); + + if (tmp) { + unlink (tmp); + free (tmp); + } + + return ret; +} + +/* * "net-list" command */ static const vshCmdInfo info_network_list[] = { @@ -2955,6 +3068,378 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) } +/**************************************************************************/ +/* + * "iface-list" command + */ +static const vshCmdInfo info_interface_list[] = { + {"help", gettext_noop("list physical host interfaces")}, + {"desc", gettext_noop("Returns list of physical host interfaces.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_list[] = { + {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive interfaces")}, + {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active interfaces")}, + {NULL, 0, 0, NULL} +}; +static int +cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + int inactive = vshCommandOptBool(cmd, "inactive"); + int all = vshCommandOptBool(cmd, "all"); + int active = !inactive || all ? 1 : 0; + int maxactive = 0, maxinactive = 0, i; + char **activeNames = NULL, **inactiveNames = NULL; + inactive |= all; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (active) { + maxactive = virConnectNumOfInterfaces(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active interfaces")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListInterfaces(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active interfaces")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + } + if (inactive) { + maxinactive = virConnectNumOfDefinedInterfaces(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive interfaces")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedInterfaces(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive interfaces")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + } + vshPrintExtra(ctl, "%-20s %-10s %s\n", _("Name"), _("State"), _("MAC Address")); + vshPrintExtra(ctl, "--------------------------------------------\n"); + + for (i = 0; i < maxactive; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, activeNames[i]); + const char *autostartStr; + int autostart = 0; + + /* this kind of work with interfaces is not atomic */ + if (!iface) { + free(activeNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-10s %s\n", + virInterfaceGetName(iface), + _("active"), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, inactiveNames[i]); + const char *autostartStr; + int autostart = 0; + + /* this kind of work with interfaces is not atomic */ + if (!iface) { + free(inactiveNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-10s %s\n", + virInterfaceGetName(iface), + _("inactive"), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + return TRUE; + +} + +/* + * "iface-name" command + */ +static const vshCmdInfo info_interface_name[] = { + {"help", gettext_noop("convert an interface MAC address to interface name")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_name[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface mac")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceName(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYMAC))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetName(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "iface-mac" command + */ +static const vshCmdInfo info_interface_mac[] = { + {"help", gettext_noop("convert an interface name to interface MAC address")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_mac[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYNAME))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "iface-dumpxml" command + */ +static const vshCmdInfo info_interface_dumpxml[] = { + {"help", gettext_noop("interface information in XML")}, + {"desc", gettext_noop("Output the physical host interface information as an XML dump to stdout.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_dumpxml[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *dump; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, NULL))) + return FALSE; + + dump = virInterfaceGetXMLDesc(iface, 0); + if (dump != NULL) { + printf("%s", dump); + free(dump); + } else { + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-define" command + */ +static const vshCmdInfo info_interface_define[] = { + {"help", gettext_noop("define (but don't start) a physical host interface from an XML file")}, + {"desc", gettext_noop("Define a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_define[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML interface description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr interface; + char *from; + int found; + int ret = TRUE; + char *buffer; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; + + interface = virInterfaceDefineXML(ctl->conn, buffer, 0); + free (buffer); + + if (interface != NULL) { + vshPrint(ctl, _("Interface %s defined from %s\n"), + virInterfaceGetName(interface), from); + } else { + vshError(ctl, FALSE, _("Failed to define interface from %s"), from); + ret = FALSE; + } + return ret; +} + +/* + * "iface-undefine" command + */ +static const vshCmdInfo info_interface_undefine[] = { + {"help", gettext_noop("undefine a physical host interface (remove it from configuration)")}, + {"desc", gettext_noop("undefine an interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_undefine[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceUndefine(iface) == 0) { + vshPrint(ctl, _("Interface %s undefined\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to undefine interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-start" command + */ +static const vshCmdInfo info_interface_start[] = { + {"help", gettext_noop("start a physical host interface (enable it / \"if-up\")")}, + {"desc", gettext_noop("start a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_start[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceCreate(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s started\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to start interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "iface-destroy" command + */ +static const vshCmdInfo info_interface_destroy[] = { + {"help", gettext_noop("destroy a physical host interface (disable it / \"if-down\")")}, + {"desc", gettext_noop("destroy a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_destroy[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceDestroy(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s destroyed\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to destroy interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/**************************************************************************/ /* * "pool-autostart" command */ @@ -6247,6 +6732,17 @@ static const vshCmdDef commands[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, + + {"iface-list", cmdInterfaceList, opts_interface_list, info_interface_list}, + {"iface-name", cmdInterfaceName, opts_interface_name, info_interface_name}, + {"iface-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, + {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, + {"iface-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, + {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, + {"iface-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, + {"iface-start", cmdInterfaceStart, opts_interface_start, info_interface_start}, + {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, @@ -6698,6 +7194,46 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, return network; } +static virInterfacePtr +vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag) +{ + virInterfacePtr iface = NULL; + char *n; + const char *optname = "interface"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; + + if (!(n = vshCommandOptString(cmd, optname, NULL))) { + vshError(ctl, FALSE, "%s", _("undefined interface identifier")); + return NULL; + } + + vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + /* try it by MAC */ + if ((iface == NULL) && (flag & VSH_BYMAC)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface MAC\n", + cmd->def->name, optname); + iface = virInterfaceLookupByMACString(ctl->conn, n); + } + /* try it by NAME */ + if ((iface == NULL) && (flag & VSH_BYNAME)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface NAME\n", + cmd->def->name, optname); + iface = virInterfaceLookupByName(ctl->conn, n); + } + + if (!iface) + vshError(ctl, FALSE, _("failed to get interface '%s'"), n); + + return iface; +} + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) -- 1.6.0.6

3 2