Re: [libvirt PATCH 06/51] conf/domain_conf: Update format strings in translated messages

On Fri, Mar 10, 2023 at 05:09:22PM +0100, Jiri Denemark wrote: This is an unusal case The current msgid was completely broken as xgettext does not cope with macro expansion, thus libvirt.pot merely contains "Target device PCI address " !! At the end of the series though there are still some places which are using this format which are translatable: $ git grep VIR_PCI_DEVICE_ADDRESS_FMT src/libxl/libxl_driver.c: _("target pci device " VIR_PCI_DEVICE_ADDRESS_FMT src/libxl/libxl_driver.c: VIR_PCI_DEVICE_ADDRESS_FMT), src/libxl/libxl_driver.c: _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT src/libxl/libxl_driver.c: VIR_PCI_DEVICE_ADDRESS_FMT), src/libxl/libxl_driver.c: VIR_PCI_DEVICE_ADDRESS_FMT), src/qemu/qemu_command.c: g_autofree char *host = g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, src/qemu/qemu_hotplug.c: _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT src/util/virpci.c: return g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, src/util/virpci.c: pcidir = g_strdup_printf("/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FMT, src/util/virpci.c: groupPath = g_strdup_printf(PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_group/devices", src/util/virpci.c: VIR_DEBUG("PF for VF device '%s': " VIR_PCI_DEVICE_ADDRESS_FMT, src/util/virpci.c: *pci_sysfs_device_link = g_strdup_printf(PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, src/util/virpci.h:#define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d" the virpci.c hits are safe as they're for filenames. The qemu_hotplug.c and libxl_driver.c files need changing though. I think ideally we would make VIR_PCI_DEVICE_ADDRESS_FMT private to virpci.c, and add a helper to virpci.c that can be used from qemu_command.c, so we avoid introducing more usage of this in translations. eg virPCIAddressFormat(....) Likewise add a helper for VIR_CCW_DEVICE_ADDRESS_FMT, which fortunately is not (yet) used in any translations. I think this ought to all be done in a commit at the start of this series, so this patch is merely adding format positions. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|