- Devel - libvirt List Archives

[libvirt] [PATCH] Implement capabilities for Solaris
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User John Levon <john.levon(a)sun.com> # Date 1231940906 28800 # Node ID a0d98d39955f4f304d318c7c780742ab929eb351 # Parent ddfcba6b4181ab433dce345d66dc399a81c92a3b Implement capabilities for Solaris Use Solaris interfaces to derive the hypervisor capabilities. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xen_internal.c b/src/xen_internal.c --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -35,6 +35,10 @@ #ifdef HAVE_XEN_SYS_PRIVCMD_H #include <xen/sys/privcmd.h> #endif +#endif + +#ifdef __sun +#include <sys/systeminfo.h> #endif /* required for shutdown flags */ @@ -662,11 +666,8 @@ typedef struct xen_op_v2_dom xen_op_v2_d #ifdef __linux__ #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" #define HYPERVISOR_CAPABILITIES "/sys/hypervisor/properties/capabilities" -#define CPUINFO "/proc/cpuinfo" #elif defined(__sun) #define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" -#define HYPERVISOR_CAPABILITIES "" -#define CPUINFO "/dev/cpu/self/cpuid" #else #error "unsupported platform" #endif @@ -2123,7 +2124,7 @@ xenHypervisorBuildCapabilities(virConnec xenHypervisorBuildCapabilities(virConnectPtr conn, const char *hostmachine, int host_pae, - char *hvm_type, + const char *hvm_type, struct guest_arch *guest_archs, int nr_guest_archs) { virCapsPtr caps; @@ -2227,8 +2228,126 @@ xenHypervisorBuildCapabilities(virConnec return NULL; } -/** - * xenHypervisorGetCapabilities: +#ifdef __sun + +static int +get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) +{ + struct { + uint32_t r_eax, r_ebx, r_ecx, r_edx; + } regs; + + char tmpbuf[20]; + int fd = -1; + int ret = 0; + + /* returns -1, errno 22 if in 32-bit mode */ + *longmode = (sysinfo(SI_ARCHITECTURE_64, tmpbuf, 20) != -1); + + if ((fd = open("/dev/cpu/self/cpuid", O_RDONLY)) == -1 || + pread(fd, &regs, sizeof(regs), 0) != sizeof(regs)) { + virXenError(conn, VIR_ERR_SYSTEM_ERROR, + "couldn't read CPU flags: %s", strerror(errno)); + goto out; + } + + *pae = 0; + *hvm = ""; + + if (strncmp((const char *)&regs.r_ebx, "AuthcAMDenti", 12) == 0) { + if (pread(fd, &regs, sizeof (regs), 0x80000001) == sizeof (regs)) { + /* Read secure virtual machine bit (bit 2 of ECX feature ID) */ + if ((regs.r_ecx >> 2) & 1) { + *hvm = "svm"; + } + if ((regs.r_edx >> 6) & 1) + *pae = 1; + } + } else if (strncmp((const char *)&regs.r_ebx, "GenuntelineI", 12) == 0) { + if (pread(fd, &regs, sizeof (regs), 0x00000001) == sizeof (regs)) { + /* Read VMXE feature bit (bit 5 of ECX feature ID) */ + if ((regs.r_ecx >> 5) & 1) + *hvm = "vmx"; + if ((regs.r_edx >> 6) & 1) + *pae = 1; + } + } + + ret = 1; + +out: + if (fd != -1) + close(fd); + return ret; +} + +static virCapsPtr +xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn) +{ + struct guest_arch guest_arches[32]; + int i = 0; + virCapsPtr caps = NULL; + struct utsname utsname; + int pae, longmode; + const char *hvm; + + if (!get_cpu_flags(conn, &hvm, &pae, &longmode)) + return NULL; + + /* Really, this never fails - look at the man-page. */ + uname (&utsname); + + guest_arches[i].model = "i686"; + guest_arches[i].bits = 32; + guest_arches[i].hvm = 0; + guest_arches[i].pae = pae; + guest_arches[i].nonpae = 1; + guest_arches[i].ia64_be = 0; + i++; + + if (longmode) { + guest_arches[i].model = "x86_64"; + guest_arches[i].bits = 64; + guest_arches[i].hvm = 0; + guest_arches[i].pae = 0; + guest_arches[i].nonpae = 1; + guest_arches[i].ia64_be = 0; + i++; + } + + if (hvm[0] != '\0') { + guest_arches[i].model = "i686"; + guest_arches[i].bits = 32; + guest_arches[i].hvm = 1; + guest_arches[i].pae = pae; + guest_arches[i].nonpae = 1; + guest_arches[i].ia64_be = 0; + i++; + + if (longmode) { + guest_arches[i].model = "x86_64"; + guest_arches[i].bits = 64; + guest_arches[i].hvm = 1; + guest_arches[i].pae = 0; + guest_arches[i].nonpae = 1; + guest_arches[i].ia64_be = 0; + i++; + } + } + + if ((caps = xenHypervisorBuildCapabilities(conn, + utsname.machine, + pae, hvm, + guest_arches, i)) == NULL) + virXenError(NULL, VIR_ERR_NO_MEMORY, NULL); + + return caps; +} + +#endif /* __sun */ + +/** + * xenHypervisorMakeCapabilitiesInternal: * @conn: pointer to the connection block * @cpuinfo: file handle containing /proc/cpuinfo data, or NULL * @capabilities: file handle containing /sys/hypervisor/properties/capabilities data, or NULL @@ -2394,6 +2513,9 @@ virCapsPtr virCapsPtr xenHypervisorMakeCapabilities(virConnectPtr conn) { +#ifdef __sun + return xenHypervisorMakeCapabilitiesSunOS(conn); +#else virCapsPtr caps; FILE *cpuinfo, *capabilities; struct utsname utsname; @@ -2432,6 +2554,7 @@ xenHypervisorMakeCapabilities(virConnect fclose(capabilities); return caps; +#endif /* __sun */ }

4 3

[libvirt] [PATCH] Remove references to non-existent files
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User John Levon <john.levon(a)sun.com> # Date 1231946129 28800 # Node ID 9d8302140e58e20c7fb22b3242a52b06467b08e6 # Parent b614f5780261464e8f10e48306e67d43d56931b0 Remove references to non-existent files Some docs files don't exist. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/docs/Makefile.am b/docs/Makefile.am --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -130,9 +130,8 @@ rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/libvir.html $(srcdir)/FAQ.html \ - $(srcdir)/redhat.gif $(srcdir)/Libxml2-Logo-90x34.gif \ - $(DESTDIR)$(HTML_DIR) + -@INSTALL@ -m 0644 $(srcdir)/FAQ.html \ + $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html for h in $(apihtml); do \ $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -20,7 +20,7 @@ install-data-local: install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) -@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \ - $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) + $(srcdir)/*.xsl $(DESTDIR)$(HTML_DIR) EXTRA_DIST=examples.xsl index.py examples.xml diff --git a/docs/examples/index.py b/docs/examples/index.py --- a/docs/examples/index.py +++ b/docs/examples/index.py @@ -218,8 +218,6 @@ def dump_Makefile(): def dump_Makefile(): for file in glob.glob('*.xml'): extras.append(file) - for file in glob.glob('*.res'): - extras.append(file) Makefile="""# -*- buffer-read-only: t -*- vi: set ro: # Beware this is autogenerated by index.py SUBDIRS=python

