3:30 a.m.
After Andrea pointed out that FreeBSD build is broken [1], I've
started my freebsd domain and found out couple of problems. Here
are the fixes.
Oh, I've noticed alternative approaches to patch 6/9 on the list
[2] [3]. None of them have been ACKed though. Yet.
1: https://www.redhat.com/archives/libvir-list/2016-December/msg01121.html
2: https://www.redhat.com/archives/libvir-list/2016-December/msg00009.html
3: https://www.redhat.com/archives/libvir-list/2016-December/msg01123.html
Michal Privoznik (9):
tests: Run virmacmaptest iff WITH_YAJL
tests: Move test_libraries a bit higher
virt-nss: Introduce more checks before enabling NSS
tests: Run nss*test iff WITH_NSS
src: Build libvirt_nss.la iff WITH_NSS
networkxml2conftest: s/lo/lo0/ on non-Linux
bhyvexml2argvdata: Fix <drive/> addresses
bhyvexml2argvdata: Add mac address to <interface/>
bhyvexml2xmltest: Test more XMLs
configure.ac | 2 +-
m4/virt-nss.m4 | 36 +++++++---
src/Makefile.am | 2 +
tests/Makefile.am | 77 +++++++++++-----------
.../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 3 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 3 +-
.../bhyvexml2argv-bhyveload-bootorder.args | 2 +-
.../bhyvexml2argv-bhyveload-bootorder.xml | 5 +-
.../bhyvexml2argv-bhyveload-bootorder1.args | 2 +-
.../bhyvexml2argv-bhyveload-bootorder1.xml | 5 +-
.../bhyvexml2argv-bhyveload-bootorder2.xml | 3 +-
.../bhyvexml2argv-bhyveload-bootorder3.args | 2 +-
.../bhyvexml2argv-bhyveload-bootorder3.xml | 5 +-
.../bhyvexml2argv-bhyveload-bootorder4.xml | 5 +-
.../bhyvexml2argv-bhyveload-explicitargs.args | 2 +-
.../bhyvexml2argv-bhyveload-explicitargs.xml | 3 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 3 +-
.../bhyvexml2argv-custom-loader.args | 2 +-
.../bhyvexml2argv-custom-loader.xml | 3 +-
.../bhyvexml2argv-disk-cdrom-grub.args | 2 +-
.../bhyvexml2argv-disk-cdrom-grub.xml | 3 +-
.../bhyvexml2argv-disk-cdrom.args | 2 +-
.../bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 3 +-
.../bhyvexml2argv-disk-virtio.args | 2 +-
.../bhyvexml2argv-disk-virtio.xml | 1 +
.../bhyvexml2argv-grub-bootorder.args | 6 +-
.../bhyvexml2argv-grub-bootorder.xml | 7 +-
.../bhyvexml2argv-grub-bootorder2.args | 6 +-
.../bhyvexml2argv-grub-bootorder2.xml | 7 +-
.../bhyvexml2argv-grub-defaults.args | 2 +-
.../bhyvexml2argv-grub-defaults.xml | 3 +-
.../bhyvexml2argvdata/bhyvexml2argv-localtime.args | 2 +-
.../bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 3 +-
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +-
.../bhyvexml2argv-serial-grub-nocons.args | 2 +-
.../bhyvexml2argv-serial-grub-nocons.xml | 3 +-
.../bhyvexml2argv-serial-grub.args | 2 +-
.../bhyvexml2argv-serial-grub.xml | 3 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 3 +-
.../bhyvexml2xmlout-acpiapic.xml | 34 ++++++++++
tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml | 30 +++++++++
.../bhyvexml2xmlout-bhyveload-bootorder.xml | 37 +++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder1.xml | 37 +++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder2.xml | 30 +++++++++
.../bhyvexml2xmlout-bhyveload-bootorder3.xml | 37 +++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder4.xml | 38 +++++++++++
.../bhyvexml2xmlout-bhyveload-explicitargs.xml | 30 +++++++++
.../bhyvexml2xmlout-console.xml | 38 +++++++++++
.../bhyvexml2xmlout-custom-loader.xml | 31 +++++++++
.../bhyvexml2xmlout-disk-cdrom-grub.xml | 31 +++++++++
.../bhyvexml2xmlout-disk-cdrom.xml | 31 +++++++++
.../bhyvexml2xmlout-disk-virtio.xml | 29 ++++++++
.../bhyvexml2xmlout-grub-bootorder.xml | 43 ++++++++++++
.../bhyvexml2xmlout-grub-bootorder2.xml | 45 +++++++++++++
.../bhyvexml2xmlout-grub-defaults.xml | 30 +++++++++
.../bhyvexml2xmlout-localtime.xml | 30 +++++++++
.../bhyvexml2xmlout-macaddr.xml | 30 +++++++++
.../bhyvexml2xmlout-serial-grub-nocons.xml | 38 +++++++++++
.../bhyvexml2xmlout-serial-grub.xml | 38 +++++++++++
.../bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml | 38 +++++++++++
tests/bhyvexml2xmltest.c | 21 ++++++
tests/networkxml2conftest.c | 15 ++++-
66 files changed, 896 insertions(+), 102 deletions(-)
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml
--
2.11.0
3:30 a.m.
New subject: [libvirt] [PATCH 1/9] tests: Run virmacmaptest iff WITH_YAJL
Since the internal implementation relies on a json parser being
available, it make no sense to run this test if there's none
available.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/Makefile.am | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ecd04e895..62c5124e6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -192,7 +192,6 @@ test_programs = virshtest sockettest \
domainconftest \
virhostdevtest \
vircaps2xmltest \
- virmacmaptest \
virnetdevtest \
virtypedparamtest \
$(NULL)
@@ -408,7 +407,6 @@ test_libraries = libshunload.la \
virhostcpumock.la \
nssmock.la \
domaincapsmock.la \
- virmacmapmock.la \
$(NULL)
if WITH_QEMU
test_libraries += libqemumonitortestutils.la \
@@ -1158,6 +1156,7 @@ nssguestlinktest_CFLAGS = \
nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la
nssguestlinktest_LDFLAGS = $(NULL)
+if WITH_YAJL
virmacmapmock_la_SOURCES = \
virmacmapmock.c
virmacmapmock_la_CFLAGS = $(AM_CFLAGS)
@@ -1166,9 +1165,15 @@ virmacmapmock_la_LIBADD = $(MOCKLIBS_LIBS)
virmacmaptest_SOURCES = \
virmacmaptest.c testutils.h testutils.c
-virmacmaptest_CLFAGS = $(AM_CFLAGS);
+virmacmaptest_CLFAGS = $(AM_CFLAGS)
virmacmaptest_LDADD = $(LDADDS)
+test_libraries += virmacmapmock.la
+test_programs += virmacmaptest
+else ! WITH_YAJL
+EXTRA_DIST += virmacmapmock.c virmacmaptest.c
+endif ! WITH_YAJL
+
virnetdevtest_SOURCES = \
virnetdevtest.c testutils.h testutils.c
virnetdevtest_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS)
--
2.11.0
10:11 a.m.
New subject: [libvirt] [PATCH 1/9] tests: Run virmacmaptest iff WITH_YAJL
Michal Privoznik wrote:
Since the internal implementation relies on a json parser being
available, it make no sense to run this test if there's none
available.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/Makefile.am | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
Not directly related to this patch (which looks OK to me BTW), I still
cannot run virmacmaptest on FreeBSD: it segfaults on testMACRemove with
a backtrace like this:
* thread #1: tid = 100493, 0x0000000803949401
libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88, ptr=0x5a5a5a5a5a5a5a5a, demote=false)
+ 97 at arena.h:1384, stop reason = signal SIGBUS: hardware error
frame #0: 0x0000000803949401 libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88,
ptr=0x5a5a5a5a5a5a5a5a, demote=false) + 97 at arena.h:1384
1381 /* Return the size of the allocation pointed to by ptr. */
1382 JEMALLOC_ALWAYS_INLINE size_t
1383 arena_salloc(tsdn_t *tsdn, const void *ptr, bool demote)
-> 1384 {
1385 size_t ret;
1386 arena_chunk_t *chunk;
1387 size_t pageind;
(lldb) bt
* thread #1: tid = 100493, 0x0000000803949401
libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88, ptr=0x5a5a5a5a5a5a5a5a, demote=false)
+ 97 at arena.h:1384, stop reason = signal SIGBUS: hardware error
* frame #0: 0x0000000803949401 libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88,
ptr=0x5a5a5a5a5a5a5a5a, demote=false) + 97 at arena.h:1384
frame #1: 0x00000008039557cb libc.so.7`ifree [inlined]
__je_isalloc(tsdn=<unavailable>, ptr=0x5a5a5a5a5a5a5a5a, demote=false) + 13 at
jemalloc_internal.h:1045
frame #2: 0x00000008039557be libc.so.7`ifree(tsd=0x000000080062ea88,
ptr=0x5a5a5a5a5a5a5a5a, tcache=0x000000080720d000, slow_path=true) + 78 at
jemalloc_jemalloc.c:1870
frame #3: 0x00000008039558f0 libc.so.7`__free(ptr=0x5a5a5a5a5a5a5a5a) + 112 at
jemalloc_jemalloc.c:1997
frame #4: 0x0000000800c71672 libvirt.so.0`virFree(ptrptr=0x000000080721cf80) + 34 at
viralloc.c:582
frame #5: 0x0000000800ce5a60
libvirt.so.0`virStringListFree(strings=0x000000080721cf80) + 80 at virstring.c:251
frame #6: 0x0000000800cb973c
libvirt.so.0`virMacMapHashFree(payload=0x000000080721cf80, name=0x000000080723f268) + 28
at virmacmap.c:67
frame #7: 0x0000000800ca0179
libvirt.so.0`virHashAddOrUpdateEntry(table=0x000000080721d420, name=0x00000000004071c0,
userdata=0x000000080721cf80, is_update=true) + 297 at virhash.c:352
frame #8: 0x0000000800ca032a libvirt.so.0`virHashUpdateEntry(table=0x000000080721d420,
name=0x00000000004071c0, userdata=0x000000080721cf80) + 42 at virhash.c:415
frame #9: 0x0000000800cb9c8f
libvirt.so.0`virMacMapRemoveLocked(mgr=0x000000080721cc80, domain="f24",
mac="aa:bb:cc:dd:ee:ff") + 175 at virmacmap.c:129
frame #10: 0x0000000800cb9bc1 libvirt.so.0`virMacMapRemove(mgr=0x000000080721cc80,
domain="f24", mac="aa:bb:cc:dd:ee:ff") + 49 at virmacmap.c:346
frame #11: 0x00000000004040a0 virmacmaptest`testMACRemove(opaque=0x00007fffffffe260) +
288 at virmacmaptest.c:109
frame #12: 0x00000000004043ac virmacmaptest`virTestRun(title="Remove
\"f24\" in \"simple2\"", body=(virmacmaptest`testMACRemove at
virmacmaptest.c:91), data=0x00007fffffffe260) + 284 at testutils.c:180
frame #13: 0x0000000000403074 virmacmaptest`mymain + 468 at virmacmaptest.c:207
frame #14: 0x000000000040629d virmacmaptest`virTestMain(argc=1,
argv=0x00007fffffffe610, func=(virmacmaptest`mymain at virmacmaptest.c:158)) + 2189 at
testutils.c:992
frame #15: 0x0000000000402e8d virmacmaptest`main(argc=1, argv=0x00007fffffffe610) + 61
at virmacmaptest.c:239
frame #16: 0x0000000000402d4f virmacmaptest`_start + 383
(lldb)
It looks like a problem in virMacMapRemoveLocked() to me, because it
calls virStringListRemove() on the existing macs list which modifies a
pointer to the macs string list. Later, when updating a hash table entry
for the existing domain, it tries to clean up the old data by calling
virStringListFree (via virMacMapHashFree) on the wrong pointer. I'm not
sure why it doesn't show up on Linux though, maybe my analysis is wrong.
I was able to fix this with a change like this:
diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index 36c364e10..b328ba714 100644
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -116,21 +116,31 @@ virMacMapRemoveLocked(virMacMapPtr mgr,
{
char **macsList = NULL;
char **newMacsList = NULL;
+ int i = 0, ret = -1;
if (!(macsList = virHashLookup(mgr->macs, domain)))
return 0;
- newMacsList = macsList;
- virStringListRemove(&macsList, mac);
- if (!macsList) {
+ for (i = 0; macsList && macsList[i]; i++) {
+ if (!STREQ(macsList[i], mac))
+ newMacsList = virStringListAdd((const char **)newMacsList,
+ macsList[i]);
+ }
+
+ if (!newMacsList) {
virHashSteal(mgr->macs, domain);
} else {
if (macsList != newMacsList &&
virHashUpdateEntry(mgr->macs, domain, newMacsList) < 0)
- return -1;
+ goto cleanup;
}
- return 0;
+ newMacsList = NULL;
+ ret = 0;
+
+ cleanup:
+ virStringListFree(newMacsList);
+ return ret;
}
PS According to valgrind, it leaks 34 (16 direct, 18 indirect) bytes. I
haven't figured out where exactly so far.
Roman Bogorodskiy
3:45 a.m.
New subject: [libvirt] [PATCH 1/9] tests: Run virmacmaptest iff WITH_YAJL
On 01.01.2017 17:11, Roman Bogorodskiy wrote:
Michal Privoznik wrote:
> Since the internal implementation relies on a json parser being
> available, it make no sense to run this test if there's none
> available.
>
> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
> ---
> tests/Makefile.am | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
Not directly related to this patch (which looks OK to me BTW), I still
cannot run virmacmaptest on FreeBSD: it segfaults on testMACRemove with
a backtrace like this:
* thread #1: tid = 100493, 0x0000000803949401
libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88, ptr=0x5a5a5a5a5a5a5a5a, demote=false)
+ 97 at arena.h:1384, stop reason = signal SIGBUS: hardware error
frame #0: 0x0000000803949401 libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88,
ptr=0x5a5a5a5a5a5a5a5a, demote=false) + 97 at arena.h:1384
1381 /* Return the size of the allocation pointed to by ptr. */
1382 JEMALLOC_ALWAYS_INLINE size_t
1383 arena_salloc(tsdn_t *tsdn, const void *ptr, bool demote)
-> 1384 {
1385 size_t ret;
1386 arena_chunk_t *chunk;
1387 size_t pageind;
(lldb) bt
* thread #1: tid = 100493, 0x0000000803949401
libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88, ptr=0x5a5a5a5a5a5a5a5a, demote=false)
+ 97 at arena.h:1384, stop reason = signal SIGBUS: hardware error
* frame #0: 0x0000000803949401 libc.so.7`__je_arena_salloc(tsdn=0x000000080062ea88,
ptr=0x5a5a5a5a5a5a5a5a, demote=false) + 97 at arena.h:1384
frame #1: 0x00000008039557cb libc.so.7`ifree [inlined]
__je_isalloc(tsdn=<unavailable>, ptr=0x5a5a5a5a5a5a5a5a, demote=false) + 13 at
jemalloc_internal.h:1045
frame #2: 0x00000008039557be libc.so.7`ifree(tsd=0x000000080062ea88,
ptr=0x5a5a5a5a5a5a5a5a, tcache=0x000000080720d000, slow_path=true) + 78 at
jemalloc_jemalloc.c:1870
frame #3: 0x00000008039558f0 libc.so.7`__free(ptr=0x5a5a5a5a5a5a5a5a) + 112 at
jemalloc_jemalloc.c:1997
frame #4: 0x0000000800c71672 libvirt.so.0`virFree(ptrptr=0x000000080721cf80) + 34 at
viralloc.c:582
frame #5: 0x0000000800ce5a60
libvirt.so.0`virStringListFree(strings=0x000000080721cf80) + 80 at virstring.c:251
frame #6: 0x0000000800cb973c
libvirt.so.0`virMacMapHashFree(payload=0x000000080721cf80, name=0x000000080723f268) + 28
at virmacmap.c:67
frame #7: 0x0000000800ca0179
libvirt.so.0`virHashAddOrUpdateEntry(table=0x000000080721d420, name=0x00000000004071c0,
userdata=0x000000080721cf80, is_update=true) + 297 at virhash.c:352
frame #8: 0x0000000800ca032a
libvirt.so.0`virHashUpdateEntry(table=0x000000080721d420, name=0x00000000004071c0,
userdata=0x000000080721cf80) + 42 at virhash.c:415
frame #9: 0x0000000800cb9c8f
libvirt.so.0`virMacMapRemoveLocked(mgr=0x000000080721cc80, domain="f24",
mac="aa:bb:cc:dd:ee:ff") + 175 at virmacmap.c:129
frame #10: 0x0000000800cb9bc1 libvirt.so.0`virMacMapRemove(mgr=0x000000080721cc80,
domain="f24", mac="aa:bb:cc:dd:ee:ff") + 49 at virmacmap.c:346
frame #11: 0x00000000004040a0 virmacmaptest`testMACRemove(opaque=0x00007fffffffe260)
+ 288 at virmacmaptest.c:109
frame #12: 0x00000000004043ac virmacmaptest`virTestRun(title="Remove
\"f24\" in \"simple2\"", body=(virmacmaptest`testMACRemove at
virmacmaptest.c:91), data=0x00007fffffffe260) + 284 at testutils.c:180
frame #13: 0x0000000000403074 virmacmaptest`mymain + 468 at virmacmaptest.c:207
frame #14: 0x000000000040629d virmacmaptest`virTestMain(argc=1,
argv=0x00007fffffffe610, func=(virmacmaptest`mymain at virmacmaptest.c:158)) + 2189 at
testutils.c:992
frame #15: 0x0000000000402e8d virmacmaptest`main(argc=1, argv=0x00007fffffffe610) +
61 at virmacmaptest.c:239
frame #16: 0x0000000000402d4f virmacmaptest`_start + 383
(lldb)
It looks like a problem in virMacMapRemoveLocked() to me, because it
calls virStringListRemove() on the existing macs list which modifies a
pointer to the macs string list. Later, when updating a hash table entry
for the existing domain, it tries to clean up the old data by calling
virStringListFree (via virMacMapHashFree) on the wrong pointer. I'm not
sure why it doesn't show up on Linux though, maybe my analysis is wrong.
Ah. Running the test under valgrind shows the same problem except the
process is not getting SIGSEGV. The problem is indeed in
virMacMapRemoveLocked(). But it is slightly more complicated. If a MAC
address that caller wants to remove is in the list,
virStringListRemove() is called which modifies the string list. Then
either virHashSteal() or virHashUpdateEntry() is called to update the
pointer to the list in the hash table. However, virHashUpdateEntry()
calls the dataFree callback - but over pointer to the old list.
Looks to me the best would be to not set dataFree callback at all. I'm
testing this approach now. Will post the patches shortly.
I was able to fix this with a change like this:
diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index 36c364e10..b328ba714 100644
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -116,21 +116,31 @@ virMacMapRemoveLocked(virMacMapPtr mgr,
{
char **macsList = NULL;
char **newMacsList = NULL;
+ int i = 0, ret = -1;
if (!(macsList = virHashLookup(mgr->macs, domain)))
return 0;
- newMacsList = macsList;
- virStringListRemove(&macsList, mac);
- if (!macsList) {
+ for (i = 0; macsList && macsList[i]; i++) {
+ if (!STREQ(macsList[i], mac))
+ newMacsList = virStringListAdd((const char **)newMacsList,
+ macsList[i]);
+ }
+
+ if (!newMacsList) {
virHashSteal(mgr->macs, domain);
} else {
if (macsList != newMacsList &&
virHashUpdateEntry(mgr->macs, domain, newMacsList) < 0)
- return -1;
+ goto cleanup;
}
- return 0;
+ newMacsList = NULL;
+ ret = 0;
+
+ cleanup:
+ virStringListFree(newMacsList);
+ return ret;
Yeah, I had it this way originally, but some people on the list disliked
the idea of allocating more memory on an element remove.
Michal
3:30 a.m.
New subject: [libvirt] [PATCH 2/9] tests: Move test_libraries a bit higher
In the Makefile in tests/ we initialize couple of variables like
test_programs, test_libraries and test_helpers. These variables
contain all the targets that we need to build in order to run
the test suite. So we initialize test_programs and test_helpers
and then conditionally add targets to them depending on what we
are building with. Then we repeat the same process with
test_libraries. It makes no sense to have two separate if-endif
sequences.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/Makefile.am | 62 ++++++++++++++++++++++---------------------------------
1 file changed, 25 insertions(+), 37 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 62c5124e6..b8de4633f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -196,6 +196,19 @@ test_programs = virshtest sockettest \
virtypedparamtest \
$(NULL)
+test_libraries = libshunload.la \
+ virportallocatormock.la \
+ virnetdaemonmock.la \
+ virnetserverclientmock.la \
+ vircgroupmock.la \
+ virpcimock.la \
+ virnetdevmock.la \
+ virrandommock.la \
+ virhostcpumock.la \
+ nssmock.la \
+ domaincapsmock.la \
+ $(NULL)
+
if WITH_REMOTE
test_programs += \
virnetmessagetest \
@@ -211,6 +224,10 @@ endif WITH_REMOTE
if WITH_LINUX
test_programs += fchosttest
test_programs += scsihosttest
+test_libraries += virusbmock.la \
+ virnetdevbandwidthmock.la \
+ virtestmock.la \
+ $(NULL)
endif WITH_LINUX
if WITH_LIBVIRTD
@@ -221,6 +238,7 @@ if WITH_DBUS
test_programs += virdbustest \
virsystemdtest \
$(NULL)
+test_libraries += virdbusmock.la
if WITH_POLKIT1
test_programs += virpolkittest
endif WITH_POLKIT1
@@ -260,6 +278,12 @@ test_programs += qemuxml2argvtest qemuxml2xmltest \
qemuagenttest qemucapabilitiestest qemucaps2xmltest \
qemucommandutiltest
test_helpers += qemucapsprobe
+test_libraries += libqemumonitortestutils.la \
+ libqemutestdriver.la \
+ qemuxml2argvmock.la \
+ qemucaps2xmlmock.la \
+ qemucapsprobemock.la \
+ $(NULL)
endif WITH_QEMU
if WITH_LXC
@@ -288,6 +312,7 @@ endif WITH_VMWARE
if WITH_BHYVE
test_programs += bhyvexml2argvtest bhyvexml2xmltest bhyveargv2xmltest
+test_libraries += bhyvexml2argvmock.la bhyveargv2xmlmock.la
endif WITH_BHYVE
if WITH_CIL
@@ -396,43 +421,6 @@ endif ! WITH_SECDRIVER_APPARMOR
EXTRA_DIST += $(test_scripts)
-test_libraries = libshunload.la \
- virportallocatormock.la \
- virnetdaemonmock.la \
- virnetserverclientmock.la \
- vircgroupmock.la \
- virpcimock.la \
- virnetdevmock.la \
- virrandommock.la \
- virhostcpumock.la \
- nssmock.la \
- domaincapsmock.la \
- $(NULL)
-if WITH_QEMU
-test_libraries += libqemumonitortestutils.la \
- libqemutestdriver.la \
- qemuxml2argvmock.la \
- qemucaps2xmlmock.la \
- qemucapsprobemock.la \
- $(NULL)
-endif WITH_QEMU
-
-if WITH_BHYVE
-test_libraries += bhyvexml2argvmock.la bhyveargv2xmlmock.la
-endif WITH_BHYVE
-
-if WITH_DBUS
-test_libraries += \
- virdbusmock.la
-endif WITH_DBUS
-
-if WITH_LINUX
-test_libraries += virusbmock.la \
- virnetdevbandwidthmock.la \
- virtestmock.la \
- $(NULL)
-endif WITH_LINUX
-
if WITH_LINUX
check-access: file-access-clean
VIR_TEST_FILE_ACCESS=1 $(MAKE) $(AM_MAKEFLAGS) check
--
2.11.0
3:30 a.m.
New subject: [libvirt] [PATCH 3/9] virt-nss: Introduce more checks before enabling NSS
The plugin depends on more modules than we currently check for,
i.e. network driver and yajl library.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
configure.ac | 2 +-
m4/virt-nss.m4 | 36 +++++++++++++++++++++++++++---------
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9a0507577..c67ba79c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -294,7 +294,6 @@ LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML
LIBVIRT_CHECK_MACVTAP
LIBVIRT_CHECK_NETCF
-LIBVIRT_CHECK_NSS
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER
LIBVIRT_CHECK_OPENWSMAN
@@ -479,6 +478,7 @@ LIBVIRT_CHECK_LOGIN_SHELL
LIBVIRT_CHECK_HOST_VALIDATE
LIBVIRT_CHECK_TLS_PRIORITY
LIBVIRT_CHECK_SYSCTL_CONFIG
+LIBVIRT_CHECK_NSS
diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4
index f50b1b91c..8840e7b24 100644
--- a/m4/virt-nss.m4
+++ b/m4/virt-nss.m4
@@ -27,16 +27,34 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[
bsd_nss=no
fail=0
if test "x$with_nss_plugin" != "xno" ; then
- AC_CHECK_HEADERS([nss.h], [
- with_nss_plugin=yes
- ],[
- if test "x$with_nss_plugin" = "xyes" ; then
- fail = 1
- fi
- ])
+ if test "x$with_yajl" != "xyes" ; then
+ if test "x$with_nss_plugin" = "xyes" ; then
+ AC_MSG_ERROR([Can't build nss plugin without yajl])
+ else
+ with_nss_plugin=no
+ fi
+ fi
- if test $fail = 1 ; then
- AC_MSG_ERROR([Can't build nss plugin without nss.h])
+ if test "x$with_network" != "xyes" ; then
+ if test "x$with_nss_plugin" = "xyes" ; then
+ AC_MSG_ERROR([Can't build nss plugin without yajl])
+ else
+ with_nss_plugin=no
+ fi
+ fi
+
+ if test "x$with_nss_plugin" != "xno" ; then
+ AC_CHECK_HEADERS([nss.h], [
+ with_nss_plugin=yes
+ ],[
+ if test "x$with_nss_plugin" = "xyes" ; then
+ fail = 1
+ fi
+ ])
+
+ if test $fail = 1 ; then
+ AC_MSG_ERROR([Can't build nss plugin without nss.h])
+ fi
fi
if test "x$with_nss_plugin" = "xyes" ; then
--
2.11.0
3:30 a.m.
New subject: [libvirt] [PATCH 4/9] tests: Run nss*test iff WITH_NSS
If the nss module is disabled we shouldn't run the tests that
include it either.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/Makefile.am | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b8de4633f..c7d474817 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -205,7 +205,6 @@ test_libraries = libshunload.la \
virnetdevmock.la \
virrandommock.la \
virhostcpumock.la \
- nssmock.la \
domaincapsmock.la \
$(NULL)
@@ -361,6 +360,7 @@ endif WITH_LINUX
if WITH_NSS
test_helpers += nsslinktest nssguestlinktest
test_programs += nsstest nssguesttest
+test_libraries += nssmock.la
endif WITH_NSS
test_programs += storagevolxml2xmltest storagepoolxml2xmltest
@@ -1102,6 +1102,7 @@ virhostcpumock_la_CFLAGS = $(AM_CFLAGS)
virhostcpumock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
virhostcpumock_la_LIBADD = $(MOCKLIBS_LIBS)
+if WITH_NSS
nsstest_SOURCES = \
nsstest.c testutils.h testutils.c
nsstest_CFLAGS = \
@@ -1143,6 +1144,9 @@ nssguestlinktest_CFLAGS = \
-I$(top_srcdir)/tools/nss
nssguestlinktest_LDADD = ../tools/nss/libnss_libvirt_guest_impl.la
nssguestlinktest_LDFLAGS = $(NULL)
+else ! WITH_NSS
+EXTRA_DIST += nsstest.c nssmock.c nsslinktest.c
+endif ! WITH_NSS
if WITH_YAJL
virmacmapmock_la_SOURCES = \
--
2.11.0
3:30 a.m.
New subject: [libvirt] [PATCH 5/9] src: Build libvirt_nss.la iff WITH_NSS
If the nss module is disabled we don't need to build the
supplementary library for it either.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Makefile.am b/src/Makefile.am
index d84c98440..0dd2faaf6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3022,6 +3022,7 @@ endif WITH_LIBVIRTD
endif WITH_SECDRIVER_APPARMOR
EXTRA_DIST += $(SECURITY_DRIVER_APPARMOR_HELPER_SOURCES)
+if WITH_NSS
noinst_LTLIBRARIES += libvirt-nss.la
libvirt_nss_la_SOURCES = \
@@ -3087,6 +3088,7 @@ libvirt_nss_la_LDFLAGS = \
libvirt_nss_la_LIBADD = \
$(YAJL_LIBS) \
$(NULL)
+endif WITH_NSS
install-data-local: install-init install-systemd
--
2.11.0
3:30 a.m.
New subject: [libvirt] [PATCH 6/9] networkxml2conftest: s/lo/lo0/ on non-Linux
After 478ddedc12 a bug is fixed where we wrongly presumed loopack
device name on non-Linux systems. It's lo0. However, the fix is
not reflected in the tests which are failing now.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/networkxml2conftest.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index a80d3b2d4..404e2c722 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -41,10 +41,21 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf,
dnsmasqCapsPtr
if (dctx == NULL)
goto fail;
- if (networkDnsmasqConfContents(obj, pidfile, &actual,
- dctx, caps) < 0)
+ if (networkDnsmasqConfContents(obj, pidfile, &actual, dctx, caps) < 0)
goto fail;
+#ifndef __linux__
+ char * tmp;
+
+ if (!(tmp = virStringReplace(actual,
+ "except-interface=lo0\n",
+ "except-interface=lo\n")))
+ goto fail;
+ VIR_FREE(actual);
+ actual = tmp;
+ tmp = NULL;
+#endif
+
if (virTestCompareToFile(actual, outconf) < 0)
goto fail;
--
2.11.0
10:14 a.m.
New subject: [libvirt] [PATCH 6/9] networkxml2conftest: s/lo/lo0/ on non-Linux
Michal Privoznik wrote:
After 478ddedc12 a bug is fixed where we wrongly presumed loopack
device name on non-Linux systems. It's lo0. However, the fix is
not reflected in the tests which are failing now.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/networkxml2conftest.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index a80d3b2d4..404e2c722 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -41,10 +41,21 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf,
dnsmasqCapsPtr
if (dctx == NULL)
goto fail;
- if (networkDnsmasqConfContents(obj, pidfile, &actual,
- dctx, caps) < 0)
+ if (networkDnsmasqConfContents(obj, pidfile, &actual, dctx, caps) < 0)
goto fail;
+#ifndef __linux__
+ char * tmp;
+
+ if (!(tmp = virStringReplace(actual,
+ "except-interface=lo0\n",
+ "except-interface=lo\n")))
+ goto fail;
+ VIR_FREE(actual);
+ actual = tmp;
+ tmp = NULL;
+#endif
+
if (virTestCompareToFile(actual, outconf) < 0)
goto fail;
Michal, what do you think about this version of this fix:
https://www.redhat.com/archives/libvir-list/2016-December/msg01190.html
?
Roman Bogorodskiy
4:02 a.m.
New subject: [libvirt] [PATCH 6/9] networkxml2conftest: s/lo/lo0/ on non-Linux
On 01.01.2017 17:14, Roman Bogorodskiy wrote:
Michal Privoznik wrote:
> After 478ddedc12 a bug is fixed where we wrongly presumed loopack
> device name on non-Linux systems. It's lo0. However, the fix is
> not reflected in the tests which are failing now.
>
> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
> ---
> tests/networkxml2conftest.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
> index a80d3b2d4..404e2c722 100644
> --- a/tests/networkxml2conftest.c
> +++ b/tests/networkxml2conftest.c
> @@ -41,10 +41,21 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf,
dnsmasqCapsPtr
> if (dctx == NULL)
> goto fail;
>
> - if (networkDnsmasqConfContents(obj, pidfile, &actual,
> - dctx, caps) < 0)
> + if (networkDnsmasqConfContents(obj, pidfile, &actual, dctx, caps) < 0)
> goto fail;
>
> +#ifndef __linux__
> + char * tmp;
> +
> + if (!(tmp = virStringReplace(actual,
> + "except-interface=lo0\n",
> + "except-interface=lo\n")))
> + goto fail;
> + VIR_FREE(actual);
> + actual = tmp;
> + tmp = NULL;
> +#endif
> +
> if (virTestCompareToFile(actual, outconf) < 0)
> goto fail;
Michal, what do you think about this version of this fix:
https://www.redhat.com/archives/libvir-list/2016-December/msg01190.html
That approach looks like heavy hammer to me. And as Andrea pointed out,
my approach works even with VIR_TEST_REGENERATE_OUTPUT.
Michal
3:02 a.m.
New subject: [libvirt] [PATCH 6/9] networkxml2conftest: s/lo/lo0/ on non-Linux
On Tue, 2016-12-27 at 10:30 +0100, Michal Privoznik wrote:
After 478ddedc12 a bug is fixed where we wrongly presumed loopack
device name on non-Linux systems. It's lo0. However, the fix is
not reflected in the tests which are failing now.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/networkxml2conftest.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index a80d3b2d4..404e2c722 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -41,10 +41,21 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf,
dnsmasqCapsPtr
if (dctx == NULL)
goto fail;
- if (networkDnsmasqConfContents(obj, pidfile, &actual,
- dctx, caps) < 0)
+ if (networkDnsmasqConfContents(obj, pidfile, &actual, dctx, caps) < 0)
goto fail;
Please add a comment pointing out that changes to
networkDnsmasqConfContents() will need to be reflected here,
and add a similar comment to the aforementioned function, so
that we have a much higher chance of them not getting out of
sync.
+#ifndef __linux__
+ char * tmp;
+
+ if (!(tmp = virStringReplace(actual,
+ "except-interface=lo0\n",
+ "except-interface=lo\n")))
+ goto fail;
+ VIR_FREE(actual);
+ actual = tmp;
+ tmp = NULL;
+#endif
+
if (virTestCompareToFile(actual, outconf) < 0)
goto fail;
--
Andrea Bolognani / Red Hat / Virtualization
3:30 a.m.
New subject: [libvirt] [PATCH 7/9] bhyvexml2argvdata: Fix <drive/> addresses
After c07d1c1c4f got merged it uncovered couple of broken domain
XMLs for bhyvexml2argv test. Some disk drives had incompatible
type of address configured.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 6 +++---
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 6 +++---
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 +-
22 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
index 2be970e05..316aaf895 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
@@ -15,7 +15,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
index 3d2337520..c0d00f131 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
index c96e79f45..983e3ccae 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
@@ -12,13 +12,13 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdb' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
index 28cfa057f..4dfc142b7 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
@@ -12,13 +12,13 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdb' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
index 2fe87dbc4..74622bc82 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
index 69a9d282c..da29b1bd4 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
@@ -11,13 +11,13 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdc' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
<boot order='1'/>
</disk>
<interface type='bridge'>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
index b854e740b..f2190be33 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
@@ -12,13 +12,13 @@
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<boot order='2'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<disk type='file' device='cdrom'>
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdb' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
<boot order='1'/>
</disk>
<interface type='bridge'>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
index 65823cd82..c8268e0c1 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
index 35206b521..bf1564ae2 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
index e9e0d5ebc..02e83f7bb 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
@@ -13,7 +13,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
index 00708e6ab..67ad98079 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdc' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
index c2afcd42b..61cef732a 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/cdrom.iso'/>
<target dev='hdc' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
index 52434233b..74d53be5a 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
@@ -7,5 +7,5 @@
-s 0:0,hostbridge \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 2:0,ahci-hd,/tmp/freebsd1.img \
--s 2:0,ahci-hd,/tmp/freebsd2.img \
--s 2:0,ahci-hd,/tmp/freebsd3.img bhyve
+-s 4:0,ahci-hd,/tmp/freebsd2.img \
+-s 6:0,ahci-hd,/tmp/freebsd3.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
index 9906cacaf..40f46a337 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
@@ -12,20 +12,20 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd1.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd2.img'/>
<target dev='hdb' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd3.img'/>
<target dev='hdc' bus='sata'/>
<boot order='1'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='6' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
index 52434233b..74d53be5a 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
@@ -7,5 +7,5 @@
-s 0:0,hostbridge \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 2:0,ahci-hd,/tmp/freebsd1.img \
--s 2:0,ahci-hd,/tmp/freebsd2.img \
--s 2:0,ahci-hd,/tmp/freebsd3.img bhyve
+-s 4:0,ahci-hd,/tmp/freebsd2.img \
+-s 6:0,ahci-hd,/tmp/freebsd3.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
index 65943f9fb..c8e877c62 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
@@ -13,21 +13,21 @@
<source file='/tmp/freebsd1.img'/>
<target dev='hda' bus='sata'/>
<boot order='111'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd2.img'/>
<target dev='hdb' bus='sata'/>
<boot order='22'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
</disk>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd3.img'/>
<target dev='hdc' bus='sata'/>
<boot order='3'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='6' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
index 27b7fd9d2..2745cd9e2 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
index f62c6261c..e16d2132f 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
index b262eb709..8df0f1dd4 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml
@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<mac address="52:54:00:22:ee:11"/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
index 8c451f7fb..83690d2d3 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
index 8c451f7fb..83690d2d3 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
@@ -12,7 +12,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
index cd4f25b6e..2c6330c08 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
@@ -11,7 +11,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
--
2.11.0
10:24 a.m.
New subject: [libvirt] [PATCH 7/9] bhyvexml2argvdata: Fix <drive/> addresses
Michal Privoznik wrote:
After c07d1c1c4f got merged it uncovered couple of broken domain
XMLs for bhyvexml2argv test. Some disk drives had incompatible
type of address configured.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 6 +++---
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args | 4 ++--
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 6 +++---
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 +-
22 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
index 2be970e05..316aaf895 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
@@ -15,7 +15,7 @@
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
Yeah, the tests are now broken for bhyve indeed. However, there's a more
serious problem than tests. The current bhyve address allocation code
doesn't really care about 'drive' address type and uses pci addresses
even for hard disk drivers. It's implemented this way to mimic the bhyve
behaviour at the time of when this code was written, i.e.:
-s 2:0,ahci-cd,/tmp/cdrom.iso bhyve
Where "2" is PCI slot and "0" is the function. So I guess the main
thing
here is to adjust the address allocation code which I hoooope to do
during this winter holidays...
Roman Bogorodskiy
4:38 a.m.
New subject: [libvirt] [PATCH 7/9] bhyvexml2argvdata: Fix <drive/> addresses
On 01.01.2017 17:24, Roman Bogorodskiy wrote:
Michal Privoznik wrote:
> After c07d1c1c4f got merged it uncovered couple of broken domain
> XMLs for bhyvexml2argv test. Some disk drives had incompatible
> type of address configured.
>
> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
> ---
> tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 4 ++--
> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 4 ++--
> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 4 ++--
> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 4 ++--
> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args | 4 ++--
> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 6 +++---
> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args | 4 ++--
> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 6 +++---
> tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml | 2 +-
> tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 +-
> 22 files changed, 32 insertions(+), 32 deletions(-)
>
> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
> index 2be970e05..316aaf895 100644
> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
> @@ -15,7 +15,7 @@
> <driver name='file' type='raw'/>
> <source file='/tmp/freebsd.img'/>
> <target dev='hda' bus='sata'/>
> - <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
> + <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
> </disk>
> <interface type='bridge'>
> <model type='virtio'/>
Yeah, the tests are now broken for bhyve indeed. However, there's a more
serious problem than tests. The current bhyve address allocation code
doesn't really care about 'drive' address type and uses pci addresses
even for hard disk drivers. It's implemented this way to mimic the bhyve
behaviour at the time of when this code was written, i.e.:
-s 2:0,ahci-cd,/tmp/cdrom.iso bhyve
Where "2" is PCI slot and "0" is the function. So I guess the main
thing
here is to adjust the address allocation code which I hoooope to do
during this winter holidays...
Ah, didn't realize this problem. However, I still think this should go
in as it also fixes bhyvexml2argvtest which is failing now. The problem
you are mentioning can be addressed later.
Michal
5:30 a.m.
New subject: [libvirt] [PATCH 7/9] bhyvexml2argvdata: Fix <drive/> addresses
Michal Privoznik wrote:
On 01.01.2017 17:24, Roman Bogorodskiy wrote:
> Michal Privoznik wrote:
>
>> After c07d1c1c4f got merged it uncovered couple of broken domain
>> XMLs for bhyvexml2argv test. Some disk drives had incompatible
>> type of address configured.
>>
>> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
>> ---
>> tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 4 ++--
>> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 4 ++--
>> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 4 ++--
>> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 4 ++--
>> tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args | 4 ++--
>> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 6 +++---
>> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args | 4 ++--
>> tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 6 +++---
>> tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml | 2 +-
>> tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 +-
>> 22 files changed, 32 insertions(+), 32 deletions(-)
>>
>> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
>> index 2be970e05..316aaf895 100644
>> --- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
>> +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
>> @@ -15,7 +15,7 @@
>> <driver name='file' type='raw'/>
>> <source file='/tmp/freebsd.img'/>
>> <target dev='hda' bus='sata'/>
>> - <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
>> + <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
>> </disk>
>> <interface type='bridge'>
>> <model type='virtio'/>
>
> Yeah, the tests are now broken for bhyve indeed. However, there's a more
> serious problem than tests. The current bhyve address allocation code
> doesn't really care about 'drive' address type and uses pci addresses
> even for hard disk drivers. It's implemented this way to mimic the bhyve
> behaviour at the time of when this code was written, i.e.:
>
> -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve
>
> Where "2" is PCI slot and "0" is the function. So I guess the
main thing
> here is to adjust the address allocation code which I hoooope to do
> during this winter holidays...
Ah, didn't realize this problem. However, I still think this should go
in as it also fixes bhyvexml2argvtest which is failing now. The problem
you are mentioning can be addressed later.
That's right, I'm fine with pushing this now.
Roman Bogorodskiy
3:30 a.m.
New subject: [libvirt] [PATCH 8/9] bhyvexml2argvdata: Add mac address to <interface/>
In the next patch we will need a stable mac address for
<interface/>.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml | 1 +
tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 1 +
38 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
index e1afefd55..930166f07 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
@@ -7,5 +7,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:81:c4:b1 \
-s 2:0,ahci-hd,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
index 316aaf895..3e34a4e7b 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
@@ -18,6 +18,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:81:c4:b1'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
index 88de17934..76d597cc6 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
-s 2:0,ahci-hd,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
index c0d00f131..0b8066733 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
@@ -14,6 +14,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:b9:94:02'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
index 01a0290a5..a303ee3c5 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
@@ -5,6 +5,6 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 4:0,ahci-cd,/tmp/cdrom.iso bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
index 983e3ccae..44a59107d 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
@@ -21,6 +21,7 @@
<address type='drive' controller='0' bus='0'
target='4' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:8d:10:e1'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
index 01a0290a5..04601319b 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
@@ -5,6 +5,6 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 4:0,ahci-cd,/tmp/cdrom.iso bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
index 4dfc142b7..37e6a412e 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
@@ -21,6 +21,7 @@
<address type='drive' controller='0' bus='0'
target='4' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:92:68:0e'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
index 74622bc82..93378cc74 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:1e:63:25'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
index 01a0290a5..79631c3a6 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
@@ -5,6 +5,6 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 4:0,ahci-cd,/tmp/cdrom.iso bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
index da29b1bd4..5529cdce7 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
@@ -21,6 +21,7 @@
<boot order='1'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:7a:f5:a4'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
index f2190be33..46dc25ce4 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
@@ -22,6 +22,7 @@
<boot order='1'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:fe:97:82'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
index 88de17934..e80ff026a 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:11:bd:26 \
-s 2:0,ahci-hd,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
index c8268e0c1..08bff2fcf 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:11:bd:26'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
index fdd89872a..bd2892c47 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
@@ -5,7 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 1,lpc \
-l com1,/dev/nmdm0A bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
index bf1564ae2..67293e559 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
@@ -14,6 +14,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:b1:42:eb'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
index 88de17934..7a0eeb2fc 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:35:99:c2 \
-s 2:0,ahci-hd,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
index 02e83f7bb..909f7dcfb 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
@@ -16,6 +16,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:35:99:c2'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
index 20c62d4b8..907751c6c 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 \
-s 2:0,ahci-cd,/tmp/cdrom.iso bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
index 67ad98079..b95a3bee4 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:6f:6a:53'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
index 20c62d4b8..180650555 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b \
-s 2:0,ahci-cd,/tmp/cdrom.iso bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
index 61cef732a..c31084896 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:e3:ec:9b'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
index 4cc9e46f6..4dcc40404 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \
-s 2:0,virtio-blk,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
index 773d55e61..1d23a95e7 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
@@ -14,6 +14,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:bc:85:fe'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
index 74d53be5a..1b38be1ab 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
@@ -5,7 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:f4:6c:be \
-s 2:0,ahci-hd,/tmp/freebsd1.img \
-s 4:0,ahci-hd,/tmp/freebsd2.img \
-s 6:0,ahci-hd,/tmp/freebsd3.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
index 40f46a337..384cd74b2 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
@@ -28,6 +28,7 @@
<address type='drive' controller='0' bus='0'
target='6' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:f4:6c:be'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
index 74d53be5a..ae510d50d 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
@@ -5,7 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:0e:d2:6f \
-s 2:0,ahci-hd,/tmp/freebsd1.img \
-s 4:0,ahci-hd,/tmp/freebsd2.img \
-s 6:0,ahci-hd,/tmp/freebsd3.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
index c8e877c62..1f2ca4af4 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
@@ -30,6 +30,7 @@
<address type='drive' controller='0' bus='0'
target='6' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:0e:d2:6f'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
index 88de17934..9457ce955 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
@@ -5,5 +5,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 \
-s 2:0,ahci-hd,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
index 2745cd9e2..761a0120e 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:ee:f5:79'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
index d9f11b435..3f62aa7fb 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
@@ -4,5 +4,5 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:82:ca:a3 \
-s 2:0,ahci-hd,/tmp/freebsd.img bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
index e16d2132f..d0fb29404 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:82:ca:a3'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
index fdd89872a..4811d491b 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
@@ -5,7 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:a7:cd:5b \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 1,lpc \
-l com1,/dev/nmdm0A bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
index 83690d2d3..a6a743e71 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:a7:cd:5b'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
index fdd89872a..efdbd63a5 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
@@ -5,7 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:f0:72:11 \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 1,lpc \
-l com1,/dev/nmdm0A bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
index 83690d2d3..5d473bb75 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
@@ -15,6 +15,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:f0:72:11'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
index fdd89872a..ccce58263 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
@@ -5,7 +5,7 @@
-H \
-P \
-s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:4f:f3:5b \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 1,lpc \
-l com1,/dev/nmdm0A bhyve
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
index 2c6330c08..a354525a8 100644
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
@@ -14,6 +14,7 @@
<address type='drive' controller='0' bus='0'
target='2' unit='0'/>
</disk>
<interface type='bridge'>
+ <mac address='52:54:00:4f:f3:5b'/>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
--
2.11.0
3:30 a.m.
New subject: [libvirt] [PATCH 9/9] bhyvexml2xmltest: Test more XMLs
Currently, bhyvexml2xmltest does only one test. We can do better.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
.../bhyvexml2xmlout-acpiapic.xml | 34 ++++++++++++++++
tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml | 30 +++++++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder.xml | 37 ++++++++++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder1.xml | 37 ++++++++++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder2.xml | 30 +++++++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder3.xml | 37 ++++++++++++++++++
.../bhyvexml2xmlout-bhyveload-bootorder4.xml | 38 ++++++++++++++++++
.../bhyvexml2xmlout-bhyveload-explicitargs.xml | 30 +++++++++++++++
.../bhyvexml2xmlout-console.xml | 38 ++++++++++++++++++
.../bhyvexml2xmlout-custom-loader.xml | 31 +++++++++++++++
.../bhyvexml2xmlout-disk-cdrom-grub.xml | 31 +++++++++++++++
.../bhyvexml2xmlout-disk-cdrom.xml | 31 +++++++++++++++
.../bhyvexml2xmlout-disk-virtio.xml | 29 ++++++++++++++
.../bhyvexml2xmlout-grub-bootorder.xml | 43 +++++++++++++++++++++
.../bhyvexml2xmlout-grub-bootorder2.xml | 45 ++++++++++++++++++++++
.../bhyvexml2xmlout-grub-defaults.xml | 30 +++++++++++++++
.../bhyvexml2xmlout-localtime.xml | 30 +++++++++++++++
.../bhyvexml2xmlout-macaddr.xml | 30 +++++++++++++++
.../bhyvexml2xmlout-serial-grub-nocons.xml | 38 ++++++++++++++++++
.../bhyvexml2xmlout-serial-grub.xml | 38 ++++++++++++++++++
.../bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml | 38 ++++++++++++++++++
tests/bhyvexml2xmltest.c | 21 ++++++++++
22 files changed, 746 insertions(+)
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml
create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml
new file mode 100644
index 000000000..b4720ecaf
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml
@@ -0,0 +1,34 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <acpi/>
+ <apic/>
+ </features>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:81:c4:b1'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml
new file mode 100644
index 000000000..cd4e4f80d
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml
@@ -0,0 +1,30 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:b9:94:02'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml
new file mode 100644
index 000000000..ab01cb5ab
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml
@@ -0,0 +1,37 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ <boot dev='cdrom'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <disk type='file' device='cdrom'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/cdrom.iso'/>
+ <target dev='hdb' bus='sata'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:8d:10:e1'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml
new file mode 100644
index 000000000..df69c4e87
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml
@@ -0,0 +1,37 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <disk type='file' device='cdrom'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/cdrom.iso'/>
+ <target dev='hdb' bus='sata'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:92:68:0e'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml
new file mode 100644
index 000000000..89131dc85
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml
@@ -0,0 +1,30 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ <boot dev='cdrom'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:1e:63:25'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml
new file mode 100644
index 000000000..96f9dc4dd
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml
@@ -0,0 +1,37 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <disk type='file' device='cdrom'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/cdrom.iso'/>
+ <target dev='hdc' bus='sata'/>
+ <readonly/>
+ <boot order='1'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:7a:f5:a4'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml
new file mode 100644
index 000000000..1dd180bc0
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml
@@ -0,0 +1,38 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <boot order='2'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <disk type='file' device='cdrom'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/cdrom.iso'/>
+ <target dev='hdb' bus='sata'/>
+ <readonly/>
+ <boot order='1'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:fe:97:82'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml
new file mode 100644
index 000000000..d7743a640
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml
@@ -0,0 +1,30 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:11:bd:26'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml
new file mode 100644
index 000000000..bf926f96b
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml
@@ -0,0 +1,38 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:b1:42:eb'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ <serial type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target port='0'/>
+ </serial>
+ <console type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target type='serial' port='0'/>
+ </console>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml
new file mode 100644
index 000000000..3e7f145ed
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml
@@ -0,0 +1,31 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/fizz_buzz_bazz</bootloader>
+ <bootloader_args>-X -Y -Z</bootloader_args>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:35:99:c2'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml
new file mode 100644
index 000000000..285842c01
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml
@@ -0,0 +1,31 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/usr/local/sbin/grub-bhyve</bootloader>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='cdrom'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/cdrom.iso'/>
+ <target dev='hdc' bus='sata'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:6f:6a:53'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml
new file mode 100644
index 000000000..02517e4fd
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml
@@ -0,0 +1,31 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ <boot dev='cdrom'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='cdrom'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/cdrom.iso'/>
+ <target dev='hdc' bus='sata'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:e3:ec:9b'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml
new file mode 100644
index 000000000..065ae813a
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml
@@ -0,0 +1,29 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='vda' bus='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
+ </disk>
+ <interface type='bridge'>
+ <mac address='52:54:00:bc:85:fe'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml
new file mode 100644
index 000000000..939f7ba58
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml
@@ -0,0 +1,43 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/usr/local/sbin/grub-bhyve</bootloader>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd1.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd2.img'/>
+ <target dev='hdb' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd3.img'/>
+ <target dev='hdc' bus='sata'/>
+ <boot order='1'/>
+ <address type='drive' controller='0' bus='0'
target='6' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:f4:6c:be'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml
new file mode 100644
index 000000000..f774411e9
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml
@@ -0,0 +1,45 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/usr/local/sbin/grub-bhyve</bootloader>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd1.img'/>
+ <target dev='hda' bus='sata'/>
+ <boot order='111'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd2.img'/>
+ <target dev='hdb' bus='sata'/>
+ <boot order='22'/>
+ <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd3.img'/>
+ <target dev='hdc' bus='sata'/>
+ <boot order='3'/>
+ <address type='drive' controller='0' bus='0'
target='6' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:0e:d2:6f'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml
new file mode 100644
index 000000000..758986b3f
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml
@@ -0,0 +1,30 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/usr/local/sbin/grub-bhyve</bootloader>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:ee:f5:79'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml
new file mode 100644
index 000000000..7e08ff9de
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml
@@ -0,0 +1,30 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='localtime'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:82:ca:a3'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml
new file mode 100644
index 000000000..4e4e672fc
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml
@@ -0,0 +1,30 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:22:ee:11'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml
new file mode 100644
index 000000000..a379f1274
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml
@@ -0,0 +1,38 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/usr/local/sbin/grub-bhyve</bootloader>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:a7:cd:5b'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ <serial type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target port='0'/>
+ </serial>
+ <console type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target type='serial' port='0'/>
+ </console>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml
new file mode 100644
index 000000000..2864089ae
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml
@@ -0,0 +1,38 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <bootloader>/usr/local/sbin/grub-bhyve</bootloader>
+ <os>
+ <type arch='x86_64'>hvm</type>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:f0:72:11'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ <serial type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target port='0'/>
+ </serial>
+ <console type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target type='serial' port='0'/>
+ </console>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml
b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml
new file mode 100644
index 000000000..954c58aca
--- /dev/null
+++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml
@@ -0,0 +1,38 @@
+<domain type='bhyve'>
+ <name>bhyve</name>
+ <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
+ <memory unit='KiB'>219136</memory>
+ <currentMemory unit='KiB'>219136</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64'>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>
+ <disk type='file' device='disk'>
+ <driver name='file' type='raw'/>
+ <source file='/tmp/freebsd.img'/>
+ <target dev='hda' bus='sata'/>
+ <address type='drive' controller='0' bus='0'
target='2' unit='0'/>
+ </disk>
+ <controller type='sata' index='0'/>
+ <interface type='bridge'>
+ <mac address='52:54:00:4f:f3:5b'/>
+ <source bridge='virbr0'/>
+ <model type='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ <serial type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target port='0'/>
+ </serial>
+ <console type='nmdm'>
+ <source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
+ <target type='serial' port='0'/>
+ </console>
+ </devices>
+</domain>
diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c
index 756d5d2fc..e95cee4b8 100644
--- a/tests/bhyvexml2xmltest.c
+++ b/tests/bhyvexml2xmltest.c
@@ -63,7 +63,28 @@ mymain(void)
# define DO_TEST_DIFFERENT(name) \
DO_TEST_FULL(name, true)
+ DO_TEST_DIFFERENT("acpiapic");
+ DO_TEST_DIFFERENT("base");
+ DO_TEST_DIFFERENT("bhyveload-bootorder");
+ DO_TEST_DIFFERENT("bhyveload-bootorder1");
+ DO_TEST_DIFFERENT("bhyveload-bootorder2");
+ DO_TEST_DIFFERENT("bhyveload-bootorder3");
+ DO_TEST_DIFFERENT("bhyveload-bootorder4");
+ DO_TEST_DIFFERENT("bhyveload-explicitargs");
+ DO_TEST_DIFFERENT("console");
+ DO_TEST_DIFFERENT("custom-loader");
+ DO_TEST_DIFFERENT("disk-cdrom");
+ DO_TEST_DIFFERENT("disk-cdrom-grub");
+ DO_TEST_DIFFERENT("disk-virtio");
+ DO_TEST_DIFFERENT("grub-bootorder");
+ DO_TEST_DIFFERENT("grub-bootorder2");
+ DO_TEST_DIFFERENT("grub-defaults");
+ DO_TEST_DIFFERENT("localtime");
+ DO_TEST_DIFFERENT("macaddr");
DO_TEST_DIFFERENT("metadata");
+ DO_TEST_DIFFERENT("serial");
+ DO_TEST_DIFFERENT("serial-grub");
+ DO_TEST_DIFFERENT("serial-grub-nocons");
virObjectUnref(driver.caps);
virObjectUnref(driver.xmlopt);
--
2.11.0
10:29 a.m.
Michal Privoznik wrote:
After Andrea pointed out that FreeBSD build is broken [1], I've
started my freebsd domain and found out couple of problems. Here
are the fixes.
Oh, I've noticed alternative approaches to patch 6/9 on the list
[2] [3]. None of them have been ACKed though. Yet.
1: https://www.redhat.com/archives/libvir-list/2016-December/msg01121.html
2: https://www.redhat.com/archives/libvir-list/2016-December/msg00009.html
3: https://www.redhat.com/archives/libvir-list/2016-December/msg01123.html
Michal Privoznik (9):
tests: Run virmacmaptest iff WITH_YAJL
tests: Move test_libraries a bit higher
virt-nss: Introduce more checks before enabling NSS
tests: Run nss*test iff WITH_NSS
src: Build libvirt_nss.la iff WITH_NSS
networkxml2conftest: s/lo/lo0/ on non-Linux
bhyvexml2argvdata: Fix <drive/> addresses
bhyvexml2argvdata: Add mac address to <interface/>
bhyvexml2xmltest: Test more XMLs
ACK the series, but would love to read your feedback on:
- 1/9: virmacmap test that core dumps
- 6/9: lo0/lo solution from Martin
- 7/9: this one could probably until the actual addresses fix
Roman Bogorodskiy
2912
days inactive
2918
days old
18 comments
3 participants
participants (3)
-
Andrea Bolognani -
Michal Privoznik -
Roman Bogorodskiy