6:36 p.m.
I've been building up a grab bag of un-acked patches (a couple
have had reviews, but most have met list silence), so I figured
a repost would help.
Eric Blake (6):
build: update to latest gnulib
build: require newer gettext
virsh: optimize creation of default connection
build: make python optional at configure time
build: silence clang false positive
remote: remove special case for getting version
.gnulib | 2 +-
bootstrap | 12 +-
bootstrap.conf | 2 +-
configure.ac | 37 +++--
daemon/remote_generator.pl | 23 +--
src/libxl/libxl_driver.c | 2 +
src/remote/remote_protocol.x | 4 +-
src/remote_protocol-structs | 4 +-
tools/virsh.c | 429 ++++++++++++++++++++++++------------------
9 files changed, 299 insertions(+), 216 deletions(-)
--
1.7.4.4
6:36 p.m.
New subject: [libvirt] [PATCHv2 1/6] build: update to latest gnulib
* .gnulib: Update, for bootstrap and other fixes.
* bootstrap: Resynchronize with gnulib.
---
v2: not sure I've sent a v1 on list, so this is a new patch
* .gnulib 64a5e38...a2b658c (23):
intprops: add doc
verify: add doc to gnulib manual and fix example
warnings.m4: don't usurp save_CPPFLAGS variable name
ChangeLog: s/^ /\t/
doc: fix typo
doc: Tweak recent change.
inttypes: avoid autoconf warning
Typo.
vc-list-files: accept multiple directory operands
Fix confusion regarding deprecated modules.
doc: List the target platforms.
* build-aux/bootstrap (gnulib_tool): Handle symlink timestamps better.
intprops-tests: new module
intprops: add safe, portable integer overflow checking
fnmatch: add a test for glibc's Bugzilla bug #12378
fnmatch: sync glibc change fixing Bugzilla bug #12378
update from texinfo
getcwd-lgpl: relax test for FreeBSD
test-fflush: silence compiler warning
canonicalize, canonicalize-lgpl: Avoid crash dialog on MacOS X.
group-member: Declare function in <unistd.h>.
group-member: Document module.
fclose: Fix mistake earlier today.
.gnulib | 2 +-
bootstrap | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/.gnulib b/.gnulib
index 64a5e38..a2b658c 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 64a5e38bced6c8f5117efbed95cdfd8ca133ed54
+Subproject commit a2b658cdccd4a13a5cef87144447f96cd1079e8c
diff --git a/bootstrap b/bootstrap
index d32db57..522ac70 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2011-05-11.17; # UTC
+scriptversion=2011-05-16.16; # UTC
# Bootstrap this package from checked-out sources.
@@ -670,10 +670,18 @@ symlink_to_dir()
cp -fp "$src" "$dst"
}
else
+ # Leave any existing symlink alone, if it already points to the source,
+ # so that broken build tools that care about symlink times
+ # aren't confused into doing unnecessary builds. Conversely, if the
+ # existing symlink's time stamp is older than the source, make it afresh,
+ # so that broken tools aren't confused into skipping needed builds. See
+ # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>;.
test -h "$dst" &&
src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls &&
src_i=$1 &&
dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls &&
dst_i=$1 &&
- test "$src_i" = "$dst_i" || {
+ test "$src_i" = "$dst_i" &&
+ both_ls=`ls -dt "$src" "$dst"` &&
+ test "X$both_ls" = "X$dst$nl$src" || {
dot_dots=
case $src in
/*) ;;
--
1.7.4.4
1:27 a.m.
New subject: [libvirt] [PATCHv2 1/6] build: update to latest gnulib
2011/5/18 Eric Blake <eblake(a)redhat.com>:
* .gnulib: Update, for bootstrap and other fixes.
* bootstrap: Resynchronize with gnulib.
---
v2: not sure I've sent a v1 on list, so this is a new patch
* .gnulib 64a5e38...a2b658c (23):
> intprops: add doc
> verify: add doc to gnulib manual and fix example
> warnings.m4: don't usurp save_CPPFLAGS variable name
> ChangeLog: s/^ /\t/
> doc: fix typo
> doc: Tweak recent change.
> inttypes: avoid autoconf warning
> Typo.
> vc-list-files: accept multiple directory operands
> Fix confusion regarding deprecated modules.
> doc: List the target platforms.
> * build-aux/bootstrap (gnulib_tool): Handle symlink timestamps better.
> intprops-tests: new module
> intprops: add safe, portable integer overflow checking
> fnmatch: add a test for glibc's Bugzilla bug #12378
> fnmatch: sync glibc change fixing Bugzilla bug #12378
> update from texinfo
> getcwd-lgpl: relax test for FreeBSD
> test-fflush: silence compiler warning
> canonicalize, canonicalize-lgpl: Avoid crash dialog on MacOS X.
> group-member: Declare function in <unistd.h>.
> group-member: Document module.
> fclose: Fix mistake earlier today.
.gnulib | 2 +-
bootstrap | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
ACK.
Matthias
9:32 a.m.
New subject: [libvirt] [PATCHv2 1/6] build: update to latest gnulib
On 05/18/2011 12:27 AM, Matthias Bolte wrote:
2011/5/18 Eric Blake <eblake(a)redhat.com>:
> * .gnulib: Update, for bootstrap and other fixes.
> * bootstrap: Resynchronize with gnulib.
> ---
>
> v2: not sure I've sent a v1 on list, so this is a new patch
>
ACK.
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
6:36 p.m.
New subject: [libvirt] [PATCHv2 2/6] build: require newer gettext
Now that RHEL 5.6 ships with gettext 0.17, we can get out of the
stone age and use the newer gettext capabilities and improved
macros for certain configure tests.
* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
(MKINSTALLDIRS): Delete hack that is no longer needed.
* bootstrap.conf (buildreq): Check for minimum gettext version.
Based on a report by Wen Congyang.
---
v2: no diff from v1:
https://www.redhat.com/archives/libvir-list/2011-May/msg00790.html
DV, since you build the nightly snapshots on RHEL, I need to make sure
your machine will handle this patch.
bootstrap.conf | 2 +-
configure.ac | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index f3e204a..769e57c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -164,7 +164,7 @@ buildreq="\
autoconf 2.59
automake 1.9.6
autopoint -
-gettext -
+gettext 0.17
git 1.5.5
gzip -
libtool -
diff --git a/configure.ac b/configure.ac
index 233e4af..8a3de4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1984,13 +1984,9 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" =
"yes"])
dnl Enable building libvirtd?
AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"])
-dnl Check for gettext
-AM_GNU_GETTEXT_VERSION([0.14.1])
+dnl Check for gettext - don't go any newer than what RHEL 5 supports
+AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
-dnl Since we're using such an old version of gettext, we must also define
-dnl this symbol, in order to make the autopoint-supplied Makefile.in.in
-dnl work properly.
-AC_SUBST([MKINSTALLDIRS], ["\$(top_builddir)/$ac_aux_dir/mkinstalldirs"])
ALL_LINGUAS=`cd "$srcdir/po" > /dev/null && ls *.po | sed
's+\.po$++'`
--
1.7.4.4
6:46 p.m.
New subject: [libvirt] [PATCHv2 2/6] build: require newer gettext
On Tue, May 17, 2011 at 05:36:06PM -0600, Eric Blake wrote:
Now that RHEL 5.6 ships with gettext 0.17, we can get out of the
stone age and use the newer gettext capabilities and improved
macros for certain configure tests.
* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
(MKINSTALLDIRS): Delete hack that is no longer needed.
* bootstrap.conf (buildreq): Check for minimum gettext version.
Based on a report by Wen Congyang.
---
v2: no diff from v1:
https://www.redhat.com/archives/libvir-list/2011-May/msg00790.html
DV, since you build the nightly snapshots on RHEL, I need to make sure
your machine will handle this patch.
bootstrap.conf | 2 +-
configure.ac | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index f3e204a..769e57c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -164,7 +164,7 @@ buildreq="\
autoconf 2.59
automake 1.9.6
autopoint -
-gettext -
+gettext 0.17
git 1.5.5
gzip -
libtool -
diff --git a/configure.ac b/configure.ac
index 233e4af..8a3de4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1984,13 +1984,9 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" =
"yes"])
dnl Enable building libvirtd?
AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"])
-dnl Check for gettext
-AM_GNU_GETTEXT_VERSION([0.14.1])
+dnl Check for gettext - don't go any newer than what RHEL 5 supports
+AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
-dnl Since we're using such an old version of gettext, we must also define
-dnl this symbol, in order to make the autopoint-supplied Makefile.in.in
-dnl work properly.
-AC_SUBST([MKINSTALLDIRS], ["\$(top_builddir)/$ac_aux_dir/mkinstalldirs"])
ALL_LINGUAS=`cd "$srcdir/po" > /dev/null && ls *.po | sed
's+\.po$++'`
Okay ACK,
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/
6:57 p.m.
New subject: [libvirt] [PATCHv2 2/6] build: require newer gettext
On 05/19/2011 05:46 PM, Daniel Veillard wrote:
On Tue, May 17, 2011 at 05:36:06PM -0600, Eric Blake wrote:
> Now that RHEL 5.6 ships with gettext 0.17, we can get out of the
> stone age and use the newer gettext capabilities and improved
> macros for certain configure tests.
>
> * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
> (MKINSTALLDIRS): Delete hack that is no longer needed.
> * bootstrap.conf (buildreq): Check for minimum gettext version.
> Based on a report by Wen Congyang.
> ---
Okay ACK,
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
6:36 p.m.
New subject: [libvirt] [PATCHv2 3/6] virsh: optimize creation of default connection
Ramon de Carvalho Valle reported a problem with:
virsh connect qemu:///system
as a non-root user. The real root problem appears to be a regression
in libvirtd being auto-started on the default qemu:///session URI;
however, the symptom points to an independent flaw in virsh - we
shouldn't be wasting efforts on making a connection if we aren't going
to be using that connection. Fixing virsh avoids Ramon's issue, while
I work in the meantime to fix the real libvirtd regression.
This patch looks big, but that's because 'gcc -Wmissing-field-initializers'
gets triggered by './autobuild.sh --enable-compile-warnings=error', so I
had to add 0 initialization to everyone (rather than my preference of
just adding the non-zero flags to virshCmds and to cmdConnect).
Meanwhile, if you use 'virsh -c URI', the connection must succeed; this
patch _only_ optimizes the default connection to be deferred to a later
point where we know if a particular command to be run needs a connection.
* tools/virsh.c (VSH_CMD_FLAG_NOCONNECT): New flag.
(vshCmdDef): Add new flags field.
(vshCommandRun): Honor new flag.
(domManagementCmds, domMonitoringCmds, storagePoolCmds)
(storageVolCmds, networkCmds, nodedevCmds, ifaceCmds)
(nwfilterCmds, secretCmds, virshCmds, snapshotCmds)
(hostAndHypervisorCmds): Populate new field.
(vshReconnect): Don't warn on initial connection.
---
v2: rebased to handle virsh commands added in meantime
v1: https://www.redhat.com/archives/libvir-list/2011-March/msg00633.html
tools/virsh.c | 429 +++++++++++++++++++++++++++++++++------------------------
1 fhttps://www.redhat.com/archives/libvir-list/2011-March/msg00iles changed, 250
insertions(+), 179 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 77cadcb..c2f4de6 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -186,6 +186,13 @@ typedef struct vshCmdOpt {
} vshCmdOpt;
/*
+ * Command Usage Flags
+ */
+enum {
+ VSH_CMD_FLAG_NOCONNECT = (1 << 0), /* no prior connection needed */
+};
+
+/*
* vshCmdDef - command definition
*/
typedef struct {
@@ -193,6 +200,7 @@ typedef struct {
bool (*handler) (vshControl *, const vshCmd *); /* command handler */
const vshCmdOptDef *opts; /* definition of command options */
const vshCmdInfo *info; /* details about command */
+ int flags; /* bitwise OR of VSH_CMD_FLAG */
} vshCmdDef;
/*
@@ -563,16 +571,21 @@ vshSetupSignals(void) {
*
*/
static void
-vshReconnect(vshControl *ctl) {
- if (ctl->conn != NULL)
+vshReconnect(vshControl *ctl)
+{
+ bool connected = false;
+
+ if (ctl->conn != NULL) {
+ connected = true;
virConnectClose(ctl->conn);
+ }
ctl->conn = virConnectOpenAuth(ctl->name,
virConnectAuthPtrDefault,
ctl->readonly ? VIR_CONNECT_RO : 0);
if (!ctl->conn)
vshError(ctl, "%s", _("Failed to reconnect to the
hypervisor"));
- else
+ else if (connected)
vshError(ctl, "%s", _("Reconnected to the hypervisor"));
disconnected = 0;
ctl->useGetInfo = false;
@@ -9966,7 +9979,7 @@ static const vshCmdOptDef opts_cd[] = {
};
static bool
-cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
+cmdCd(vshControl *ctl, const vshCmd *cmd)
{
const char *dir = NULL;
char *dir_malloced = NULL;
@@ -10737,205 +10750,259 @@ cleanup:
}
static const vshCmdDef domManagementCmds[] = {
- {"attach-device", cmdAttachDevice, opts_attach_device,
info_attach_device},
- {"attach-disk", cmdAttachDisk, opts_attach_disk, info_attach_disk},
- {"attach-interface", cmdAttachInterface, opts_attach_interface,
info_attach_interface},
- {"autostart", cmdAutostart, opts_autostart, info_autostart},
- {"blkiotune", cmdBlkiotune, opts_blkiotune, info_blkiotune},
+ {"attach-device", cmdAttachDevice, opts_attach_device,
+ info_attach_device, 0},
+ {"attach-disk", cmdAttachDisk, opts_attach_disk,
+ info_attach_disk, 0},
+ {"attach-interface", cmdAttachInterface, opts_attach_interface,
+ info_attach_interface, 0},
+ {"autostart", cmdAutostart, opts_autostart, info_autostart, 0},
+ {"blkiotune", cmdBlkiotune, opts_blkiotune, info_blkiotune, 0},
#ifndef WIN32
- {"console", cmdConsole, opts_console, info_console},
+ {"console", cmdConsole, opts_console, info_console, 0},
#endif
- {"cpu-baseline", cmdCPUBaseline, opts_cpu_baseline, info_cpu_baseline},
- {"cpu-compare", cmdCPUCompare, opts_cpu_compare, info_cpu_compare},
- {"create", cmdCreate, opts_create, info_create},
- {"define", cmdDefine, opts_define, info_define},
- {"destroy", cmdDestroy, opts_destroy, info_destroy},
- {"detach-device", cmdDetachDevice, opts_detach_device,
info_detach_device},
- {"detach-disk", cmdDetachDisk, opts_detach_disk, info_detach_disk},
- {"detach-interface", cmdDetachInterface, opts_detach_interface,
info_detach_interface},
- {"domid", cmdDomid, opts_domid, info_domid},
- {"domjobabort", cmdDomjobabort, opts_domjobabort, info_domjobabort},
- {"domjobinfo", cmdDomjobinfo, opts_domjobinfo, info_domjobinfo},
- {"domname", cmdDomname, opts_domname, info_domname},
- {"domuuid", cmdDomuuid, opts_domuuid, info_domuuid},
- {"domxml-from-native", cmdDomXMLFromNative, opts_domxmlfromnative,
info_domxmlfromnative},
- {"domxml-to-native", cmdDomXMLToNative, opts_domxmltonative,
info_domxmltonative},
- {"dump", cmdDump, opts_dump, info_dump},
- {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml},
- {"edit", cmdEdit, opts_edit, info_edit},
- {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave},
- {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove,
info_managedsaveremove},
- {"maxvcpus", cmdMaxvcpus, opts_maxvcpus, info_maxvcpus},
- {"memtune", cmdMemtune, opts_memtune, info_memtune},
- {"migrate", cmdMigrate, opts_migrate, info_migrate},
- {"migrate-setmaxdowntime", cmdMigrateSetMaxDowntime,
opts_migrate_setmaxdowntime, info_migrate_setmaxdowntime},
- {"reboot", cmdReboot, opts_reboot, info_reboot},
- {"restore", cmdRestore, opts_restore, info_restore},
- {"resume", cmdResume, opts_resume, info_resume},
- {"save", cmdSave, opts_save, info_save},
- {"schedinfo", cmdSchedinfo, opts_schedinfo, info_schedinfo},
- {"setmaxmem", cmdSetmaxmem, opts_setmaxmem, info_setmaxmem},
- {"setmem", cmdSetmem, opts_setmem, info_setmem},
- {"setvcpus", cmdSetvcpus, opts_setvcpus, info_setvcpus},
- {"inject-nmi", cmdInjectNMI, opts_inject_nmi, info_inject_nmi},
- {"shutdown", cmdShutdown, opts_shutdown, info_shutdown},
- {"start", cmdStart, opts_start, info_start},
- {"suspend", cmdSuspend, opts_suspend, info_suspend},
- {"ttyconsole", cmdTTYConsole, opts_ttyconsole, info_ttyconsole},
- {"undefine", cmdUndefine, opts_undefine, info_undefine},
- {"update-device", cmdUpdateDevice, opts_update_device,
info_update_device},
- {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount},
- {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo},
- {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin},
- {"version", cmdVersion, NULL, info_version},
- {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay},
- {NULL, NULL, NULL, NULL}
+ {"cpu-baseline", cmdCPUBaseline, opts_cpu_baseline, info_cpu_baseline, 0},
+ {"cpu-compare", cmdCPUCompare, opts_cpu_compare, info_cpu_compare, 0},
+ {"create", cmdCreate, opts_create, info_create, 0},
+ {"define", cmdDefine, opts_define, info_define, 0},
+ {"destroy", cmdDestroy, opts_destroy, info_destroy, 0},
+ {"detach-device", cmdDetachDevice, opts_detach_device,
+ info_detach_device, 0},
+ {"detach-disk", cmdDetachDisk, opts_detach_disk, info_detach_disk, 0},
+ {"detach-interface", cmdDetachInterface, opts_detach_interface,
+ info_detach_interface, 0},
+ {"domid", cmdDomid, opts_domid, info_domid, 0},
+ {"domjobabort", cmdDomjobabort, opts_domjobabort, info_domjobabort, 0},
+ {"domjobinfo", cmdDomjobinfo, opts_domjobinfo, info_domjobinfo, 0},
+ {"domname", cmdDomname, opts_domname, info_domname, 0},
+ {"domuuid", cmdDomuuid, opts_domuuid, info_domuuid, 0},
+ {"domxml-from-native", cmdDomXMLFromNative, opts_domxmlfromnative,
+ info_domxmlfromnative, 0},
+ {"domxml-to-native", cmdDomXMLToNative, opts_domxmltonative,
+ info_domxmltonative, 0},
+ {"dump", cmdDump, opts_dump, info_dump, 0},
+ {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml, 0},
+ {"edit", cmdEdit, opts_edit, info_edit, 0},
+ {"inject-nmi", cmdInjectNMI, opts_inject_nmi, info_inject_nmi, 0},
+ {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave, 0},
+ {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove,
+ info_managedsaveremove, 0},
+ {"maxvcpus", cmdMaxvcpus, opts_maxvcpus, info_maxvcpus, 0},
+ {"memtune", cmdMemtune, opts_memtune, info_memtune, 0},
+ {"migrate", cmdMigrate, opts_migrate, info_migrate, 0},
+ {"migrate-setmaxdowntime", cmdMigrateSetMaxDowntime,
+ opts_migrate_setmaxdowntime, info_migrate_setmaxdowntime, 0},
+ {"reboot", cmdReboot, opts_reboot, info_reboot, 0},
+ {"restore", cmdRestore, opts_restore, info_restore, 0},
+ {"resume", cmdResume, opts_resume, info_resume, 0},
+ {"save", cmdSave, opts_save, info_save, 0},
+ {"schedinfo", cmdSchedinfo, opts_schedinfo, info_schedinfo, 0},
+ {"setmaxmem", cmdSetmaxmem, opts_setmaxmem, info_setmaxmem, 0},
+ {"setmem", cmdSetmem, opts_setmem, info_setmem, 0},
+ {"setvcpus", cmdSetvcpus, opts_setvcpus, info_setvcpus, 0},
+ {"shutdown", cmdShutdown, opts_shutdown, info_shutdown, 0},
+ {"start", cmdStart, opts_start, info_start, 0},
+ {"suspend", cmdSuspend, opts_suspend, info_suspend, 0},
+ {"ttyconsole", cmdTTYConsole, opts_ttyconsole, info_ttyconsole, 0},
+ {"undefine", cmdUndefine, opts_undefine, info_undefine, 0},
+ {"update-device", cmdUpdateDevice, opts_update_device,
+ info_update_device, 0},
+ {"vcpucount", cmdVcpucount, opts_vcpucount, info_vcpucount, 0},
+ {"vcpuinfo", cmdVcpuinfo, opts_vcpuinfo, info_vcpuinfo, 0},
+ {"vcpupin", cmdVcpupin, opts_vcpupin, info_vcpupin, 0},
+ {"version", cmdVersion, NULL, info_version, 0},
+ {"vncdisplay", cmdVNCDisplay, opts_vncdisplay, info_vncdisplay, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef domMonitoringCmds[] = {
- {"domblkinfo", cmdDomblkinfo, opts_domblkinfo, info_domblkinfo},
- {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat},
- {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat},
- {"dominfo", cmdDominfo, opts_dominfo, info_dominfo},
- {"dommemstat", cmdDomMemStat, opts_dommemstat, info_dommemstat},
- {"domstate", cmdDomstate, opts_domstate, info_domstate},
- {"list", cmdList, opts_list, info_list},
- {NULL, NULL, NULL, NULL}
+ {"domblkinfo", cmdDomblkinfo, opts_domblkinfo, info_domblkinfo, 0},
+ {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat, 0},
+ {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat, 0},
+ {"dominfo", cmdDominfo, opts_dominfo, info_dominfo, 0},
+ {"dommemstat", cmdDomMemStat, opts_dommemstat, info_dommemstat, 0},
+ {"domstate", cmdDomstate, opts_domstate, info_domstate, 0},
+ {"list", cmdList, opts_list, info_list, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef storagePoolCmds[] = {
{"find-storage-pool-sources-as", cmdPoolDiscoverSourcesAs,
- opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as},
+ opts_find_storage_pool_sources_as, info_find_storage_pool_sources_as, 0},
{"find-storage-pool-sources", cmdPoolDiscoverSources,
- opts_find_storage_pool_sources, info_find_storage_pool_sources},
- {"pool-autostart", cmdPoolAutostart, opts_pool_autostart,
info_pool_autostart},
- {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build},
- {"pool-create-as", cmdPoolCreateAs, opts_pool_X_as, info_pool_create_as},
- {"pool-create", cmdPoolCreate, opts_pool_create, info_pool_create},
- {"pool-define-as", cmdPoolDefineAs, opts_pool_X_as, info_pool_define_as},
- {"pool-define", cmdPoolDefine, opts_pool_define, info_pool_define},
- {"pool-delete", cmdPoolDelete, opts_pool_delete, info_pool_delete},
- {"pool-destroy", cmdPoolDestroy, opts_pool_destroy, info_pool_destroy},
- {"pool-dumpxml", cmdPoolDumpXML, opts_pool_dumpxml, info_pool_dumpxml},
- {"pool-edit", cmdPoolEdit, opts_pool_edit, info_pool_edit},
- {"pool-info", cmdPoolInfo, opts_pool_info, info_pool_info},
- {"pool-list", cmdPoolList, opts_pool_list, info_pool_list},
- {"pool-name", cmdPoolName, opts_pool_name, info_pool_name},
- {"pool-refresh", cmdPoolRefresh, opts_pool_refresh, info_pool_refresh},
- {"pool-start", cmdPoolStart, opts_pool_start, info_pool_start},
- {"pool-undefine", cmdPoolUndefine, opts_pool_undefine,
info_pool_undefine},
- {"pool-uuid", cmdPoolUuid, opts_pool_uuid, info_pool_uuid},
- {NULL, NULL, NULL, NULL}
+ opts_find_storage_pool_sources, info_find_storage_pool_sources, 0},
+ {"pool-autostart", cmdPoolAutostart, opts_pool_autostart,
+ info_pool_autostart, 0},
+ {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build, 0},
+ {"pool-create-as", cmdPoolCreateAs, opts_pool_X_as, info_pool_create_as,
0},
+ {"pool-create", cmdPoolCreate, opts_pool_create, info_pool_create, 0},
+ {"pool-define-as", cmdPoolDefineAs, opts_pool_X_as, info_pool_define_as,
0},
+ {"pool-define", cmdPoolDefine, opts_pool_define, info_pool_define, 0},
+ {"pool-delete", cmdPoolDelete, opts_pool_delete, info_pool_delete, 0},
+ {"pool-destroy", cmdPoolDestroy, opts_pool_destroy, info_pool_destroy, 0},
+ {"pool-dumpxml", cmdPoolDumpXML, opts_pool_dumpxml, info_pool_dumpxml, 0},
+ {"pool-edit", cmdPoolEdit, opts_pool_edit, info_pool_edit, 0},
+ {"pool-info", cmdPoolInfo, opts_pool_info, info_pool_info, 0},
+ {"pool-list", cmdPoolList, opts_pool_list, info_pool_list, 0},
+ {"pool-name", cmdPoolName, opts_pool_name, info_pool_name, 0},
+ {"pool-refresh", cmdPoolRefresh, opts_pool_refresh, info_pool_refresh, 0},
+ {"pool-start", cmdPoolStart, opts_pool_start, info_pool_start, 0},
+ {"pool-undefine", cmdPoolUndefine, opts_pool_undefine,
+ info_pool_undefine, 0},
+ {"pool-uuid", cmdPoolUuid, opts_pool_uuid, info_pool_uuid, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef storageVolCmds[] = {
- {"vol-clone", cmdVolClone, opts_vol_clone, info_vol_clone},
- {"vol-create-as", cmdVolCreateAs, opts_vol_create_as, info_vol_create_as},
- {"vol-create", cmdVolCreate, opts_vol_create, info_vol_create},
- {"vol-create-from", cmdVolCreateFrom, opts_vol_create_from,
info_vol_create_from},
- {"vol-delete", cmdVolDelete, opts_vol_delete, info_vol_delete},
- {"vol-download", cmdVolDownload, opts_vol_download, info_vol_download },
- {"vol-dumpxml", cmdVolDumpXML, opts_vol_dumpxml, info_vol_dumpxml},
- {"vol-info", cmdVolInfo, opts_vol_info, info_vol_info},
- {"vol-key", cmdVolKey, opts_vol_key, info_vol_key},
- {"vol-list", cmdVolList, opts_vol_list, info_vol_list},
- {"vol-name", cmdVolName, opts_vol_name, info_vol_name},
- {"vol-path", cmdVolPath, opts_vol_path, info_vol_path},
- {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool},
- {"vol-upload", cmdVolUpload, opts_vol_upload, info_vol_upload },
- {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe},
- {NULL, NULL, NULL, NULL}
+ {"vol-clone", cmdVolClone, opts_vol_clone, info_vol_clone, 0},
+ {"vol-create-as", cmdVolCreateAs, opts_vol_create_as,
+ info_vol_create_as, 0},
+ {"vol-create", cmdVolCreate, opts_vol_create, info_vol_create, 0},
+ {"vol-create-from", cmdVolCreateFrom, opts_vol_create_from,
+ info_vol_create_from, 0},
+ {"vol-delete", cmdVolDelete, opts_vol_delete, info_vol_delete, 0},
+ {"vol-download", cmdVolDownload, opts_vol_download, info_vol_download, 0},
+ {"vol-dumpxml", cmdVolDumpXML, opts_vol_dumpxml, info_vol_dumpxml, 0},
+ {"vol-info", cmdVolInfo, opts_vol_info, info_vol_info, 0},
+ {"vol-key", cmdVolKey, opts_vol_key, info_vol_key, 0},
+ {"vol-list", cmdVolList, opts_vol_list, info_vol_list, 0},
+ {"vol-name", cmdVolName, opts_vol_name, info_vol_name, 0},
+ {"vol-path", cmdVolPath, opts_vol_path, info_vol_path, 0},
+ {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool, 0},
+ {"vol-upload", cmdVolUpload, opts_vol_upload, info_vol_upload, 0},
+ {"vol-wipe", cmdVolWipe, opts_vol_wipe, info_vol_wipe, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef networkCmds[] = {
- {"net-autostart", cmdNetworkAutostart, opts_network_autostart,
info_network_autostart},
- {"net-create", cmdNetworkCreate, opts_network_create,
info_network_create},
- {"net-define", cmdNetworkDefine, opts_network_define,
info_network_define},
- {"net-destroy", cmdNetworkDestroy, opts_network_destroy,
info_network_destroy},
- {"net-dumpxml", cmdNetworkDumpXML, opts_network_dumpxml,
info_network_dumpxml},
- {"net-edit", cmdNetworkEdit, opts_network_edit, info_network_edit},
- {"net-info", cmdNetworkInfo, opts_network_info, info_network_info},
- {"net-list", cmdNetworkList, opts_network_list, info_network_list},
- {"net-name", cmdNetworkName, opts_network_name, info_network_name},
- {"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},
- {NULL, NULL, NULL, NULL}
+ {"net-autostart", cmdNetworkAutostart, opts_network_autostart,
+ info_network_autostart, 0},
+ {"net-create", cmdNetworkCreate, opts_network_create,
+ info_network_create, 0},
+ {"net-define", cmdNetworkDefine, opts_network_define,
+ info_network_define, 0},
+ {"net-destroy", cmdNetworkDestroy, opts_network_destroy,
+ info_network_destroy, 0},
+ {"net-dumpxml", cmdNetworkDumpXML, opts_network_dumpxml,
+ info_network_dumpxml, 0},
+ {"net-edit", cmdNetworkEdit, opts_network_edit, info_network_edit, 0},
+ {"net-info", cmdNetworkInfo, opts_network_info, info_network_info, 0},
+ {"net-list", cmdNetworkList, opts_network_list, info_network_list, 0},
+ {"net-name", cmdNetworkName, opts_network_name, info_network_name, 0},
+ {"net-start", cmdNetworkStart, opts_network_start, info_network_start, 0},
+ {"net-undefine", cmdNetworkUndefine, opts_network_undefine,
+ info_network_undefine, 0},
+ {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef nodedevCmds[] = {
- {"nodedev-create", cmdNodeDeviceCreate, opts_node_device_create,
info_node_device_create},
- {"nodedev-destroy", cmdNodeDeviceDestroy, opts_node_device_destroy,
info_node_device_destroy},
- {"nodedev-dettach", cmdNodeDeviceDettach, opts_node_device_dettach,
info_node_device_dettach},
- {"nodedev-dumpxml", cmdNodeDeviceDumpXML, opts_node_device_dumpxml,
info_node_device_dumpxml},
- {"nodedev-list", cmdNodeListDevices, opts_node_list_devices,
info_node_list_devices},
- {"nodedev-reattach", cmdNodeDeviceReAttach, opts_node_device_reattach,
info_node_device_reattach},
- {"nodedev-reset", cmdNodeDeviceReset, opts_node_device_reset,
info_node_device_reset},
- {NULL, NULL, NULL, NULL}
+ {"nodedev-create", cmdNodeDeviceCreate, opts_node_device_create,
+ info_node_device_create, 0},
+ {"nodedev-destroy", cmdNodeDeviceDestroy, opts_node_device_destroy,
+ info_node_device_destroy, 0},
+ {"nodedev-dettach", cmdNodeDeviceDettach, opts_node_device_dettach,
+ info_node_device_dettach, 0},
+ {"nodedev-dumpxml", cmdNodeDeviceDumpXML, opts_node_device_dumpxml,
+ info_node_device_dumpxml, 0},
+ {"nodedev-list", cmdNodeListDevices, opts_node_list_devices,
+ info_node_list_devices, 0},
+ {"nodedev-reattach", cmdNodeDeviceReAttach, opts_node_device_reattach,
+ info_node_device_reattach, 0},
+ {"nodedev-reset", cmdNodeDeviceReset, opts_node_device_reset,
+ info_node_device_reset, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef ifaceCmds[] = {
- {"iface-define", cmdInterfaceDefine, opts_interface_define,
info_interface_define},
- {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy,
info_interface_destroy},
- {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml,
info_interface_dumpxml},
- {"iface-edit", cmdInterfaceEdit, opts_interface_edit,
info_interface_edit},
- {"iface-list", cmdInterfaceList, opts_interface_list,
info_interface_list},
- {"iface-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac},
- {"iface-name", cmdInterfaceName, opts_interface_name,
info_interface_name},
- {"iface-start", cmdInterfaceStart, opts_interface_start,
info_interface_start},
- {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine,
info_interface_undefine},
- {NULL, NULL, NULL, NULL}
+ {"iface-define", cmdInterfaceDefine, opts_interface_define,
+ info_interface_define, 0},
+ {"iface-destroy", cmdInterfaceDestroy, opts_interface_destroy,
+ info_interface_destroy, 0},
+ {"iface-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml,
+ info_interface_dumpxml, 0},
+ {"iface-edit", cmdInterfaceEdit, opts_interface_edit,
+ info_interface_edit, 0},
+ {"iface-list", cmdInterfaceList, opts_interface_list,
+ info_interface_list, 0},
+ {"iface-mac", cmdInterfaceMAC, opts_interface_mac,
+ info_interface_mac, 0},
+ {"iface-name", cmdInterfaceName, opts_interface_name,
+ info_interface_name, 0},
+ {"iface-start", cmdInterfaceStart, opts_interface_start,
+ info_interface_start, 0},
+ {"iface-undefine", cmdInterfaceUndefine, opts_interface_undefine,
+ info_interface_undefine, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef nwfilterCmds[] = {
- {"nwfilter-define", cmdNWFilterDefine, opts_nwfilter_define,
info_nwfilter_define},
- {"nwfilter-dumpxml", cmdNWFilterDumpXML, opts_nwfilter_dumpxml,
info_nwfilter_dumpxml},
- {"nwfilter-edit", cmdNWFilterEdit, opts_nwfilter_edit,
info_nwfilter_edit},
- {"nwfilter-list", cmdNWFilterList, opts_nwfilter_list,
info_nwfilter_list},
- {"nwfilter-undefine", cmdNWFilterUndefine, opts_nwfilter_undefine,
info_nwfilter_undefine},
- {NULL, NULL, NULL, NULL}
+ {"nwfilter-define", cmdNWFilterDefine, opts_nwfilter_define,
+ info_nwfilter_define, 0},
+ {"nwfilter-dumpxml", cmdNWFilterDumpXML, opts_nwfilter_dumpxml,
+ info_nwfilter_dumpxml, 0},
+ {"nwfilter-edit", cmdNWFilterEdit, opts_nwfilter_edit,
+ info_nwfilter_edit, 0},
+ {"nwfilter-list", cmdNWFilterList, opts_nwfilter_list,
+ info_nwfilter_list, 0},
+ {"nwfilter-undefine", cmdNWFilterUndefine, opts_nwfilter_undefine,
+ info_nwfilter_undefine, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef secretCmds[] = {
- {"secret-define", cmdSecretDefine, opts_secret_define,
info_secret_define},
- {"secret-dumpxml", cmdSecretDumpXML, opts_secret_dumpxml,
info_secret_dumpxml},
- {"secret-get-value", cmdSecretGetValue, opts_secret_get_value,
info_secret_get_value},
- {"secret-list", cmdSecretList, NULL, info_secret_list},
- {"secret-set-value", cmdSecretSetValue, opts_secret_set_value,
info_secret_set_value},
- {"secret-undefine", cmdSecretUndefine, opts_secret_undefine,
info_secret_undefine},
- {NULL, NULL, NULL, NULL}
+ {"secret-define", cmdSecretDefine, opts_secret_define,
+ info_secret_define, 0},
+ {"secret-dumpxml", cmdSecretDumpXML, opts_secret_dumpxml,
+ info_secret_dumpxml, 0},
+ {"secret-get-value", cmdSecretGetValue, opts_secret_get_value,
+ info_secret_get_value, 0},
+ {"secret-list", cmdSecretList, NULL, info_secret_list, 0},
+ {"secret-set-value", cmdSecretSetValue, opts_secret_set_value,
+ info_secret_set_value, 0},
+ {"secret-undefine", cmdSecretUndefine, opts_secret_undefine,
+ info_secret_undefine, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef virshCmds[] = {
- {"cd", cmdCd, opts_cd, info_cd},
- {"echo", cmdEcho, opts_echo, info_echo},
- {"exit", cmdQuit, NULL, info_quit},
- {"help", cmdHelp, opts_help, info_help},
- {"pwd", cmdPwd, NULL, info_pwd},
- {"quit", cmdQuit, NULL, info_quit},
- {NULL, NULL, NULL, NULL}
+ {"cd", cmdCd, opts_cd, info_cd, VSH_CMD_FLAG_NOCONNECT},
+ {"echo", cmdEcho, opts_echo, info_echo, VSH_CMD_FLAG_NOCONNECT},
+ {"exit", cmdQuit, NULL, info_quit, VSH_CMD_FLAG_NOCONNECT},
+ {"help", cmdHelp, opts_help, info_help, VSH_CMD_FLAG_NOCONNECT},
+ {"pwd", cmdPwd, NULL, info_pwd, VSH_CMD_FLAG_NOCONNECT},
+ {"quit", cmdQuit, NULL, info_quit, VSH_CMD_FLAG_NOCONNECT},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef snapshotCmds[] = {
- {"snapshot-create", cmdSnapshotCreate, opts_snapshot_create,
info_snapshot_create},
- {"snapshot-current", cmdSnapshotCurrent, opts_snapshot_current,
info_snapshot_current},
- {"snapshot-delete", cmdSnapshotDelete, opts_snapshot_delete,
info_snapshot_delete},
- {"snapshot-dumpxml", cmdSnapshotDumpXML, opts_snapshot_dumpxml,
info_snapshot_dumpxml},
- {"snapshot-list", cmdSnapshotList, opts_snapshot_list,
info_snapshot_list},
- {"snapshot-revert", cmdDomainSnapshotRevert, opts_snapshot_revert,
info_snapshot_revert},
- {NULL, NULL, NULL, NULL}
+ {"snapshot-create", cmdSnapshotCreate, opts_snapshot_create,
+ info_snapshot_create, 0},
+ {"snapshot-current", cmdSnapshotCurrent, opts_snapshot_current,
+ info_snapshot_current, 0},
+ {"snapshot-delete", cmdSnapshotDelete, opts_snapshot_delete,
+ info_snapshot_delete, 0},
+ {"snapshot-dumpxml", cmdSnapshotDumpXML, opts_snapshot_dumpxml,
+ info_snapshot_dumpxml, 0},
+ {"snapshot-list", cmdSnapshotList, opts_snapshot_list,
+ info_snapshot_list, 0},
+ {"snapshot-revert", cmdDomainSnapshotRevert, opts_snapshot_revert,
+ info_snapshot_revert, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdDef hostAndHypervisorCmds[] = {
- {"capabilities", cmdCapabilities, NULL, info_capabilities},
- {"connect", cmdConnect, opts_connect, info_connect},
- {"freecell", cmdFreecell, opts_freecell, info_freecell},
- {"hostname", cmdHostname, NULL, info_hostname},
- {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo},
- {"qemu-monitor-command", cmdQemuMonitorCommand, opts_qemu_monitor_command,
info_qemu_monitor_command},
- {"sysinfo", cmdSysinfo, NULL, info_sysinfo},
- {"uri", cmdURI, NULL, info_uri},
- {NULL, NULL, NULL, NULL}
+ {"capabilities", cmdCapabilities, NULL, info_capabilities, 0},
+ {"connect", cmdConnect, opts_connect, info_connect,
+ VSH_CMD_FLAG_NOCONNECT},
+ {"freecell", cmdFreecell, opts_freecell, info_freecell, 0},
+ {"hostname", cmdHostname, NULL, info_hostname, 0},
+ {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo, 0},
+ {"qemu-monitor-command", cmdQemuMonitorCommand, opts_qemu_monitor_command,
+ info_qemu_monitor_command, 0},
+ {"sysinfo", cmdSysinfo, NULL, info_sysinfo, 0},
+ {"uri", cmdURI, NULL, info_uri, 0},
+ {NULL, NULL, NULL, NULL, 0}
};
static const vshCmdGrp cmdGroups[] = {
@@ -11744,7 +11811,8 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd)
struct timeval before, after;
bool enable_timing = ctl->timing;
- if ((ctl->conn == NULL) || (disconnected != 0))
+ if ((ctl->conn == NULL || disconnected) &&
+ !(cmd->def->flags & VSH_CMD_FLAG_NOCONNECT))
vshReconnect(ctl);
if (enable_timing)
@@ -12352,19 +12420,22 @@ vshInit(vshControl *ctl)
if (virEventRegisterDefaultImpl() < 0)
return false;
- ctl->conn = virConnectOpenAuth(ctl->name,
- virConnectAuthPtrDefault,
- ctl->readonly ? VIR_CONNECT_RO : 0);
-
+ if (ctl->name) {
+ ctl->conn = virConnectOpenAuth(ctl->name,
+ virConnectAuthPtrDefault,
+ ctl->readonly ? VIR_CONNECT_RO : 0);
- /* This is not necessarily fatal. All the individual commands check
- * vshConnectionUsability, except ones which don't need a connection
- * such as "help".
- */
- if (!ctl->conn) {
- virshReportError(ctl);
- vshError(ctl, "%s", _("failed to connect to the
hypervisor"));
- return false;
+ /* Connecting to a named connection must succeed, but we delay
+ * connecting to the default connection until we need it
+ * (since the first command might be 'connect' which allows a
+ * non-default connection, or might be 'help' which needs no
+ * connection).
+ */
+ if (!ctl->conn) {
+ virshReportError(ctl);
+ vshError(ctl, "%s", _("failed to connect to the
hypervisor"));
+ return false;
+ }
}
return true;
--
1.7.4.4
10:40 a.m.
New subject: [libvirt] [PATCHv2 3/6] virsh: optimize creation of default connection
2011/5/18 Eric Blake <eblake(a)redhat.com>:
Ramon de Carvalho Valle reported a problem with:
virsh connect qemu:///system
as a non-root user. The real root problem appears to be a regression
in libvirtd being auto-started on the default qemu:///session URI;
however, the symptom points to an independent flaw in virsh - we
shouldn't be wasting efforts on making a connection if we aren't going
to be using that connection. Fixing virsh avoids Ramon's issue, while
I work in the meantime to fix the real libvirtd regression.
This patch looks big, but that's because 'gcc -Wmissing-field-initializers'
gets triggered by './autobuild.sh --enable-compile-warnings=error', so I
had to add 0 initialization to everyone (rather than my preference of
just adding the non-zero flags to virshCmds and to cmdConnect).
Meanwhile, if you use 'virsh -c URI', the connection must succeed; this
patch _only_ optimizes the default connection to be deferred to a later
point where we know if a particular command to be run needs a connection.
* tools/virsh.c (VSH_CMD_FLAG_NOCONNECT): New flag.
(vshCmdDef): Add new flags field.
(vshCommandRun): Honor new flag.
(domManagementCmds, domMonitoringCmds, storagePoolCmds)
(storageVolCmds, networkCmds, nodedevCmds, ifaceCmds)
(nwfilterCmds, secretCmds, virshCmds, snapshotCmds)
(hostAndHypervisorCmds): Populate new field.
(vshReconnect): Don't warn on initial connection.
---
v2: rebased to handle virsh commands added in meantime
v1: https://www.redhat.com/archives/libvir-list/2011-March/msg00633.html
tools/virsh.c | 429 +++++++++++++++++++++++++++++++++------------------------
1 fhttps://www.redhat.com/archives/libvir-list/2011-March/msg00iles changed, 250
insertions(+), 179 deletions(-)
I tested that virsh help doesn't open a connection.
ACK.
Matthias
2:22 p.m.
New subject: [libvirt] [PATCHv2 3/6] virsh: optimize creation of default connection
On 05/18/2011 09:40 AM, Matthias Bolte wrote:
2011/5/18 Eric Blake <eblake(a)redhat.com>:
> Ramon de Carvalho Valle reported a problem with:
> virsh connect qemu:///system
> as a non-root user. The real root problem appears to be a regression
> in libvirtd being auto-started on the default qemu:///session URI;
> however, the symptom points to an independent flaw in virsh - we
> shouldn't be wasting efforts on making a connection if we aren't going
> to be using that connection. Fixing virsh avoids Ramon's issue, while
> I work in the meantime to fix the real libvirtd regression.
I tested that virsh help doesn't open a connection.
ACK.
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
6:36 p.m.
New subject: [libvirt] [PATCHv2 4/6] build: make python optional at configure time
Regression introduced in commit 53cb23f4.
* configure.ac: Let --with-python default to check.
---
v2: no change from v1
v1: https://www.redhat.com/archives/libvir-list/2011-May/msg00412.html
configure.ac | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8a3de4c..1a9fddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1832,12 +1832,12 @@ dnl check for python
dnl
AC_ARG_WITH([python],
- AC_HELP_STRING([--with-python], [Build python bindings
@<:@default=yes@:>@]),[],[with_python=yes])
+ AC_HELP_STRING([--with-python],
+ [Build python bindings @<:@default=check@:>@]),[],[with_python=check])
if test "$enable_shared:$with_python" = no:yes; then
- AC_MSG_WARN([Disabling shared libraries is incompatible with building Python
extensions.])
- AC_MSG_WARN([Ignoring --with-python.])
- with_python=no
+ AC_MSG_ERROR([Disabling shared libraries is incompatible with building
+ Python extensions.])
fi
PYTHON_VERSION=
@@ -1863,7 +1863,7 @@ if test "$with_python" != "no" ; then
fi
fi
- if test "$with_python" = "yes" ; then
+ if test "$with_python" = "yes" || test "$with_python" =
"check"; then
AM_PATH_PYTHON(,, [:])
if test "$PYTHON" != : ; then
@@ -1872,30 +1872,41 @@ if test "$with_python" != "no" ; then
if test -x "$PYTHON_CONFIG"
then
PYTHON_INCLUDES=`$PYTHON_CONFIG --includes`
+ with_python=yes
else
if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h
then
PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION
+ with_python=yes
else
if test -r $prefix/include/python$PYTHON_VERSION/Python.h
then
PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION
+ with_python=yes
else
if test -r /usr/include/python$PYTHON_VERSION/Python.h
then
PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION
+ with_python=yes
+ elif test "$with_python" = "yes"; then
+ AC_MSG_ERROR([You must install python-devel to
+ build Python bindings])
else
- AC_MSG_ERROR([You must install python-devel to build Python
bindings])
+ AC_MSG_WARN([Could not find python-devel, disabling
+ bindings])
+ with_python=no
fi
fi
fi
fi
- else
+ elif test "$with_python" = "yes"; then
AC_MSG_ERROR([You must install python to build Python bindings])
+ else
+ AC_MSG_WARN([Could not find python, disabling bindings])
+ with_python=no
fi
else
- AC_MSG_NOTICE([Could not find python in $with_python, disabling bindings])
- with_python=no
+ AC_MSG_ERROR([Could not find python in $with_python])
fi
fi
AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
--
1.7.4.4
10:47 a.m.
New subject: [libvirt] [PATCHv2 4/6] build: make python optional at configure time
2011/5/18 Eric Blake <eblake(a)redhat.com>:
Regression introduced in commit 53cb23f4.
* configure.ac: Let --with-python default to check.
---
v2: no change from v1
v1: https://www.redhat.com/archives/libvir-list/2011-May/msg00412.html
configure.ac | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8a3de4c..1a9fddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1832,12 +1832,12 @@ dnl check for python
dnl
AC_ARG_WITH([python],
- AC_HELP_STRING([--with-python], [Build python bindings
@<:@default=yes@:>@]),[],[with_python=yes])
+ AC_HELP_STRING([--with-python],
+ [Build python bindings @<:@default=check@:>@]),[],[with_python=check])
if test "$enable_shared:$with_python" = no:yes; then
- AC_MSG_WARN([Disabling shared libraries is incompatible with building Python
extensions.])
- AC_MSG_WARN([Ignoring --with-python.])
- with_python=no
+ AC_MSG_ERROR([Disabling shared libraries is incompatible with building
+ Python extensions.])
fi
So, now this reports an error when you explicitly enable Python
bindings. But as with_python defaults to check now we might end up
enabling the bindings after this check even though enable_shared is
no. So this check doesn't work correctly anymore.
Matthas
6:36 p.m.
New subject: [libvirt] [PATCHv2 5/6] build: silence clang false positive
Clang couldn't quite see that the same condition of
(flags & VIR_DOMAIN_MEM_CONFIG) is used twice, such that
the second block is guaranteed that def was assigned in
the first block.
* src/libxl/libxl_driver.c (libxlDomainSetMemoryFlags): Add a hint
for clang.
---
v2: no change from v1
v1: https://www.redhat.com/archives/libvir-list/2011-May/msg00726.html
src/libxl/libxl_driver.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 5cc9362..6226a49 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1535,6 +1535,8 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long memory,
ret = 0;
if (flags & VIR_DOMAIN_MEM_CONFIG) {
+ /* clang 2.9 needs an extra hint. */
+ sa_assert(def);
def->mem.cur_balloon = memory;
ret = virDomainSaveConfig(driver->configDir, def);
}
--
1.7.4.4
10:49 a.m.
New subject: [libvirt] [PATCHv2 5/6] build: silence clang false positive
2011/5/18 Eric Blake <eblake(a)redhat.com>:
Clang couldn't quite see that the same condition of
(flags & VIR_DOMAIN_MEM_CONFIG) is used twice, such that
the second block is guaranteed that def was assigned in
the first block.
* src/libxl/libxl_driver.c (libxlDomainSetMemoryFlags): Add a hint
for clang.
---
v2: no change from v1
v1: https://www.redhat.com/archives/libvir-list/2011-May/msg00726.html
src/libxl/libxl_driver.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
ACK.
Matthias
2:22 p.m.
New subject: [libvirt] [PATCHv2 5/6] build: silence clang false positive
On 05/18/2011 09:49 AM, Matthias Bolte wrote:
2011/5/18 Eric Blake <eblake(a)redhat.com>:
> Clang couldn't quite see that the same condition of
> (flags & VIR_DOMAIN_MEM_CONFIG) is used twice, such that
> the second block is guaranteed that def was assigned in
> the first block.
>
> * src/libxl/libxl_driver.c (libxlDomainSetMemoryFlags): Add a hint
> for clang.
> ---
>
> v2: no change from v1
> v1: https://www.redhat.com/archives/libvir-list/2011-May/msg00726.html
>
> src/libxl/libxl_driver.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
ACK.
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
6:36 p.m.
New subject: [libvirt] [PATCHv2 6/6] remote: remove special case for getting version
The on-the-wire protocol is identical; XDR guarantees that
both 'hyper' and 'unsigned hyper' are transmitted as 8 bytes.
* src/remote/remote_protocol.x (remote_get_version_ret)
(remote_get_lib_version_ret): Match public API.
* daemon/remote_generator.pl: Drop special case.
* src/remote_protocol-structs: Reflect updated type.
---
v2: fix src/remote_protocol-structs
v1: reviewed but no ACK at:
https://www.redhat.com/archives/libvir-list/2011-May/msg00718.html
daemon/remote_generator.pl | 23 +++++++++--------------
src/remote/remote_protocol.x | 4 ++--
src/remote_protocol-structs | 4 ++--
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index a3b8421..1fc3b17 100755
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -504,13 +504,6 @@ elsif ($opt_b) {
$type_name = $1 if ($1);
$type_name .= "long";
- if ($type_name eq "long" and
- $calls{$_}->{ProcName} =~ m/^Get(Lib)?Version$/) {
- # SPECIAL: virConnectGet(Lib)?Version uses unsigned long
- # in public API but hyper in XDR protocol
- $type_name = "unsigned long";
- }
-
push(@vars_list, "$type_name $ret_name");
push(@ret_list, "ret->$ret_name = $ret_name;");
$single_ret_var = $ret_name;
@@ -995,19 +988,21 @@ elsif ($opt_k) {
$single_ret_type = "int";
} elsif ($ret_member =~ m/^unsigned hyper (\S+);/) {
my $arg_name = $1;
- push(@ret_list, "rv = ret.$arg_name;");
- $single_ret_var = "unsigned long rv = 0";
- $single_ret_type = "unsigned long";
- } elsif ($ret_member =~ m/^hyper (\S+);/) {
- my $arg_name = $1;
-
if ($call->{ProcName} =~ m/Get(Lib)?Version/) {
push(@args_list, "unsigned long *$arg_name");
push(@ret_list, "if ($arg_name) *$arg_name =
ret.$arg_name;");
push(@ret_list, "rv = 0;");
$single_ret_var = "int rv = -1";
$single_ret_type = "int";
- } elsif ($call->{ProcName} eq "NodeGetFreeMemory") {
+ } else {
+ push(@ret_list, "rv = ret.$arg_name;");
+ $single_ret_var = "unsigned long rv = 0";
+ $single_ret_type = "unsigned long";
+ }
+ } elsif ($ret_member =~ m/^hyper (\S+);/) {
+ my $arg_name = $1;
+
+ if ($call->{ProcName} eq "NodeGetFreeMemory") {
push(@ret_list, "rv = ret.$arg_name;");
$single_ret_var = "unsigned long long rv = 0";
$single_ret_type = "unsigned long long";
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 5932b2c..c784dba 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -391,11 +391,11 @@ struct remote_get_type_ret {
};
struct remote_get_version_ret {
- hyper hv_ver;
+ unsigned hyper hv_ver;
};
struct remote_get_lib_version_ret {
- hyper lib_ver;
+ unsigned hyper lib_ver;
};
struct remote_get_hostname_ret {
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 5b43cb4..414b4d5 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -115,10 +115,10 @@ struct remote_get_type_ret {
remote_nonnull_string type;
};
struct remote_get_version_ret {
- int64_t hv_ver;
+ uint64_t hv_ver;
};
struct remote_get_lib_version_ret {
- int64_t lib_ver;
+ uint64_t lib_ver;
};
struct remote_get_hostname_ret {
remote_nonnull_string hostname;
--
1.7.4.4
2:34 p.m.
New subject: [libvirt] [PATCHv2 6/6] remote: remove special case for getting version
2011/5/18 Eric Blake <eblake(a)redhat.com>:
The on-the-wire protocol is identical; XDR guarantees that
both 'hyper' and 'unsigned hyper' are transmitted as 8 bytes.
* src/remote/remote_protocol.x (remote_get_version_ret)
(remote_get_lib_version_ret): Match public API.
* daemon/remote_generator.pl: Drop special case.
* src/remote_protocol-structs: Reflect updated type.
---
v2: fix src/remote_protocol-structs
v1: reviewed but no ACK at:
https://www.redhat.com/archives/libvir-list/2011-May/msg00718.html
daemon/remote_generator.pl | 23 +++++++++--------------
src/remote/remote_protocol.x | 4 ++--
src/remote_protocol-structs | 4 ++--
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index a3b8421..1fc3b17 100755
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -995,19 +988,21 @@ elsif ($opt_k) {
$single_ret_type = "int";
} elsif ($ret_member =~ m/^unsigned hyper (\S+);/) {
my $arg_name = $1;
- push(@ret_list, "rv = ret.$arg_name;");
- $single_ret_var = "unsigned long rv = 0";
- $single_ret_type = "unsigned long";
- } elsif ($ret_member =~ m/^hyper (\S+);/) {
- my $arg_name = $1;
-
if ($call->{ProcName} =~ m/Get(Lib)?Version/) {
push(@args_list, "unsigned long *$arg_name");
push(@ret_list, "if ($arg_name) *$arg_name =
ret.$arg_name;");
push(@ret_list, "rv = 0;");
$single_ret_var = "int rv = -1";
$single_ret_type = "int";
- } elsif ($call->{ProcName} eq "NodeGetFreeMemory") {
+ } else {
+ push(@ret_list, "rv = ret.$arg_name;");
+ $single_ret_var = "unsigned long rv = 0";
+ $single_ret_type = "unsigned long";
+ }
+ } elsif ($ret_member =~ m/^hyper (\S+);/) {
+ my $arg_name = $1;
+
+ if ($call->{ProcName} eq "NodeGetFreeMemory") {
push(@ret_list, "rv = ret.$arg_name;");
$single_ret_var = "unsigned long long rv = 0";
$single_ret_type = "unsigned long long";
I tested that a new virsh connected to an old libvirtd still gives the
right version number.
ACK.
Matthias
4:40 p.m.
New subject: [libvirt] [PATCHv2 6/6] remote: remove special case for getting version
On 05/18/2011 01:34 PM, Matthias Bolte wrote:
2011/5/18 Eric Blake <eblake(a)redhat.com>:
> The on-the-wire protocol is identical; XDR guarantees that
> both 'hyper' and 'unsigned hyper' are transmitted as 8 bytes.
>
> * src/remote/remote_protocol.x (remote_get_version_ret)
> (remote_get_lib_version_ret): Match public API.
> * daemon/remote_generator.pl: Drop special case.
> * src/remote_protocol-structs: Reflect updated type.
> ---
I tested that a new virsh connected to an old libvirtd still gives the
right version number.
ACK.
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
1:36 a.m.
At 05/18/2011 07:36 AM, Eric Blake Write:
I've been building up a grab bag of un-acked patches (a couple
have had reviews, but most have met list silence), so I figured
a repost would help.
Eric Blake (6):
build: update to latest gnulib
build: require newer gettext
virsh: optimize creation of default connection
build: make python optional at configure time
build: silence clang false positive
remote: remove special case for getting version
You may forget this patch:
https://www.redhat.com/archives/libvir-list/2011-May/msg00696.html
.gnulib | 2 +-
bootstrap | 12 +-
bootstrap.conf | 2 +-
configure.ac | 37 +++--
daemon/remote_generator.pl | 23 +--
src/libxl/libxl_driver.c | 2 +
src/remote/remote_protocol.x | 4 +-
src/remote_protocol-structs | 4 +-
tools/virsh.c | 429 ++++++++++++++++++++++++------------------
9 files changed, 299 insertions(+), 216 deletions(-)
9:31 a.m.
On 05/18/2011 12:36 AM, Wen Congyang wrote:
At 05/18/2011 07:36 AM, Eric Blake Write:
> I've been building up a grab bag of un-acked patches (a couple
> have had reviews, but most have met list silence), so I figured
> a repost would help.
>
> Eric Blake (6):
> build: update to latest gnulib
> build: require newer gettext
> virsh: optimize creation of default connection
> build: make python optional at configure time
> build: silence clang false positive
> remote: remove special case for getting version
You may forget this patch:
https://www.redhat.com/archives/libvir-list/2011-May/msg00696.html
Not forgotten, but I'm still in the middle of testing that. I think you
were right - we both had two independent patches, both of which are
needed to fix 'make dist' when ./configure disabled particular features
of libvirt.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
4937
days inactive
4939
days old
19 comments
4 participants
participants (4)
-
Daniel Veillard -
Eric Blake -
Matthias Bolte -
Wen Congyang