2 1

[libvirt] [PATCH] Separate objdir build fixes
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User John Levon <john.levon(a)sun.com> # Date 1231946129 28800 # Node ID b614f5780261464e8f10e48306e67d43d56931b0 # Parent 53c621a65055f4752abef748c0ad15cbb1d8013d Separate objdir build fixes Let devhelp build in a separate objdir. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/docs/devhelp/Makefile.am b/docs/devhelp/Makefile.am --- a/docs/devhelp/Makefile.am +++ b/docs/devhelp/Makefile.am @@ -1,7 +1,8 @@ DEVHELP_DIR=$(datadir)/gtk-doc/html/libv DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt HTML_FILES=index.html general.html $(HTML_MODULES) HTML_MODULES= \ - libvirt-libvirt.html + libvirt-libvirt.html \ + libvirt-virterror.html EXTRA_FORMAT= \ home.png \ @@ -17,11 +18,12 @@ libvirt.devhelp $(HTML_FILES): $(srcdir) libvirt.devhelp $(HTML_FILES): $(srcdir)/devhelp.xsl html.xsl $(top_srcdir)/docs/libvirt-api.xml -@(echo Rebuilding devhelp files) -@(if [ -x $(XSLTPROC) ] ; then \ - $(XSLTPROC) --nonet -o $(srcdir)/libvirt.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/docs/libvirt-api.xml ; fi ); + $(XSLTPROC) --nonet -o libvirt.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/docs/libvirt-api.xml ; fi ); install-data-local: $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) -@INSTALL@ -m 0644 libvirt.devhelp $(DESTDIR)$(DEVHELP_DIR) - -@INSTALL@ -m 0644 $(EXTRA_FORMAT) $(DESTDIR)$(DEVHELP_DIR) -@INSTALL@ -m 0644 $(HTML_FILES) $(DESTDIR)$(DEVHELP_DIR) - + -for file in $(EXTRA_FORMAT); do \ + @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ + done

2 1

[libvirt] [PATCH] Fix devhelp build
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User John Levon <john.levon(a)sun.com> # Date 1231946129 28800 # Node ID c08132809fb6e060b1301e97954a1b0ababb384c # Parent 52dcd17a9fd4bf4a6171386f083d235eebd5aa23 Fix devhelp build For devhelp to actually be created during a build, we need to explicitly depend on the generated files. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/docs/devhelp/Makefile.am b/docs/devhelp/Makefile.am --- a/docs/devhelp/Makefile.am +++ b/docs/devhelp/Makefile.am @@ -20,7 +20,7 @@ libvirt.devhelp $(HTML_FILES): $(srcdir) -@(if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o libvirt.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/docs/libvirt-api.xml ; fi ); -install-data-local: +install-data-local: libvirt.devhelp $(HTML_FILES) $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) -@INSTALL@ -m 0644 libvirt.devhelp $(DESTDIR)$(DEVHELP_DIR) -@INSTALL@ -m 0644 $(HTML_FILES) $(DESTDIR)$(DEVHELP_DIR)

2 1

[libvirt] [PATCH] Add copy-on-write image support
by Miloslav Trmač 14 Jan '09

14 Jan '09

Hello, the attached patch adds support for copy-on-write images: creating them, deleting them, identifying them. Mirek

3 5

[libvirt] [PATCH] Mark Xen PV CD-ROM devices as such
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User John Levon <john.levon(a)sun.com> # Date 1231946129 28800 # Node ID 53c621a65055f4752abef748c0ad15cbb1d8013d # Parent bde7017c447cf36451194e64179b60e1c8d9f039 Mark Xen PV CD-ROM devices as such Add a ':cdrom' marker for PV as well as HVM devices. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -5025,6 +5025,8 @@ xenDaemonFormatSxprDisk(virConnectPtr co virBufferVSprintf(buf, "(dev '%s:%s')", def->dst, def->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? "cdrom" : "disk"); + } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { + virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst); } else { virBufferVSprintf(buf, "(dev '%s')", def->dst); }

2 1

