From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6dkc-00068G-Of for qemu-devel@nongnu.org; Mon, 14 Jul 2014 06:45:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6dkT-0002cn-HM for qemu-devel@nongnu.org; Mon, 14 Jul 2014 06:44:54 -0400 Received: from mail-we0-x232.google.com ([2a00:1450:400c:c03::232]:43230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6dkT-0002cL-BA for qemu-devel@nongnu.org; Mon, 14 Jul 2014 06:44:45 -0400 Received: by mail-we0-f178.google.com with SMTP id w61so2987311wes.37 for ; Mon, 14 Jul 2014 03:44:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 14 Jul 2014 12:44:35 +0200 Message-Id: <1405334675-16453-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for 2.1] virtio-scsi: fix with -M pc-i440fx-2.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com Right now starting a machine with virtio-scsi and a <= 2.0 machine type fails with: qemu-system-x86_64: -device virtio-scsi-pci: Property .any_layout not found This is because the any_layout bit was actually never set after virtio-scsi was changed to support arbitrary layout for virtio buffers. (This was just a cleanup and a preparation for virtio 1.0; no guest actually checks the bit, but the new request parsing algorithms are tested even with old guest). Reported-by: David Gilbert Signed-off-by: Paolo Bonzini --- include/hw/virtio/virtio-scsi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index 0419ee4..188a2d9 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -178,6 +178,8 @@ typedef struct { DEFINE_PROP_UINT32("cmd_per_lun", _state, _conf_field.cmd_per_lun, 128) #define DEFINE_VIRTIO_SCSI_FEATURES(_state, _feature_field) \ + DEFINE_PROP_BIT("any_layout", _state, _feature_field, \ + VIRTIO_F_ANY_LAYOUT, true), \ DEFINE_PROP_BIT("hotplug", _state, _feature_field, VIRTIO_SCSI_F_HOTPLUG, \ true), \ DEFINE_PROP_BIT("param_change", _state, _feature_field, \ -- 1.9.3