8:35 a.m.
Peter Krempa (2):
conf: Reset disk type if <source> element is completely missing
tests: Add test case for empty 'network' cdrom
src/conf/domain_conf.c | 4 +++
...m-empty-network-invalid.x86_64-latest.args | 34 +++++++++++++++++++
.../disk-cdrom-empty-network-invalid.xml | 30 ++++++++++++++++
tests/qemuxml2argvtest.c | 1 +
...om-empty-network-invalid.x86_64-latest.xml | 34 +++++++++++++++++++
tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 +-
tests/qemuxml2xmltest.c | 1 +
7 files changed, 105 insertions(+), 1 deletion(-)
create mode 100644
tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
create mode 100644
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
--
2.21.0
8:35 a.m.
New subject: [libvirt] [PATCH 1/2] conf: Reset disk type if <source> element is completely missing
The disk type is not part of source and thus it's parsed earlier. This
bypasses the checks when parsing a disk type='network' if it's
completely missing the source.
Since there are possible active users of this (it was reported as a
problem with openstack) fix it by resetting the disk type to '_FILE' for
an empty cdrom which is handled correctly.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/domain_conf.c | 4 ++++
tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c1705a07b6..399804dfbd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10189,6 +10189,10 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
}
}
+ /* Reset def->src->type in case when 'source' was not present */
+ if (!source)
+ def->src->type = VIR_STORAGE_TYPE_FILE;
+
/* Only CDROM and Floppy devices are allowed missing source path
* to indicate no media present. LUN is for raw access CD-ROMs
* that are not attached to a physical device presently */
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml
b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index 78e0449dfd..807d1099ed 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -25,7 +25,7 @@
<readonly/>
<address type='drive' controller='0' bus='0'
target='0' unit='1'/>
</disk>
- <disk type='volume' device='cdrom'>
+ <disk type='file' device='cdrom'>
<driver name='qemu' type='raw'/>
<target dev='hdc' bus='ide'/>
<readonly/>
--
2.21.0
8:35 a.m.
New subject: [libvirt] [PATCH 2/2] tests: Add test case for empty 'network' cdrom
We don't allow such config in the schema but the code can handle that so
add a test case supporting it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
...m-empty-network-invalid.x86_64-latest.args | 34 +++++++++++++++++++
.../disk-cdrom-empty-network-invalid.xml | 30 ++++++++++++++++
tests/qemuxml2argvtest.c | 1 +
...om-empty-network-invalid.x86_64-latest.xml | 34 +++++++++++++++++++
tests/qemuxml2xmltest.c | 1 +
5 files changed, 100 insertions(+)
create mode 100644
tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
create mode 100644
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
new file mode 100644
index 0000000000..1e43047459
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i686 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-drive if=none,id=drive-ide0-1-1,readonly=on \
+-device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
new file mode 100644
index 0000000000..f593b33c91
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-i686</emulator>
+ <disk type='network' device='cdrom'>
+ <driver name='qemu' type='raw'/>
+ <target dev='hdd' bus='ide'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='1'
target='0' unit='1'/>
+ </disk>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 834a289532..6b9da3b8ff 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1013,6 +1013,7 @@ mymain(void)
DO_TEST("disk-cdrom", NONE);
DO_TEST_CAPS_VER("disk-cdrom", "2.12.0");
DO_TEST_CAPS_LATEST("disk-cdrom");
+ DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-bus-other");
DO_TEST("disk-iscsi", NONE);
DO_TEST("disk-cdrom-network", QEMU_CAPS_KVM);
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
new file mode 100644
index 0000000000..f7772d832c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
@@ -0,0 +1,34 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-i686</emulator>
+ <disk type='file' device='cdrom'>
+ <driver name='qemu' type='raw'/>
+ <target dev='hdd' bus='ide'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='1'
target='0' unit='1'/>
+ </disk>
+ <controller type='usb' index='0' model='piix3-uhci'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b9364f942f..c3de13f64a 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -329,6 +329,7 @@ mymain(void)
DO_TEST("qemu-ns-no-env", NONE);
DO_TEST("disk-aio", NONE);
DO_TEST("disk-cdrom", NONE);
+ DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST("disk-cdrom-bus-other", NONE);
DO_TEST("disk-floppy", NONE);
DO_TEST("disk-usb-device", NONE);
--
2.21.0
9:09 a.m.
On 10/15/19 3:35 PM, Peter Krempa wrote:
Peter Krempa (2):
conf: Reset disk type if <source> element is completely missing
tests: Add test case for empty 'network' cdrom
src/conf/domain_conf.c | 4 +++
...m-empty-network-invalid.x86_64-latest.args | 34 +++++++++++++++++++
.../disk-cdrom-empty-network-invalid.xml | 30 ++++++++++++++++
tests/qemuxml2argvtest.c | 1 +
...om-empty-network-invalid.x86_64-latest.xml | 34 +++++++++++++++++++
tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 +-
tests/qemuxml2xmltest.c | 1 +
7 files changed, 105 insertions(+), 1 deletion(-)
create mode 100644
tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml
create mode 100644
tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
I agree that this is not pretty, but I don't think there's a better way.
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
1861
days inactive
1861
days old
3 comments
2 participants
participants (2)
-
Michal Privoznik -
Peter Krempa