[libvirt] [PATCH] Fix oversized stack allocation
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User John Levon <john.levon(a)sun.com> # Date 1231946129 28800 # Node ID c7538cb7fab4e6f3aa6714fdd4126dcf2f0371b4 # Parent cfe04caba5de61620fa6d1c2bff85cfd62255c1d Fix oversized stack allocation REMOTE_MESSAGE_MAX is a whopping 262Kb and shouldn't be allocated on the stack. Signed-off-by: Ryan Scott <ryan.scott(a)sun.com> diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -4797,10 +4797,11 @@ call (virConnectPtr conn, struct private xdrproc_t args_filter, char *args, xdrproc_t ret_filter, char *ret) { - char buffer[REMOTE_MESSAGE_MAX]; + char *buffer = NULL; char buffer2[4]; struct remote_message_header hdr; XDR xdr; + int err = -1; int len; struct remote_error rerror; @@ -4814,18 +4815,23 @@ call (virConnectPtr conn, struct private hdr.serial = serial; hdr.status = REMOTE_OK; + if ((buffer = malloc(REMOTE_MESSAGE_MAX)) == NULL) { + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto out; + } + /* Serialise header followed by args. */ - xdrmem_create (&xdr, buffer, sizeof buffer, XDR_ENCODE); + xdrmem_create (&xdr, buffer, REMOTE_MESSAGE_MAX, XDR_ENCODE); if (!xdr_remote_message_header (&xdr, &hdr)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("xdr_remote_message_header failed")); - return -1; + goto out; } if (!(*args_filter) (&xdr, args)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("marshalling args")); - return -1; + goto out; } /* Get the length stored in buffer. */ @@ -4842,25 +4848,25 @@ call (virConnectPtr conn, struct private if (!xdr_int (&xdr, &len)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("xdr_int (length word)")); - return -1; + goto out; } xdr_destroy (&xdr); /* Send length word followed by header+args. */ if (really_write (conn, priv, flags & REMOTE_CALL_IN_OPEN, buffer2, sizeof buffer2) == -1 || really_write (conn, priv, flags & REMOTE_CALL_IN_OPEN, buffer, len-4) == -1) - return -1; + goto out; retry_read: /* Read and deserialise length word. */ if (really_read (conn, priv, flags & REMOTE_CALL_IN_OPEN, buffer2, sizeof buffer2) == -1) - return -1; + goto out; xdrmem_create (&xdr, buffer2, sizeof buffer2, XDR_DECODE); if (!xdr_int (&xdr, &len)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("xdr_int (length word, reply)")); - return -1; + goto out; } xdr_destroy (&xdr); @@ -4870,20 +4876,25 @@ retry_read: if (len < 0 || len > REMOTE_MESSAGE_MAX) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("packet received from server too large")); - return -1; } /* Read reply header and what follows (either a ret or an error). */ if (really_read (conn, priv, flags & REMOTE_CALL_IN_OPEN, buffer, len) == -1) - return -1; + goto out; /* Deserialise reply header. */ xdrmem_create (&xdr, buffer, len, XDR_DECODE); if (!xdr_remote_message_header (&xdr, &hdr)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("invalid header in reply")); - return -1; - } + goto out; + } + + /* + * Although the previous lines were the last references to buffer in this + * function, we can't free it yet, as the xdr struct still has some + * pointers to it. + */ /* Check program, version, etc. are what we expect. */ if (hdr.prog != REMOTE_PROGRAM) { @@ -4892,7 +4903,7 @@ retry_read: VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("unknown program (received %x, expected %x)"), hdr.prog, REMOTE_PROGRAM); - return -1; + goto out; } if (hdr.vers != REMOTE_PROTOCOL_VERSION) { virRaiseError (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, @@ -4900,7 +4911,7 @@ retry_read: VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("unknown protocol version (received %x, expected %x)"), hdr.vers, REMOTE_PROTOCOL_VERSION); - return -1; + goto out; } if (hdr.proc == REMOTE_PROC_DOMAIN_EVENT && @@ -4923,7 +4934,7 @@ retry_read: VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("unknown procedure (received %x, expected %x)"), hdr.proc, proc_nr); - return -1; + goto out; } if (hdr.direction != REMOTE_REPLY) { virRaiseError (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, @@ -4931,14 +4942,14 @@ retry_read: VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("unknown direction (received %x, expected %x)"), hdr.direction, REMOTE_REPLY); - return -1; + goto out; } if (hdr.serial != serial) { virRaiseError (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE, VIR_ERR_RPC, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, _("unknown serial (received %x, expected %x)"), hdr.serial, serial); - return -1; + goto out; } /* Status is either REMOTE_OK (meaning that what follows is a ret @@ -4950,17 +4961,18 @@ retry_read: if (!(*ret_filter) (&xdr, ret)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("unmarshalling ret")); - return -1; + goto out; } xdr_destroy (&xdr); - return 0; + err = 0; + goto out; case REMOTE_ERROR: memset (&rerror, 0, sizeof rerror); if (!xdr_remote_error (&xdr, &rerror)) { error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, VIR_ERR_RPC, _("unmarshalling remote_error")); - return -1; + goto out; } xdr_destroy (&xdr); /* See if caller asked us to keep quiet about missing RPCs @@ -4970,11 +4982,12 @@ retry_read: rerror.code == VIR_ERR_RPC && rerror.level == VIR_ERR_ERROR && STRPREFIX(*rerror.message, "unknown procedure")) { - return -2; + err = -2; + goto out; } server_error (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, &rerror); xdr_free ((xdrproc_t) xdr_remote_error, (char *) &rerror); - return -1; + goto out; default: virRaiseError (flags & REMOTE_CALL_IN_OPEN ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE, @@ -4982,8 +4995,12 @@ retry_read: _("unknown status (received %x)"), hdr.status); xdr_destroy (&xdr); - return -1; - } + goto out; + } + +out: + VIR_FREE (buffer); + return err; } static int @@ -5551,7 +5568,7 @@ remoteDomainEventFired(int watch, int event, void *opaque) { - char buffer[REMOTE_MESSAGE_MAX]; + char *buffer = NULL; char buffer2[4]; struct remote_message_header hdr; XDR xdr; @@ -5566,22 +5583,22 @@ remoteDomainEventFired(int watch, DEBUG("%s : VIR_EVENT_HANDLE_HANGUP or " "VIR_EVENT_HANDLE_ERROR encountered", __FUNCTION__); virEventRemoveHandle(watch); - return; + goto out; } if (fd != priv->sock) { virEventRemoveHandle(watch); - return; + goto out; } /* Read and deserialise length word. */ if (really_read (conn, priv, 0, buffer2, sizeof buffer2) == -1) - return; + goto out; xdrmem_create (&xdr, buffer2, sizeof buffer2, XDR_DECODE); if (!xdr_int (&xdr, &len)) { error (conn, VIR_ERR_RPC, _("xdr_int (length word, reply)")); - return; + goto out; } xdr_destroy (&xdr); @@ -5590,20 +5607,25 @@ remoteDomainEventFired(int watch, if (len < 0 || len > REMOTE_MESSAGE_MAX) { error (conn, VIR_ERR_RPC, _("packet received from server too large")); - return; + goto out; + } + + if ((buffer = malloc(REMOTE_MESSAGE_MAX)) == NULL) { + error (conn, VIR_ERR_SYSTEM_ERROR, strerror (errno)); + goto out; } /* Read reply header and what follows (either a ret or an error). */ if (really_read (conn, priv, 0, buffer, len) == -1) { error (conn, VIR_ERR_RPC, _("error reading buffer from memory")); - return; + goto out; } /* Deserialise reply header. */ xdrmem_create (&xdr, buffer, len, XDR_DECODE); if (!xdr_remote_message_header (&xdr, &hdr)) { error (conn, VIR_ERR_RPC, _("invalid header in event firing")); - return; + goto out; } if (hdr.proc == REMOTE_PROC_DOMAIN_EVENT && @@ -5614,6 +5636,9 @@ remoteDomainEventFired(int watch, DEBUG0("invalid proc in event firing"); error (conn, VIR_ERR_RPC, _("invalid proc in event firing")); } + +out: + VIR_FREE (buffer); } void

2 1

[libvirt] [PATCH] Improve compiler flag checking
by john.levon＠sun.com 14 Jan '09

