> - die "disk '$disk' does not exist\n" if !$conf->{$disk};
> + die "disk '$disk' does not exist\n" if !$conf->{$disk} &&
> !$conf->{pending}->{$disk};
> +
> + my $drive = undef;
Code gets really complex and clumsy if we implement such things. It that really
required?
Signed-off-by: Alexandre Derumier
---
www/manager/qemu/Options.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/manager/qemu/Options.js b/www/manager/qemu/Options.js
index 3faa895..49e8641 100644
--- a/www/manager/qemu/Options.js
+++ b/www/manager/qemu/Options.js
Signed-off-by: Alexandre Derumier
---
www/manager/grid/PendingObjectGrid.js | 17 +
www/manager/qemu/HardwareView.js | 13 -
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/www/manager/grid/PendingObjectGrid.js
b/www/manager/grid/PendingObjec
Signed-off-by: Alexandre Derumier
---
www/manager/Makefile |2 +
www/manager/data/PVEProxy.js |6 ++
www/manager/data/PendingObjectStore.js | 29
www/manager/data/reader/JsonObject.js | 48
www/manager/grid/PendingObjectGrid.js | 1
Signed-off-by: Alexandre Derumier
---
www/css/ext-pve.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/css/ext-pve.css b/www/css/ext-pve.css
index ffdfa3a..6f63bd0 100644
--- a/www/css/ext-pve.css
+++ b/www/css/ext-pve.css
@@ -58,7 +58,7 @@
.pve-itype-icon-itype
{
All seem to be ok now
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Signed-off-by: Alexandre Derumier
---
www/manager/qemu/HardwareView.js |9 +
1 file changed, 9 insertions(+)
diff --git a/www/manager/qemu/HardwareView.js b/www/manager/qemu/HardwareView.js
index 5738d9a..4abb3f6 100644
--- a/www/manager/qemu/HardwareView.js
+++ b/www/manager/qemu/H
fixme : parse digest
Signed-off-by: Alexandre Derumier
---
PVE/API2/Qemu.pm | 39 +++
1 file changed, 7 insertions(+), 32 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index a45509e..969b654 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.
Signed-off-by: Alexandre Derumier
---
PVE/QemuServer.pm | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index df9ce74..a212183 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3537,6 +3537,10 @@ sub vmconfig_h
Signed-off-by: Alexandre Derumier
---
PVE/QemuServer.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a212183..10ed42b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3509,7 +3509,7 @@ sub vmconfig_hotplug_pendin
Signed-off-by: Alexandre Derumier
---
PVE/QemuServer.pm |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ab8565d..1d85ac8 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3541,7 +3541,9 @@ sub vmconfig_hotplug_pending
config api return by default the pending config, like this it don't break
current behaviour
Add an optionnal current param to get to current running config
Signed-off-by: Alexandre Derumier
---
PVE/API2/Qemu.pm | 29 ++---
1 file changed, 22 insertions(+), 7 deletions
All seem to works fine now,
I'll wait for review before doing other changes
___
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
We can't hotplug theses devices,
so we can avoid to throw always an error when adding them
Signed-off-by: Alexandre Derumier
---
PVE/QemuServer.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 67e3015..df9ce74 100644
--- a/
Signed-off-by: Alexandre Derumier
---
PVE/API2/Qemu.pm | 18 ++
PVE/QemuServer.pm |4 ++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 328a82c..a45509e 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -27
> >> (maybe could we merge /pending api into it with an optional param too)
> >>
> >>The return data structure is completely different, so I am not sure this is
> >>a
> >>good idea.
>
> I thinked to change the return data structure too, (see my private mail)
It is still different! Keep in mind t
Signed-off-by: Alexandre Derumier
---
www/manager/Makefile |1 +
www/manager/data/ObjectStore2.js |8 ++--
www/manager/data/reader/JsonObjectPending.js | 60 ++
3 files changed, 65 insertions(+), 4 deletions(-)
create mode 10
fixme : parse digest
Signed-off-by: Alexandre Derumier
---
PVE/API2/Qemu.pm | 45 +
1 file changed, 13 insertions(+), 32 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index a45509e..647fe03 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API
18 matches
Mail list logo