- 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