14 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1229789393 28800 # Node ID a158bbc6df6fb8b15af875d08e73cfd3ca75f907 # Parent 34706075e6c801cd9532490c11b20b64dfcf464b Improve compiler flag checking Some compilers (including GCC) don't set the return value consistently if an erroneous option is passed on the command line. Account for that. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -45,21 +45,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ ;; esac - compiler_flags= + COMPILER_FLAGS= for option in $try_compiler_flags; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_LINK([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - compiler_flags="$compiler_flags $option" - fi - unset has_option - unset SAVE_CFLAGS + gl_COMPILER_FLAGS($option) done unset option unset try_compiler_flags @@ -85,7 +73,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ fi AC_MSG_RESULT($complCFLAGS) - WARN_CFLAGS="$compiler_flags $complCFLAGS" + WARN_CFLAGS="$COMPILER_FLAGS $complCFLAGS" AC_SUBST(WARN_CFLAGS) dnl Needed to keep compile quiet on python 2.4 diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4 --- a/m4/compiler-flags.m4 +++ b/m4/compiler-flags.m4 @@ -25,10 +25,16 @@ AC_DEFUN([gl_COMPILER_FLAGS], AC_SUBST(COMPILER_FLAGS) ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $1" - AC_TRY_COMPILE(, - [int x;], - COMPILER_FLAGS="$COMPILER_FLAGS $1" - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - CFLAGS="$ac_save_CFLAGS" + AC_TRY_LINK([], [], has_option=yes, has_option=no,) + echo 'int x;' >conftest.c + $CC $CFLAGS -c conftest.c 2>conftest.err + ret=$? + if test $ret != 0 -o -s conftest.err -o $has_option = "no"; then + AC_MSG_RESULT(no) + else + AC_MSG_RESULT(yes) + COMPILER_FLAGS="$COMPILER_FLAGS $1" + fi + CFLAGS="$ac_save_CFLAGS" + rm -f conftest* ])

2 1

[libvirt] libvirtd shutdown script patches
by Sir Woody Hackswell 14 Jan '09

14 Jan '09

Here is a small patch for libvirtd init and sysconfig script. Before killing libvirtd, we virsh shutdown any running domains. We also have a maximum time limit for shutdown (300 sec default), just in case the VM will not shut down. Any thoughts as to whether this is the right place to put this functionality? Is the shutdown script proper, or since libvirtd handles autostarts domains internally, should libvirtd shut down active domains upon SIGTERM all by itself? -Richard --- /etc/init.d/libvirtd.orig 2009-01-13 19:31:47.000000000 -0500 +++ /etc/init.d/libvirtd 2009-01-13 19:53:25.000000000 -0500 @@ -47,6 +47,11 @@ LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" fi +if [ -z "$LIBVIRTD_SHUTDOWN_TIMEOUT" ] +then + LIBVIRTD_SHUTDOWN_TIMEOUT=300 +fi + RETVAL=0 start() { @@ -62,6 +67,15 @@ stop() { echo -n $"Stopping $SERVICE daemon: " + starttime=`date '+%s'` + for VM in $(virsh list | grep running | gawk '{print $2}'); do virsh -q shutdown $VM; done + while ( virsh list | grep -qc running ); do + sleep 5; + nowtime=`date '+%s'` + elapsed=$(($nowtime-$starttime)) + [[ $elapsed -ge $LIBVIRTD_SHUTDOWN_TIMEOUT ]] && break + done + killproc $PROCESS RETVAL=$? echo --- /etc/sysconfig/libvirtd.orig 2009-01-13 19:56:09.000000000 -0500 +++ /etc/sysconfig/libvirtd 2009-01-13 19:41:27.000000000 -0500 @@ -8,4 +8,7 @@ # Override Kerberos service keytab for SASL/GSSAPI #KRB5_KTNAME=/etc/libvirt/krb5.tab +# Shutdown timeout in seconds - Default is 300 seconds (or 5 minutes) +#LIBVIRTD_SHUTDOWN_TIMEOUT=300 -- -Sir Woody Hackswell

3 3

[libvirt] QEMU link on libvirt.org needs updated
by Michael Schenck 13 Jan '09

13 Jan '09

Maintainer of libvirt.org, Currently the QEMU link under "libvirt supports" on http://libvirt.org/index.html points to http://fabrice.bellard.free.fr/qemu/, which should be updated to http://bellard.org/qemu/ Best Regards, Michael Schenck -- Michael Schenck - www.tek-ops.com Karma police, arrest this man He talks in maths He buzzes like a fridge He's like a detuned radio

2 1

[libvirt] proposal: allow use of "bool": HACKING: discuss C types
by Jim Meyering 13 Jan '09

13 Jan '09

Hello, I don't want to make waves, but I do care about certain aspects of code quality, so... I propose to allow (encourage, even) the use of the standard C99 type, bool, in libvirt, but not in public interfaces[1]. There are already uses in cgroup.c and xmlrpc.c, as well as those in the gnulib "c-ctype.h" header which is included from many of libvirt's .c files. The motivation is to make the code as readable as possible. When you see the declaration of an "int" variable, member, or function, that type gives you no clue whether it is used as a boolean. If you see a few uses that treat it as boolean, that's still no guarantee, and it may be non-trivial to ensure that there isn't some non-boolean value with a special meaning. However, if you see a "bool" variable, you do have that guarantee. This is one reason to using the tighter, more descriptive type. In addition, if ever you need to go back to using "int", it's trivial to automate the substitution, e.g., -Dint=bool or sed s/int/bool/. On the other hand, it is very hard to automatically identify "int" variables that may safely be converted to "bool". Portability is no problem whatsoever, thanks to gnulib's stdbool module, which ensures that there is a working <stdbool.h> header in the compiler's include path. libvirt even includes/runs a test to ensure that the <stdbool.h> in use (from gnulib or from the system) works properly. Of course, if you agree on principle, we should update HACKING to reflect the policy, so I've taken a shot at that. But if we start talking about using the right type for boolean variables, we can't avoid the more general question of scalars, signedness, etc. And once you mention scalars, you have to mention pointers and const-correctness, so it got longer still. Patch below. Jim [1]: We can use "bool" reliably in libvirt-internal code, due to the fact that it is guaranteed to be compiled with a usable <stdbool.h> header. We cannot make such a guarantee for all applications that compile code including libvirt's public headers, <libvirt.h> and <virterror.h>. P.S. I confess I have a vested interested. I wrote a patch recently that declares a local to be of type "bool", and would like to ensure that policy permits doing that. >From 3c6a9bc0fd043ce9f84e5aaba3cfbc1db0359eb7 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 12 Dec 2008 09:45:31 +0100 Subject: [PATCH] HACKING: use the right type --- HACKING | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/HACKING b/HACKING index 3945833..511c8cc 100644 --- a/HACKING +++ b/HACKING @@ -91,6 +91,52 @@ Usually they're in macro definitions or strings, and should be converted anyhow. +C types +======= +Use the right type. + +Scalars +------- +If you're using "int" or "long", odds are good that there's a better type. +If a variable is counting something, be sure to declare it with an +unsigned type. +If it's memory-size-related, use size_t (use ssize_t only if required). +If it's file-size related, use uintmax_t, or maybe off_t. +If it's file-offset related (i.e., signed), use off_t. +If it's just counting small numbers use "unsigned int"; +(on all but oddball embedded systems, you can assume that that +type is at least four bytes wide). +If a variable has boolean semantics, give it the "bool" type +and use the corresponding "true" and "false" macros. It's ok +to include <stdbool.h>, since libvirt's use of gnulib ensures +that it exists and is usable. +In the unusual event that you require a specific width, use a +standard type like int32_t, uint32_t, uint64_t, etc. + +Of course, take all of the above with a grain of salt. If you're about +to use some system interface that requires a type like int or ssize_t, +use types for your own variables that match. + +Also, if you try to use e.g., "unsigned int" as a type, and that +conflicts with the signedness of a related variable, sometimes +it's best just to use the *wrong* type, if "pulling the thread" +and fixing all related variables would be too invasive. + +Finally, while using descriptive types is important, be careful not to +go overboard. If whatever you're doing causes warnings, or requires +casts, then reconsider or ask for help. + +Pointers +-------- +Ensure that all of your pointers are "const-correct". +Unless a pointer is used to modify the pointed-to storage, +give it the "const" attribute. That way, the reader knows +up-front that this is a read-only pointer. Perhaps more +importantly, if we're diligent about this, when you see a non-const +pointer, you're guaranteed that it is used to modify the storage +it points to, or it is aliased to another pointer that is. + + Low level memory management =========================== -- 1.6.1.rc2.299.gead4c.dirty

