are you sure that it's the correct bug id ?
"Bug 33 - gft2-tools cannot be installed: conflict with redhat-cluster-pve"
But for sata, I thin we have had a patch for previous proxmox release. (maybe
not stable).
I see a patches in qemu-mailing from january, don't know why it's not upstream
From: Kevin Wolf <kw...@redhat.com>
To: anth...@codemonkey.ws
Date: Fri, 25 Jan 2013 19:45:58 +0100
Message-Id: <1359139560-15387-23-git-send-email-kw...@redhat.com>
In-Reply-To: <1359139560-15387-1-git-send-email-kw...@redhat.com>
References: <1359139560-15387-1-git-send-email-kw...@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id
r0PIkcxb020984
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 209.132.183.28
Cc: kw...@redhat.com, qemu-de...@nongnu.org
Subject: [Qemu-devel] [PATCH 22/24] ahci: Add migration support
X-BeenThere: qemu-de...@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-requ...@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-de...@nongnu.org>
List-Help: <mailto:qemu-devel-requ...@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-requ...@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+aderumier=odiso....@nongnu.org
Sender: qemu-devel-bounces+aderumier=odiso....@nongnu.org
From: Jason Baron <jba...@redhat.com>
Jason tested these patches by migrating Windows 7 and Fedora 17 guests
(while under I/O) on both piix with ahci attached and on q35 (which has
a built-in AHCI controller).
Signed-off-by: Andreas F=C3=A4rber <afaer...@suse.de>
Signed-off-by: Jason Baron <jba...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
---
hw/ide/ahci.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++=
+++++-
hw/ide/ahci.h | 10 +++++++
hw/ide/ich.c | 14 +++++++---
3 files changed, 101 insertions(+), 5 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index f91cff2..ad0094f 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1199,6 +1199,82 @@ void ahci_reset(AHCIState *s)
}
}
=20
+static const VMStateDescription vmstate_ahci_device =3D {
+ .name =3D "ahci port",
+ .version_id =3D 1,
+ .fields =3D (VMStateField []) {
+ VMSTATE_IDE_BUS(port, AHCIDevice),
+ VMSTATE_UINT32(port_state, AHCIDevice),
+ VMSTATE_UINT32(finished, AHCIDevice),
+ VMSTATE_UINT32(port_regs.lst_addr, AHCIDevice),
+ VMSTATE_UINT32(port_regs.lst_addr_hi, AHCIDevice),
+ VMSTATE_UINT32(port_regs.fis_addr, AHCIDevice),
+ VMSTATE_UINT32(port_regs.fis_addr_hi, AHCIDevice),
+ VMSTATE_UINT32(port_regs.irq_stat, AHCIDevice),
+ VMSTATE_UINT32(port_regs.irq_mask, AHCIDevice),
+ VMSTATE_UINT32(port_regs.cmd, AHCIDevice),
+ VMSTATE_UINT32(port_regs.tfdata, AHCIDevice),
+ VMSTATE_UINT32(port_regs.sig, AHCIDevice),
+ VMSTATE_UINT32(port_regs.scr_stat, AHCIDevice),
+ VMSTATE_UINT32(port_regs.scr_ctl, AHCIDevice),
+ VMSTATE_UINT32(port_regs.scr_err, AHCIDevice),
+ VMSTATE_UINT32(port_regs.scr_act, AHCIDevice),
+ VMSTATE_UINT32(port_regs.cmd_issue, AHCIDevice),
+ VMSTATE_BOOL(done_atapi_packet, AHCIDevice),
+ VMSTATE_INT32(busy_slot, AHCIDevice),
+ VMSTATE_BOOL(init_d2h_sent, AHCIDevice),
+ VMSTATE_END_OF_LIST()
+ },
+};
+
+static int ahci_state_post_load(void *opaque, int version_id)
+{
+ int i;
+ struct AHCIDevice *ad;
+ AHCIState *s =3D opaque;
+
+ for (i =3D 0; i < s->ports; i++) {
+ ad =3D &s->dev[i];
+ AHCIPortRegs *pr =3D &ad->port_regs;
+
+ map_page(&ad->lst,
+ ((uint64_t)pr->lst_addr_hi << 32) | pr->lst_addr, 1024)=
;
+ map_page(&ad->res_fis,
+ ((uint64_t)pr->fis_addr_hi << 32) | pr->fis_addr, 256);
+ /*
+ * All pending i/o should be flushed out on a migrate. However,
+ * we might not have cleared the busy_slot since this is done
+ * in a bh. Also, issue i/o against any slots that are pending.
+ */
+ if ((ad->busy_slot !=3D -1) &&
+ !(ad->port.ifs[0].status & (BUSY_STAT|DRQ_STAT))) {
+ pr->cmd_issue &=3D ~(1 << ad->busy_slot);
+ ad->busy_slot =3D -1;
+ }
+ check_cmd(s, i);
+ }
+
+ return 0;
+}
+
+const VMStateDescription vmstate_ahci =3D {
+ .name =3D "ahci",
+ .version_id =3D 1,
+ .post_load =3D ahci_state_post_load,
+ .fields =3D (VMStateField []) {
+ VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports,
+ vmstate_ahci_device, AHCIDevice),
+ VMSTATE_UINT32(control_regs.cap, AHCIState),
+ VMSTATE_UINT32(control_regs.ghc, AHCIState),
+ VMSTATE_UINT32(control_regs.irqstatus, AHCIState),
+ VMSTATE_UINT32(control_regs.impl, AHCIState),
+ VMSTATE_UINT32(control_regs.version, AHCIState),
+ VMSTATE_UINT32(idp_index, AHCIState),
+ VMSTATE_INT32(ports, AHCIState),
+ VMSTATE_END_OF_LIST()
+ },
+};
+
typedef struct SysbusAHCIState {
SysBusDevice busdev;
AHCIState ahci;
@@ -1207,7 +1283,11 @@ typedef struct SysbusAHCIState {
=20
static const VMStateDescription vmstate_sysbus_ahci =3D {
.name =3D "sysbus-ahci",
- .unmigratable =3D 1,
+ .unmigratable =3D 1, /* Still buggy under I/O load */
+ .fields =3D (VMStateField []) {
+ VMSTATE_AHCI(ahci, AHCIPCIState),
+ VMSTATE_END_OF_LIST()
+ },
};
=20
static void sysbus_ahci_reset(DeviceState *dev)
diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h
index 70d3b57..85f37fe 100644
--- a/hw/ide/ahci.h
+++ b/hw/ide/ahci.h
@@ -305,6 +305,16 @@ typedef struct AHCIPCIState {
AHCIState ahci;
} AHCIPCIState;
=20
+extern const VMStateDescription vmstate_ahci;
+
+#define VMSTATE_AHCI(_field, _state) { \
+ .name =3D (stringify(_field)), \
+ .size =3D sizeof(AHCIState), \
+ .vmsd =3D &vmstate_ahci, \
+ .flags =3D VMS_STRUCT, \
+ .offset =3D vmstate_offset_value(_state, _field, AHCIState), \
+}
+
typedef struct NCQFrame {
uint8_t fis_type;
uint8_t c;
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 1fb803d..cc30adc 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -79,9 +79,15 @@
#define ICH9_IDP_INDEX 0x10
#define ICH9_IDP_INDEX_LOG2 0x04
=20
-static const VMStateDescription vmstate_ahci =3D {
- .name =3D "ahci",
- .unmigratable =3D 1,
+static const VMStateDescription vmstate_ich9_ahci =3D {
+ .name =3D "ich9_ahci",
+ .unmigratable =3D 1, /* Still buggy under I/O load */
+ .version_id =3D 1,
+ .fields =3D (VMStateField []) {
+ VMSTATE_PCI_DEVICE(card, AHCIPCIState),
+ VMSTATE_AHCI(ahci, AHCIPCIState),
+ VMSTATE_END_OF_LIST()
+ },
};
=20
static void pci_ich9_reset(DeviceState *dev)
@@ -152,7 +158,7 @@ static void ich_ahci_class_init(ObjectClass *klass, v=
oid *data)
k->device_id =3D PCI_DEVICE_ID_INTEL_82801IR;
k->revision =3D 0x02;
k->class_id =3D PCI_CLASS_STORAGE_SATA;
- dc->vmsd =3D &vmstate_ahci;
+ dc->vmsd =3D &vmstate_ich9_ahci;
dc->reset =3D pci_ich9_reset;
}
=20
--=20
1.7.6.5
----- Mail original -----
De: "Martin Maurer" <mar...@proxmox.com>
À: "Dietmar Maurer" <diet...@proxmox.com>
Cc: pve-devel@pve.proxmox.com
Envoyé: Vendredi 22 Février 2013 20:45:48
Objet: Re: [pve-devel] cannot live migrate with sata disks (ich9)
See https://bugzilla.proxmox.com/show_bug.cgi?id=33
Martin
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
