From b297e1011580a9910b6bbfe22b99b04506b3eced Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Fri, 22 Nov 2019 09:36:51 +0300
Subject: [PATCH 1/2] instance.html: Add new column for Qos, and send qos data
 with different form to prevent validation problem

---
 instances/templates/instance.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 75f1def..00ab3bb 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -855,6 +855,7 @@
                                         <th>{% trans 'MAC' %}</th>
                                         <th>{% trans 'NIC' %}</th>
                                         <th>{% trans 'Filter' %}</th>
+                                        <th>{% trans 'Qos' %}</th>
                                         <th>{% trans 'Actions' %}</th>
                                     </tr>
                                     </thead>
@@ -865,6 +866,12 @@
                                             <td><input class="form-control" type="text" value="{{ network.mac }}" readonly/></td>
                                             <td><input class="form-control" type="text" value="{{ network.nic }}" readonly/></td>
                                             <td><input class="form-control" type="text" value="{{ network.filterref }}" readonly/></td>
+                                            <td>
+                                                <form class="form-horizontal" method="post" name="add_qos{{ forloop.counter0 }}" role="form">{% csrf_token %}
+                                                    <input type="text" name="net-mac-{{ forloop.counter0 }}" value="{{ network.mac }}" hidden/>
+                                                    {% include 'add_network_qos.html' with id=forloop.counter0 %}
+                                                </form>
+                                            </td>
                                             <td class="col-sm-2">
                                             <form class="form-horizontal" method="post" name="set_qos{{ forloop.counter0 }}" role="form">{% csrf_token %}
                                                 <button data-target="#editInstanceNetwork{{ forloop.counter0 }}" type="button" class="btn btn-sm btn-primary"
@@ -920,8 +927,6 @@
                                                     onclick="return confirm('{% trans "Are you sure?" %}')">
                                                     <i class="glyphicon glyphicon-trash"></i>
                                                 </button>
-
-                                                {% include 'add_network_qos.html' with id=forloop.counter0 %}
                                             </form>
                                             </td>
                                         </tr>

From 34df35c5d759833fcdc18205c39c60a0998b2a49 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Fri, 22 Nov 2019 11:52:08 +0300
Subject: [PATCH 2/2] libvirt-bootstrap.sh: add debian 10 package install
 support

---
 dev/libvirt-bootstrap.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/libvirt-bootstrap.sh b/dev/libvirt-bootstrap.sh
index 948d3d6..54054d9 100644
--- a/dev/libvirt-bootstrap.sh
+++ b/dev/libvirt-bootstrap.sh
@@ -662,7 +662,10 @@ daemons_running_ubuntu() {
 #
 install_debian() {
     apt-get update || return 1
-    apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
+    if [ $DISTRO_MAJOR_VERSION -lt 10 ]; then
+	apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
+    else
+	apt-get -y install qemu qemu-kvm qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin virtinst supervisor || return 1
     return 0
 }