3 8

[libvirt] Bridge interface and script
by John Levon 12 Jan '09

12 Jan '09

With current libvirt, it's not possible to specify a script for VIR_DOMAIN_NET_TYPE_BRIDGE. Is this just an oversight, or intentional? We use the bridge type with Solaris virtual NICs, and need to specify the correct script to use. Suggestions on how to fix this? Should I just add script handling to this net type? thanks john

2 4

[libvirt] [PATCH] Fix remote_protocol header for Solaris
by john.levon＠sun.com 12 Jan '09

12 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1229367889 28800 # Node ID 46a487775d4b35c32455a5ca8eb3009d10a02c5b # Parent a1f24e9f8a1fbf191c71172ae986110b7e98fc32 Fix remote_protocol header for Solaris quad_t is not a portable type, but rather than force rpcgen every build, we just patch in the fixes needed. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/qemud/Makefile.am b/qemud/Makefile.am --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -47,6 +47,7 @@ if GLIBC_RPCGEN chmod 444 $@-t mv $@-t $@ endif + patch < rpcgen-solaris.diff endif remote_protocol.c: remote_protocol.h diff --git a/qemud/rpcgen-solaris.diff b/qemud/rpcgen-solaris.diff new file mode 100644 --- /dev/null +++ b/qemud/rpcgen-solaris.diff @@ -0,0 +1,19 @@ +diff ./remote_protocol.h ./remote_protocol.h +--- ./remote_protocol.h ++++ ./remote_protocol.h +@@ -11,6 +11,15 @@ + + #ifdef __cplusplus + extern "C" { ++#endif ++ ++#if defined(__sun) ++#include <rpc/xdr.h> ++#define u_quad_t uint64_t ++#define quad_t int64_t ++#define xdr_u_quad_t xdr_uint64_t ++#define xdr_quad_t xdr_int64_t ++#define IXDR_GET_LONG IXDR_GET_INT32 + #endif + + #include <config.h>

5 9

[libvirt] [PATCH] Fix invocation of rpcgen
by Richard W.M. Jones 12 Jan '09

12 Jan '09

Currently if rpcgen != glibc's rpcgen, then it gets a bit confused with the temporary files. Also it's best to call the rpcgen that configure detected and not some random rpcgen that happens to be in the path. The attached patch fixes this. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 1

[libvirt] [PATCH] Avoid GCC extensions
by john.levon＠sun.com 12 Jan '09

