Re: [libvirt] [PATCH 2/2] build acpitable argument for qemu
On Wed, Jan 09, 2013 at 10:35:33AM +0800, liguang wrote: Signed-off-by: liguang lig.f...@cn.fujitsu.com --- src/conf/domain_conf.c |1 + src/conf/domain_conf.h |1 + src/qemu/qemu_command.c |4 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a7646e..54ba77f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9548,6 +9548,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def-os.bootloader = virXPathString(string(./bootloader), ctxt); def-os.bootloaderArgs = virXPathString(string(./bootloader_args), ctxt); +def-os.acpitable = virXPathString(string(./bootloader_args), ctxt); This is clearly bogus - you can't just grab an existing XML field and repurpose it. Second we shouldn't be requireing the user to specify custom ACPI tables just to use the machine type. libvirt should do the right thing with q35. Daniel -- |: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/2] build acpitable argument for qemu
On 01/09/2013 05:31 AM, Daniel P. Berrange wrote: On Wed, Jan 09, 2013 at 10:35:33AM +0800, liguang wrote: Signed-off-by: liguang lig.f...@cn.fujitsu.com --- src/conf/domain_conf.c |1 + src/conf/domain_conf.h |1 + src/qemu/qemu_command.c |4 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a7646e..54ba77f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9548,6 +9548,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def-os.bootloader = virXPathString(string(./bootloader), ctxt); def-os.bootloaderArgs = virXPathString(string(./bootloader_args), ctxt); +def-os.acpitable = virXPathString(string(./bootloader_args), ctxt); This is clearly bogus - you can't just grab an existing XML field and repurpose it. Second we shouldn't be requireing the user to specify custom ACPI tables just to use the machine type. libvirt should do the right thing with q35. Daniel Also, there are patches on qemu-devel which claim to remove the -acpitable requirement. https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg00356.html - Cole -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH 2/2] build acpitable argument for qemu
Signed-off-by: liguang lig.f...@cn.fujitsu.com --- src/conf/domain_conf.c |1 + src/conf/domain_conf.h |1 + src/qemu/qemu_command.c |4 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a7646e..54ba77f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9548,6 +9548,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def-os.bootloader = virXPathString(string(./bootloader), ctxt); def-os.bootloaderArgs = virXPathString(string(./bootloader_args), ctxt); +def-os.acpitable = virXPathString(string(./bootloader_args), ctxt); def-os.type = virXPathString(string(./os/type[1]), ctxt); if (!def-os.type) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5062e07..4f1dd10 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1514,6 +1514,7 @@ struct _virDomainOSDef { char *loader; char *bootloader; char *bootloaderArgs; +char *acpitable; int smbios_mode; virDomainBIOSDef bios; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f40e1a5..ec56706 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5606,6 +5606,10 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, -bootloader, def-os.bootloader, NULL); } +if (def-os.acpitable) +virCommandAddArgFormat(cmd, -acpitable file=%s, + def-os.acpitable); + for (i = 0 ; i def-ndisks ; i++) { virDomainDiskDefPtr disk = def-disks[i]; -- 1.7.2.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list