search for: end_el

In some places when generating XML output in C code we use some clever macros: start_element ("memory") { attribute ("unit", "MiB"); string ("%d", g->memsize); } end_element (); This commit which is mostly refactoring moves the repeated definitions of these macros into a common header file. I also took this opportunity to change / clean up the macros: - The macros are now documented properly. - comment() and empty_element() macros are now available everywher...

After the previous commit, wherever we had: start_element ("foo") { string ("bar"); } end_element (); this can now be replaced by: single_element ("foo", "bar"); --- common/utils/libxml2-writer-macros.h | 2 +- lib/launch-libvirt.c | 78 ++++++++-------------------- p2v/physical-xml.c | 15 ++---- 3 files changed, 26 insertions(+)...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-October/msg00047.html However it was broken in a few ways. First of all the documentation was broken because "/**" enhanced comments were not permitted on macros. This is fixed in the new 1/4 patch. Secondly we didn't use single_element() everywhere possible, which is fixed in the new 4/4 patch. Lastly I've

Consolidate and extend the use of funky start_element() etc macros. Rich.

qemu in SLIRP mode offers DHCP services to the appliance. We don't use them, but use a fixed IP address intead. This changes the appliance to get its IP address using DHCP. Note: This is only used when the network is enabled. dhclient is somewhat slower, but the penalty (a few seconds) is only paid for network users. We could consider using the faster systemd dhcp client instead. ---

...++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 706ae38..50c3f9d 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -1236,6 +1236,19 @@ construct_libvirt_xml_devices (guestfs_h *g, } end_element (); } end_element (); + /* Connect to libvirt bridge virbr0 (see: RHBZ#1148012). */ + if (g->enable_network) { + start_element ("interface") { + attribute ("type", "bridge"); + start_element ("source") { + attr...

...le changed, 13 insertions(+), 21 deletions(-) > > diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c > index 706ae38..50c3f9d 100644 > --- a/src/launch-libvirt.c > +++ b/src/launch-libvirt.c > @@ -1236,6 +1236,19 @@ construct_libvirt_xml_devices (guestfs_h *g, > } end_element (); > } end_element (); > > + /* Connect to libvirt bridge virbr0 (see: RHBZ#1148012). */ > + if (g->enable_network) { > + start_element ("interface") { > + attribute ("type", "bridge"); > + start_element (&q...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-October/msg00047.html v2 was here: https://www.redhat.com/archives/libguestfs/2018-October/msg00051.html v3: - Back to using string/string_format and attribute/attribute_format. - Add both single_element and single_element_format. - Rebased and retested. Rich.

This patch causes aarch64 to use virtio-pci instead of virtio-mmio. Virtio-pci is considerably faster than virtio-mmio, it's more like how other architectures work, and it supports hotplugging (although it's not likely we'd use the latter feature). I'm not necessarily suggesting that we apply this. Laine (CC'd) has some further patches to libvirt lined up which AIUI would

Possibly for post 1.40. Rich.

...nt (xo)); XMLERROR (-1, xmlTextWriterEndElement (xo)); The new code looks like this: start_element ("cpu") { attribute ("mode", "host-passthrough"); start_element ("model") { attribute ("fallback", "allow"); } end_element (); } end_element (); --- src/launch-libvirt.c | 157 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 96 insertions(+), 61 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index f28b288..b2af881 100644 --- a/src/launch-libvirt.c +++ b/src/launch-li...

...I_SLOT_NETWORK 5 + /* These macros make it easier to write XML, but they also make a lot * of assumptions: * @@ -1337,6 +1344,9 @@ construct_libvirt_xml_devices (guestfs_h *g, attribute ("model", "random"); string ("/dev/urandom"); } end_element (); + if (construct_libvirt_xml_virtio_pci_address (g, xo, + VIRTIO_PCI_SLOT_RNG) == -1) + return -1; } end_element (); } @@ -1345,6 +1355,9 @@ construct_libvirt_xml_devices (guestfs_h *g, attribute (&quo...

Use libvirt to set up the user network instead of a custom qemu argument. Note this requires a non-upstream patch being discussed on the libvirt mailing list at the moment. https://bugzilla.redhat.com/show_bug.cgi?id=1075520#c6 Rich.

...ler (g); - if (g->enable_network && check_bridge_exists (g, data->network_bridge) == -1) - goto cleanup; - /* Locate and/or build the appliance. */ TRACE0 (launch_build_libvirt_appliance_start); @@ -1276,19 +1265,6 @@ construct_libvirt_xml_devices (guestfs_h *g, } end_element (); } end_element (); - /* Connect to libvirt bridge (see: RHBZ#1148012). */ - if (g->enable_network) { - start_element ("interface") { - attribute ("type", "bridge"); - start_element ("source") { - attribute (...

v3: - Various changes to dhclient/dhcpcd as discussed on the mailing list.

Unfortunately I was not able to test this because I don't currently have access to a P9 machine. Rich.

Let's actually compile and test the patch this time, rather than trusting the RHEL 7.6 patch to apply directly to head ... Rich.

v2: - Make virbr0 configurable. - Fix the tests.

...irt.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 7a57f30..ca12320 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -1085,12 +1085,16 @@ construct_libvirt_xml_cpu (guestfs_h *g, } end_element (); } else { - /* XXX This does not work, see: + /* XXX This does not work on aarch64, see: * https://www.redhat.com/archives/libvirt-users/2014-August/msg00043.html + * https://bugzilla.redhat.com/show_bug.cgi?id=1184411 + * Instead we hack around it us...

...guestfs_h *g, > } > } > > +#ifdef __powerpc64__ > + start_element ("features") { > + start_element ("pseries") { > + start_element ("htm") { > + attribute ("state", "on"); > + } end_element (); > + } end_element (); > + } end_element (); > +#endif This generates an XML snippet like: <features> <pseries> <htm state="on"/> </pseries> </features> I see two problems: - there is no <pseries> subelement,...