12 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1229367890 28800 # Node ID 6a8e82d7d2e166880fed8d7ad860a3e2e93d62be # Parent c324c231c6a50be9f970f0f6c6d1629a7c09ab3b Avoid GCC extensions Anonymous unions are not portable, nor are zero-sizes structures. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -1437,7 +1437,7 @@ virDomainHostdevSubsysUsbDefParseXML(vir if (vendor) { if (virStrToLong_ui(vendor, NULL, 0, - &def->source.subsys.usb.vendor) < 0) { + &def->source.subsys.u.usb.vendor) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot parse vendor id %s"), vendor); VIR_FREE(vendor); @@ -1454,7 +1454,7 @@ virDomainHostdevSubsysUsbDefParseXML(vir if (product) { if (virStrToLong_ui(product, NULL, 0, - &def->source.subsys.usb.product) < 0) { + &def->source.subsys.u.usb.product) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot parse product %s"), product); VIR_FREE(product); @@ -1472,7 +1472,7 @@ virDomainHostdevSubsysUsbDefParseXML(vir bus = virXMLPropString(cur, "bus"); if (bus) { if (virStrToLong_ui(bus, NULL, 0, - &def->source.subsys.usb.bus) < 0) { + &def->source.subsys.u.usb.bus) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot parse bus %s"), bus); VIR_FREE(bus); @@ -1488,7 +1488,7 @@ virDomainHostdevSubsysUsbDefParseXML(vir device = virXMLPropString(cur, "device"); if (device) { if (virStrToLong_ui(device, NULL, 0, - &def->source.subsys.usb.device) < 0) { + &def->source.subsys.u.usb.device) < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot parse device %s"), device); @@ -1510,14 +1510,14 @@ virDomainHostdevSubsysUsbDefParseXML(vir cur = cur->next; } - if (def->source.subsys.usb.vendor == 0 && - def->source.subsys.usb.product != 0) { + if (def->source.subsys.u.usb.vendor == 0 && + def->source.subsys.u.usb.product != 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("missing vendor")); goto out; } - if (def->source.subsys.usb.vendor != 0 && - def->source.subsys.usb.product == 0) { + if (def->source.subsys.u.usb.vendor != 0 && + def->source.subsys.u.usb.product == 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("missing product")); goto out; @@ -2951,15 +2951,15 @@ virDomainHostdevDefFormat(virConnectPtr virBufferVSprintf(buf, " <hostdev mode='%s' type='%s'>\n", mode, type); virBufferAddLit(buf, " <source>\n"); - if (def->source.subsys.usb.vendor) { + if (def->source.subsys.u.usb.vendor) { virBufferVSprintf(buf, " <vendor id='0x%.4x'/>\n", - def->source.subsys.usb.vendor); + def->source.subsys.u.usb.vendor); virBufferVSprintf(buf, " <product id='0x%.4x'/>\n", - def->source.subsys.usb.product); + def->source.subsys.u.usb.product); } else { virBufferVSprintf(buf, " <address bus='%d' device='%d'/>\n", - def->source.subsys.usb.bus, - def->source.subsys.usb.device); + def->source.subsys.u.usb.bus, + def->source.subsys.u.usb.device); } virBufferAddLit(buf, " </source>\n"); diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -307,12 +307,13 @@ struct _virDomainHostdevDef { unsigned slot; unsigned function; } pci; - }; + } u; } subsys; struct { /* TBD: struct capabilities see: * https://www.redhat.com/archives/libvir-list/2008-July/msg00429.html */ + int dummy; } caps; } source; char* target; diff --git a/src/qemu_conf.c b/src/qemu_conf.c --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1264,15 +1264,15 @@ int qemudBuildCommandLine(virConnectPtr if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { - if(hostdev->source.subsys.usb.vendor) { + if(hostdev->source.subsys.u.usb.vendor) { ret = asprintf(&usbdev, "host:%.4x:%.4x", - hostdev->source.subsys.usb.vendor, - hostdev->source.subsys.usb.product); + hostdev->source.subsys.u.usb.vendor, + hostdev->source.subsys.u.usb.product); } else { ret = asprintf(&usbdev, "host:%.3d.%.3d", - hostdev->source.subsys.usb.bus, - hostdev->source.subsys.usb.device); + hostdev->source.subsys.u.usb.bus, + hostdev->source.subsys.u.usb.device); } if (ret < 0) { usbdev = NULL; diff --git a/src/qemu_driver.c b/src/qemu_driver.c --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2790,14 +2790,14 @@ static int qemudDomainAttachHostDevice(v return -1; } - if (dev->data.hostdev->source.subsys.usb.vendor) { + if (dev->data.hostdev->source.subsys.u.usb.vendor) { ret = asprintf(&cmd, "usb_add host:%.4x:%.4x", - dev->data.hostdev->source.subsys.usb.vendor, - dev->data.hostdev->source.subsys.usb.product); + dev->data.hostdev->source.subsys.u.usb.vendor, + dev->data.hostdev->source.subsys.u.usb.product); } else { ret = asprintf(&cmd, "usb_add host:%.3d.%.3d", - dev->data.hostdev->source.subsys.usb.bus, - dev->data.hostdev->source.subsys.usb.device); + dev->data.hostdev->source.subsys.u.usb.bus, + dev->data.hostdev->source.subsys.u.usb.device); } if (ret == -1) { qemudReportError(dom->conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); diff --git a/src/remote_internal.c b/src/remote_internal.c --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -649,7 +649,7 @@ doRemoteOpen (virConnectPtr conn, if (username) nr_args += 2; /* For -l username */ if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */ - command = command ? : strdup ("ssh"); + command = command ? command : strdup ("ssh"); if (command == NULL) goto out_of_memory;

4 4

[libvirt] [PATCH] fix non-srcdir build failure
by Jim Meyering 12 Jan '09

12 Jan '09

"make distcheck" was failing. This fixes it and adds some quotes. >From 8b6f9ff168dd0ce7318f1947a7766a4b223acdd4 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 8 Jan 2009 20:53:30 +0100 Subject: [PATCH] fix non-srcdir build failure * qemud/Makefile.am (check-local): Prefix use of test_libvirtd.aug with $(srcdir)/. Add quotes around $(AUGPARSE), in case it expands to something unusual. --- qemud/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 8983416..ad4ccf1 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -239,7 +239,8 @@ libvirtd.init: libvirtd.init.in mv $@-t $@ check-local: - if [ -x $(AUGPARSE) ]; then $(AUGPARSE) -I $(srcdir) test_libvirtd.aug ; fi + test -x '$(AUGPARSE)' \ + && '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug || : else -- 1.6.1.141.gfe98e

2 2

[libvirt] [PATCH 5/5] read saved vm status on libvirtd startup
by Guido Günther 12 Jan '09

12 Jan '09

