On 2011-07-20 10:13, Avi Kivity wrote:
> On 07/19/2011 08:30 PM, Jan Kiszka wrote:
>>> Rebasing is already not so fun for me with 78 patches and counting.
>>> Let's drop yours and focus of getting mine in shape, since it's a superset.
>>
>> The patches series are widely orthogonal except for both killing the
>> obsolete start/stop logging logic.
>>
>> But I don't mind rebasing over yours - if something is finally merged at
>> all.
>
> If you post patches I'll incorporate them in my patchset. They're
> available in qemu-kvm.git branch memory-region.
Thanks, looking into this ATM.
To allow building of that branch, this needs to be folded on one of the
patches:
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index a75a5a9..92ba3c9 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -161,7 +161,8 @@ static int virtio_pci_set_host_notifier_internal(VirtIOPCIProxy *proxy,
{
VirtQueue *vq = virtio_get_queue(proxy->vdev, n);
EventNotifier *notifier = virtio_queue_get_host_notifier(vq);
- int r;
+ int r = 0;
+
if (assign) {
r = event_notifier_init(notifier, 1);
if (r < 0) {
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
