|
 |
fbe740 |
From 92ec9a02d57b18eac3abc33e0807cd70c6bb46c5 Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <92ec9a02d57b18eac3abc33e0807cd70c6bb46c5@dist-git>
|
|
|
fbe740 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Date: Tue, 4 Feb 2020 15:08:03 +0100
|
|
|
fbe740 |
Subject: [PATCH] qemuMigrationCookieNBD: Extract embedded struct
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
Extract the struct so that it's type has a name.
|
|
|
fbe740 |
|
|
|
fbe740 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
fbe740 |
(cherry picked from commit 3093822d1d8e3bbd01ea59f35a9fea1228f9268f)
|
|
|
fbe740 |
|
|
|
fbe740 |
https://bugzilla.redhat.com/show_bug.cgi?id=1793263
|
|
|
fbe740 |
Message-Id: <e05be367f0869dbbf726cea7e91925fc48bb683f.1580824112.git.pkrempa@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_migration_cookie.h | 10 ++++++----
|
|
|
fbe740 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h
|
|
|
fbe740 |
index 20e1ed60ca..1e88684589 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_migration_cookie.h
|
|
|
fbe740 |
+++ b/src/qemu/qemu_migration_cookie.h
|
|
|
fbe740 |
@@ -84,16 +84,18 @@ struct _qemuMigrationCookieNetwork {
|
|
|
fbe740 |
qemuMigrationCookieNetDataPtr net;
|
|
|
fbe740 |
};
|
|
|
fbe740 |
|
|
|
fbe740 |
+struct qemuMigrationCookieNBDDisk {
|
|
|
fbe740 |
+ char *target; /* Disk target */
|
|
|
fbe740 |
+ unsigned long long capacity; /* And its capacity */
|
|
|
fbe740 |
+};
|
|
|
fbe740 |
+
|
|
|
fbe740 |
typedef struct _qemuMigrationCookieNBD qemuMigrationCookieNBD;
|
|
|
fbe740 |
typedef qemuMigrationCookieNBD *qemuMigrationCookieNBDPtr;
|
|
|
fbe740 |
struct _qemuMigrationCookieNBD {
|
|
|
fbe740 |
int port; /* on which port does NBD server listen for incoming data */
|
|
|
fbe740 |
|
|
|
fbe740 |
size_t ndisks; /* Number of items in @disk array */
|
|
|
fbe740 |
- struct {
|
|
|
fbe740 |
- char *target; /* Disk target */
|
|
|
fbe740 |
- unsigned long long capacity; /* And its capacity */
|
|
|
fbe740 |
- } *disks;
|
|
|
fbe740 |
+ struct qemuMigrationCookieNBDDisk *disks;
|
|
|
fbe740 |
};
|
|
|
fbe740 |
|
|
|
fbe740 |
typedef struct _qemuMigrationCookieCaps qemuMigrationCookieCaps;
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.25.0
|
|
|
fbe740 |
|