[libvirt] [PATCH] virsh: Honour --readonly with cmdConnect and no name
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tools/virsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 94bb7ff6c93a..9883e87df2b5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -218,7 +218,13 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; virshControlPtr priv = ctl->privData; - bool ro = name ? readonly : priv->readonly; + + /* If the flag was not specified, then it depends on whether we are + * reconnecting to the default URI (in which case we want to keep the + * readonly flag as it was) or to a specified URI in which case it + * should stay false */ + if (!readonly && !name) + readonly = priv->readonly; if (priv->conn) { int ret; @@ -233,7 +239,7 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) "disconnect from the hypervisor")); } - priv->conn = virshConnect(ctl, name ? name : ctl->connname, ro); + priv->conn = virshConnect(ctl, name ? name : ctl->connname, readonly); if (!priv->conn) { if (disconnected) -- 2.14.1
On Fri, Aug 18, 2017 at 04:40:04PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tools/virsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1436042 (already added into the commit locally)
On Fri, Aug 18, 2017 at 04:40:04PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tools/virsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c index 94bb7ff6c93a..9883e87df2b5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -218,7 +218,13 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; virshControlPtr priv = ctl->privData; - bool ro = name ? readonly : priv->readonly; + + /* If the flag was not specified, then it depends on whether we are + * reconnecting to the default URI (in which case we want to keep the
Probably I'm just thinking about it too much, but "default URI" means the URI to use when none specified - you can define it by the following: uri_default in libvirt.conf, LIBVIRT_DEFAULT_URI env or let libvirt use the hardcoded default - the thing is that I can have the default defined as "qemu:///system" but use lxc for the moment and this would still work nicely, so maybe "last known URI"?? But as I said, maybe I'm just spending ridiculously too much time thinking about it. ACK Erik
On Mon, Aug 21, 2017 at 11:29:15AM +0200, Erik Skultety wrote:
On Fri, Aug 18, 2017 at 04:40:04PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tools/virsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c index 94bb7ff6c93a..9883e87df2b5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -218,7 +218,13 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; virshControlPtr priv = ctl->privData; - bool ro = name ? readonly : priv->readonly; + + /* If the flag was not specified, then it depends on whether we are + * reconnecting to the default URI (in which case we want to keep the
Probably I'm just thinking about it too much, but "default URI" means the URI to use when none specified - you can define it by the following: uri_default in libvirt.conf, LIBVIRT_DEFAULT_URI env or let libvirt use the hardcoded default - the thing is that I can have the default defined as "qemu:///system" but use lxc for the moment and this would still work nicely, so maybe "last known URI"?? But as I said, maybe I'm just spending ridiculously too much time thinking about it.
No, you're right, it's reconnecting to the current URI, just with a new flag, so it should say "current". Will fix before pushing.
ACK
Erik
participants (2)
-
Erik Skultety -
Martin Kletzander