The earlier patches didn't change libvirtd behaviour (except for kvm/qemu not being teared down on an unexpected daemon crash), all vms were still being shutoff at daemon shutdown. This patch now adds the code to read back the vm status after on daemon startup and reconnects all running vms found in stateDir which are left over from a daemon restart or crash and also disables shutting down of VMs when libvirt quits. --- src/qemu_driver.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 158 insertions(+), 7 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d8b87e4..57a396c 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -183,6 +183,46 @@ qemudAutostartConfigs(struct qemud_driver *driver) { } +static int +qemudGetProcFD(pid_t pid, int fdnum) +{ + int fd; + +#ifdef __linux__ + char *path = NULL; + + if (!asprintf(&path, "/proc/%d/fd/%d", pid, fdnum)) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); + return -1; + } + + if((fd = open(path, O_RDONLY)) < 0) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unable to open %s"), path); + return -1; + } + if (qemudSetCloseExec(fd) < 0) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unable to set close-on-exec flag on %s"), path); + goto error; + } + + if (qemudSetNonBlock(fd) < 0) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unable to put %s into non-blocking mode"), path); + goto error; + } + + VIR_FREE(path); + return fd; +error: + VIR_FREE(path); + close(fd); +#endif + return -1; +} + + /** * qemudRemoveDomainStatus * @@ -220,6 +260,104 @@ cleanup: } +static int qemudOpenMonitor(virConnectPtr conn, + virDomainObjPtr vm, + const char *monitor, + int reconnect); + +/** + * qemudReconnectVMs + * + * Reconnect running vms to the daemon process + */ +static int +qemudReconnectVMs(struct qemud_driver *driver) +{ + int i; + + for (i = 0 ; i < qemu_driver->domains.count ; i++) { + virDomainObjPtr vm = qemu_driver->domains.objs[i]; + qemudDomainStatusPtr status = NULL; + char *config = NULL; + int rc; + + virDomainObjLock(vm); + /* Read pid */ + if ((rc = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) + DEBUG("Found pid %d for '%s'", vm->pid, vm->def->name); + else + goto next; + + if ((config = virDomainConfigFile(NULL, + driver->stateDir, + vm->def->name)) == NULL) { + qemudLog(QEMUD_ERR, _("Failed to read domain status for %s\n"), + vm->def->name); + goto next_error; + } + + status = qemudDomainStatusParseFile(NULL, driver->caps, config, 0); + if (status) { + vm->newDef = vm->def; + vm->def = status->def; + } else { + qemudLog(QEMUD_ERR, _("Failed to parse domain status for %s\n"), + vm->def->name); + goto next_error; + } + + if ((rc = qemudOpenMonitor(NULL, vm, status->monitorpath, 1)) != 0) { + qemudLog(QEMUD_ERR, _("Failed to reconnect monitor for %s: %d\n"), + vm->def->name, rc); + goto next_error; + } else + vm->monitorpath = status->monitorpath; + + vm->stdin_fd = qemudGetProcFD(vm->pid, 0); + vm->stdout_fd = qemudGetProcFD(vm->pid, 1); + vm->stderr_fd = qemudGetProcFD(vm->pid, 2); + if (vm->stdin_fd == -1 || vm->stdout_fd == -1 || vm->stderr_fd == -1) + goto next_error; + + if (((vm->stdout_watch = virEventAddHandle(vm->stdout_fd, + VIR_EVENT_HANDLE_READABLE | + VIR_EVENT_HANDLE_ERROR | + VIR_EVENT_HANDLE_HANGUP, + qemudDispatchVMEvent, + driver, NULL)) < 0) || + ((vm->stderr_watch = virEventAddHandle(vm->stderr_fd, + VIR_EVENT_HANDLE_READABLE | + VIR_EVENT_HANDLE_ERROR | + VIR_EVENT_HANDLE_HANGUP, + qemudDispatchVMEvent, + driver, NULL)) < 0)) { + + qemudLog(QEMUD_ERR, _("Failed to reconnect to stdout/stderr\n")); + goto next_error; + } + + if (vm->def->id >= driver->nextvmid) + driver->nextvmid = vm->def->id + 1; + + vm->state = status->state; + goto next; + +next_error: + /* we failed to reconnect the vm so remove it's traces */ + vm->def->id = -1; + qemudRemoveDomainStatus(NULL, driver, vm); + virDomainDefFree(vm->def); + vm->def = vm->newDef; + vm->newDef = NULL; +next: + virDomainObjUnlock(vm); + VIR_FREE(status); + VIR_FREE(config); + } + return 0; +} + + /** * qemudStartup: * @@ -316,6 +454,7 @@ qemudStartup(void) { qemu_driver->autostartDir, NULL, NULL) < 0) goto error; + qemudReconnectVMs(qemu_driver); qemudAutostartConfigs(qemu_driver); qemuDriverUnlock(qemu_driver); @@ -418,11 +557,14 @@ qemudShutdown(void) { /* shutdown active VMs */ for (i = 0 ; i < qemu_driver->domains.count ; i++) { + /* FIXME: don't shutdown VMs on daemon shutdown for now */ +#if 0 virDomainObjPtr dom = qemu_driver->domains.objs[i]; virDomainObjLock(dom); if (virDomainIsActive(dom)) qemudShutdownVMDaemon(NULL, qemu_driver, dom); virDomainObjUnlock(dom); +#endif } virDomainObjListFree(&qemu_driver->domains); @@ -543,7 +685,8 @@ qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED, static int qemudOpenMonitor(virConnectPtr conn, virDomainObjPtr vm, - const char *monitor) { + const char *monitor, + int reconnect) { int monfd; char buf[1024]; int ret = -1; @@ -564,11 +707,19 @@ static int qemudOpenMonitor(virConnectPtr conn, goto error; } - ret = qemudReadMonitorOutput(conn, - vm, monfd, - buf, sizeof(buf), - qemudCheckMonitorPrompt, - "monitor", 10000); + if (!reconnect) { + ret = qemudReadMonitorOutput(conn, + vm, monfd, + buf, sizeof(buf), + qemudCheckMonitorPrompt, + "monitor", 10000); + } else { + vm->monitor = monfd; + ret = 0; + } + + if (ret != 0) + goto error; if (!(vm->monitorpath = strdup(monitor))) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, @@ -669,7 +820,7 @@ qemudFindCharDevicePTYs(virConnectPtr conn, } /* Got them all, so now open the monitor console */ - ret = qemudOpenMonitor(conn, vm, monitor); + ret = qemudOpenMonitor(conn, vm, monitor, 0); cleanup: VIR_FREE(monitor); -- 1.6.0.2

4 13

[libvirt] [PATCH] PCI passthrough docs, tests and minor change
by Daniel Veillard 12 Jan '09

12 Jan '09

The following add the documentation for the PCI passthrough, extends the RNG and add an extra test for the QEmu parsing to args and serialization back to XML. I also noticed that we parse (and save) and extra PCI domain argument, but it's not actually used when calling qemu, so I assume it's a missing feature for QEmu and just decided to patch the code to not save the extra value when not defined (i.e. 0). Whether it should just be removed at this point is IMHO a separate decision, which is why I took the way with minimal changes. Note that the domain attribute is not documented nor part or the RNG either at this point. 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/

3 7

[libvirt] text console install
by Michael Kress 12 Jan '09

12 Jan '09

Hi, I'm not able to get a text console install of any distribution (CentOS-5.2 for example). I'm using the following command: virt-install -n myname -f myimage.img -s 10 -c /iso/CentOS-5.2-x86_64-bin-DVD.iso --accelerate -r 1024 --hvm --nographics The vnc version of this command works flawlessly, but I'd like this host to be a headless one. The installation seems to start as I can see the instance with state "running" with the following command: virsh -c qemu:///system list But all I see is the following messages: ======================== Starting install... Creating domain... Connecting to uri: qemu:///system ======================== After a while there's one strange character showing up in the console. Pressing Ctrl-Alt Gr-] I can exit the screen and there's a message: ======================== Domain installation still in progress. You can reconnect to the console to complete the installation process. ======================== BTW, I got the following line in /etc/libvirt/qemu.conf vnc_listen="192.168.2.3" But also tried without that line. How can I get the text console to show up? Thanks Michael -- Michael Kress, kress(a)hal.saar.de http://www.michael-kress.de / http://kress.net P E N G U I N S A R E C O O L

2 1

[libvirt] Question, new libvirt driver - OpenNebula.
by "Abel Míguez Rodríguez" 12 Jan '09

12 Jan '09

Hello all, We have updated the libvirt implementation for OpenNebula to libvirt- 0.5.1 release, made use of the internal XML handling API and the existing infrastructure for error, data structures, etc... Now we are facing the problem of needing several libraries to compile the driver, the OpenNebula API (liboneapi) and the xmlrpc library that the API makes use of. The problem is that the xmlrpc library itself depends on: libxmlrpc_client++ libxmlrpc_client libxmlrpc++ libxmlrpc libxmlrpc_util libxmlrpc_xmlparse libxmlrpc_xmltok We would like to link just against less libraries to make the driver compilation clear and simple, any idea? Cheers Abel

2 1

