[fedora-virt] Upgrading qemu to 1.1 in rawhide

[Hans de Goede]

Hi,

On 07/04/2012 08:34 PM, Ruben Kerkhof wrote:
> On Wed, Jul 4, 2012 at 2:40 PM, Hans de Goede <hdegoede at redhat.com> wrote:
>> Hi all,
>
> Hey Hans,
>
>> This is just a heads-up that I intend to upgrade qemu to 1.1 for rawhide,
>> dropping about a 100 spice/usb patches which are upstream now :)
>>
>> If you do not want me to do this please protest loud and quickly, because
>> I expect to build the new qemu before the end of today.
>
> While you're at it, would you mind picking up 2 patches from the
> stable-1.1 branch? They missed the release by a few days.
> They are:
> 6f82a5e qemu-kvm: virtio: Do not register mask notifiers without
> in-kernel irqchip support
> 398b87f qemu-kvm: Add missing default machine options

I've already added those 2 :) But there are some problems doing the non
kvm builds from the qemu-kvm sources. First I got linker errors,
which I've fixed with the following patch:

--- a/Makefile.objs
+++ b/Makefile.objs
@@ -211,10 +211,8 @@ hw-obj-y =
  hw-obj-y += vl.o loader.o
  hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
  hw-obj-y += usb/libhw.o
-hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
  hw-obj-y += fw_cfg.o
  hw-obj-$(CONFIG_PCI) += pci_bridge.o pci_bridge_dev.o
-hw-obj-$(CONFIG_PCI) += msix.o msi.o
  hw-obj-$(CONFIG_PCI) += shpc.o
  hw-obj-$(CONFIG_PCI) += slotid_cap.o
  hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
--- a/Makefile.target
+++ b/Makefile.target
@@ -183,9 +183,10 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o b
  # virtio has to be here due to weird dependency between PCI and virtio-net.
  # need to fix this properly
  obj-$(CONFIG_NO_PCI) += pci-stub.o
-obj-$(CONFIG_PCI) += pci.o
+obj-$(CONFIG_PCI) += pci.o msi.o msix.o
  obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o vi
  obj-$(CONFIG_VIRTIO) += virtio-scsi.o
+obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
  obj-y += vhost_net.o
  obj-$(CONFIG_VHOST_NET) += vhost.o
  obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o

And now make check is hanging, so likely there is some silent breakage of
non kvm builds too. I'm going to try the big hammer next and put a
"make clean" between the kvm and non kvm builds.

Regards,

Hans