[libvirt] interface.script not launched (KVM/qemu)
by Daniel Schwager 12 Jan '09

12 Jan '09

Hi, I use kvm and libvirt for running windows on a fedora-core9. Problem: I defined a interface script which should run, if the KVM/qemu starts, but libvirt does not tell kvm to use the script: Part of my domain.xml: <interface type="bridge"> <source bridge="br-guest"/> <script path='bridge-kvm.sh'/> <model type='e1000'/> </interface> Part of the logfile of qemu in /var/log/libvirt/qemu LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin / /usr/bin/qemu-kvm \ -S -M pc -m 250 -smp 1 -name winxp100 -monitor pty -boot c \ -drive file=/tmp/winxp100,if=ide,index=0,boot=on \ -net nic,macaddr=52:54:00:79:d5:c9,vlan=0,model=e1000 \ -net tap,fd=14,script=,vlan=0,ifname=vnet0 \ -serial pty -parallel none -usb -usbdevice tablet -vnc 0.0.0.0:0 There, you can see the empty script directive "...,script=,...." root@kvm ~]$ rpm -qa | grep libvirt libvirt-0.5.1-2.fc9.x86_64 How can I fix this problem ? regards Danny

2 1

[libvirt] [PATCH] split out logfile opening
by Guido Günther 11 Jan '09

11 Jan '09

Hi, attached patch splits out the qemu logfile opening into a separate function which makes the code a bit more readable and I'll need this for the libvirtd restart code. Cheers, -- Guido

3 10

[libvirt] Libvirt - Xen Enterprise - Koan
by Gerhardus.Geldenhuis＠gta-travel.com 09 Jan '09

09 Jan '09

Hi I hope me "replying" this way does not break anyone's mail sorting, I only now subscribed to the list. > Thanks for this - this sounds like the most likely issue. The problem is > that Citrix seems to move things around somewhat as that config file > does not exist. There is a xensource directory that contains the > following but other than that i am a bit stuck. They might have overriden the config file to point somewhere else. Try and find the file "XendOptions.py" and see where it loads the config from. Or see if anything sets $XEND_CONFIG env variable at startup. In regular upstream xen code, it XendOptions.py has: class XendOptionsFile(XendOptions): """Default path to the config file.""" config_default = "/etc/xen/xend-config.sxp" I did a find . -name *.py > temp.gg and then 141 cat temp.gg | xargs grep -i xendoptions 142 cat temp.gg | xargs grep -i xend 144 cat temp.gg | xargs grep -i XEND_CONFIG 148 cat temp.gg | xargs grep -i config_default All of these searches gave me absolutely no results. I am sure that the config files are in : /etc/xensource/ xapi.conf xapi-ssl.conf the contents of xapi.conf is: schema_filename = /etc/xensource/db_schema.sql license_filename = /etc/xensource/license http-port = 80 use-ssl = true ssl-cert = /etc/ssl/certs/xensource-rio.pem ssl-port = 443 # dom0-mem = 128 and of xapi-ssl.conf is: pid = /var/run/xapi.ssl.pid socket = r:TCP_NODELAY=1 socket = a:TCP_NODELAY=1 socket = l:TCP_NODELAY=1 [xapi] accept = 443 connect = 80 cert = /etc/xensource/xapi-ssl.pem I am thinking that maybe only ssl connections are allowed ... which is why virsh can't connect? we are running "XenServer release 4.1.0-7843p (xenenterprise)" and I am trying to get spacewalk to get the necessary domain details when registering a xen host. ______________________________________________________________________ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email ______________________________________________________________________

9 21

[libvirt] [PATCH] Fix non-debug compile
by john.levon＠sun.com 09 Jan '09

09 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1230005985 28800 # Node ID 60090fd4e447795742265241b39f2759d9530514 # Parent d7c3bd669a72371127852aefb3ba2cc0443da8da Fix non-debug compile Remove duplicate defines, and stub out virLogMessage() for non-debug builds. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/src/logging.h b/src/logging.h --- a/src/logging.h +++ b/src/logging.h @@ -47,12 +47,6 @@ do { } while (0) #define VIR_ERROR(category, f, l, fmt,...) \ do { } while (0) -#define VIR_INFO(category, fmt,...) \ - do { } while (0) -#define VIR_WARN(category, fmt,...) \ - do { } while (0) -#define VIR_ERROR(category, fmt,...) \ - do { } while (0) #endif /* !ENABLE_DEBUG */ #define DEBUG(fmt,...) \ @@ -82,6 +76,8 @@ typedef enum { VIR_LOG_WARN, VIR_LOG_ERROR, } virLogPriority; + +#ifdef ENABLE_DEBUG /** * virLogOutputFunc: @@ -114,10 +110,6 @@ extern int virLogDefineOutput(virLogOutp extern int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, void *data, int priority, int flags); -#if 0 -extern char *virLogGetDump(int flags); -#endif - /* * Internal logging API */ @@ -127,8 +119,23 @@ extern void virLogShutdown(void); extern void virLogShutdown(void); extern int virLogParseFilters(const char *filters); extern int virLogParseOutputs(const char *output); + 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

2 1

[libvirt] [PATCH] Fix Solaris compile after gnulib refresh
by john.levon＠sun.com 09 Jan '09

09 Jan '09

# HG changeset patch # User john.levon(a)sun.com # Date 1231444798 28800 # Node ID bf47245a1fecebe59ef30371a4465d713d37af06 # Parent b0dbefc87cb8b0194ad2bd518c2e8261b6bb0a6c Fix Solaris compile after gnulib refresh As documented in NEWS, we now need to explicitly specify usage of libsocket. Signed-off-by: John Levon <john.levon(a)sun.com> diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -79,9 +79,9 @@ AC_CHECK_HEADERS([pwd.h paths.h regex.h dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. -dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW) or none (most Unix) +dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW), nsl (Solaris) or none (most Unix) AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ - AC_SEARCH_LIBS([xdrmem_create],[rpc xdr]) + AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl]) ]) AC_CHECK_LIB([intl],[gettext],[]) diff --git a/qemud/Makefile.am b/qemud/Makefile.am --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -248,7 +248,7 @@ endif # DBUS_INIT_SCRIPTS_RED_HAT # This must be added last, since functions it provides/replaces # are used by nearly every other library. -libvirtd_LDADD += ../gnulib/lib/libgnu.la +libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET) endif # WITH_LIBVIRTD diff --git a/tests/Makefile.am b/tests/Makefile.am --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,6 +33,7 @@ LDADDS = \ $(WARN_CFLAGS) \ ../src/libvirt_test.la \ ../gnulib/lib/libgnu.la \ + $(LIBSOCKET) \ $(COVERAGE_LDFLAGS) EXTRA_DIST = \

3 2